diff --git a/.github/workflows/publish-datahub-jars.yml b/.github/workflows/publish-datahub-jars.yml
index eb57c29e151ae6..5aec66bc33bb67 100644
--- a/.github/workflows/publish-datahub-jars.yml
+++ b/.github/workflows/publish-datahub-jars.yml
@@ -196,3 +196,52 @@ jobs:
           echo signingKey=$SIGNING_KEY >> gradle.properties
           ./gradlew -PreleaseVersion=${{ needs.setup.outputs.tag }} :metadata-integration:java:custom-plugin-lib:publish
           ./gradlew :metadata-integration:java:custom-plugin-lib:closeAndReleaseRepository --info
+  publish-java8:
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read
+    needs: ["check-secret", "setup"]
+    if: ${{ needs.check-secret.outputs.publish-enabled == 'true' }}
+    steps:
+      - uses: acryldata/sane-checkout-action@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: "zulu"
+          java-version: 17
+      - uses: gradle/actions/setup-gradle@v3
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.10"
+          cache: "pip"
+      - name: checkout upstream repo
+        run: |
+          git remote add upstream https://github.com/datahub-project/datahub.git
+          git fetch upstream --tags --force --filter=tree:0
+      - name: publish datahub-client jar snapshot
+        if: ${{ github.event_name != 'release' }}
+        env:
+          RELEASE_USERNAME: ${{ secrets.RELEASE_USERNAME }}
+          RELEASE_PASSWORD: ${{ secrets.RELEASE_PASSWORD }}
+          SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
+          SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
+          NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }}
+          NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
+        run: |
+          echo signingKey=$SIGNING_KEY >> gradle.properties
+          ./gradlew :metadata-integration:java:datahub-client:printVersion -PjavaClassVersionDefault=8 -ParchiveAppendix=java8
+          ./gradlew :metadata-integration:java:datahub-client:publish -PjavaClassVersionDefault=8 -ParchiveAppendix=java8
+      - name: release datahub-client jar
+        if: ${{ github.event_name == 'release' }}
+        env:
+          RELEASE_USERNAME: ${{ secrets.RELEASE_USERNAME }}
+          RELEASE_PASSWORD: ${{ secrets.RELEASE_PASSWORD }}
+          SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
+          SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
+          NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }}
+          NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
+        run: |
+          echo signingKey=$SIGNING_KEY >> gradle.properties
+          ./gradlew -PreleaseVersion=${{ needs.setup.outputs.tag }} :metadata-integration:java:datahub-client:publish -PjavaClassVersionDefault=8 -ParchiveAppendix=java8
+          ./gradlew :metadata-integration:java:datahub-client:closeAndReleaseRepository --info -PjavaClassVersionDefault=8 -ParchiveAppendix=java8
\ No newline at end of file
diff --git a/datahub-web-react/src/App.tsx b/datahub-web-react/src/App.tsx
index 2fdd7c8ed68004..81f137417f1f8a 100644
--- a/datahub-web-react/src/App.tsx
+++ b/datahub-web-react/src/App.tsx
@@ -79,7 +79,7 @@ export const InnerApp: React.VFC = () => {
         <HelmetProvider>
             <CustomThemeProvider>
                 <Helmet>
-                    <title>{useCustomTheme().theme?.content.title}</title>
+                    <title>{useCustomTheme().theme?.content?.title}</title>
                 </Helmet>
                 <Router>
                     <Routes />
diff --git a/datahub-web-react/src/app/AdminConsole.tsx b/datahub-web-react/src/app/AdminConsole.tsx
index f6395a3bd3cb8a..a79575c3d88d78 100644
--- a/datahub-web-react/src/app/AdminConsole.tsx
+++ b/datahub-web-react/src/app/AdminConsole.tsx
@@ -37,8 +37,8 @@ export const AdminConsole = (): JSX.Element => {
     const [adminConsoleOpen, setAdminConsoleOpen] = useState(false);
     const { config } = useAppConfig();
 
-    const isAnalyticsEnabled = config?.analyticsConfig.enabled;
-    const isPoliciesEnabled = config?.policiesConfig.enabled;
+    const isAnalyticsEnabled = config?.analyticsConfig?.enabled;
+    const isPoliciesEnabled = config?.policiesConfig?.enabled;
 
     const showAnalytics = (isAnalyticsEnabled && me && me?.platformPrivileges?.viewAnalytics) || false;
     const showPolicyBuilder = (isPoliciesEnabled && me && me?.platformPrivileges?.managePolicies) || false;
diff --git a/datahub-web-react/src/app/analyticsDashboard/components/AnalyticsPage.tsx b/datahub-web-react/src/app/analyticsDashboard/components/AnalyticsPage.tsx
index bf0e5af2427bbb..f139ef7368a74d 100644
--- a/datahub-web-react/src/app/analyticsDashboard/components/AnalyticsPage.tsx
+++ b/datahub-web-react/src/app/analyticsDashboard/components/AnalyticsPage.tsx
@@ -121,11 +121,11 @@ export const AnalyticsPage = () => {
                                 placeholder="Select a domain"
                                 onChange={onDomainChange}
                                 filterOption={(input, option) =>
-                                    option?.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                                    option?.children?.toLowerCase()?.indexOf(input.toLowerCase()) >= 0
                                 }
                             >
                                 <Select.Option value="ALL">All</Select.Option>
-                                {domainData?.listDomains?.domains.map((domainChoice) => (
+                                {domainData?.listDomains?.domains?.map((domainChoice) => (
                                     <Select.Option value={domainChoice.urn}>
                                         {domainChoice?.properties?.name}
                                     </Select.Option>
diff --git a/datahub-web-react/src/app/domain/nestedDomains/domainNavigator/DomainNode.tsx b/datahub-web-react/src/app/domain/nestedDomains/domainNavigator/DomainNode.tsx
index bf70bd043fd4a1..82977eff4f95bc 100644
--- a/datahub-web-react/src/app/domain/nestedDomains/domainNavigator/DomainNode.tsx
+++ b/datahub-web-react/src/app/domain/nestedDomains/domainNavigator/DomainNode.tsx
@@ -83,7 +83,7 @@ export default function DomainNode({ domain, numDomainChildren, domainUrnToHide,
     const hasDomainChildren = useHasDomainChildren({ domainUrn: domain.urn, numDomainChildren });
 
     const shouldAutoOpen = useMemo(
-        () => !isInSelectMode && entityData?.parentDomains?.domains.some((parent) => parent.urn === domain.urn),
+        () => !isInSelectMode && entityData?.parentDomains?.domains?.some((parent) => parent.urn === domain.urn),
         [isInSelectMode, entityData, domain.urn],
     );
 
diff --git a/datahub-web-react/src/app/embed/lookup/useGetEntityByUrl.ts b/datahub-web-react/src/app/embed/lookup/useGetEntityByUrl.ts
index f11a3a02b43448..49136c39fd2424 100644
--- a/datahub-web-react/src/app/embed/lookup/useGetEntityByUrl.ts
+++ b/datahub-web-react/src/app/embed/lookup/useGetEntityByUrl.ts
@@ -31,7 +31,7 @@ const useGetEntityByUrl = (externalUrl: string) => {
     const getLookupData = () => {
         if (!data) return {} as const;
 
-        const entities = data.searchAcrossEntities?.searchResults.map((result) => result.entity) ?? [];
+        const entities = data.searchAcrossEntities?.searchResults?.map((result) => result.entity) ?? [];
         const notFound = entities.length === 0;
         const foundMultiple = entities.length > 1;
         const entity = entities.length === 1 ? entities[0] : null;
diff --git a/datahub-web-react/src/app/entity/businessAttribute/profile/BusinessAttributeRelatedEntity.tsx b/datahub-web-react/src/app/entity/businessAttribute/profile/BusinessAttributeRelatedEntity.tsx
index 46d9d4ea51d245..a73b36d6922279 100644
--- a/datahub-web-react/src/app/entity/businessAttribute/profile/BusinessAttributeRelatedEntity.tsx
+++ b/datahub-web-react/src/app/entity/businessAttribute/profile/BusinessAttributeRelatedEntity.tsx
@@ -18,7 +18,7 @@ export default function BusinessAttributeRelatedEntity() {
         ]) ||
         [];
 
-    entityData?.isAChildren?.relationships.forEach((businessAttribute) => {
+    entityData?.isAChildren?.relationships?.forEach((businessAttribute) => {
         const childUrn = businessAttribute.entity?.urn;
 
         if (childUrn) {
diff --git a/datahub-web-react/src/app/entity/chart/ChartEntity.tsx b/datahub-web-react/src/app/entity/chart/ChartEntity.tsx
index 70fe8a5e7c7c23..b20116f615556d 100644
--- a/datahub-web-react/src/app/entity/chart/ChartEntity.tsx
+++ b/datahub-web-react/src/app/entity/chart/ChartEntity.tsx
@@ -142,9 +142,9 @@ export class ChartEntity implements Entity<Chart> {
                     component: EmbedTab,
                     display: {
                         visible: (_, chart: GetChartQuery) =>
-                            !!chart?.chart?.embed?.renderUrl && chart?.chart?.platform.urn === LOOKER_URN,
+                            !!chart?.chart?.embed?.renderUrl && chart?.chart?.platform?.urn === LOOKER_URN,
                         enabled: (_, chart: GetChartQuery) =>
-                            !!chart?.chart?.embed?.renderUrl && chart?.chart?.platform.urn === LOOKER_URN,
+                            !!chart?.chart?.embed?.renderUrl && chart?.chart?.platform?.urn === LOOKER_URN,
                     },
                 },
                 {
@@ -170,7 +170,7 @@ export class ChartEntity implements Entity<Chart> {
                     name: 'Incidents',
                     component: IncidentTab,
                     getDynamicName: (_, chart) => {
-                        const activeIncidentCount = chart?.chart?.activeIncidents.total;
+                        const activeIncidentCount = chart?.chart?.activeIncidents?.total;
                         return `Incidents${(activeIncidentCount && ` (${activeIncidentCount})`) || ''}`;
                     },
                 },
diff --git a/datahub-web-react/src/app/entity/dashboard/DashboardEntity.tsx b/datahub-web-react/src/app/entity/dashboard/DashboardEntity.tsx
index 7d0275f60435a9..c35b1f90ee9c00 100644
--- a/datahub-web-react/src/app/entity/dashboard/DashboardEntity.tsx
+++ b/datahub-web-react/src/app/entity/dashboard/DashboardEntity.tsx
@@ -149,10 +149,10 @@ export class DashboardEntity implements Entity<Dashboard> {
                     display: {
                         visible: (_, dashboard: GetDashboardQuery) =>
                             !!dashboard?.dashboard?.embed?.renderUrl &&
-                            dashboard?.dashboard?.platform.urn === LOOKER_URN,
+                            dashboard?.dashboard?.platform?.urn === LOOKER_URN,
                         enabled: (_, dashboard: GetDashboardQuery) =>
                             !!dashboard?.dashboard?.embed?.renderUrl &&
-                            dashboard?.dashboard?.platform.urn === LOOKER_URN,
+                            dashboard?.dashboard?.platform?.urn === LOOKER_URN,
                     },
                 },
                 {
@@ -170,7 +170,7 @@ export class DashboardEntity implements Entity<Dashboard> {
                     name: 'Incidents',
                     component: IncidentTab,
                     getDynamicName: (_, dashboard) => {
-                        const activeIncidentCount = dashboard?.dashboard?.activeIncidents.total;
+                        const activeIncidentCount = dashboard?.dashboard?.activeIncidents?.total;
                         return `Incidents${(activeIncidentCount && ` (${activeIncidentCount})`) || ''}`;
                     },
                 },
diff --git a/datahub-web-react/src/app/entity/dataFlow/DataFlowEntity.tsx b/datahub-web-react/src/app/entity/dataFlow/DataFlowEntity.tsx
index 42555a0dd3f37d..3c03dfb65ccbcd 100644
--- a/datahub-web-react/src/app/entity/dataFlow/DataFlowEntity.tsx
+++ b/datahub-web-react/src/app/entity/dataFlow/DataFlowEntity.tsx
@@ -92,7 +92,7 @@ export class DataFlowEntity implements Entity<DataFlow> {
                     name: 'Incidents',
                     component: IncidentTab,
                     getDynamicName: (_, dataFlow) => {
-                        const activeIncidentCount = dataFlow?.dataFlow?.activeIncidents.total;
+                        const activeIncidentCount = dataFlow?.dataFlow?.activeIncidents?.total;
                         return `Incidents${(activeIncidentCount && ` (${activeIncidentCount})`) || ''}`;
                     },
                 },
diff --git a/datahub-web-react/src/app/entity/dataJob/DataJobEntity.tsx b/datahub-web-react/src/app/entity/dataJob/DataJobEntity.tsx
index 503acf7652dfa6..5b1aaeaef76d5b 100644
--- a/datahub-web-react/src/app/entity/dataJob/DataJobEntity.tsx
+++ b/datahub-web-react/src/app/entity/dataJob/DataJobEntity.tsx
@@ -112,7 +112,7 @@ export class DataJobEntity implements Entity<DataJob> {
                     name: 'Incidents',
                     component: IncidentTab,
                     getDynamicName: (_, dataJob) => {
-                        const activeIncidentCount = dataJob?.dataJob?.activeIncidents.total;
+                        const activeIncidentCount = dataJob?.dataJob?.activeIncidents?.total;
                         return `Incidents${(activeIncidentCount && ` (${activeIncidentCount})`) || ''}`;
                     },
                 },
diff --git a/datahub-web-react/src/app/entity/dataJob/tabs/RunsTab.tsx b/datahub-web-react/src/app/entity/dataJob/tabs/RunsTab.tsx
index 5cd621719ce8fd..f00e3402c8ed4c 100644
--- a/datahub-web-react/src/app/entity/dataJob/tabs/RunsTab.tsx
+++ b/datahub-web-react/src/app/entity/dataJob/tabs/RunsTab.tsx
@@ -129,8 +129,8 @@ export const RunsTab = () => {
             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),
+            inputs: run?.inputs?.relationships?.map((relationship) => relationship.entity),
+            outputs: run?.outputs?.relationships?.map((relationship) => relationship.entity),
             externalUrl: run?.externalUrl,
         }));
     if (loading) {
diff --git a/datahub-web-react/src/app/entity/dataset/DatasetEntity.tsx b/datahub-web-react/src/app/entity/dataset/DatasetEntity.tsx
index 35ed3ffcc4c532..abf8e732c47d61 100644
--- a/datahub-web-react/src/app/entity/dataset/DatasetEntity.tsx
+++ b/datahub-web-react/src/app/entity/dataset/DatasetEntity.tsx
@@ -217,7 +217,7 @@ export class DatasetEntity implements Entity<Dataset> {
                     name: 'Incidents',
                     component: IncidentTab,
                     getDynamicName: (_, dataset) => {
-                        const activeIncidentCount = dataset?.dataset?.activeIncidents.total;
+                        const activeIncidentCount = dataset?.dataset?.activeIncidents?.total;
                         return `Incidents${(activeIncidentCount && ` (${activeIncidentCount})`) || ''}`;
                     },
                 },
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 78ec334f071ba4..d3371d3790d028 100644
--- a/datahub-web-react/src/app/entity/dataset/profile/OperationsTab.tsx
+++ b/datahub-web-react/src/app/entity/dataset/profile/OperationsTab.tsx
@@ -195,8 +195,8 @@ export const OperationsTab = () => {
             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),
+            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,
         }));
diff --git a/datahub-web-react/src/app/entity/dataset/profile/schema/utils/schemaTitleRenderer.tsx b/datahub-web-react/src/app/entity/dataset/profile/schema/utils/schemaTitleRenderer.tsx
index 3d03b6306454d8..fdd03622fc0e19 100644
--- a/datahub-web-react/src/app/entity/dataset/profile/schema/utils/schemaTitleRenderer.tsx
+++ b/datahub-web-react/src/app/entity/dataset/profile/schema/utils/schemaTitleRenderer.tsx
@@ -69,7 +69,7 @@ export default function useSchemaTitleRenderer(
                         ?.filter(
                             (constraint) =>
                                 (constraint?.sourceFields?.filter(
-                                    (sourceField) => sourceField?.fieldPath.trim() === fieldPath.trim(),
+                                    (sourceField) => sourceField?.fieldPath?.trim() === fieldPath.trim(),
                                 ).length || 0) > 0,
                         )
                         .map((constraint) => (
diff --git a/datahub-web-react/src/app/entity/dataset/profile/schema/utils/utils.ts b/datahub-web-react/src/app/entity/dataset/profile/schema/utils/utils.ts
index 51cb8ab0245196..9d719ae25e2bed 100644
--- a/datahub-web-react/src/app/entity/dataset/profile/schema/utils/utils.ts
+++ b/datahub-web-react/src/app/entity/dataset/profile/schema/utils/utils.ts
@@ -37,7 +37,7 @@ export function convertEditableSchemaMetadataForUpdate(
 ): EditableSchemaMetadataUpdate {
     return {
         editableSchemaFieldInfo:
-            editableSchemaMetadata?.editableSchemaFieldInfo.map((editableSchemaFieldInfo) => ({
+            editableSchemaMetadata?.editableSchemaFieldInfo?.map((editableSchemaFieldInfo) => ({
                 fieldPath: editableSchemaFieldInfo?.fieldPath,
                 description: editableSchemaFieldInfo?.description,
                 globalTags: { tags: convertTagsForUpdate(editableSchemaFieldInfo?.globalTags?.tags || []) },
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 c834597e41a6d5..15cc99127f3500 100644
--- a/datahub-web-react/src/app/entity/domain/DataProductsTab/DataProductsTab.tsx
+++ b/datahub-web-react/src/app/entity/domain/DataProductsTab/DataProductsTab.tsx
@@ -70,7 +70,7 @@ export default function DataProductsTab() {
         },
     });
     const totalResults = data?.searchAcrossEntities?.total || 0;
-    const searchResults = data?.searchAcrossEntities?.searchResults.map((r) => r.entity) || [];
+    const searchResults = data?.searchAcrossEntities?.searchResults?.map((r) => r.entity) || [];
     const dataProducts = [...createdDataProducts, ...searchResults];
     const displayedDataProducts = dataProducts
         .map(
diff --git a/datahub-web-react/src/app/entity/glossaryTerm/profile/AddRelatedTermsModal.tsx b/datahub-web-react/src/app/entity/glossaryTerm/profile/AddRelatedTermsModal.tsx
index a609dc4cca599d..9131af265a7516 100644
--- a/datahub-web-react/src/app/entity/glossaryTerm/profile/AddRelatedTermsModal.tsx
+++ b/datahub-web-react/src/app/entity/glossaryTerm/profile/AddRelatedTermsModal.tsx
@@ -104,7 +104,10 @@ function AddRelatedTermsModal(props: Props) {
         const newUrns = [...selectedUrns, urn];
         setSelectedUrns(newUrns);
         const selectedSearchOption = tagSearchOptions.find((option) => option.props.value === urn);
-        setSelectedTerms([...selectedTerms, { urn, component: <TermLabel name={selectedSearchOption?.props.name} /> }]);
+        setSelectedTerms([
+            ...selectedTerms,
+            { urn, component: <TermLabel name={selectedSearchOption?.props?.name} /> },
+        ]);
     };
 
     // When a Tag or term search result is deselected, remove the urn from the Owners
diff --git a/datahub-web-react/src/app/entity/glossaryTerm/profile/GlossaryRelatedEntity.tsx b/datahub-web-react/src/app/entity/glossaryTerm/profile/GlossaryRelatedEntity.tsx
index 098e97e526fd84..6959fc082f7346 100644
--- a/datahub-web-react/src/app/entity/glossaryTerm/profile/GlossaryRelatedEntity.tsx
+++ b/datahub-web-react/src/app/entity/glossaryTerm/profile/GlossaryRelatedEntity.tsx
@@ -22,7 +22,7 @@ export default function GlossaryRelatedEntity() {
         ]) ||
         [];
 
-    entityData?.isAChildren?.relationships.forEach((term) => {
+    entityData?.isAChildren?.relationships?.forEach((term) => {
         const childUrn = term.entity?.urn;
 
         if (childUrn) {
diff --git a/datahub-web-react/src/app/entity/mlFeatureTable/profile/Sources.tsx b/datahub-web-react/src/app/entity/mlFeatureTable/profile/Sources.tsx
index eb114e9774e294..56c0fcbb602003 100644
--- a/datahub-web-react/src/app/entity/mlFeatureTable/profile/Sources.tsx
+++ b/datahub-web-react/src/app/entity/mlFeatureTable/profile/Sources.tsx
@@ -35,14 +35,14 @@ export default function SourcesView() {
             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) => {
+                    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) => {
+                    feature.properties?.sources?.map((source: Dataset | null) => {
                         if (source && accumulator.findIndex((dataset) => dataset.urn === source?.urn) === -1) {
                             accumulator.push(source);
                         }
diff --git a/datahub-web-react/src/app/entity/mlModel/profile/MlModelFeaturesTab.tsx b/datahub-web-react/src/app/entity/mlModel/profile/MlModelFeaturesTab.tsx
index b8dc64793c2256..7fd719177d1516 100644
--- a/datahub-web-react/src/app/entity/mlModel/profile/MlModelFeaturesTab.tsx
+++ b/datahub-web-react/src/app/entity/mlModel/profile/MlModelFeaturesTab.tsx
@@ -9,7 +9,7 @@ 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<
+    const features = model?.features?.relationships?.map((relationship) => relationship.entity) as Array<
         MlFeature | MlPrimaryKey
     >;
 
diff --git a/datahub-web-react/src/app/entity/ownership/OwnershipList.tsx b/datahub-web-react/src/app/entity/ownership/OwnershipList.tsx
index 8d6e109d2bca36..3d7904a5c55052 100644
--- a/datahub-web-react/src/app/entity/ownership/OwnershipList.tsx
+++ b/datahub-web-react/src/app/entity/ownership/OwnershipList.tsx
@@ -64,7 +64,7 @@ export const OwnershipList = () => {
     });
     const totalOwnershipTypes = data?.listOwnershipTypes?.total || 0;
     const ownershipTypes =
-        data?.listOwnershipTypes?.ownershipTypes.filter((type) => type.urn !== 'urn:li:ownershipType:none') || [];
+        data?.listOwnershipTypes?.ownershipTypes?.filter((type) => type.urn !== 'urn:li:ownershipType:none') || [];
 
     const onClickCreateOwnershipType = () => {
         setShowOwnershipBuilder(true);
diff --git a/datahub-web-react/src/app/entity/shared/EntityDropdown/DomainParentSelect.tsx b/datahub-web-react/src/app/entity/shared/EntityDropdown/DomainParentSelect.tsx
index d43b04ec11a165..1e918757e46192 100644
--- a/datahub-web-react/src/app/entity/shared/EntityDropdown/DomainParentSelect.tsx
+++ b/datahub-web-react/src/app/entity/shared/EntityDropdown/DomainParentSelect.tsx
@@ -23,7 +23,7 @@ export function filterResultsForMove(entity: Domain, entityUrn: string) {
     return (
         entity.urn !== entityUrn &&
         entity.__typename === 'Domain' &&
-        !entity.parentDomains?.domains.some((node) => node.urn === entityUrn)
+        !entity.parentDomains?.domains?.some((node) => node.urn === entityUrn)
     );
 }
 
diff --git a/datahub-web-react/src/app/entity/shared/EntityDropdown/NodeParentSelect.tsx b/datahub-web-react/src/app/entity/shared/EntityDropdown/NodeParentSelect.tsx
index 7227354a465695..3746c5f6b95f82 100644
--- a/datahub-web-react/src/app/entity/shared/EntityDropdown/NodeParentSelect.tsx
+++ b/datahub-web-react/src/app/entity/shared/EntityDropdown/NodeParentSelect.tsx
@@ -22,7 +22,7 @@ export function filterResultsForMove(entity: GlossaryNode, entityUrn: string) {
     return (
         entity.urn !== entityUrn &&
         entity.__typename === 'GlossaryNode' &&
-        !entity.parentNodes?.nodes.some((node) => node.urn === entityUrn)
+        !entity.parentNodes?.nodes?.some((node) => node.urn === entityUrn)
     );
 }
 
diff --git a/datahub-web-react/src/app/entity/shared/EntityDropdown/useHandleMoveDomainComplete.ts b/datahub-web-react/src/app/entity/shared/EntityDropdown/useHandleMoveDomainComplete.ts
index 81f19331e18b77..2d9c346e18d5b4 100644
--- a/datahub-web-react/src/app/entity/shared/EntityDropdown/useHandleMoveDomainComplete.ts
+++ b/datahub-web-react/src/app/entity/shared/EntityDropdown/useHandleMoveDomainComplete.ts
@@ -13,7 +13,7 @@ export function useHandleMoveDomainComplete() {
         if (!entityData) return;
 
         const domain = entityData as Domain;
-        const oldParentUrn = domain.parentDomains?.domains.length ? domain.parentDomains.domains[0].urn : undefined;
+        const oldParentUrn = domain.parentDomains?.domains?.length ? domain.parentDomains.domains[0].urn : undefined;
 
         analytics.event({
             type: EventType.MoveDomainEvent,
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 00e89e5943c176..f3b857ab2ef3be 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
@@ -203,10 +203,10 @@ describe('siblingUtils', () => {
 
             // merges schema metadata properly  by fieldPath
             expect(combinedData.dataset.schemaMetadata?.fields).toHaveLength(4);
-            expect(combinedData.dataset.schemaMetadata?.fields[0].fieldPath).toEqual('new_one');
-            expect(combinedData.dataset.schemaMetadata?.fields[1].fieldPath).toEqual('DUPLICATE_FIELD');
-            expect(combinedData.dataset.schemaMetadata?.fields[2].fieldPath).toEqual('user_id');
-            expect(combinedData.dataset.schemaMetadata?.fields[3].fieldPath).toEqual('user_name');
+            expect(combinedData.dataset.schemaMetadata?.fields[0]?.fieldPath).toEqual('new_one');
+            expect(combinedData.dataset.schemaMetadata?.fields[1]?.fieldPath).toEqual('DUPLICATE_FIELD');
+            expect(combinedData.dataset.schemaMetadata?.fields[2]?.fieldPath).toEqual('user_id');
+            expect(combinedData.dataset.schemaMetadata?.fields[3]?.fieldPath).toEqual('user_name');
 
             // will overwrite string properties w/ primary
             expect(combinedData.dataset.editableProperties.description).toEqual('secondary description');
diff --git a/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/CreateERModelRelationModal.tsx b/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/CreateERModelRelationModal.tsx
index ea40fb71818033..de22daeeedd817 100644
--- a/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/CreateERModelRelationModal.tsx
+++ b/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/CreateERModelRelationModal.tsx
@@ -241,9 +241,9 @@ export const CreateERModelRelationModal = ({
     };
 
     const table1NameBusiness = getDatasetName(table1Dataset);
-    const table1NameTech = table1Dataset?.name || table1Dataset?.urn.split(',').at(1) || '';
+    const table1NameTech = table1Dataset?.name || table1Dataset?.urn?.split(',').at(1) || '';
     const table2NameBusiness = getDatasetName(table2Dataset);
-    const table2NameTech = table2Dataset?.name || table2Dataset?.urn.split(',').at(1) || '';
+    const table2NameTech = table2Dataset?.name || table2Dataset?.urn?.split(',').at(1) || '';
 
     const handleAdd = () => {
         const newData: ERModelRelationDataType = {
diff --git a/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/ERModelRelationUtils.tsx b/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/ERModelRelationUtils.tsx
index e7a242daa5121a..0eb198aec48033 100644
--- a/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/ERModelRelationUtils.tsx
+++ b/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/ERModelRelationUtils.tsx
@@ -68,6 +68,6 @@ export function getDatasetName(datainput: any): string {
         datainput?.editableProperties?.name ||
         datainput?.properties?.name ||
         datainput?.name ||
-        datainput?.urn.split(',').at(1)
+        datainput?.urn?.split(',').at(1)
     );
 }
diff --git a/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/EditableCell.tsx b/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/EditableCell.tsx
index a190d9090cc8c4..4320aacd53e4af 100644
--- a/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/EditableCell.tsx
+++ b/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/EditableCell.tsx
@@ -53,7 +53,7 @@ export const EditableCell = ({
                 <Select
                     size="large"
                     className="ermodelrelation-select-selector"
-                    options={tableRecord?.schemaMetadata?.fields.map((result) => ({
+                    options={tableRecord?.schemaMetadata?.fields?.map((result) => ({
                         value: result.fieldPath,
                         label: result.fieldPath,
                     }))}
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/nav/ProfileNavBrowsePathV2.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/nav/ProfileNavBrowsePathV2.tsx
index d91bb565c0cd19..7805c8c73b3578 100644
--- a/datahub-web-react/src/app/entity/shared/containers/profile/nav/ProfileNavBrowsePathV2.tsx
+++ b/datahub-web-react/src/app/entity/shared/containers/profile/nav/ProfileNavBrowsePathV2.tsx
@@ -87,7 +87,7 @@ export default function ProfileNavBrowsePathV2({ urn, type }: Props) {
                         {entityRegistry.getDisplayName(EntityType.DataPlatform, entityData.platform)}
                     </BreadcrumbItem>
                 )}
-                {entityData?.browsePathV2?.path.map((pathEntry, index) => (
+                {entityData?.browsePathV2?.path?.map((pathEntry, index) => (
                     <BreadcrumbItem
                         key={pathEntry.name}
                         disabled={!isBrowsable}
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/DataProduct/SetDataProductModal.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/DataProduct/SetDataProductModal.tsx
index 904b4c064f0016..ece50e5ae14965 100644
--- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/DataProduct/SetDataProductModal.tsx
+++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/DataProduct/SetDataProductModal.tsx
@@ -146,7 +146,7 @@ export default function SetDataProductModal({
                 tagRender={tagRender}
                 onBlur={() => setQuery('')}
             >
-                {data?.searchAcrossEntities?.searchResults.map((result) => (
+                {data?.searchAcrossEntities?.searchResults?.map((result) => (
                     <Select.Option value={result.entity.urn} key={result.entity.urn}>
                         <OptionWrapper>
                             {entityRegistry.getIcon(EntityType.DataProduct, 12, IconStyleType.ACCENT, 'black')}
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/useGetPromptInfo.ts b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/useGetPromptInfo.ts
index 252cefb9f6f4f2..e141114f2c4785 100644
--- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/useGetPromptInfo.ts
+++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/useGetPromptInfo.ts
@@ -18,10 +18,10 @@ export default function useGetPromptInfo(formUrn?: string) {
         requiredEntityPrompts,
     } = getEntityPromptsInfo(prompts, entityData);
     const { fieldPrompts, numRequiredFieldPromptsRemaining, numOptionalFieldPromptsRemaining, requiredFieldPrompts } =
-        getFieldPromptsInfo(prompts, entityData, entityWithSchema?.schemaMetadata?.fields.length || 0, formUrn);
+        getFieldPromptsInfo(prompts, entityData, entityWithSchema?.schemaMetadata?.fields?.length || 0, formUrn);
     // Multiply number of field prompts by number of schema fields for total number of schema field prompts
     const totalRequiredSchemaFieldPrompts =
-        (entityWithSchema?.schemaMetadata?.fields.length || 0) * requiredFieldPrompts.length;
+        (entityWithSchema?.schemaMetadata?.fields?.length || 0) * requiredFieldPrompts.length;
 
     const numRequiredPromptsRemaining = numRequiredEntityPromptsRemaining + numRequiredFieldPromptsRemaining;
     const numOptionalPromptsRemaining = numOptionalEntityPromptsRemaining + numOptionalFieldPromptsRemaining;
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/utils.ts b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/utils.ts
index 4a0ae2131623f2..c7c0e6f48b4115 100644
--- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/utils.ts
+++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/utils.ts
@@ -197,7 +197,7 @@ export function findPromptAssociation(prompt: FormPrompt, allPrompts: Array<Form
 // Get the prompts for a given form
 export function getPromptsForForm(formUrn: string, entityData: GenericEntityProperties | null) {
     const formAssociation = getFormAssociation(formUrn, entityData);
-    return formAssociation?.form.info.prompts || [];
+    return formAssociation?.form?.info?.prompts || [];
 }
 
 /*
@@ -279,7 +279,7 @@ export function isVerificationComplete(entityData: GenericEntityProperties | nul
 
 export function isFormVerificationType(entityData: GenericEntityProperties | null, formUrn: string) {
     const formAssociation = getFormAssociation(formUrn, entityData);
-    return formAssociation?.form.info.type === FormType.Verification;
+    return formAssociation?.form?.info?.type === FormType.Verification;
 }
 
 /*
@@ -317,6 +317,6 @@ export function getVerificationAuditStamp(entityData: GenericEntityProperties |
 export function getBulkByQuestionPrompts(formUrn: string, entityData: GenericEntityProperties | null) {
     const formAssociation = getFormAssociation(formUrn, entityData);
     return (
-        formAssociation?.form.info.prompts.filter((prompt) => !SCHEMA_FIELD_PROMPT_TYPES.includes(prompt.type)) || []
+        formAssociation?.form?.info?.prompts?.filter((prompt) => !SCHEMA_FIELD_PROMPT_TYPES.includes(prompt.type)) || []
     );
 }
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 c32ba405630550..bb35755826a899 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
@@ -231,7 +231,7 @@ export function sortEntityProfileTabs(appConfig: AppConfig, entityType: EntityTy
     const sortedTabs = [...tabs];
 
     if (entityType === EntityType.Domain && appConfig.visualConfig.entityProfiles?.domain?.defaultTab) {
-        const defaultTabId = appConfig.visualConfig.entityProfiles?.domain.defaultTab;
+        const defaultTabId = appConfig.visualConfig.entityProfiles?.domain?.defaultTab;
         sortTabsWithDefaultTabId(sortedTabs, defaultTabId);
     }
 
diff --git a/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/FailingAssertions.tsx b/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/FailingAssertions.tsx
index 0784be9ff2f885..939418ffc11047 100644
--- a/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/FailingAssertions.tsx
+++ b/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/FailingAssertions.tsx
@@ -28,7 +28,7 @@ export default function FailingAssertions({ upstreamSummary }: Props) {
             failing assertions
             <FailingDataWrapper>
                 {datasetsWithFailingAssertions.map((dataset) => {
-                    const totalNumAssertions = dataset.assertions?.assertions.length;
+                    const totalNumAssertions = dataset.assertions?.assertions?.length;
                     const numAssertionsFailing = getNumAssertionsFailing(dataset);
 
                     return (
diff --git a/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/utils.ts b/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/utils.ts
index 374c00f34a8a81..84b18725972e63 100644
--- a/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/utils.ts
+++ b/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/utils.ts
@@ -53,7 +53,7 @@ export function extractUpstreamSummary(upstreams: Entity[]) {
 export function getNumAssertionsFailing(dataset: Dataset) {
     let numFailing = 0;
 
-    dataset.assertions?.assertions.forEach((assertion) => {
+    dataset.assertions?.assertions?.forEach((assertion) => {
         if (assertion.runEvents?.failed) {
             numFailing += 1;
         }
diff --git a/datahub-web-react/src/app/entity/shared/entityForm/EntityFormContextProvider.tsx b/datahub-web-react/src/app/entity/shared/entityForm/EntityFormContextProvider.tsx
index 278cb02a89ac92..44d771515f6906 100644
--- a/datahub-web-react/src/app/entity/shared/entityForm/EntityFormContextProvider.tsx
+++ b/datahub-web-react/src/app/entity/shared/entityForm/EntityFormContextProvider.tsx
@@ -19,7 +19,7 @@ export default function EntityFormContextProvider({ children, formUrn }: Props)
     const { entityData, refetch: refetchEntityProfile, loading: profileLoading } = useEntityContext();
     const formAssociation = getFormAssociation(formUrn, entityData);
     const initialPromptId =
-        formAssociation?.form.info.prompts.filter((prompt) => !SCHEMA_FIELD_PROMPT_TYPES.includes(prompt.type))[0]
+        formAssociation?.form?.info?.prompts?.filter((prompt) => !SCHEMA_FIELD_PROMPT_TYPES.includes(prompt.type))[0]
             ?.id || null;
     const isVerificationType = isFormVerificationType(entityData, formUrn);
     const [formView, setFormView] = useState<FormView>(FormView.BY_ENTITY);
diff --git a/datahub-web-react/src/app/entity/shared/entityForm/Form.tsx b/datahub-web-react/src/app/entity/shared/entityForm/Form.tsx
index 88b3c25162ec56..05fd91d4680ac7 100644
--- a/datahub-web-react/src/app/entity/shared/entityForm/Form.tsx
+++ b/datahub-web-react/src/app/entity/shared/entityForm/Form.tsx
@@ -54,9 +54,9 @@ function Form({ formUrn }: Props) {
     if (!hasRendered) return <Loading />;
 
     const formAssociation = getFormAssociation(formUrn, entityData);
-    const title = formAssociation?.form.info.name;
+    const title = formAssociation?.form?.info?.name;
     const associatedUrn = formAssociation?.associatedUrn;
-    const description = formAssociation?.form.info.description;
+    const description = formAssociation?.form?.info?.description;
     const owners = formAssociation?.form.ownership?.owners;
 
     return (
diff --git a/datahub-web-react/src/app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/utils.ts b/datahub-web-react/src/app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/utils.ts
index 1050c5fcde7283..9840f9a2cbd05c 100644
--- a/datahub-web-react/src/app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/utils.ts
+++ b/datahub-web-react/src/app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/utils.ts
@@ -20,7 +20,7 @@ export function getInitialValues(prompt: FormPrompt, entityData: GenericEntityPr
             (propAssignment) => propAssignment.structuredProperty.urn === structuredProperty?.urn,
         );
     }
-    return structuredPropertyAssignment?.values.map((value) => getStructuredPropertyValue(value as PropertyValue));
+    return structuredPropertyAssignment?.values?.map((value) => getStructuredPropertyValue(value as PropertyValue));
 }
 
 export function getInitialEntitiesForUrnPrompt(
diff --git a/datahub-web-react/src/app/entity/shared/entityForm/schemaFieldPrompts/SchemaFieldPrompts.tsx b/datahub-web-react/src/app/entity/shared/entityForm/schemaFieldPrompts/SchemaFieldPrompts.tsx
index 087a42e3f8000c..0a39d2ef8a5f4d 100644
--- a/datahub-web-react/src/app/entity/shared/entityForm/schemaFieldPrompts/SchemaFieldPrompts.tsx
+++ b/datahub-web-react/src/app/entity/shared/entityForm/schemaFieldPrompts/SchemaFieldPrompts.tsx
@@ -26,7 +26,7 @@ export default function SchemaFieldPrompts({ prompts, associatedUrn }: Props) {
         <>
             <Divider />
             <FieldPromptsTitle data-testid="field-level-requirements">Field-Level Requirements</FieldPromptsTitle>
-            {entityWithSchema?.schemaMetadata?.fields.map((field) => (
+            {entityWithSchema?.schemaMetadata?.fields?.map((field) => (
                 <VirtualScrollChild key={field.fieldPath} height={50} triggerOnce>
                     <SchemaFieldDropdown prompts={prompts} field={field as SchemaField} associatedUrn={associatedUrn} />
                 </VirtualScrollChild>
diff --git a/datahub-web-react/src/app/entity/shared/entityForm/useShouldShowVerificationPrompt.ts b/datahub-web-react/src/app/entity/shared/entityForm/useShouldShowVerificationPrompt.ts
index d7a8a417a0c866..8987848dc12dda 100644
--- a/datahub-web-react/src/app/entity/shared/entityForm/useShouldShowVerificationPrompt.ts
+++ b/datahub-web-react/src/app/entity/shared/entityForm/useShouldShowVerificationPrompt.ts
@@ -28,7 +28,7 @@ export default function useShouldShowVerificationPrompt(formUrn: string) {
     const { entityData } = useEntityData();
     const formVerification = getFormVerification(formUrn, entityData);
     const formAssociation = getFormAssociation(formUrn, entityData);
-    const formType = formAssociation?.form.info.type;
+    const formType = formAssociation?.form?.info?.type;
 
     return shouldShowVerificationPrompt({
         formType,
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/AccessManagement/utils.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/AccessManagement/utils.tsx
index 5b61e0df5f53ef..96a99b172b574e 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/AccessManagement/utils.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/AccessManagement/utils.tsx
@@ -2,8 +2,8 @@ export function handleAccessRoles(externalRoles) {
     const accessRoles = new Array<any>();
     if (
         externalRoles?.dataset?.access &&
-        externalRoles?.dataset?.access.roles &&
-        externalRoles?.dataset?.access.roles.length > 0
+        externalRoles?.dataset?.access?.roles &&
+        externalRoles?.dataset?.access?.roles?.length > 0
     ) {
         externalRoles?.dataset?.access?.roles?.forEach((userRoles) => {
             const role = {
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/SchemaTable.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/SchemaTable.tsx
index 83ebb8f6b78285..e287e3675c26ab 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/SchemaTable.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/SchemaTable.tsx
@@ -193,7 +193,7 @@ export default function SchemaTable({
     function getCount(fieldPath: any) {
         const data: any =
             usageStats?.aggregations?.fields &&
-            usageStats?.aggregations?.fields.find((field) => {
+            usageStats?.aggregations?.fields?.find((field) => {
                 return field?.fieldName === fieldPath;
             });
         return data && data.count;
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/ForeignKeyLabel.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/ForeignKeyLabel.tsx
index fa4826551c3a45..7aec54d9f3b87d 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/ForeignKeyLabel.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/ForeignKeyLabel.tsx
@@ -38,7 +38,7 @@ export default function ForeignKeyLabel({
     const selectedFk = useContext(FkContext);
 
     const onOpenFk = () => {
-        if (selectedFk?.fieldPath.trim() === fieldPath.trim() && selectedFk?.constraint?.name === constraint?.name) {
+        if (selectedFk?.fieldPath?.trim() === fieldPath.trim() && selectedFk?.constraint?.name === constraint?.name) {
             onClick(null);
         } else {
             onClick({ fieldPath, constraint });
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 366fc4762b2106..b4ffce294d136a 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
@@ -31,8 +31,8 @@ export default function PropertyTypeLabel({ type, dataType }: Props) {
     const nativeFallback = type.type === SchemaFieldDataType.Null;
 
     const typeText =
-        dataType?.info.displayName ||
-        dataType?.info.type ||
+        dataType?.info?.displayName ||
+        dataType?.info?.type ||
         (nativeFallback ? truncate(250, nativeDataType) : type.type);
 
     return <PropertyTypeBadge count={capitalizeFirstLetterOnly(typeText)} />;
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldProperties.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldProperties.tsx
index d6f2a837482512..98cfa296508cbe 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldProperties.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldProperties.tsx
@@ -74,7 +74,7 @@ export default function FieldProperties({ expandedField, schemaColumnProperties
             <PropertiesWrapper>
                 {properties.map((structuredProp) => {
                     const isRichText =
-                        structuredProp.structuredProperty.definition.valueType?.info.type === StdDataType.RichText;
+                        structuredProp.structuredProperty.definition.valueType?.info?.type === StdDataType.RichText;
                     const valuesData = mapStructuredPropertyValues(structuredProp);
                     const hasMultipleValues = valuesData.length > 1;
 
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldDrawer.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldDrawer.tsx
index df0cd8b2dd762f..798795c19de65d 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldDrawer.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldDrawer.tsx
@@ -49,7 +49,7 @@ export default function SchemaFieldDrawer({
     );
     const expandedField =
         expandedFieldIndex !== undefined && expandedFieldIndex !== -1 ? schemaFields[expandedFieldIndex] : undefined;
-    const editableFieldInfo = editableSchemaMetadata?.editableSchemaFieldInfo.find((candidateEditableFieldInfo) =>
+    const editableFieldInfo = editableSchemaMetadata?.editableSchemaFieldInfo?.find((candidateEditableFieldInfo) =>
         pathMatchesNewPath(candidateEditableFieldInfo.fieldPath, expandedField?.fieldPath),
     );
     const schemaColumnProperties = useGetSchemaColumnProperties();
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useDescriptionRenderer.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useDescriptionRenderer.tsx
index bb70c2cb493037..b754624446cef3 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useDescriptionRenderer.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useDescriptionRenderer.tsx
@@ -22,7 +22,7 @@ export default function useDescriptionRenderer(editableSchemaMetadata: EditableS
     };
 
     return (description: string, record: SchemaField, index: number): JSX.Element => {
-        const editableFieldInfo = editableSchemaMetadata?.editableSchemaFieldInfo.find((candidateEditableFieldInfo) =>
+        const editableFieldInfo = editableSchemaMetadata?.editableSchemaFieldInfo?.find((candidateEditableFieldInfo) =>
             pathMatchesNewPath(candidateEditableFieldInfo.fieldPath, record.fieldPath),
         );
         const { schemaFieldEntity } = record;
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRenderer.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRenderer.tsx
index 8652f4bb2e8b8b..e5f27a5001eb52 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRenderer.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRenderer.tsx
@@ -21,7 +21,7 @@ export default function useTagsAndTermsRenderer(
     };
 
     const tagAndTermRender = (tags: GlobalTags, record: SchemaField) => {
-        const relevantEditableFieldInfo = editableSchemaMetadata?.editableSchemaFieldInfo.find(
+        const relevantEditableFieldInfo = editableSchemaMetadata?.editableSchemaFieldInfo?.find(
             (candidateEditableFieldInfo) => pathMatchesNewPath(candidateEditableFieldInfo.fieldPath, record.fieldPath),
         );
 
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRendererFeatureTable.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRendererFeatureTable.tsx
index df9e01ac4d4441..ac3e13dabc86d4 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRendererFeatureTable.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRendererFeatureTable.tsx
@@ -14,7 +14,7 @@ export default function useTagsAndTermsRendererFeatureTable(
     const refetch = useRefetch();
 
     const tagAndTermRender = (tags: GlobalTags, record: SchemaField, rowIndex: number | undefined) => {
-        const relevantEditableFieldInfo = editableSchemaMetadata?.editableSchemaFieldInfo.find(
+        const relevantEditableFieldInfo = editableSchemaMetadata?.editableSchemaFieldInfo?.find(
             (candidateEditableFieldInfo) => pathMatchesNewPath(candidateEditableFieldInfo.fieldPath, record.fieldPath),
         );
 
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionDetails.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionDetails.tsx
index 73259b0ec832ab..ad2c4e05d77098 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionDetails.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionDetails.tsx
@@ -97,7 +97,7 @@ export const DatasetAssertionDetails = ({ urn, lastEvaluatedAtMillis }: Props) =
     };
 
     const completeAssertionRunEvents =
-        data?.assertion?.runEvents?.runEvents.filter((runEvent) => runEvent.status === AssertionRunStatus.Complete) ||
+        data?.assertion?.runEvents?.runEvents?.filter((runEvent) => runEvent.status === AssertionRunStatus.Complete) ||
         [];
 
     /**
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/FreshnessScheduleSummary.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/FreshnessScheduleSummary.tsx
index 5009587c0d2775..3659e527a872bf 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/FreshnessScheduleSummary.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/FreshnessScheduleSummary.tsx
@@ -29,7 +29,7 @@ export const FreshnessScheduleSummary = ({ definition, evaluationSchedule }: Pro
         case FreshnessAssertionScheduleType.FixedInterval:
             scheduleText = `In the past ${
                 definition.fixedInterval?.multiple
-            } ${definition.fixedInterval?.unit.toLocaleLowerCase()}s${
+            } ${definition.fixedInterval?.unit?.toLocaleLowerCase()}s${
                 cronStr ? `, as of ${cronstrue.toString(cronStr).toLowerCase()}` : ''
             }`;
             break;
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/builder/utils.ts b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/builder/utils.ts
index da2ae66d1ec9c9..7eeb526d2bf4dd 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/builder/utils.ts
+++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/builder/utils.ts
@@ -9,12 +9,12 @@ export const createBuilderState = (contract?: DataContract | null): DataContract
         return {
             schema:
                 (contract?.properties?.schema?.length && {
-                    assertionUrn: contract?.properties?.schema[0].assertion.urn,
+                    assertionUrn: contract?.properties?.schema[0]?.assertion?.urn,
                 }) ||
                 undefined,
             freshness:
                 (contract?.properties?.freshness?.length && {
-                    assertionUrn: contract?.properties?.freshness[0].assertion.urn,
+                    assertionUrn: contract?.properties?.freshness[0]?.assertion?.urn,
                 }) ||
                 undefined,
             dataQuality:
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Entity/ChartDashboardsTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Entity/ChartDashboardsTab.tsx
index 89e017947519c9..fc1ff4784dac73 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Entity/ChartDashboardsTab.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Entity/ChartDashboardsTab.tsx
@@ -7,7 +7,7 @@ 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 dashboards = chart?.dashboards?.relationships?.map((relationship) => relationship.entity);
     const entityRegistry = useEntityRegistry();
     const totalDashboards = chart?.dashboards?.total || 0;
     const title = `Found in ${totalDashboards} ${
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Entity/DashboardChartsTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Entity/DashboardChartsTab.tsx
index 7e5b1cdebd77bf..1b099eb1beb547 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Entity/DashboardChartsTab.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Entity/DashboardChartsTab.tsx
@@ -7,7 +7,7 @@ import { useEntityRegistry } from '../../../../useEntityRegistry';
 export const DashboardChartsTab = () => {
     const entity = useBaseEntity() as any;
     const dashboard = entity && entity.dashboard;
-    const charts = dashboard?.charts?.relationships.map((relationship) => relationship.entity);
+    const charts = dashboard?.charts?.relationships?.map((relationship) => relationship.entity);
     const entityRegistry = useEntityRegistry();
     const totalCharts = dashboard?.charts?.total || 0;
     const title = `Contains ${totalCharts} ${
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Entity/DashboardDatasetsTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Entity/DashboardDatasetsTab.tsx
index 62d612b0df4df2..758c412e031dba 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Entity/DashboardDatasetsTab.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Entity/DashboardDatasetsTab.tsx
@@ -7,7 +7,7 @@ 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 datasets = dashboard?.datasets?.relationships?.map((relationship) => relationship.entity);
     const entityRegistry = useEntityRegistry();
     const totalDatasets = dashboard?.datasets?.total || 0;
     const title = `Consumes ${totalDatasets} ${
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Entity/DataFlowJobsTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Entity/DataFlowJobsTab.tsx
index 36e8c035c0d236..cccf8e1449d830 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Entity/DataFlowJobsTab.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Entity/DataFlowJobsTab.tsx
@@ -30,7 +30,7 @@ export const DataFlowJobsTab = ({ properties = { urn: '' } }: Props) => {
     };
 
     const dataFlow = data && data?.dataFlow;
-    const dataJobs = dataFlow?.childJobs?.relationships.map((relationship) => relationship.entity);
+    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;
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Entity/weaklyTypedAspects/DynamicPropertiesTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Entity/weaklyTypedAspects/DynamicPropertiesTab.tsx
index 81a9398afa418d..aea879d72376f4 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Entity/weaklyTypedAspects/DynamicPropertiesTab.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Entity/weaklyTypedAspects/DynamicPropertiesTab.tsx
@@ -25,7 +25,7 @@ export default function DynamicTabularTab({ payload: rawPayload }: Props) {
             width: 210,
             title: 'Name',
             dataIndex: 'key',
-            sorter: (a, b) => a?.key.localeCompare(b?.key || '') || 0,
+            sorter: (a, b) => a?.key?.localeCompare(b?.key || '') || 0,
             defaultSortOrder: 'ascend',
             render: (name: string) => <NameText>{name}</NameText>,
         },
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Incident/components/IncidentListItem.tsx b/datahub-web-react/src/app/entity/shared/tabs/Incident/components/IncidentListItem.tsx
index 3438003c2f17b3..5c413b1e8b3e8b 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Incident/components/IncidentListItem.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Incident/components/IncidentListItem.tsx
@@ -233,7 +233,7 @@ export default function IncidentListItem({ incident, refetch }: Props) {
                                     <>
                                         <IncidentDescriptionLabel>Resolution Note</IncidentDescriptionLabel>
                                         <IncidentDescriptionText>
-                                            {incident?.status.message || 'No additional details'}
+                                            {incident?.status?.message || 'No additional details'}
                                         </IncidentDescriptionText>
                                     </>
                                 ) : null}
@@ -264,15 +264,15 @@ export default function IncidentListItem({ incident, refetch }: Props) {
                                 placement="left"
                                 title={<Typography.Text strong>Note</Typography.Text>}
                                 content={
-                                    incident?.status.message === null ? (
+                                    incident?.status?.message === null ? (
                                         <Typography.Text type="secondary">No additional details</Typography.Text>
                                     ) : (
-                                        <Typography.Text type="secondary">{incident?.status.message}</Typography.Text>
+                                        <Typography.Text type="secondary">{incident?.status?.message}</Typography.Text>
                                     )
                                 }
                             >
                                 <IncidentResolvedText>
-                                    {incident?.status.lastUpdated && (
+                                    {incident?.status?.lastUpdated && (
                                         <Tooltip showArrow={false} title={toLocalDateTimeString(lastModifiedDate)}>
                                             Resolved {toRelativeTimeString(lastModifiedDate)} by{' '}
                                         </Tooltip>
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Lineage/ColumnLineageSelect.tsx b/datahub-web-react/src/app/entity/shared/tabs/Lineage/ColumnLineageSelect.tsx
index ebde070e387813..3b626181f80b1b 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Lineage/ColumnLineageSelect.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Lineage/ColumnLineageSelect.tsx
@@ -70,7 +70,7 @@ export default function ColumnsLineageSelect({
                     allowClear
                     placeholder="Select column"
                 >
-                    {entityWithSchema?.schemaMetadata?.fields.map((field) => {
+                    {entityWithSchema?.schemaMetadata?.fields?.map((field) => {
                         const fieldPath = downgradeV2FieldPath(field.fieldPath);
                         return (
                             <Select.Option value={field.fieldPath}>
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Lineage/generateUseDownloadScrollAcrossLineageSearchResultsHook.ts b/datahub-web-react/src/app/entity/shared/tabs/Lineage/generateUseDownloadScrollAcrossLineageSearchResultsHook.ts
index ab1957f681b834..156471a6dd7f0c 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Lineage/generateUseDownloadScrollAcrossLineageSearchResultsHook.ts
+++ b/datahub-web-react/src/app/entity/shared/tabs/Lineage/generateUseDownloadScrollAcrossLineageSearchResultsHook.ts
@@ -30,11 +30,11 @@ export default function generateUseDownloadSearchAcrossLineageSearchResultsHook(
                 input: {
                     urn,
                     direction,
-                    types: params.variables?.input.types,
-                    query: params.variables?.input.query,
-                    scrollId: params.variables?.input.scrollId,
-                    count: params.variables?.input.count,
-                    orFilters: params.variables?.input.orFilters,
+                    types: params.variables?.input?.types,
+                    query: params.variables?.input?.query,
+                    scrollId: params.variables?.input?.scrollId,
+                    count: params.variables?.input?.count,
+                    orFilters: params.variables?.input?.orFilters,
                     startTimeMillis: startTimeMillis || undefined,
                     endTimeMillis: endTimeMillis || undefined,
                 },
@@ -44,8 +44,8 @@ export default function generateUseDownloadSearchAcrossLineageSearchResultsHook(
         return {
             searchResults: (data?.scrollAcrossLineage && {
                 ...data?.scrollAcrossLineage,
-                nextScrollId: data?.scrollAcrossLineage.nextScrollId,
-                searchResults: data?.scrollAcrossLineage.searchResults,
+                nextScrollId: data?.scrollAcrossLineage?.nextScrollId,
+                searchResults: data?.scrollAcrossLineage?.searchResults,
             }) as DownloadSearchResults,
             loading,
             error,
diff --git a/datahub-web-react/src/app/entity/shared/tabs/ML/MlFeatureFeatureTableTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/ML/MlFeatureFeatureTableTab.tsx
index 2930232b4c6204..bf2e42e8eaf9d7 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/ML/MlFeatureFeatureTableTab.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/ML/MlFeatureFeatureTableTab.tsx
@@ -10,7 +10,7 @@ export const FeatureTableTab = () => {
     const entityRegistry = useEntityRegistry();
 
     const feature = entity && entity.mlFeature;
-    const featureTables = feature?.featureTables?.relationships.map((relationship) => relationship.entity);
+    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/entity/shared/tabs/ML/MlPrimaryKeyFeatureTableTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/ML/MlPrimaryKeyFeatureTableTab.tsx
index 185e60c27fc807..ecad39fd45e57b 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/ML/MlPrimaryKeyFeatureTableTab.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/ML/MlPrimaryKeyFeatureTableTab.tsx
@@ -10,7 +10,7 @@ export const FeatureTableTab = () => {
     const entityRegistry = useEntityRegistry();
 
     const feature = entity && entity.mlPrimaryKey;
-    const featureTables = feature?.featureTables?.relationships.map((relationship) => relationship.entity);
+    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/entity/shared/tabs/Properties/Edit/EditColumn.tsx b/datahub-web-react/src/app/entity/shared/tabs/Properties/Edit/EditColumn.tsx
index a2d5c44b391e34..a5eafbae353995 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Properties/Edit/EditColumn.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Properties/Edit/EditColumn.tsx
@@ -47,7 +47,7 @@ export function EditColumn({ structuredProperty, associatedUrn, values, refetch,
     const [showConfirmRemove, setShowConfirmRemove] = useState<boolean>(false);
     const mutationUrn = useMutationUrn();
 
-    if (!structuredProperty || structuredProperty?.definition.immutable) {
+    if (!structuredProperty || structuredProperty?.definition?.immutable) {
         return null;
     }
 
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Properties/Edit/EditStructuredPropertyModal.tsx b/datahub-web-react/src/app/entity/shared/tabs/Properties/Edit/EditStructuredPropertyModal.tsx
index 13aa0dfd42d1ee..1714f0d1872e37 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Properties/Edit/EditStructuredPropertyModal.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Properties/Edit/EditStructuredPropertyModal.tsx
@@ -120,7 +120,7 @@ export default function EditStructuredPropertyModal({
             }
             destroyOnClose
         >
-            {structuredProperty?.definition.description && (
+            {structuredProperty?.definition?.description && (
                 <Description>{structuredProperty.definition.description}</Description>
             )}
             <StructuredPropertyInput
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Properties/NameColumn.tsx b/datahub-web-react/src/app/entity/shared/tabs/Properties/NameColumn.tsx
index 3b718c1ec30edd..069ba991b98c65 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Properties/NameColumn.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Properties/NameColumn.tsx
@@ -77,7 +77,7 @@ export default function NameColumn({ propertyRow, filterText }: Props) {
                     ) : (
                         <span />
                     )}
-                    {structuredProperty?.definition.allowedValues && (
+                    {structuredProperty?.definition?.allowedValues && (
                         <CardinalityLabel structuredProperty={structuredProperty} />
                     )}
                 </NameLabelWrapper>
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Properties/ValuesColumn.tsx b/datahub-web-react/src/app/entity/shared/tabs/Properties/ValuesColumn.tsx
index b050e06f96de85..3e21f1b5e2870b 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Properties/ValuesColumn.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Properties/ValuesColumn.tsx
@@ -10,7 +10,7 @@ interface Props {
 
 export default function ValuesColumn({ propertyRow, filterText }: Props) {
     const { values } = propertyRow;
-    const isRichText = propertyRow.dataType?.info.type === StdDataType.RichText;
+    const isRichText = propertyRow.dataType?.info?.type === StdDataType.RichText;
 
     return (
         <>
diff --git a/datahub-web-react/src/app/entity/user/UserProfile.tsx b/datahub-web-react/src/app/entity/user/UserProfile.tsx
index 2d6efb95b9d2af..57d02031f4f956 100644
--- a/datahub-web-react/src/app/entity/user/UserProfile.tsx
+++ b/datahub-web-react/src/app/entity/user/UserProfile.tsx
@@ -65,9 +65,9 @@ export default function UserProfile() {
     const castedCorpUser = data?.corpUser as any;
 
     const userGroups: Array<EntityRelationship> =
-        castedCorpUser?.groups?.relationships.map((relationship) => relationship as EntityRelationship) || [];
+        castedCorpUser?.groups?.relationships?.map((relationship) => relationship as EntityRelationship) || [];
     const userRoles: Array<EntityRelationship> =
-        castedCorpUser?.roles?.relationships.map((relationship) => relationship as EntityRelationship) || [];
+        castedCorpUser?.roles?.relationships?.map((relationship) => relationship as EntityRelationship) || [];
 
     // Routed Tabs Constants
     const getTabs = () => {
diff --git a/datahub-web-react/src/app/entity/view/builder/ViewBuilder.tsx b/datahub-web-react/src/app/entity/view/builder/ViewBuilder.tsx
index 8a0b84ce0fa7fd..9d8ba3e7a73922 100644
--- a/datahub-web-react/src/app/entity/view/builder/ViewBuilder.tsx
+++ b/datahub-web-react/src/app/entity/view/builder/ViewBuilder.tsx
@@ -32,7 +32,9 @@ export const ViewBuilder = ({ mode, urn, initialState, onSubmit, onCancel }: Pro
     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 filterFields = Array.from(
+            new Set(state.definition?.filter?.filters?.map((filter) => filter.field) ?? []),
+        );
         const entityTypes = Array.from(new Set(state.definition?.entityTypes ?? []));
 
         analytics.event({
diff --git a/datahub-web-react/src/app/entity/view/utils.ts b/datahub-web-react/src/app/entity/view/utils.ts
index 68b64714c7ce99..0952cacb5ac45c 100644
--- a/datahub-web-react/src/app/entity/view/utils.ts
+++ b/datahub-web-react/src/app/entity/view/utils.ts
@@ -28,7 +28,7 @@ export const convertStateToUpdateInput = (state: ViewBuilderState) => {
             entityTypes: state?.definition?.entityTypes,
             filter: {
                 operator: state?.definition?.filter?.operator,
-                filters: state?.definition?.filter?.filters.map((filter) => ({
+                filters: state?.definition?.filter?.filters?.map((filter) => ({
                     field: filter.field,
                     condition: filter.condition,
                     values: filter.values,
diff --git a/datahub-web-react/src/app/glossary/BusinessGlossaryPage.tsx b/datahub-web-react/src/app/glossary/BusinessGlossaryPage.tsx
index 4e424b776a8ce2..78944f19caa841 100644
--- a/datahub-web-react/src/app/glossary/BusinessGlossaryPage.tsx
+++ b/datahub-web-react/src/app/glossary/BusinessGlossaryPage.tsx
@@ -70,10 +70,10 @@ function BusinessGlossaryPage() {
         setEntityData(null);
     }, [setEntityData]);
 
-    const terms = termsData?.getRootGlossaryTerms?.terms.sort((termA, termB) =>
+    const terms = termsData?.getRootGlossaryTerms?.terms?.sort((termA, termB) =>
         sortGlossaryTerms(entityRegistry, termA, termB),
     );
-    const nodes = nodesData?.getRootGlossaryNodes?.nodes.sort((nodeA, nodeB) =>
+    const nodes = nodesData?.getRootGlossaryNodes?.nodes?.sort((nodeA, nodeB) =>
         sortGlossaryNodes(entityRegistry, nodeA, nodeB),
     );
 
diff --git a/datahub-web-react/src/app/glossary/GlossaryBrowser/NodeItem.tsx b/datahub-web-react/src/app/glossary/GlossaryBrowser/NodeItem.tsx
index af3c7454425de3..a01c6712cc71f7 100644
--- a/datahub-web-react/src/app/glossary/GlossaryBrowser/NodeItem.tsx
+++ b/datahub-web-react/src/app/glossary/GlossaryBrowser/NodeItem.tsx
@@ -80,7 +80,7 @@ function NodeItem(props: Props) {
     });
 
     useEffect(() => {
-        if (openToEntity && entityData && entityData.parentNodes?.nodes.some((parent) => parent.urn === node.urn)) {
+        if (openToEntity && entityData && entityData.parentNodes?.nodes?.some((parent) => parent.urn === node.urn)) {
             setAreChildrenVisible(true);
         }
     }, [entityData, node.urn, openToEntity]);
diff --git a/datahub-web-react/src/app/glossary/__tests__/utils.test.ts b/datahub-web-react/src/app/glossary/__tests__/utils.test.ts
index b3deb552cc7217..91f50f6dfd983a 100644
--- a/datahub-web-react/src/app/glossary/__tests__/utils.test.ts
+++ b/datahub-web-react/src/app/glossary/__tests__/utils.test.ts
@@ -13,7 +13,7 @@ const glossaryTermWithParent = {
 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);
+        expect(parentNode).toBe(glossaryNode3.parentNodes?.nodes[0]?.urn);
     });
 
     it('should get the direct parent node urn in getParentNodeToUpdate for glossary terms', () => {
diff --git a/datahub-web-react/src/app/glossary/utils.ts b/datahub-web-react/src/app/glossary/utils.ts
index 4cfbb06b8a4f3a..dc08d3ae3eab32 100644
--- a/datahub-web-react/src/app/glossary/utils.ts
+++ b/datahub-web-react/src/app/glossary/utils.ts
@@ -12,8 +12,8 @@ export function getGlossaryRootToUpdate(entityType: EntityType) {
 // 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
+    return entityData?.parentNodes?.nodes?.length
+        ? entityData?.parentNodes?.nodes[0]?.urn
         : getGlossaryRootToUpdate(entityType);
 }
 
diff --git a/datahub-web-react/src/app/home/HomePageHeader.tsx b/datahub-web-react/src/app/home/HomePageHeader.tsx
index c881109f6e419d..586e100ac46f06 100644
--- a/datahub-web-react/src/app/home/HomePageHeader.tsx
+++ b/datahub-web-react/src/app/home/HomePageHeader.tsx
@@ -221,7 +221,7 @@ export const HomePageHeader = () => {
     const searchResultsToShow = useMemo(() => {
         let result: string[] | undefined = [];
         if (searchResultsData) {
-            const entities = searchResultsData?.searchAcrossEntities?.searchResults.map((searchResult) => {
+            const entities = searchResultsData?.searchAcrossEntities?.searchResults?.map((searchResult) => {
                 return searchResult?.entity;
             });
 
diff --git a/datahub-web-react/src/app/ingest/ManageIngestionPage.tsx b/datahub-web-react/src/app/ingest/ManageIngestionPage.tsx
index 5085a20b9b2bba..48dd2ae78ffc48 100644
--- a/datahub-web-react/src/app/ingest/ManageIngestionPage.tsx
+++ b/datahub-web-react/src/app/ingest/ManageIngestionPage.tsx
@@ -52,7 +52,7 @@ export const ManageIngestionPage = () => {
      */
     const me = useUserContext();
     const { config, loaded } = useAppConfig();
-    const isIngestionEnabled = config?.managedIngestionConfig.enabled;
+    const isIngestionEnabled = config?.managedIngestionConfig?.enabled;
     const showIngestionTab = isIngestionEnabled && me && me.platformPrivileges?.manageIngestion;
     const showSecretsTab = isIngestionEnabled && me && me.platformPrivileges?.manageSecrets;
     const [selectedTab, setSelectedTab] = useState<TabType>(TabType.Sources);
diff --git a/datahub-web-react/src/app/ingest/source/IngestionSourceList.tsx b/datahub-web-react/src/app/ingest/source/IngestionSourceList.tsx
index 1990a3d7798973..edb01a5acb07e0 100644
--- a/datahub-web-react/src/app/ingest/source/IngestionSourceList.tsx
+++ b/datahub-web-react/src/app/ingest/source/IngestionSourceList.tsx
@@ -153,7 +153,7 @@ export const IngestionSourceList = () => {
 
     function hasActiveExecution() {
         return !!filteredSources.find((source) =>
-            source.executions?.executionRequests.find((request) => isExecutionRequestActive(request)),
+            source.executions?.executionRequests?.find((request) => isExecutionRequestActive(request)),
         );
     }
     useRefreshIngestionData(onRefresh, hasActiveExecution);
@@ -468,7 +468,7 @@ export const IngestionSourceList = () => {
                 onSubmit={onSubmit}
                 onCancel={onCancel}
             />
-            {isViewingRecipe && <RecipeViewerModal recipe={focusSource?.config.recipe} onCancel={onCancel} />}
+            {isViewingRecipe && <RecipeViewerModal recipe={focusSource?.config?.recipe} onCancel={onCancel} />}
             {focusExecutionUrn && (
                 <ExecutionDetailsModal urn={focusExecutionUrn} open onClose={() => setFocusExecutionUrn(undefined)} />
             )}
diff --git a/datahub-web-react/src/app/ingest/source/IngestionSourceTable.tsx b/datahub-web-react/src/app/ingest/source/IngestionSourceTable.tsx
index d890160958ed1c..2d785d71648533 100644
--- a/datahub-web-react/src/app/ingest/source/IngestionSourceTable.tsx
+++ b/datahub-web-react/src/app/ingest/source/IngestionSourceTable.tsx
@@ -114,16 +114,16 @@ function IngestionSourceTable({
         execCount: source.executions?.total || 0,
         lastExecUrn:
             source.executions &&
-            source.executions?.executionRequests.length > 0 &&
-            source.executions?.executionRequests[0].urn,
+            source.executions?.executionRequests?.length > 0 &&
+            source.executions?.executionRequests[0]?.urn,
         lastExecTime:
             source.executions &&
-            source.executions?.executionRequests.length > 0 &&
-            source.executions?.executionRequests[0].result?.startTimeMs,
+            source.executions?.executionRequests?.length > 0 &&
+            source.executions?.executionRequests[0]?.result?.startTimeMs,
         lastExecStatus:
             source.executions &&
-            source.executions?.executionRequests.length > 0 &&
-            getIngestionSourceStatus(source.executions?.executionRequests[0].result),
+            source.executions?.executionRequests?.length > 0 &&
+            getIngestionSourceStatus(source.executions?.executionRequests[0]?.result),
         cliIngestion: source.config?.executorId === CLI_EXECUTOR_ID,
     }));
 
diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/RecipeForm.tsx b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/RecipeForm.tsx
index 4199658568b9a6..528c1fe4a6a9e2 100644
--- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/RecipeForm.tsx
+++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/RecipeForm.tsx
@@ -118,7 +118,7 @@ function RecipeForm(props: Props) {
         },
     });
     const secrets =
-        data?.listSecrets?.secrets.sort((secretA, secretB) => secretA.name.localeCompare(secretB.name)) || [];
+        data?.listSecrets?.secrets?.sort((secretA, secretB) => secretA.name.localeCompare(secretB.name)) || [];
     const [form] = Form.useForm();
 
     function updateFormValues(changedValues: any, allValues: any) {
diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/SecretField/SecretField.tsx b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/SecretField/SecretField.tsx
index 73acfbcc3fc4e4..7e49eb836d4408 100644
--- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/SecretField/SecretField.tsx
+++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/SecretField/SecretField.tsx
@@ -102,7 +102,7 @@ function SecretField({ field, secrets, removeMargin, updateFormValue, refetchSec
         >
             <AutoComplete
                 placeholder={field.placeholder}
-                filterOption={(input, option) => !!option?.value.toLowerCase().includes(input.toLowerCase())}
+                filterOption={(input, option) => !!option?.value?.toLowerCase().includes(input.toLowerCase())}
                 notFoundContent={<>No secrets found</>}
                 options={options}
                 dropdownRender={(menu) => {
diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/TestConnection/TestConnectionModal.tsx b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/TestConnection/TestConnectionModal.tsx
index 3a0bc47fa7d262..049e30ba5b1415 100644
--- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/TestConnection/TestConnectionModal.tsx
+++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/TestConnection/TestConnectionModal.tsx
@@ -158,9 +158,9 @@ function TestConnectionModal({
                     {testConnectionResult?.basic_connectivity && (
                         <ConnectionCapabilityView
                             capability="Basic Connectivity"
-                            displayMessage={testConnectionResult?.basic_connectivity.failure_reason}
-                            success={testConnectionResult?.basic_connectivity.capable}
-                            tooltipMessage={testConnectionResult?.basic_connectivity.mitigation_message}
+                            displayMessage={testConnectionResult?.basic_connectivity?.failure_reason}
+                            success={testConnectionResult?.basic_connectivity?.capable}
+                            tooltipMessage={testConnectionResult?.basic_connectivity?.mitigation_message}
                             number={1}
                         />
                     )}
diff --git a/datahub-web-react/src/app/ingest/source/executions/IngestionSourceExecutionList.tsx b/datahub-web-react/src/app/ingest/source/executions/IngestionSourceExecutionList.tsx
index 9c40a3334df174..526f6f08334f58 100644
--- a/datahub-web-react/src/app/ingest/source/executions/IngestionSourceExecutionList.tsx
+++ b/datahub-web-react/src/app/ingest/source/executions/IngestionSourceExecutionList.tsx
@@ -49,7 +49,7 @@ export const IngestionSourceExecutionList = ({ urn, isExpanded, lastRefresh, onR
     };
 
     function hasActiveExecution() {
-        return !!data?.ingestionSource?.executions?.executionRequests.find((request) =>
+        return !!data?.ingestionSource?.executions?.executionRequests?.find((request) =>
             isExecutionRequestActive(request as ExecutionRequest),
         );
     }
diff --git a/datahub-web-react/src/app/lineage/LineageEntityColumns.tsx b/datahub-web-react/src/app/lineage/LineageEntityColumns.tsx
index 281d6381741f8d..4777c6fef4fd4d 100644
--- a/datahub-web-react/src/app/lineage/LineageEntityColumns.tsx
+++ b/datahub-web-react/src/app/lineage/LineageEntityColumns.tsx
@@ -67,7 +67,7 @@ export default function LineageEntityColumns({ node, onHover }: Props) {
     }, [displayedFields, node?.data?.urn, setVisibleColumnsByUrn, previousDisplayedFields]);
 
     const hasColumnPagination =
-        (node.data.schemaMetadata?.fields && node.data.schemaMetadata?.fields.length > NUM_COLUMNS_PER_PAGE) ||
+        (node.data.schemaMetadata?.fields && node.data.schemaMetadata?.fields?.length > NUM_COLUMNS_PER_PAGE) ||
         (node.data.inputFields?.fields && node.data.inputFields.fields.length > NUM_COLUMNS_PER_PAGE);
 
     return (
diff --git a/datahub-web-react/src/app/lineage/LineageExplorer.tsx b/datahub-web-react/src/app/lineage/LineageExplorer.tsx
index 2d42d164f6626e..fbf305a034d4da 100644
--- a/datahub-web-react/src/app/lineage/LineageExplorer.tsx
+++ b/datahub-web-react/src/app/lineage/LineageExplorer.tsx
@@ -101,7 +101,7 @@ export default function LineageExplorer({ urn, type }: Props) {
 
     const maybeAddAsyncLoadedEntity = useCallback(
         (entityAndType: EntityAndType) => {
-            if (entityAndType?.entity.urn && !asyncEntities.get(entityAndType?.entity.urn)?.fullyFetched) {
+            if (entityAndType?.entity?.urn && !asyncEntities.get(entityAndType?.entity?.urn)?.fullyFetched) {
                 // record that we have added this entity
                 let newAsyncEntities = extendAsyncEntities(
                     fineGrainedMap,
diff --git a/datahub-web-react/src/app/lineage/manage/AddEntityEdge.tsx b/datahub-web-react/src/app/lineage/manage/AddEntityEdge.tsx
index d5041c63da1d37..a4057f97fe37aa 100644
--- a/datahub-web-react/src/app/lineage/manage/AddEntityEdge.tsx
+++ b/datahub-web-react/src/app/lineage/manage/AddEntityEdge.tsx
@@ -104,7 +104,7 @@ export default function AddEntityEdge({
     }
 
     function selectEntity(urn: string) {
-        const resultEntities = autoCompleteResults?.autoCompleteForMultiple?.suggestions.flatMap(
+        const resultEntities = autoCompleteResults?.autoCompleteForMultiple?.suggestions?.flatMap(
             (suggestion) => suggestion.entities || [],
         );
         const selectedEntity = resultEntities?.find((entity) => entity.urn === urn);
diff --git a/datahub-web-react/src/app/lineage/utils/columnLineageUtils.ts b/datahub-web-react/src/app/lineage/utils/columnLineageUtils.ts
index c3483f229f7a09..bd4f07cae11179 100644
--- a/datahub-web-react/src/app/lineage/utils/columnLineageUtils.ts
+++ b/datahub-web-react/src/app/lineage/utils/columnLineageUtils.ts
@@ -149,7 +149,7 @@ export function filterColumns(
     setColumnsByUrn: (value: React.SetStateAction<Record<string, SchemaField[]>>) => void,
 ) {
     const formattedFilterText = filterText.toLocaleLowerCase();
-    const filteredFields = node.data.schemaMetadata?.fields.filter((field) =>
+    const filteredFields = node.data.schemaMetadata?.fields?.filter((field) =>
         field.fieldPath.toLocaleLowerCase().includes(formattedFilterText),
     );
     if (filteredFields) {
diff --git a/datahub-web-react/src/app/lineage/utils/layoutTree.ts b/datahub-web-react/src/app/lineage/utils/layoutTree.ts
index a972a62308f073..bc88337ccebdb6 100644
--- a/datahub-web-react/src/app/lineage/utils/layoutTree.ts
+++ b/datahub-web-react/src/app/lineage/utils/layoutTree.ts
@@ -219,9 +219,9 @@ function drawColumnEdge({
     const targetFieldY = targetNode?.y || 0 + 3;
     let targetFieldX = (targetNode?.x || 0) + 35 + targetTitleHeight;
     // if currentNode is a dataJob, draw line to center of data job
-    if (targetNode?.data.type === EntityType.DataJob) {
+    if (targetNode?.data?.type === EntityType.DataJob) {
         targetFieldX = targetNode?.x || 0;
-    } else if (!collapsedColumnsNodes[targetNode?.data.urn || 'no-op']) {
+    } else if (!collapsedColumnsNodes[targetNode?.data?.urn || 'no-op']) {
         if (!visibleColumnsByUrn[targetUrn]?.has(targetField)) {
             targetFieldX =
                 (targetNode?.x || 0) +
@@ -299,19 +299,19 @@ function layoutColumnTree(
                 const fieldForwardEdges = fieldPathToEdges[sourceField];
 
                 const currentNode = nodesToRender.find((node) => node.data.urn === entityUrn);
-                const fields = columnsByUrn[currentNode?.data.urn || ''] || [];
+                const fields = columnsByUrn[currentNode?.data?.urn || ''] || [];
                 const fieldIndex = fields.findIndex((candidate) => candidate.fieldPath === sourceField) || 0;
 
                 const sourceTitleHeight = getTitleHeight(
-                    expandTitles ? currentNode?.data.expandedName || currentNode?.data.name : undefined,
+                    expandTitles ? currentNode?.data?.expandedName || currentNode?.data?.name : undefined,
                 );
 
                 const sourceFieldY = currentNode?.y || 0 + 1;
                 let sourceFieldX = (currentNode?.x || 0) + 30 + sourceTitleHeight;
                 // if currentNode is a dataJob, draw line from center of data job
-                if (currentNode?.data.type === EntityType.DataJob) {
+                if (currentNode?.data?.type === EntityType.DataJob) {
                     sourceFieldX = currentNode?.x || 0;
-                } else if (!collapsedColumnsNodes[currentNode?.data.urn || 'no-op']) {
+                } else if (!collapsedColumnsNodes[currentNode?.data?.urn || 'no-op']) {
                     if (!visibleColumnsByUrn[entityUrn]?.has(sourceField)) {
                         sourceFieldX =
                             (currentNode?.x || 0) +
@@ -331,9 +331,9 @@ function layoutColumnTree(
 
                 Object.keys(fieldForwardEdges || {}).forEach((targetUrn) => {
                     const targetNode = nodesToRender.find((node) => node.data.urn === targetUrn);
-                    const targetFields = columnsByUrn[targetNode?.data.urn || ''] || [];
+                    const targetFields = columnsByUrn[targetNode?.data?.urn || ''] || [];
                     const targetTitleHeight = getTitleHeight(
-                        expandTitles ? targetNode?.data.expandedName || targetNode?.data.name : undefined,
+                        expandTitles ? targetNode?.data?.expandedName || targetNode?.data?.name : undefined,
                     );
 
                     (fieldForwardEdges[targetUrn] || []).forEach((targetField) => {
diff --git a/datahub-web-react/src/app/permissions/policy/PolicyActorForm.tsx b/datahub-web-react/src/app/permissions/policy/PolicyActorForm.tsx
index adb660d43f4717..f351c6db3966f3 100644
--- a/datahub-web-react/src/app/permissions/policy/PolicyActorForm.tsx
+++ b/datahub-web-react/src/app/permissions/policy/PolicyActorForm.tsx
@@ -58,7 +58,7 @@ export default function PolicyActorForm({ policyType, actors, setActors }: Props
         },
     });
     const ownershipTypes =
-        ownershipData?.listOwnershipTypes?.ownershipTypes.filter((type) => type.urn !== 'urn:li:ownershipType:none') ||
+        ownershipData?.listOwnershipTypes?.ownershipTypes?.filter((type) => type.urn !== 'urn:li:ownershipType:none') ||
         [];
     const ownershipTypesMap = Object.fromEntries(ownershipTypes.map((type) => [type.urn, type.info?.name]));
     // Toggle the "Owners" switch
diff --git a/datahub-web-react/src/app/permissions/roles/ManageRoles.tsx b/datahub-web-react/src/app/permissions/roles/ManageRoles.tsx
index 7c2cec63071adb..151d23300c7ba8 100644
--- a/datahub-web-react/src/app/permissions/roles/ManageRoles.tsx
+++ b/datahub-web-react/src/app/permissions/roles/ManageRoles.tsx
@@ -176,7 +176,7 @@ export const ManageRoles = () => {
             render: (_: any, record: any) => {
                 return (
                     <>
-                        {(record?.users.length && (
+                        {(record?.users?.length && (
                             <AvatarsGroup
                                 users={record?.users}
                                 groups={record?.resolvedGroups}
@@ -217,8 +217,8 @@ export const ManageRoles = () => {
         type: role?.type,
         description: role?.description,
         name: role?.name,
-        users: role?.users?.relationships.map((relationship) => relationship.entity as CorpUser),
-        policies: role?.policies?.relationships.map((relationship) => relationship.entity as DataHubPolicy),
+        users: role?.users?.relationships?.map((relationship) => relationship.entity as CorpUser),
+        policies: role?.policies?.relationships?.map((relationship) => relationship.entity as DataHubPolicy),
     }));
 
     return (
diff --git a/datahub-web-react/src/app/permissions/roles/RoleDetailsModal.tsx b/datahub-web-react/src/app/permissions/roles/RoleDetailsModal.tsx
index 7bca62c040c2db..6dc7ebbe1407cb 100644
--- a/datahub-web-react/src/app/permissions/roles/RoleDetailsModal.tsx
+++ b/datahub-web-react/src/app/permissions/roles/RoleDetailsModal.tsx
@@ -45,8 +45,8 @@ export default function RoleDetailsModal({ role, open, onClose }: Props) {
 
     const castedRole = role as any;
 
-    const users = castedRole?.users?.relationships.map((relationship) => relationship.entity as CorpUser);
-    const policies = castedRole?.policies?.relationships.map((relationship) => relationship.entity as DataHubPolicy);
+    const users = castedRole?.users?.relationships?.map((relationship) => relationship.entity as CorpUser);
+    const policies = castedRole?.policies?.relationships?.map((relationship) => relationship.entity as DataHubPolicy);
 
     return (
         <Modal title={role?.name} open={open} onCancel={onClose} closable width={800} footer={actionButtons}>
diff --git a/datahub-web-react/src/app/search/AdvancedFilterSelectValueModal.tsx b/datahub-web-react/src/app/search/AdvancedFilterSelectValueModal.tsx
index 056aca56c13137..43b4388e92ba1c 100644
--- a/datahub-web-react/src/app/search/AdvancedFilterSelectValueModal.tsx
+++ b/datahub-web-react/src/app/search/AdvancedFilterSelectValueModal.tsx
@@ -47,7 +47,7 @@ export const AdvancedFilterSelectValueModal = ({
                 urns={[]}
                 defaultValues={initialValues?.map((urn) => ({
                     urn,
-                    entity: facet?.aggregations.find((aggregation) => aggregation.value === urn)?.entity,
+                    entity: facet?.aggregations?.find((aggregation) => aggregation.value === urn)?.entity,
                 }))}
                 onCloseModal={onCloseModal}
                 hideOwnerType
@@ -66,7 +66,7 @@ export const AdvancedFilterSelectValueModal = ({
                 defaultValue={
                     initialValues?.map((urn) => ({
                         urn,
-                        entity: facet?.aggregations.find((aggregation) => aggregation.value === urn)?.entity,
+                        entity: facet?.aggregations?.find((aggregation) => aggregation.value === urn)?.entity,
                     }))?.[0]
                 }
                 onCloseModal={onCloseModal}
@@ -84,7 +84,7 @@ export const AdvancedFilterSelectValueModal = ({
                 titleOverride="Select Container"
                 defaultValues={initialValues?.map((urn) => ({
                     urn,
-                    entity: facet?.aggregations.find((aggregation) => aggregation.value === urn)?.entity,
+                    entity: facet?.aggregations?.find((aggregation) => aggregation.value === urn)?.entity,
                 }))}
                 onCloseModal={onCloseModal}
                 onOkOverride={(containerUrns) => {
@@ -100,7 +100,7 @@ export const AdvancedFilterSelectValueModal = ({
             <SelectPlatformModal
                 defaultValues={initialValues?.map((urn) => ({
                     urn,
-                    entity: facet?.aggregations.find((aggregation) => aggregation.value === urn)?.entity,
+                    entity: facet?.aggregations?.find((aggregation) => aggregation.value === urn)?.entity,
                 }))}
                 titleOverride="Select Platform"
                 onCloseModal={onCloseModal}
@@ -195,7 +195,7 @@ export const AdvancedFilterSelectValueModal = ({
                 }}
                 defaultValues={initialValues?.map((urn) => ({
                     urn,
-                    entity: facet?.aggregations.find((aggregation) => aggregation.value === urn)?.entity,
+                    entity: facet?.aggregations?.find((aggregation) => aggregation.value === urn)?.entity,
                 }))}
             />
         );
@@ -219,7 +219,7 @@ export const AdvancedFilterSelectValueModal = ({
                 }}
                 defaultValues={initialValues?.map((urn) => ({
                     urn,
-                    entity: facet?.aggregations.find((aggregation) => aggregation.value === urn)?.entity,
+                    entity: facet?.aggregations?.find((aggregation) => aggregation.value === urn)?.entity,
                 }))}
             />
         );
diff --git a/datahub-web-react/src/app/search/SearchBar.tsx b/datahub-web-react/src/app/search/SearchBar.tsx
index 7568e4ece8403c..15bdf62eadf791 100644
--- a/datahub-web-react/src/app/search/SearchBar.tsx
+++ b/datahub-web-react/src/app/search/SearchBar.tsx
@@ -188,7 +188,7 @@ export const SearchBar = ({
 
     const emptyQueryOptions = useMemo(() => {
         const moduleOptions =
-            data?.listRecommendations?.modules.map((module) => ({
+            data?.listRecommendations?.modules?.map((module) => ({
                 label: <EntityTypeLabel>{module.title}</EntityTypeLabel>,
                 options: [...module.content.map((content) => renderRecommendedQuery(content.value))],
             })) || [];
diff --git a/datahub-web-react/src/app/search/filters/utils.tsx b/datahub-web-react/src/app/search/filters/utils.tsx
index 2bbad251533632..6aea405d0465c9 100644
--- a/datahub-web-react/src/app/search/filters/utils.tsx
+++ b/datahub-web-react/src/app/search/filters/utils.tsx
@@ -319,7 +319,7 @@ export function getFilterOptions(
         ...agg,
     }));
 
-    const searchResults = autoCompleteResults?.autoCompleteForMultiple?.suggestions.find((suggestion) =>
+    const searchResults = autoCompleteResults?.autoCompleteForMultiple?.suggestions?.find((suggestion) =>
         FACETS_TO_ENTITY_TYPES[filterField]?.includes(suggestion.type),
     );
     const searchFilterOptions = searchResults?.entities
diff --git a/datahub-web-react/src/app/search/sidebar/useBrowsePagination.tsx b/datahub-web-react/src/app/search/sidebar/useBrowsePagination.tsx
index 48a71e96e4f7ff..cadecdb318532a 100644
--- a/datahub-web-react/src/app/search/sidebar/useBrowsePagination.tsx
+++ b/datahub-web-react/src/app/search/sidebar/useBrowsePagination.tsx
@@ -98,7 +98,7 @@ const useBrowsePagination = ({ skip }: Props) => {
         loaded: !!latestData || !!error,
         error,
         groups,
-        path: latestData?.browseV2?.metadata.path,
+        path: latestData?.browseV2?.metadata?.path,
         observable: <div ref={observableRef} style={{ width: '1px', height: '1px' }} />,
         retry,
     } as const;
diff --git a/datahub-web-react/src/app/search/utils/useDownloadScrollAcrossEntitiesSearchResults.ts b/datahub-web-react/src/app/search/utils/useDownloadScrollAcrossEntitiesSearchResults.ts
index b1bfb40ef0e455..dd71834b29d2ab 100644
--- a/datahub-web-react/src/app/search/utils/useDownloadScrollAcrossEntitiesSearchResults.ts
+++ b/datahub-web-react/src/app/search/utils/useDownloadScrollAcrossEntitiesSearchResults.ts
@@ -25,7 +25,7 @@ export function useDownloadScrollAcrossEntitiesSearchResults(params: DownloadSea
         searchResults:
             ((data?.scrollAcrossEntities && {
                 ...data?.scrollAcrossEntities,
-                nextScrollId: data?.scrollAcrossEntities.nextScrollId,
+                nextScrollId: data?.scrollAcrossEntities?.nextScrollId,
             }) as DownloadSearchResults) || undefined,
         loading,
         error,
@@ -44,7 +44,7 @@ export function useDownloadScrollAcrossEntitiesSearchResults(params: DownloadSea
                 (res) =>
                     ((res.data?.scrollAcrossEntities && {
                         ...res.data?.scrollAcrossEntities,
-                        nextScrollId: res.data?.scrollAcrossEntities.nextScrollId,
+                        nextScrollId: res.data?.scrollAcrossEntities?.nextScrollId,
                     }) as DownloadSearchResults) || undefined,
             ),
     };
diff --git a/datahub-web-react/src/app/settings/AccessTokens.tsx b/datahub-web-react/src/app/settings/AccessTokens.tsx
index 6ccca8dd360d70..507224ed4df1f6 100644
--- a/datahub-web-react/src/app/settings/AccessTokens.tsx
+++ b/datahub-web-react/src/app/settings/AccessTokens.tsx
@@ -196,8 +196,8 @@ export const AccessTokens = () => {
         return renderSearchResult(result);
     });
 
-    const totalTokens = tokensData?.listAccessTokens.total || 0;
-    const tokens = useMemo(() => tokensData?.listAccessTokens.tokens || [], [tokensData]);
+    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();
diff --git a/datahub-web-react/src/app/settings/SettingsPage.tsx b/datahub-web-react/src/app/settings/SettingsPage.tsx
index e3948349546efb..448782fa5d970c 100644
--- a/datahub-web-react/src/app/settings/SettingsPage.tsx
+++ b/datahub-web-react/src/app/settings/SettingsPage.tsx
@@ -111,9 +111,9 @@ export const SettingsPage = () => {
     const me = useUserContext();
     const { config } = useAppConfig();
 
-    const isPoliciesEnabled = config?.policiesConfig.enabled;
-    const isIdentityManagementEnabled = config?.identityManagementConfig.enabled;
-    const isViewsEnabled = config?.viewsConfig.enabled;
+    const isPoliciesEnabled = config?.policiesConfig?.enabled;
+    const isIdentityManagementEnabled = config?.identityManagementConfig?.enabled;
+    const isViewsEnabled = config?.viewsConfig?.enabled;
     const { readOnlyModeEnabled } = config.featureFlags;
 
     const showPolicies = (isPoliciesEnabled && me && me?.platformPrivileges?.managePolicies) || false;
diff --git a/datahub-web-react/src/app/shared/admin/HeaderLinks.tsx b/datahub-web-react/src/app/shared/admin/HeaderLinks.tsx
index 2e8556a20b0865..64e12cf23b7182 100644
--- a/datahub-web-react/src/app/shared/admin/HeaderLinks.tsx
+++ b/datahub-web-react/src/app/shared/admin/HeaderLinks.tsx
@@ -70,8 +70,8 @@ export function HeaderLinks(props: Props) {
 
     const businessAttributesFlag = useBusinessAttributesFlag();
 
-    const isAnalyticsEnabled = config?.analyticsConfig.enabled;
-    const isIngestionEnabled = config?.managedIngestionConfig.enabled;
+    const isAnalyticsEnabled = config?.analyticsConfig?.enabled;
+    const isIngestionEnabled = config?.managedIngestionConfig?.enabled;
 
     const showAnalytics = (isAnalyticsEnabled && me && me?.platformPrivileges?.viewAnalytics) || false;
     const showSettings = true;
diff --git a/datahub-web-react/src/app/shared/businessAttribute/AddBusinessAttributeModal.tsx b/datahub-web-react/src/app/shared/businessAttribute/AddBusinessAttributeModal.tsx
index ea51ac4e12c3f5..51b96b14126b32 100644
--- a/datahub-web-react/src/app/shared/businessAttribute/AddBusinessAttributeModal.tsx
+++ b/datahub-web-react/src/app/shared/businessAttribute/AddBusinessAttributeModal.tsx
@@ -180,7 +180,7 @@ export default function EditBusinessAttributeModal({
                 component: (
                     <div>
                         <GlobalOutlined />
-                        <AttributeName>{selectedSearchOption?.props.name}</AttributeName>
+                        <AttributeName>{selectedSearchOption?.props?.name}</AttributeName>
                     </div>
                 ),
             });
diff --git a/datahub-web-react/src/app/shared/tags/AddTagsTermsModal.tsx b/datahub-web-react/src/app/shared/tags/AddTagsTermsModal.tsx
index 7f2f80e023a6b9..cd233552e68aa6 100644
--- a/datahub-web-react/src/app/shared/tags/AddTagsTermsModal.tsx
+++ b/datahub-web-react/src/app/shared/tags/AddTagsTermsModal.tsx
@@ -236,7 +236,7 @@ export default function EditTagTermsModal({
         setUrns(newUrns);
         setSelectedTerms([
             ...selectedTerms,
-            { urn, component: <TagTermLabel termName={selectedSearchOption?.props.name} /> },
+            { urn, component: <TagTermLabel termName={selectedSearchOption?.props?.name} /> },
         ]);
         setSelectedTags([
             ...selectedTags,
diff --git a/datahub-web-react/src/providers/EducationStepsProvider.tsx b/datahub-web-react/src/providers/EducationStepsProvider.tsx
index f254b21ea99a55..807d15322227bc 100644
--- a/datahub-web-react/src/providers/EducationStepsProvider.tsx
+++ b/datahub-web-react/src/providers/EducationStepsProvider.tsx
@@ -9,7 +9,7 @@ export function EducationStepsProvider({ children }: { children: React.ReactNode
     const userUrn = useUserContext()?.user?.urn;
     const stepIds = getStepIds(userUrn || '');
     const { data } = useBatchGetStepStatesQuery({ skip: !userUrn, variables: { input: { ids: stepIds } } });
-    const results = data?.batchGetStepStates.results;
+    const results = data?.batchGetStepStates?.results;
     const [educationSteps, setEducationSteps] = useState<StepStateResult[] | null>(results || null);
     const [educationStepIdsAllowlist, setEducationStepIdsAllowlist] = useState<Set<string>>(
         new Set(getInitialAllowListIds()),
diff --git a/metadata-ingestion/src/datahub/ingestion/source/metadata/business_glossary.py b/metadata-ingestion/src/datahub/ingestion/source/metadata/business_glossary.py
index 79ec47a7efb2c2..26a0331e1e5767 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/metadata/business_glossary.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/metadata/business_glossary.py
@@ -45,6 +45,9 @@ class Owners(ConfigModel):
     groups: Optional[List[str]] = None
 
 
+OwnersMultipleTypes = Union[List[Owners], Owners]
+
+
 class KnowledgeCard(ConfigModel):
     url: Optional[str] = None
     label: Optional[str] = None
@@ -57,7 +60,7 @@ class GlossaryTermConfig(ConfigModel):
     term_source: Optional[str] = None
     source_ref: Optional[str] = None
     source_url: Optional[str] = None
-    owners: Optional[Owners] = None
+    owners: Optional[OwnersMultipleTypes] = None
     inherits: Optional[List[str]] = None
     contains: Optional[List[str]] = None
     values: Optional[List[str]] = None
@@ -74,7 +77,7 @@ class GlossaryNodeConfig(ConfigModel):
     id: Optional[str] = None
     name: str
     description: str
-    owners: Optional[Owners] = None
+    owners: Optional[OwnersMultipleTypes] = None
     terms: Optional[List["GlossaryTermConfig"]] = None
     nodes: Optional[List["GlossaryNodeConfig"]] = None
     knowledge_links: Optional[List[KnowledgeCard]] = None
@@ -88,7 +91,7 @@ class DefaultConfig(ConfigModel):
     """Holds defaults for populating fields in glossary terms"""
 
     source: Optional[str] = None
-    owners: Owners
+    owners: OwnersMultipleTypes
     url: Optional[str] = None
     source_type: str = "INTERNAL"
 
@@ -153,30 +156,44 @@ def make_glossary_term_urn(
     return "urn:li:glossaryTerm:" + create_id(path, default_id, enable_auto_id)
 
 
-def get_owners(owners: Owners) -> models.OwnershipClass:
-    ownership_type, ownership_type_urn = validate_ownership_type(owners.type)
+def get_owners_multiple_types(owners: OwnersMultipleTypes) -> models.OwnershipClass:
+    """Allows owner types to be a list and maintains backward compatibility"""
+    if isinstance(owners, Owners):
+        return models.OwnershipClass(owners=list(get_owners(owners)))
+
+    owners_meta: List[models.OwnerClass] = []
+    for owner in owners:
+        owners_meta.extend(get_owners(owner))
+
+    return models.OwnershipClass(owners=owners_meta)
+
+
+def get_owners(owners: Owners) -> Iterable[models.OwnerClass]:
+    actual_type = owners.type or models.OwnershipTypeClass.DEVELOPER
+
+    if actual_type.startswith("urn:li:ownershipType:"):
+        ownership_type: str = "CUSTOM"
+        ownership_type_urn: Optional[str] = actual_type
+    else:
+        ownership_type, ownership_type_urn = validate_ownership_type(actual_type)
+
     if owners.typeUrn is not None:
         ownership_type_urn = owners.typeUrn
-    owners_meta: List[models.OwnerClass] = []
+
     if owners.users is not None:
-        owners_meta = owners_meta + [
-            models.OwnerClass(
+        for o in owners.users:
+            yield models.OwnerClass(
                 owner=make_user_urn(o),
                 type=ownership_type,
                 typeUrn=ownership_type_urn,
             )
-            for o in owners.users
-        ]
     if owners.groups is not None:
-        owners_meta = owners_meta + [
-            models.OwnerClass(
+        for o in owners.groups:
+            yield models.OwnerClass(
                 owner=make_group_urn(o),
                 type=ownership_type,
                 typeUrn=ownership_type_urn,
             )
-            for o in owners.groups
-        ]
-    return models.OwnershipClass(owners=owners_meta)
 
 
 def get_mces(
@@ -185,7 +202,7 @@ def get_mces(
     ingestion_config: BusinessGlossarySourceConfig,
     ctx: PipelineContext,
 ) -> Iterable[Union[MetadataChangeProposalWrapper, models.MetadataChangeEventClass]]:
-    root_owners = get_owners(glossary.owners)
+    root_owners = get_owners_multiple_types(glossary.owners)
 
     if glossary.nodes:
         for node in glossary.nodes:
@@ -270,7 +287,7 @@ def get_mces_from_node(
     node_owners = parentOwners
     if glossaryNode.owners is not None:
         assert glossaryNode.owners is not None
-        node_owners = get_owners(glossaryNode.owners)
+        node_owners = get_owners_multiple_types(glossaryNode.owners)
 
     node_snapshot = models.GlossaryNodeSnapshotClass(
         urn=node_urn,
@@ -426,7 +443,7 @@ def get_mces_from_term(
     ownership: models.OwnershipClass = parentOwnership
     if glossaryTerm.owners is not None:
         assert glossaryTerm.owners is not None
-        ownership = get_owners(glossaryTerm.owners)
+        ownership = get_owners_multiple_types(glossaryTerm.owners)
     aspects.append(ownership)
 
     if glossaryTerm.domain is not None:
diff --git a/metadata-ingestion/tests/integration/business-glossary/custom_ownership_urns.yml b/metadata-ingestion/tests/integration/business-glossary/custom_ownership_urns.yml
new file mode 100644
index 00000000000000..94aae6999a3f50
--- /dev/null
+++ b/metadata-ingestion/tests/integration/business-glossary/custom_ownership_urns.yml
@@ -0,0 +1,38 @@
+version: "1"
+source: DataHub
+owners:
+  users:
+    - mjames
+url: "https://github.com/datahub-project/datahub/"
+
+nodes:
+  - name: Custom URN Types
+    description: Testing custom ownership URN types
+    owners:
+      - type: urn:li:ownershipType:custom_type_1
+        users:
+          - user1
+        groups:
+          - group1
+      - type: urn:li:ownershipType:custom_type_2
+        users:
+          - user2
+    terms:
+      - name: Mixed URN Types
+        description: Term with custom URN types
+        owners:
+          - type: urn:li:ownershipType:custom_type_3
+            users:
+              - user3
+          - type: urn:li:ownershipType:custom_type_4
+            groups:
+              - group2
+      - name: Mixed Standard and URN
+        description: Term with both standard and URN types
+        owners:
+          - type: DEVELOPER
+            users:
+              - dev1
+          - type: urn:li:ownershipType:custom_type_5
+            groups:
+              - group3
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/business-glossary/custom_ownership_urns_golden.json b/metadata-ingestion/tests/integration/business-glossary/custom_ownership_urns_golden.json
new file mode 100644
index 00000000000000..2fc3de77efd8eb
--- /dev/null
+++ b/metadata-ingestion/tests/integration/business-glossary/custom_ownership_urns_golden.json
@@ -0,0 +1,188 @@
+[
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.GlossaryNodeSnapshot": {
+            "urn": "urn:li:glossaryNode:Custom URN Types",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.glossary.GlossaryNodeInfo": {
+                        "customProperties": {},
+                        "definition": "Testing custom ownership URN types",
+                        "name": "Custom URN Types"
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Ownership": {
+                        "owners": [
+                            {
+                                "owner": "urn:li:corpuser:user1",
+                                "type": "CUSTOM",
+                                "typeUrn": "urn:li:ownershipType:custom_type_1"
+                            },
+                            {
+                                "owner": "urn:li:corpGroup:group1",
+                                "type": "CUSTOM",
+                                "typeUrn": "urn:li:ownershipType:custom_type_1"
+                            },
+                            {
+                                "owner": "urn:li:corpuser:user2",
+                                "type": "CUSTOM",
+                                "typeUrn": "urn:li:ownershipType:custom_type_2"
+                            }
+                        ],
+                        "ownerTypes": {},
+                        "lastModified": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        }
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "datahub-business-glossary-2020_04_14-07_00_00-dlsmlo",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.GlossaryTermSnapshot": {
+            "urn": "urn:li:glossaryTerm:Custom URN Types.Mixed URN Types",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.glossary.GlossaryTermInfo": {
+                        "customProperties": {},
+                        "name": "Mixed URN Types",
+                        "definition": "Term with custom URN types",
+                        "parentNode": "urn:li:glossaryNode:Custom URN Types",
+                        "termSource": "INTERNAL",
+                        "sourceRef": "DataHub",
+                        "sourceUrl": "https://github.com/datahub-project/datahub/"
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Ownership": {
+                        "owners": [
+                            {
+                                "owner": "urn:li:corpuser:user3",
+                                "type": "CUSTOM",
+                                "typeUrn": "urn:li:ownershipType:custom_type_3"
+                            },
+                            {
+                                "owner": "urn:li:corpGroup:group2",
+                                "type": "CUSTOM",
+                                "typeUrn": "urn:li:ownershipType:custom_type_4"
+                            }
+                        ],
+                        "ownerTypes": {},
+                        "lastModified": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        }
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "datahub-business-glossary-2020_04_14-07_00_00-dlsmlo",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.GlossaryTermSnapshot": {
+            "urn": "urn:li:glossaryTerm:Custom URN Types.Mixed Standard and URN",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.glossary.GlossaryTermInfo": {
+                        "customProperties": {},
+                        "name": "Mixed Standard and URN",
+                        "definition": "Term with both standard and URN types",
+                        "parentNode": "urn:li:glossaryNode:Custom URN Types",
+                        "termSource": "INTERNAL",
+                        "sourceRef": "DataHub",
+                        "sourceUrl": "https://github.com/datahub-project/datahub/"
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Ownership": {
+                        "owners": [
+                            {
+                                "owner": "urn:li:corpuser:dev1",
+                                "type": "DEVELOPER"
+                            },
+                            {
+                                "owner": "urn:li:corpGroup:group3",
+                                "type": "CUSTOM",
+                                "typeUrn": "urn:li:ownershipType:custom_type_5"
+                            }
+                        ],
+                        "ownerTypes": {},
+                        "lastModified": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        }
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "datahub-business-glossary-2020_04_14-07_00_00-dlsmlo",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "glossaryNode",
+    "entityUrn": "urn:li:glossaryNode:Custom URN Types",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "datahub-business-glossary-2020_04_14-07_00_00-dlsmlo",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "glossaryTerm",
+    "entityUrn": "urn:li:glossaryTerm:Custom URN Types.Mixed Standard and URN",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "datahub-business-glossary-2020_04_14-07_00_00-dlsmlo",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "glossaryTerm",
+    "entityUrn": "urn:li:glossaryTerm:Custom URN Types.Mixed URN Types",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "datahub-business-glossary-2020_04_14-07_00_00-dlsmlo",
+        "lastRunId": "no-run-id-provided"
+    }
+}
+]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/business-glossary/multiple_owners_different_types.yml b/metadata-ingestion/tests/integration/business-glossary/multiple_owners_different_types.yml
new file mode 100644
index 00000000000000..efcc594f758fa8
--- /dev/null
+++ b/metadata-ingestion/tests/integration/business-glossary/multiple_owners_different_types.yml
@@ -0,0 +1,39 @@
+version: "1"
+source: DataHub
+owners:
+  users:
+    - mjames
+url: "https://github.com/datahub-project/datahub/"
+
+nodes:
+  - name: Different Owner Types
+    description: Testing multiple owners with different types
+    owners:
+      - type: DEVELOPER
+        users:
+          - dev1
+        groups:
+          - engineering
+      - type: DATAOWNER
+        users:
+          - owner1
+        groups:
+          - data_stewards
+      - type: PRODUCER
+        users:
+          - producer1
+    terms:
+      - name: Mixed Ownership
+        description: Term with different owner types
+        owners:
+          - type: STAKEHOLDER
+            users:
+              - stakeholder1
+            groups:
+              - business
+          - type: DEVELOPER
+            users:
+              - dev2
+          - type: DATAOWNER
+            groups:
+              - compliance
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/business-glossary/multiple_owners_different_types_golden.json b/metadata-ingestion/tests/integration/business-glossary/multiple_owners_different_types_golden.json
new file mode 100644
index 00000000000000..4cec348708291a
--- /dev/null
+++ b/metadata-ingestion/tests/integration/business-glossary/multiple_owners_different_types_golden.json
@@ -0,0 +1,138 @@
+[
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.GlossaryNodeSnapshot": {
+            "urn": "urn:li:glossaryNode:Different Owner Types",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.glossary.GlossaryNodeInfo": {
+                        "customProperties": {},
+                        "definition": "Testing multiple owners with different types",
+                        "name": "Different Owner Types"
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Ownership": {
+                        "owners": [
+                            {
+                                "owner": "urn:li:corpuser:dev1",
+                                "type": "DEVELOPER"
+                            },
+                            {
+                                "owner": "urn:li:corpGroup:engineering",
+                                "type": "DEVELOPER"
+                            },
+                            {
+                                "owner": "urn:li:corpuser:owner1",
+                                "type": "DATAOWNER"
+                            },
+                            {
+                                "owner": "urn:li:corpGroup:data_stewards",
+                                "type": "DATAOWNER"
+                            },
+                            {
+                                "owner": "urn:li:corpuser:producer1",
+                                "type": "PRODUCER"
+                            }
+                        ],
+                        "ownerTypes": {},
+                        "lastModified": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        }
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "datahub-business-glossary-2020_04_14-07_00_00-2te9j9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.GlossaryTermSnapshot": {
+            "urn": "urn:li:glossaryTerm:Different Owner Types.Mixed Ownership",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.glossary.GlossaryTermInfo": {
+                        "customProperties": {},
+                        "name": "Mixed Ownership",
+                        "definition": "Term with different owner types",
+                        "parentNode": "urn:li:glossaryNode:Different Owner Types",
+                        "termSource": "INTERNAL",
+                        "sourceRef": "DataHub",
+                        "sourceUrl": "https://github.com/datahub-project/datahub/"
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Ownership": {
+                        "owners": [
+                            {
+                                "owner": "urn:li:corpuser:stakeholder1",
+                                "type": "STAKEHOLDER"
+                            },
+                            {
+                                "owner": "urn:li:corpGroup:business",
+                                "type": "STAKEHOLDER"
+                            },
+                            {
+                                "owner": "urn:li:corpuser:dev2",
+                                "type": "DEVELOPER"
+                            },
+                            {
+                                "owner": "urn:li:corpGroup:compliance",
+                                "type": "DATAOWNER"
+                            }
+                        ],
+                        "ownerTypes": {},
+                        "lastModified": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        }
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "datahub-business-glossary-2020_04_14-07_00_00-2te9j9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "glossaryNode",
+    "entityUrn": "urn:li:glossaryNode:Different Owner Types",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "datahub-business-glossary-2020_04_14-07_00_00-2te9j9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "glossaryTerm",
+    "entityUrn": "urn:li:glossaryTerm:Different Owner Types.Mixed Ownership",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "datahub-business-glossary-2020_04_14-07_00_00-2te9j9",
+        "lastRunId": "no-run-id-provided"
+    }
+}
+]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/business-glossary/multiple_owners_same_type.yml b/metadata-ingestion/tests/integration/business-glossary/multiple_owners_same_type.yml
new file mode 100644
index 00000000000000..8fb093b8b58993
--- /dev/null
+++ b/metadata-ingestion/tests/integration/business-glossary/multiple_owners_same_type.yml
@@ -0,0 +1,37 @@
+version: "1"
+source: DataHub
+owners:
+  users:
+    - mjames
+url: "https://github.com/datahub-project/datahub/"
+
+nodes:
+  - name: Multiple Owners
+    description: Testing multiple owners with same type
+    owners:
+      - type: DEVELOPER
+        users:
+          - dev1
+          - dev2
+        groups:
+          - engineering
+      - type: DEVELOPER
+        users:
+          - dev3
+        groups:
+          - qa
+    terms:
+      - name: Multiple Dev Owners
+        description: Term owned by multiple developers
+        owners:
+          - type: DEVELOPER
+            users:
+              - dev4
+              - dev5
+            groups:
+              - platform
+          - type: DEVELOPER
+            users:
+              - dev6
+            groups:
+              - infra
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/business-glossary/multiple_owners_same_type_golden.json b/metadata-ingestion/tests/integration/business-glossary/multiple_owners_same_type_golden.json
new file mode 100644
index 00000000000000..9342682510d84b
--- /dev/null
+++ b/metadata-ingestion/tests/integration/business-glossary/multiple_owners_same_type_golden.json
@@ -0,0 +1,142 @@
+[
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.GlossaryNodeSnapshot": {
+            "urn": "urn:li:glossaryNode:Multiple Owners",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.glossary.GlossaryNodeInfo": {
+                        "customProperties": {},
+                        "definition": "Testing multiple owners with same type",
+                        "name": "Multiple Owners"
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Ownership": {
+                        "owners": [
+                            {
+                                "owner": "urn:li:corpuser:dev1",
+                                "type": "DEVELOPER"
+                            },
+                            {
+                                "owner": "urn:li:corpuser:dev2",
+                                "type": "DEVELOPER"
+                            },
+                            {
+                                "owner": "urn:li:corpGroup:engineering",
+                                "type": "DEVELOPER"
+                            },
+                            {
+                                "owner": "urn:li:corpuser:dev3",
+                                "type": "DEVELOPER"
+                            },
+                            {
+                                "owner": "urn:li:corpGroup:qa",
+                                "type": "DEVELOPER"
+                            }
+                        ],
+                        "ownerTypes": {},
+                        "lastModified": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        }
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "datahub-business-glossary-2020_04_14-07_00_00-0l66l7",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.GlossaryTermSnapshot": {
+            "urn": "urn:li:glossaryTerm:Multiple Owners.Multiple Dev Owners",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.glossary.GlossaryTermInfo": {
+                        "customProperties": {},
+                        "name": "Multiple Dev Owners",
+                        "definition": "Term owned by multiple developers",
+                        "parentNode": "urn:li:glossaryNode:Multiple Owners",
+                        "termSource": "INTERNAL",
+                        "sourceRef": "DataHub",
+                        "sourceUrl": "https://github.com/datahub-project/datahub/"
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Ownership": {
+                        "owners": [
+                            {
+                                "owner": "urn:li:corpuser:dev4",
+                                "type": "DEVELOPER"
+                            },
+                            {
+                                "owner": "urn:li:corpuser:dev5",
+                                "type": "DEVELOPER"
+                            },
+                            {
+                                "owner": "urn:li:corpGroup:platform",
+                                "type": "DEVELOPER"
+                            },
+                            {
+                                "owner": "urn:li:corpuser:dev6",
+                                "type": "DEVELOPER"
+                            },
+                            {
+                                "owner": "urn:li:corpGroup:infra",
+                                "type": "DEVELOPER"
+                            }
+                        ],
+                        "ownerTypes": {},
+                        "lastModified": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        }
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "datahub-business-glossary-2020_04_14-07_00_00-0l66l7",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "glossaryNode",
+    "entityUrn": "urn:li:glossaryNode:Multiple Owners",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "datahub-business-glossary-2020_04_14-07_00_00-0l66l7",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "glossaryTerm",
+    "entityUrn": "urn:li:glossaryTerm:Multiple Owners.Multiple Dev Owners",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "datahub-business-glossary-2020_04_14-07_00_00-0l66l7",
+        "lastRunId": "no-run-id-provided"
+    }
+}
+]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/business-glossary/single_owner_types.yml b/metadata-ingestion/tests/integration/business-glossary/single_owner_types.yml
new file mode 100644
index 00000000000000..22fc24e6695bc2
--- /dev/null
+++ b/metadata-ingestion/tests/integration/business-glossary/single_owner_types.yml
@@ -0,0 +1,39 @@
+version: "1"
+source: DataHub
+url: "https://github.com/datahub-project/datahub/"
+owners:
+  users:
+    - mjames
+
+nodes:
+  - name: Single Owner Types
+    description: Testing different single owner types
+    owners:
+      type: DEVELOPER
+      users:
+        - dev1
+    terms:
+      - name: Developer Owned
+        description: Term owned by developer
+        owners:
+          type: DEVELOPER
+          users:
+            - dev2
+      - name: Data Owner Owned
+        description: Term owned by data owner
+        owners:
+          type: DATAOWNER
+          users:
+            - dataowner1           
+      - name: Producer Owned
+        description: Term owned by producer
+        owners:
+          type: PRODUCER
+          users:
+            - producer1         
+      - name: Stakeholder Owned
+        description: Term owned by stakeholder
+        owners:
+          type: STAKEHOLDER
+          groups:
+            - stakeholders
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/business-glossary/single_owner_types_golden.json b/metadata-ingestion/tests/integration/business-glossary/single_owner_types_golden.json
new file mode 100644
index 00000000000000..006e77f523a10b
--- /dev/null
+++ b/metadata-ingestion/tests/integration/business-glossary/single_owner_types_golden.json
@@ -0,0 +1,278 @@
+[
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.GlossaryNodeSnapshot": {
+            "urn": "urn:li:glossaryNode:Single Owner Types",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.glossary.GlossaryNodeInfo": {
+                        "customProperties": {},
+                        "definition": "Testing different single owner types",
+                        "name": "Single Owner Types"
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Ownership": {
+                        "owners": [
+                            {
+                                "owner": "urn:li:corpuser:dev1",
+                                "type": "DEVELOPER"
+                            }
+                        ],
+                        "ownerTypes": {},
+                        "lastModified": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        }
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "datahub-business-glossary-2020_04_14-07_00_00-ruwyic",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.GlossaryTermSnapshot": {
+            "urn": "urn:li:glossaryTerm:Single Owner Types.Developer Owned",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.glossary.GlossaryTermInfo": {
+                        "customProperties": {},
+                        "name": "Developer Owned",
+                        "definition": "Term owned by developer",
+                        "parentNode": "urn:li:glossaryNode:Single Owner Types",
+                        "termSource": "INTERNAL",
+                        "sourceRef": "DataHub",
+                        "sourceUrl": "https://github.com/datahub-project/datahub/"
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Ownership": {
+                        "owners": [
+                            {
+                                "owner": "urn:li:corpuser:dev2",
+                                "type": "DEVELOPER"
+                            }
+                        ],
+                        "ownerTypes": {},
+                        "lastModified": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        }
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "datahub-business-glossary-2020_04_14-07_00_00-ruwyic",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.GlossaryTermSnapshot": {
+            "urn": "urn:li:glossaryTerm:Single Owner Types.Data Owner Owned",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.glossary.GlossaryTermInfo": {
+                        "customProperties": {},
+                        "name": "Data Owner Owned",
+                        "definition": "Term owned by data owner",
+                        "parentNode": "urn:li:glossaryNode:Single Owner Types",
+                        "termSource": "INTERNAL",
+                        "sourceRef": "DataHub",
+                        "sourceUrl": "https://github.com/datahub-project/datahub/"
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Ownership": {
+                        "owners": [
+                            {
+                                "owner": "urn:li:corpuser:dataowner1",
+                                "type": "DATAOWNER"
+                            }
+                        ],
+                        "ownerTypes": {},
+                        "lastModified": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        }
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "datahub-business-glossary-2020_04_14-07_00_00-ruwyic",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.GlossaryTermSnapshot": {
+            "urn": "urn:li:glossaryTerm:Single Owner Types.Producer Owned",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.glossary.GlossaryTermInfo": {
+                        "customProperties": {},
+                        "name": "Producer Owned",
+                        "definition": "Term owned by producer",
+                        "parentNode": "urn:li:glossaryNode:Single Owner Types",
+                        "termSource": "INTERNAL",
+                        "sourceRef": "DataHub",
+                        "sourceUrl": "https://github.com/datahub-project/datahub/"
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Ownership": {
+                        "owners": [
+                            {
+                                "owner": "urn:li:corpuser:producer1",
+                                "type": "PRODUCER"
+                            }
+                        ],
+                        "ownerTypes": {},
+                        "lastModified": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        }
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "datahub-business-glossary-2020_04_14-07_00_00-ruwyic",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.GlossaryTermSnapshot": {
+            "urn": "urn:li:glossaryTerm:Single Owner Types.Stakeholder Owned",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.glossary.GlossaryTermInfo": {
+                        "customProperties": {},
+                        "name": "Stakeholder Owned",
+                        "definition": "Term owned by stakeholder",
+                        "parentNode": "urn:li:glossaryNode:Single Owner Types",
+                        "termSource": "INTERNAL",
+                        "sourceRef": "DataHub",
+                        "sourceUrl": "https://github.com/datahub-project/datahub/"
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Ownership": {
+                        "owners": [
+                            {
+                                "owner": "urn:li:corpGroup:stakeholders",
+                                "type": "STAKEHOLDER"
+                            }
+                        ],
+                        "ownerTypes": {},
+                        "lastModified": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        }
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "datahub-business-glossary-2020_04_14-07_00_00-ruwyic",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "glossaryNode",
+    "entityUrn": "urn:li:glossaryNode:Single Owner Types",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "datahub-business-glossary-2020_04_14-07_00_00-ruwyic",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "glossaryTerm",
+    "entityUrn": "urn:li:glossaryTerm:Single Owner Types.Data Owner Owned",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "datahub-business-glossary-2020_04_14-07_00_00-ruwyic",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "glossaryTerm",
+    "entityUrn": "urn:li:glossaryTerm:Single Owner Types.Developer Owned",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "datahub-business-glossary-2020_04_14-07_00_00-ruwyic",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "glossaryTerm",
+    "entityUrn": "urn:li:glossaryTerm:Single Owner Types.Producer Owned",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "datahub-business-glossary-2020_04_14-07_00_00-ruwyic",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "glossaryTerm",
+    "entityUrn": "urn:li:glossaryTerm:Single Owner Types.Stakeholder Owned",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "datahub-business-glossary-2020_04_14-07_00_00-ruwyic",
+        "lastRunId": "no-run-id-provided"
+    }
+}
+]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/business-glossary/test_business_glossary.py b/metadata-ingestion/tests/integration/business-glossary/test_business_glossary.py
index 73b90df65c04fe..74cf9aa3b528f2 100644
--- a/metadata-ingestion/tests/integration/business-glossary/test_business_glossary.py
+++ b/metadata-ingestion/tests/integration/business-glossary/test_business_glossary.py
@@ -71,6 +71,134 @@ def test_glossary_ingest(
     )
 
 
+@freeze_time(FROZEN_TIME)
+@pytest.mark.integration
+def test_single_owner_types(
+    mock_datahub_graph_instance,
+    pytestconfig,
+    tmp_path,
+    mock_time,
+):
+    """Test basic single owner cases with different ownership types"""
+    test_resources_dir = pytestconfig.rootpath / "tests/integration/business-glossary"
+    output_mces_path: str = f"{tmp_path}/single_owner_types.json"
+    golden_mces_path: str = f"{test_resources_dir}/single_owner_types_golden.json"
+
+    pipeline = Pipeline.create(
+        get_default_recipe(
+            glossary_yml_file_path=f"{test_resources_dir}/single_owner_types.yml",
+            event_output_file_path=output_mces_path,
+            enable_auto_id=False,
+        )
+    )
+    pipeline.ctx.graph = mock_datahub_graph_instance
+    pipeline.run()
+    pipeline.raise_from_status()
+
+    mce_helpers.check_golden_file(
+        pytestconfig,
+        output_path=output_mces_path,
+        golden_path=golden_mces_path,
+    )
+
+
+@freeze_time(FROZEN_TIME)
+@pytest.mark.integration
+def test_multiple_owners_same_type(
+    mock_datahub_graph_instance,
+    pytestconfig,
+    tmp_path,
+    mock_time,
+):
+    """Test multiple owners all having the same type"""
+    test_resources_dir = pytestconfig.rootpath / "tests/integration/business-glossary"
+    output_mces_path: str = f"{tmp_path}/multiple_owners_same_type.json"
+    golden_mces_path: str = (
+        f"{test_resources_dir}/multiple_owners_same_type_golden.json"
+    )
+
+    pipeline = Pipeline.create(
+        get_default_recipe(
+            glossary_yml_file_path=f"{test_resources_dir}/multiple_owners_same_type.yml",
+            event_output_file_path=output_mces_path,
+            enable_auto_id=False,
+        )
+    )
+    pipeline.ctx.graph = mock_datahub_graph_instance
+    pipeline.run()
+    pipeline.raise_from_status()
+
+    mce_helpers.check_golden_file(
+        pytestconfig,
+        output_path=output_mces_path,
+        golden_path=golden_mces_path,
+    )
+
+
+@freeze_time(FROZEN_TIME)
+@pytest.mark.integration
+def test_multiple_owners_different_types(
+    mock_datahub_graph_instance,
+    pytestconfig,
+    tmp_path,
+    mock_time,
+):
+    """Test multiple owners with different types"""
+    test_resources_dir = pytestconfig.rootpath / "tests/integration/business-glossary"
+    output_mces_path: str = f"{tmp_path}/multiple_owners_different_types.json"
+    golden_mces_path: str = (
+        f"{test_resources_dir}/multiple_owners_different_types_golden.json"
+    )
+
+    pipeline = Pipeline.create(
+        get_default_recipe(
+            glossary_yml_file_path=f"{test_resources_dir}/multiple_owners_different_types.yml",
+            event_output_file_path=output_mces_path,
+            enable_auto_id=False,
+        )
+    )
+    pipeline.ctx.graph = mock_datahub_graph_instance
+    pipeline.run()
+    pipeline.raise_from_status()
+
+    mce_helpers.check_golden_file(
+        pytestconfig,
+        output_path=output_mces_path,
+        golden_path=golden_mces_path,
+    )
+
+
+@freeze_time(FROZEN_TIME)
+@pytest.mark.integration
+def test_custom_ownership_urns(
+    mock_datahub_graph_instance,
+    pytestconfig,
+    tmp_path,
+    mock_time,
+):
+    """Test custom ownership URNs"""
+    test_resources_dir = pytestconfig.rootpath / "tests/integration/business-glossary"
+    output_mces_path: str = f"{tmp_path}/custom_ownership_urns.json"
+    golden_mces_path: str = f"{test_resources_dir}/custom_ownership_urns_golden.json"
+
+    pipeline = Pipeline.create(
+        get_default_recipe(
+            glossary_yml_file_path=f"{test_resources_dir}/custom_ownership_urns.yml",
+            event_output_file_path=output_mces_path,
+            enable_auto_id=False,
+        )
+    )
+    pipeline.ctx.graph = mock_datahub_graph_instance
+    pipeline.run()
+    pipeline.raise_from_status()
+
+    mce_helpers.check_golden_file(
+        pytestconfig,
+        output_path=output_mces_path,
+        golden_path=golden_mces_path,
+    )
+
+
 @freeze_time(FROZEN_TIME)
 def test_auto_id_creation_on_reserved_char():
     id_: str = business_glossary.create_id(["pii", "secure % password"], None, False)
diff --git a/metadata-integration/java/datahub-client/build.gradle b/metadata-integration/java/datahub-client/build.gradle
index 2535d091f6ce52..7dad21a6417fc4 100644
--- a/metadata-integration/java/datahub-client/build.gradle
+++ b/metadata-integration/java/datahub-client/build.gradle
@@ -13,6 +13,9 @@ import org.apache.tools.ant.filters.ReplaceTokens
 
 
 jar {
+  if (project.hasProperty('archiveAppendix')) {
+    archiveAppendix.set(project.archiveAppendix)
+  }
   archiveClassifier = "lib"
 }
 
@@ -98,6 +101,9 @@ task checkShadowJar(type: Exec) {
 
 shadowJar {
   zip64 = true
+  if (project.hasProperty('archiveAppendix')) {
+    archiveAppendix.set(project.archiveAppendix)
+  }
   archiveClassifier = ''
   // preventing java multi-release JAR leakage
   // https://github.com/johnrengelman/shadow/issues/729