diff --git a/app/client/src/ce/pages/Applications/index.tsx b/app/client/src/ce/pages/Applications/index.tsx
index 14b6733899..140b7c20bb 100644
--- a/app/client/src/ce/pages/Applications/index.tsx
+++ b/app/client/src/ce/pages/Applications/index.tsx
@@ -12,7 +12,6 @@ import {
   createMessage,
   INVITE_USERS_PLACEHOLDER,
   NO_APPS_FOUND,
-  NO_WORKSPACE_DESCRIPTION,
   NO_WORKSPACE_HEADING,
   WORKSPACES_HEADING,
 } from "@appsmith/constants/messages";
@@ -565,11 +564,14 @@ export function ApplicationsSection(props: any) {
     setSelectedWorkspaceIdForImportApplication,
   ]);
 
-  const leaveWS = (workspaceId: string) => {
-    setWarnLeavingWorkspace(false);
-    setWorkspaceToOpenMenu(null);
-    dispatch(leaveWorkspace(workspaceId));
-  };
+  const leaveWS = useCallback(
+    (workspaceId: string) => {
+      setWarnLeavingWorkspace(false);
+      setWorkspaceToOpenMenu(null);
+      dispatch(leaveWorkspace(workspaceId));
+    },
+    [dispatch],
+  );
 
   const handleDeleteWorkspace = useCallback(
     (workspaceId: string) => {
@@ -657,9 +659,6 @@ export function ApplicationsSection(props: any) {
         <NewText className="!mb-3 !font-semibold" kind="heading-s">
           {createMessage(NO_WORKSPACE_HEADING)}
         </NewText>
-        <NewText className="w-[328px]" kind="heading-xs">
-          {createMessage(NO_WORKSPACE_DESCRIPTION)}
-        </NewText>
       </div>
     );
   }
diff --git a/app/client/src/ce/sagas/userSagas.tsx b/app/client/src/ce/sagas/userSagas.tsx
index dc84d0f5b2..4439ea2df9 100644
--- a/app/client/src/ce/sagas/userSagas.tsx
+++ b/app/client/src/ce/sagas/userSagas.tsx
@@ -602,6 +602,7 @@ export function* leaveWorkspaceSaga(
       toast.show(`You have successfully left the workspace`, {
         kind: "success",
       });
+      history.push("/applications");
     }
   } catch (error) {
     // do nothing as it's already handled globally
diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useConnectToOptions.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useConnectToOptions.tsx
index 17d202093a..2a781f7329 100644
--- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useConnectToOptions.tsx
+++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useConnectToOptions.tsx
@@ -98,7 +98,13 @@ export const getQueryIcon = (
   query: ActionData | ModuleInstanceData,
   pluginImages: Record<string, string>,
 ) => {
-  if (!query.config.hasOwnProperty("sourceModuleId")) {
+  if (query.config.hasOwnProperty("type")) {
+    return (
+      <EntityIcon>
+        <Icon name="module" />
+      </EntityIcon>
+    );
+  } else {
     const action = query as ActionData;
     return (
       <ImageWrapper>
@@ -109,12 +115,6 @@ export const getQueryIcon = (
         />
       </ImageWrapper>
     );
-  } else {
-    return (
-      <EntityIcon>
-        <Icon name="module" />
-      </EntityIcon>
-    );
   }
 };
 
diff --git a/app/client/src/constants/ThirdPartyConstants.tsx b/app/client/src/constants/ThirdPartyConstants.tsx
index f03e68f827..f98268edb0 100644
--- a/app/client/src/constants/ThirdPartyConstants.tsx
+++ b/app/client/src/constants/ThirdPartyConstants.tsx
@@ -31,6 +31,8 @@ export const DOCS_BRANCH_PROTECTION_URL =
   "https://docs.appsmith.com/advanced-concepts/version-control-with-git/working-with-branches#branch-protection";
 export const DOCS_DEFAULT_BRANCH_URL =
   "https://docs.appsmith.com/advanced-concepts/version-control-with-git/working-with-branches#default-branch";
+export const PACKAGES_OVERVIEW_DOC =
+  "https://docs.appsmith.com/packages/overview";
 
 export const PRICING_PAGE_URL = (
   URL: string,
diff --git a/app/client/src/pages/Editor/gitSync/components/GitChangesList.tsx b/app/client/src/pages/Editor/gitSync/components/GitChangesList.tsx
index 011417885c..1d4002cef7 100644
--- a/app/client/src/pages/Editor/gitSync/components/GitChangesList.tsx
+++ b/app/client/src/pages/Editor/gitSync/components/GitChangesList.tsx
@@ -57,6 +57,8 @@ export enum Kind {
   JS_LIB = "JS_LIB",
   THEME = "THEME",
   SETTINGS = "SETTINGS",
+  PACKAGES = "PACKAGES",
+  MODULES = "MODULES",
 }
 
 interface GitStatusProps {
@@ -125,6 +127,22 @@ const STATUS_MAP: GitStatusMap = {
     iconName: "package",
     hasValue: (status?.modifiedJSLibs || 0) > 0,
   }),
+  [Kind.PACKAGES]: (status) => ({
+    message: `${status?.modifiedPackages || 0} ${
+      (status?.modifiedPackages || 0) <= 1 ? "package" : "packages"
+    } modified`,
+    iconName: "package",
+    hasValue: (status?.modifiedPackages || 0) > 0,
+  }),
+  [Kind.MODULES]: (status) => ({
+    message: `${status?.modifiedModules || 0} ${
+      (status?.modifiedModules || 0) <= 1
+        ? "module configuration"
+        : "module configurations"
+    } modified`,
+    iconName: "package",
+    hasValue: (status?.modifiedModules || 0) > 0,
+  }),
 };
 
 function behindCommitMessage(status: Partial<GitStatusData>) {
@@ -193,6 +211,8 @@ export function gitChangeListData(
     Kind.JS_OBJECT,
     Kind.DATA_SOURCE,
     Kind.JS_LIB,
+    Kind.MODULES,
+    Kind.PACKAGES,
   ];
   return changeKind
     .map((type: Kind) => STATUS_MAP[type](status))
diff --git a/app/client/src/reducers/uiReducers/gitSyncReducer.ts b/app/client/src/reducers/uiReducers/gitSyncReducer.ts
index 5c28324c38..b69a7b9f06 100644
--- a/app/client/src/reducers/uiReducers/gitSyncReducer.ts
+++ b/app/client/src/reducers/uiReducers/gitSyncReducer.ts
@@ -670,6 +670,9 @@ export interface GitStatusData {
   modifiedJSLibs: number;
   discardDocUrl?: string;
   migrationMessage?: string;
+  modifiedPackages?: number;
+  modifiedModules?: number;
+  modifiedModuleInstances?: number;
 }
 
 interface GitErrorPayloadType {
diff --git a/app/client/src/selectors/gitSyncSelectors.tsx b/app/client/src/selectors/gitSyncSelectors.tsx
index d3b6efc307..68c3388953 100644
--- a/app/client/src/selectors/gitSyncSelectors.tsx
+++ b/app/client/src/selectors/gitSyncSelectors.tsx
@@ -135,8 +135,12 @@ export const getMergeError = (state: AppState) => state.ui.gitSync.mergeError;
 
 export const getCountOfChangesToCommit = (state: AppState) => {
   const gitStatus = getGitStatus(state);
-  const { modifiedPages = 0, modifiedQueries = 0 } = gitStatus || {};
-  return modifiedPages + modifiedQueries;
+  const {
+    modifiedModules = 0,
+    modifiedPages = 0,
+    modifiedQueries = 0,
+  } = gitStatus || {};
+  return modifiedPages + modifiedQueries + modifiedModules;
 };
 
 export const getShowRepoLimitErrorModal = (state: AppState) =>