diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Derived_Column_Data_validation_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Derived_Column_Data_validation_spec.js
index 0a56162c813a..ac2d450fcfcb 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Derived_Column_Data_validation_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Derived_Column_Data_validation_spec.js
@@ -7,7 +7,6 @@ const commonlocators = require("../../../../../locators/commonlocators.json");
 import {
   agHelper,
   apiPage,
-  entityExplorer,
   propPane,
 } from "../../../../../support/Objects/ObjectsCore";
 
@@ -116,6 +115,38 @@ describe(
       // verify customColumn is visible in the table
       cy.get(".draggable-header:contains('CustomColumn')").should("be.visible");
       cy.closePropertyPane();
+      cy.deleteColumn("customColumn1");
+    });
+
+    it("5. Verify computed value with try-catch blocks handles missing nested properties", function () {
+      cy.openPropertyPane("tablewidgetv2");
+
+      // Set table data with nested object and missing property
+      propPane.UpdatePropertyFieldValue(
+        "Table data",
+        `{{[{"name": "Rahul", age: {value: 31}}, {"name": "Jacq", age: {}}, {"name": "John"}]}}`,
+      );
+
+      cy.editColumn("age");
+      propPane.UpdatePropertyFieldValue(
+        "Computed value",
+        "{{currentRow.age.value}}",
+      );
+
+      cy.readTableV2data(0, 1).then((val) => {
+        expect(val).to.equal("31");
+      });
+
+      cy.readTableV2data(1, 1).then((val) => {
+        expect(val).to.equal("");
+      });
+
+      cy.readTableV2data(2, 1).then((val) => {
+        expect(val).to.equal("");
+      });
+
+      // Clean up
+      cy.backFromPropertyPanel();
     });
   },
 );
diff --git a/app/client/packages/design-system/widgets/src/components/Button/src/Button.tsx b/app/client/packages/design-system/widgets/src/components/Button/src/Button.tsx
index 8aeab5dee079..9682f927a1a3 100644
--- a/app/client/packages/design-system/widgets/src/components/Button/src/Button.tsx
+++ b/app/client/packages/design-system/widgets/src/components/Button/src/Button.tsx
@@ -57,7 +57,7 @@ const _Button = (props: ButtonProps, ref: ForwardedRef<HTMLButtonElement>) => {
 
         {isLoading && (
           <span aria-hidden={!isLoading ? true : undefined} data-loader="">
-            <Spinner />
+            <Spinner size={size} />
             <span {...visuallyHiddenProps}>{loadingText}</span>
           </span>
         )}
diff --git a/app/client/packages/design-system/widgets/src/components/Button/src/types.ts b/app/client/packages/design-system/widgets/src/components/Button/src/types.ts
index fd181f5e16ff..82ebeb68d55c 100644
--- a/app/client/packages/design-system/widgets/src/components/Button/src/types.ts
+++ b/app/client/packages/design-system/widgets/src/components/Button/src/types.ts
@@ -40,7 +40,7 @@ export interface ButtonProps extends HeadlessButtonProps {
   /** Size of the button
    * @default medium
    */
-  size?: Omit<keyof typeof SIZES, "large">;
+  size?: Exclude<keyof typeof SIZES, "large">;
   /** Indicates if the button should be disabled when the form is invalid */
   disableOnInvalidForm?: boolean;
   /** Indicates if the button should reset the form when clicked */
diff --git a/app/client/packages/design-system/widgets/src/components/Button/stories/Button.stories.tsx b/app/client/packages/design-system/widgets/src/components/Button/stories/Button.stories.tsx
index 8525882f1990..b456ff828805 100644
--- a/app/client/packages/design-system/widgets/src/components/Button/stories/Button.stories.tsx
+++ b/app/client/packages/design-system/widgets/src/components/Button/stories/Button.stories.tsx
@@ -1,6 +1,13 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { Button, Flex, BUTTON_VARIANTS, COLORS, SIZES } from "@appsmith/wds";
+import {
+  Button,
+  Flex,
+  BUTTON_VARIANTS,
+  COLORS,
+  SIZES,
+  type ButtonProps,
+} from "@appsmith/wds";
 import { objectKeys } from "@appsmith/utils";
 
 /**
@@ -59,15 +66,21 @@ export const Sizes: Story = {
   render: () => (
     <Flex direction="column" gap="spacing-6">
       <Flex alignItems="start" gap="spacing-4">
-        {Object.keys(SIZES)
-          .filter((size) => !["large"].includes(size))
+        {objectKeys(SIZES)
+          .filter(
+            (size): size is NonNullable<ButtonProps["size"]> =>
+              !["large"].includes(size),
+          )
           .map((size) => (
             <Button icon="star" key={size} size={size} />
           ))}
       </Flex>
       <Flex alignItems="start" gap="spacing-4">
-        {Object.keys(SIZES)
-          .filter((size) => !["large"].includes(size))
+        {objectKeys(SIZES)
+          .filter(
+            (size): size is NonNullable<ButtonProps["size"]> =>
+              !["large"].includes(size),
+          )
           .map((size) => (
             <Button icon="star" key={size} size={size}>
               {size}
@@ -75,8 +88,11 @@ export const Sizes: Story = {
           ))}
       </Flex>
       <Flex alignItems="start" gap="spacing-4">
-        {Object.keys(SIZES)
-          .filter((size) => !["large"].includes(size))
+        {objectKeys(SIZES)
+          .filter(
+            (size): size is NonNullable<ButtonProps["size"]> =>
+              !["large"].includes(size),
+          )
           .map((size) => (
             <Button icon="star" iconPosition="end" key={size} size={size}>
               {size}
@@ -84,8 +100,11 @@ export const Sizes: Story = {
           ))}
       </Flex>
       <Flex alignItems="start" gap="spacing-4">
-        {Object.keys(SIZES)
-          .filter((size) => !["large"].includes(size))
+        {objectKeys(SIZES)
+          .filter(
+            (size): size is NonNullable<ButtonProps["size"]> =>
+              !["large"].includes(size),
+          )
           .map((size) => (
             <Button key={size} size={size}>
               {size}
diff --git a/app/client/packages/design-system/widgets/src/components/ComboBox/src/types.ts b/app/client/packages/design-system/widgets/src/components/ComboBox/src/types.ts
index 30e4c2de7ec2..33312b692d77 100644
--- a/app/client/packages/design-system/widgets/src/components/ComboBox/src/types.ts
+++ b/app/client/packages/design-system/widgets/src/components/ComboBox/src/types.ts
@@ -8,7 +8,7 @@ export interface ComboBoxProps
    *
    * @default medium
    */
-  size?: Omit<keyof typeof SIZES, "xSmall" | "large">;
+  size?: Exclude<keyof typeof SIZES, "xSmall" | "large">;
 
   /** The content to display as the placeholder. */
   placeholder?: string;
diff --git a/app/client/packages/design-system/widgets/src/components/Datepicker/src/DatepickerTrigger.tsx b/app/client/packages/design-system/widgets/src/components/Datepicker/src/DatepickerTrigger.tsx
index 32e5fea91b23..0b9db87bd0b1 100644
--- a/app/client/packages/design-system/widgets/src/components/Datepicker/src/DatepickerTrigger.tsx
+++ b/app/client/packages/design-system/widgets/src/components/Datepicker/src/DatepickerTrigger.tsx
@@ -9,7 +9,7 @@ import dateInputStyles from "./styles.module.css";
 
 interface DatepickerTriggerProps {
   isLoading?: boolean;
-  size?: Omit<keyof typeof SIZES, "xSmall" | "large">;
+  size?: Exclude<keyof typeof SIZES, "xSmall" | "large">;
   isDisabled?: boolean;
 }
 
diff --git a/app/client/packages/design-system/widgets/src/components/Datepicker/src/types.ts b/app/client/packages/design-system/widgets/src/components/Datepicker/src/types.ts
index f2a7e016718d..2d097df9f6ee 100644
--- a/app/client/packages/design-system/widgets/src/components/Datepicker/src/types.ts
+++ b/app/client/packages/design-system/widgets/src/components/Datepicker/src/types.ts
@@ -11,7 +11,7 @@ export interface DatePickerProps<T extends DateValue>
    *
    * @default medium
    */
-  size?: Omit<keyof typeof SIZES, "xSmall" | "large">;
+  size?: Exclude<keyof typeof SIZES, "xSmall" | "large">;
   /**
    * className for the popover
    */
diff --git a/app/client/packages/design-system/widgets/src/components/Datepicker/stories/Datepicker.stories.tsx b/app/client/packages/design-system/widgets/src/components/Datepicker/stories/Datepicker.stories.tsx
index 37137ed02297..282c1838c9d7 100644
--- a/app/client/packages/design-system/widgets/src/components/Datepicker/stories/Datepicker.stories.tsx
+++ b/app/client/packages/design-system/widgets/src/components/Datepicker/stories/Datepicker.stories.tsx
@@ -4,7 +4,7 @@ import { Button, Flex, SIZES } from "@appsmith/wds";
 import { parseDate } from "@internationalized/date";
 import type { Meta, StoryObj } from "@storybook/react";
 
-import { DatePicker } from "../src";
+import { DatePicker, type DatePickerProps, type DateValue } from "../src";
 /**
  * A date picker allows a user to select a date.
  */
@@ -44,7 +44,10 @@ export const Sizes: Story = {
   render: () => (
     <Flex direction="column" gap="spacing-4" width="sizing-60">
       {objectKeys(SIZES)
-        .filter((size) => !["xSmall", "large"].includes(size))
+        .filter(
+          (size): size is NonNullable<DatePickerProps<DateValue>["size"]> =>
+            !["xSmall", "large"].includes(size),
+        )
         .map((size) => (
           <DatePicker key={size} popoverClassName="sb-unstyled" size={size} />
         ))}
diff --git a/app/client/packages/design-system/widgets/src/components/Icon/src/Icon.tsx b/app/client/packages/design-system/widgets/src/components/Icon/src/Icon.tsx
index 9dbcb8efb551..a3295b3c9e43 100644
--- a/app/client/packages/design-system/widgets/src/components/Icon/src/Icon.tsx
+++ b/app/client/packages/design-system/widgets/src/components/Icon/src/Icon.tsx
@@ -1,3 +1,4 @@
+import clsx from "clsx";
 import type { Component, Ref } from "react";
 import React, { Suspense, forwardRef, lazy, useMemo } from "react";
 
@@ -7,7 +8,7 @@ import type { IconProps } from "./types";
 import { FallbackIcon } from "./FallbackIcon";
 
 const _Icon = (props: IconProps, ref: Ref<Component>) => {
-  const { color, name, size = "medium", ...rest } = props;
+  const { className, color, name, size = "medium", ...rest } = props;
 
   const Icon = useMemo(() => {
     const pascalName = ICONS[name];
@@ -16,7 +17,9 @@ const _Icon = (props: IconProps, ref: Ref<Component>) => {
       import("@tabler/icons-react").then((module) => {
         if (pascalName in module) {
           return {
-            default: module[pascalName] as React.ComponentType,
+            default: module[pascalName] as React.ComponentType<{
+              className?: string;
+            }>,
           };
         }
 
@@ -29,14 +32,14 @@ const _Icon = (props: IconProps, ref: Ref<Component>) => {
     <Suspense
       fallback={
         <FallbackIcon
-          className={styles.icon}
+          className={clsx(styles.icon, className)}
           data-size={Boolean(size) ? size : undefined}
           {...rest}
         />
       }
     >
       <Icon
-        className={styles.icon}
+        className={clsx(styles.icon, className)}
         data-color={color ? color : undefined}
         data-icon=""
         data-size={Boolean(size) ? size : undefined}
diff --git a/app/client/packages/design-system/widgets/src/components/IconButton/stories/IconButton.stories.tsx b/app/client/packages/design-system/widgets/src/components/IconButton/stories/IconButton.stories.tsx
index a5241ff2ca7f..3680e6198e76 100644
--- a/app/client/packages/design-system/widgets/src/components/IconButton/stories/IconButton.stories.tsx
+++ b/app/client/packages/design-system/widgets/src/components/IconButton/stories/IconButton.stories.tsx
@@ -6,6 +6,7 @@ import {
   SIZES,
   BUTTON_VARIANTS,
   COLORS,
+  type IconButtonProps,
 } from "@appsmith/wds";
 import { objectKeys } from "@appsmith/utils";
 
@@ -66,7 +67,10 @@ export const Sizes: Story = {
   render: () => (
     <Flex alignItems="start" gap="spacing-2">
       {objectKeys(SIZES)
-        .filter((size) => !["xSmall", "large"].includes(size))
+        .filter(
+          (size): size is NonNullable<IconButtonProps["size"]> =>
+            !["xSmall", "large"].includes(size),
+        )
         .map((size) => (
           <IconButton icon="star" key={size} size={size} />
         ))}
diff --git a/app/client/packages/design-system/widgets/src/components/InlineButtons/src/types.ts b/app/client/packages/design-system/widgets/src/components/InlineButtons/src/types.ts
index 5fca7a22821f..f5caa198c83e 100644
--- a/app/client/packages/design-system/widgets/src/components/InlineButtons/src/types.ts
+++ b/app/client/packages/design-system/widgets/src/components/InlineButtons/src/types.ts
@@ -34,7 +34,7 @@ export interface InlineButtonsProps<T>
   /** Size of buttons
    * @default medium
    */
-  size?: Omit<keyof typeof SIZES, "large">;
+  size?: Exclude<keyof typeof SIZES, "large">;
 }
 
 export interface InlineButtonsItem
diff --git a/app/client/packages/design-system/widgets/src/components/InlineButtons/stories/InlineButtons.stories.tsx b/app/client/packages/design-system/widgets/src/components/InlineButtons/stories/InlineButtons.stories.tsx
index c30b43e51a2a..4483bc96949b 100644
--- a/app/client/packages/design-system/widgets/src/components/InlineButtons/stories/InlineButtons.stories.tsx
+++ b/app/client/packages/design-system/widgets/src/components/InlineButtons/stories/InlineButtons.stories.tsx
@@ -66,8 +66,11 @@ export const IndividualSemantic: Story = {
 export const Sizes: Story = {
   render: () => (
     <Flex direction="column" gap="spacing-4" width="100%">
-      {Object.keys(SIZES)
-        .filter((size) => !["xSmall", "large"].includes(size))
+      {objectKeys(SIZES)
+        .filter(
+          (size): size is Exclude<keyof typeof SIZES, "xSmall" | "large"> =>
+            !["xSmall", "large"].includes(size),
+        )
         .map((size) => (
           <InlineButtons items={itemList} key={size} size={size} />
         ))}
diff --git a/app/client/packages/design-system/widgets/src/components/Input/src/types.ts b/app/client/packages/design-system/widgets/src/components/Input/src/types.ts
index ef229ff9b320..93ace153b92b 100644
--- a/app/client/packages/design-system/widgets/src/components/Input/src/types.ts
+++ b/app/client/packages/design-system/widgets/src/components/Input/src/types.ts
@@ -10,7 +10,7 @@ interface CommonInputProps {
   suffix?: React.ReactNode;
   isLoading?: boolean;
   isReadOnly?: boolean;
-  size?: Omit<keyof typeof SIZES, "xSmall">;
+  size?: Exclude<keyof typeof SIZES, "xSmall">;
 }
 
 export interface InputProps
diff --git a/app/client/packages/design-system/widgets/src/components/Modal/src/types.ts b/app/client/packages/design-system/widgets/src/components/Modal/src/types.ts
index df2b3fe57291..f76969b564f9 100644
--- a/app/client/packages/design-system/widgets/src/components/Modal/src/types.ts
+++ b/app/client/packages/design-system/widgets/src/components/Modal/src/types.ts
@@ -19,7 +19,7 @@ export interface ModalProps
   /** size of the modal
    * @default medium
    */
-  size?: Omit<keyof typeof SIZES, "xSmall">;
+  size?: Exclude<keyof typeof SIZES, "xSmall">;
   /** The children of the component. */
   children: ReactNode;
   /** Additional props to be passed to the overlay */
diff --git a/app/client/packages/design-system/widgets/src/components/Select/src/types.ts b/app/client/packages/design-system/widgets/src/components/Select/src/types.ts
index d2d57a905713..47a97db7b8e5 100644
--- a/app/client/packages/design-system/widgets/src/components/Select/src/types.ts
+++ b/app/client/packages/design-system/widgets/src/components/Select/src/types.ts
@@ -8,5 +8,5 @@ export interface SelectProps
    *
    * @default medium
    */
-  size?: Omit<keyof typeof SIZES, "xSmall" | "large">;
+  size?: Exclude<keyof typeof SIZES, "xSmall" | "large">;
 }
diff --git a/app/client/packages/design-system/widgets/src/components/Select/stories/Select.stories.tsx b/app/client/packages/design-system/widgets/src/components/Select/stories/Select.stories.tsx
index 84b1ae3e8742..05a82ae10f5a 100644
--- a/app/client/packages/design-system/widgets/src/components/Select/stories/Select.stories.tsx
+++ b/app/client/packages/design-system/widgets/src/components/Select/stories/Select.stories.tsx
@@ -1,6 +1,13 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { Select, Button, Flex, SIZES, ListBoxItem } from "@appsmith/wds";
+import {
+  Select,
+  Button,
+  Flex,
+  SIZES,
+  ListBoxItem,
+  type SelectProps,
+} from "@appsmith/wds";
 
 import { selectItems, selectItemsWithIcons } from "./selectData";
 
@@ -40,7 +47,10 @@ export const Sizes: Story = {
   render: () => (
     <Flex direction="column" gap="spacing-4" width="sizing-60">
       {Object.keys(SIZES)
-        .filter((size) => !["xSmall", "large"].includes(size))
+        .filter(
+          (size): size is NonNullable<SelectProps["size"]> =>
+            !["xSmall", "large"].includes(size),
+        )
         .map((size) => (
           <Select key={size} label={size} placeholder={size} size={size}>
             {selectItems.map((item) => (
diff --git a/app/client/packages/design-system/widgets/src/components/Spinner/src/index.tsx b/app/client/packages/design-system/widgets/src/components/Spinner/src/index.tsx
index d881c58b15cc..f1ec657c6231 100644
--- a/app/client/packages/design-system/widgets/src/components/Spinner/src/index.tsx
+++ b/app/client/packages/design-system/widgets/src/components/Spinner/src/index.tsx
@@ -1,10 +1,14 @@
 import React from "react";
 
-import { Icon } from "../../Icon";
+import { Icon, type IconProps } from "../../Icon";
 import styles from "./styles.module.css";
 
-const Spinner = () => {
-  return <Icon className={styles.spinner} name="loader" size="xSmall" />;
+interface SpinnerProps {
+  size?: Exclude<IconProps["size"], "large">;
+}
+
+const Spinner = ({ size = "medium" }: SpinnerProps) => {
+  return <Icon className={styles.spinner} name="loader" size={size} />;
 };
 
 Spinner.displayName = "Spinner";
diff --git a/app/client/packages/design-system/widgets/src/components/Spinner/src/styles.module.css b/app/client/packages/design-system/widgets/src/components/Spinner/src/styles.module.css
index b11344d7a64f..7a2d0b015477 100644
--- a/app/client/packages/design-system/widgets/src/components/Spinner/src/styles.module.css
+++ b/app/client/packages/design-system/widgets/src/components/Spinner/src/styles.module.css
@@ -1,7 +1,5 @@
 .spinner {
   animation: spin 1s linear infinite;
-  height: 1.5em;
-  width: 1.5em;
 }
 
 @keyframes spin {
diff --git a/app/client/packages/design-system/widgets/src/components/TextArea/src/types.ts b/app/client/packages/design-system/widgets/src/components/TextArea/src/types.ts
index f00cac39c38a..613d22e475d8 100644
--- a/app/client/packages/design-system/widgets/src/components/TextArea/src/types.ts
+++ b/app/client/packages/design-system/widgets/src/components/TextArea/src/types.ts
@@ -10,5 +10,5 @@ export interface TextAreaProps extends AriaTextFieldProps, FieldProps {
   rows?: number;
   fieldClassName?: string;
   inputClassName?: string;
-  size?: Omit<keyof typeof SIZES, "xSmall">;
+  size?: Exclude<keyof typeof SIZES, "xSmall">;
 }
diff --git a/app/client/packages/design-system/widgets/src/components/TextField/src/types.ts b/app/client/packages/design-system/widgets/src/components/TextField/src/types.ts
index 0504e9f1f599..576bac311c41 100644
--- a/app/client/packages/design-system/widgets/src/components/TextField/src/types.ts
+++ b/app/client/packages/design-system/widgets/src/components/TextField/src/types.ts
@@ -6,5 +6,5 @@ export interface TextFieldProps extends AriaTextFieldProps, FieldProps {
   placeholder?: string;
   suffix?: ReactNode;
   prefix?: ReactNode;
-  size?: Omit<keyof typeof SIZES, "xSmall">;
+  size?: Exclude<keyof typeof SIZES, "xSmall">;
 }
diff --git a/app/client/packages/design-system/widgets/src/components/TimeField/src/types.ts b/app/client/packages/design-system/widgets/src/components/TimeField/src/types.ts
index a524a9b9d91d..628dae1d20fa 100644
--- a/app/client/packages/design-system/widgets/src/components/TimeField/src/types.ts
+++ b/app/client/packages/design-system/widgets/src/components/TimeField/src/types.ts
@@ -10,5 +10,5 @@ export interface TimeFieldProps<T extends TimeValue>
     FieldProps {
   suffix?: ReactNode;
   prefix?: ReactNode;
-  size?: Omit<keyof typeof SIZES, "xSmall">;
+  size?: Exclude<keyof typeof SIZES, "xSmall">;
 }
diff --git a/app/client/packages/design-system/widgets/src/components/ToolbarButtons/src/types.ts b/app/client/packages/design-system/widgets/src/components/ToolbarButtons/src/types.ts
index a38474a56a6b..0e1b6ba25523 100644
--- a/app/client/packages/design-system/widgets/src/components/ToolbarButtons/src/types.ts
+++ b/app/client/packages/design-system/widgets/src/components/ToolbarButtons/src/types.ts
@@ -33,7 +33,7 @@ export interface ToolbarButtonsProps<T>
   /** Size of buttons
    * @default medium
    */
-  size?: Omit<keyof typeof SIZES, "large">;
+  size?: Exclude<keyof typeof SIZES, "large">;
   /** Alignment of buttons inside the container
    * @default start
    */
diff --git a/app/client/packages/design-system/widgets/src/components/ToolbarButtons/stories/ToolbarButtons.stories.tsx b/app/client/packages/design-system/widgets/src/components/ToolbarButtons/stories/ToolbarButtons.stories.tsx
index 2fdeaa192ba7..902c6a5de69d 100644
--- a/app/client/packages/design-system/widgets/src/components/ToolbarButtons/stories/ToolbarButtons.stories.tsx
+++ b/app/client/packages/design-system/widgets/src/components/ToolbarButtons/stories/ToolbarButtons.stories.tsx
@@ -70,10 +70,14 @@ export const Semantic: Story = {
 export const Sizes: Story = {
   render: () => (
     <Flex direction="column" gap="spacing-4" width="100%">
-      {Object.keys(SIZES)
+      {objectKeys(SIZES)
         .filter((size) => !["xSmall", "large"].includes(size))
         .map((size) => (
-          <ToolbarButtons items={itemList} key={size} size={size} />
+          <ToolbarButtons
+            items={itemList}
+            key={size}
+            size={size as Exclude<keyof typeof SIZES, "large">}
+          />
         ))}
     </Flex>
   ),
diff --git a/app/client/packages/dsl/src/migrate/index.ts b/app/client/packages/dsl/src/migrate/index.ts
index 75ce6f7b6d5f..9d0508427d21 100644
--- a/app/client/packages/dsl/src/migrate/index.ts
+++ b/app/client/packages/dsl/src/migrate/index.ts
@@ -91,9 +91,10 @@ import { migrateTableServerSideFiltering } from "./migrations/086-migrate-table-
 import { migrateChartwidgetCustomEchartConfig } from "./migrations/087-migrate-chart-widget-customechartdata";
 import { migrateCustomWidgetDynamicHeight } from "./migrations/088-migrate-custom-widget-dynamic-height";
 import { migrateTableWidgetV2CurrentRowInValidationsBinding } from "./migrations/089-migrage-table-widget-v2-currentRow-binding";
+import { migrateTableWidgetV2ValidationTryCatch } from "./migrations/090-migrate-table-widget-v2-validation-try-catch";
 import type { DSLWidget } from "./types";
 
-export const LATEST_DSL_VERSION = 91;
+export const LATEST_DSL_VERSION = 92;
 
 export const calculateDynamicHeight = () => {
   const DEFAULT_GRID_ROW_HEIGHT = 10;
@@ -624,6 +625,11 @@ const migrateVersionedDSL = async (currentDSL: DSLWidget, newPage = false) => {
      * What we missed was that, the auto-commit does not handle clientVersion, which lead to this bug: https://github.com/appsmithorg/appsmith/issues/38511
      * We are bumping this version to make sure that the auto-commit will handle this version bump.
      */
+    currentDSL.version = 91;
+  }
+
+  if (currentDSL.version === 91) {
+    currentDSL = migrateTableWidgetV2ValidationTryCatch(currentDSL);
     currentDSL.version = LATEST_DSL_VERSION;
   }
 
diff --git a/app/client/packages/dsl/src/migrate/migrations/090-migrate-table-widget-v2-validation-try-catch.ts b/app/client/packages/dsl/src/migrate/migrations/090-migrate-table-widget-v2-validation-try-catch.ts
new file mode 100644
index 000000000000..4faefd3f4c4a
--- /dev/null
+++ b/app/client/packages/dsl/src/migrate/migrations/090-migrate-table-widget-v2-validation-try-catch.ts
@@ -0,0 +1,46 @@
+import type { ColumnProperties, DSLWidget, WidgetProps } from "../types";
+import { isDynamicValue, traverseDSLAndMigrate } from "../utils";
+
+const oldBindingPrefix = (tableName: string) => {
+  return `{{${tableName}.processedTableData.map((currentRow, currentIndex) => (`;
+};
+
+const newBindingPrefix = (tableName: string) => {
+  return `{{${tableName}.processedTableData.map((currentRow, currentIndex) => { try { return (`;
+};
+
+const oldBindingSuffix = `))}}`;
+const newBindingSuffix = `); } catch (e) { return null; }})}}`;
+
+export const migrateTableWidgetV2ValidationTryCatch = (
+  currentDSL: DSLWidget,
+) => {
+  return traverseDSLAndMigrate(currentDSL, (widget: WidgetProps) => {
+    if (widget.type !== "TABLE_WIDGET_V2") return;
+
+    const primaryColumns: Record<string, ColumnProperties> =
+      widget.primaryColumns as Record<string, ColumnProperties>;
+
+    Object.values(primaryColumns).forEach((colProperties) => {
+      if (!colProperties.computedValue) return;
+
+      const value = colProperties.computedValue;
+
+      if (!isDynamicValue(value)) return;
+
+      const tableName = widget.widgetName;
+      const oldPrefix = oldBindingPrefix(tableName);
+
+      // Only update if it matches the old format
+      if (!value.startsWith(oldPrefix)) return;
+
+      // Replace old prefix/suffix with new ones
+      const computation = value
+        .replace(oldPrefix, "")
+        .replace(oldBindingSuffix, "");
+
+      // Add the new prefix and suffix with try-catch
+      colProperties.computedValue = `${newBindingPrefix(tableName)}${computation}${newBindingSuffix}`;
+    });
+  });
+};
diff --git a/app/client/packages/dsl/src/migrate/tests/DSLMigration.test.ts b/app/client/packages/dsl/src/migrate/tests/DSLMigration.test.ts
index fd03b573d57e..e58adcfceb87 100644
--- a/app/client/packages/dsl/src/migrate/tests/DSLMigration.test.ts
+++ b/app/client/packages/dsl/src/migrate/tests/DSLMigration.test.ts
@@ -90,6 +90,7 @@ import * as m86 from "../migrations/086-migrate-table-server-side-filtering";
 import * as m87 from "../migrations/087-migrate-chart-widget-customechartdata";
 import * as m88 from "../migrations/088-migrate-custom-widget-dynamic-height";
 import * as m89 from "../migrations/089-migrage-table-widget-v2-currentRow-binding";
+import * as m91 from "../migrations/090-migrate-table-widget-v2-validation-try-catch";
 
 interface Migration {
   functionLookup: {
@@ -934,6 +935,15 @@ const migrations: Migration[] = [
     functionLookup: [],
     version: 90,
   },
+  {
+    functionLookup: [
+      {
+        moduleObj: m91,
+        functionName: "migrateTableWidgetV2ValidationTryCatch",
+      },
+    ],
+    version: 91,
+  },
 ];
 
 const mockFnObj: Record<number, any> = {};
diff --git a/app/client/packages/dsl/src/migrate/tests/TableWidgetV2/DSLs/ValidationTryCatchDSLs.ts b/app/client/packages/dsl/src/migrate/tests/TableWidgetV2/DSLs/ValidationTryCatchDSLs.ts
new file mode 100644
index 000000000000..4db0a19fc3f0
--- /dev/null
+++ b/app/client/packages/dsl/src/migrate/tests/TableWidgetV2/DSLs/ValidationTryCatchDSLs.ts
@@ -0,0 +1,48 @@
+import type { DSLWidget } from "../../../types";
+
+const oldBindingPrefix = (tableName: string) => {
+  return `{{${tableName}.processedTableData.map((currentRow, currentIndex) => (`;
+};
+
+const newBindingPrefix = (tableName: string) => {
+  return `{{${tableName}.processedTableData.map((currentRow, currentIndex) => { try { return (`;
+};
+
+const oldBindingSuffix = `))}}`;
+const newBindingSuffix = `); } catch (e) { return null; }})}}`;
+
+const computation = "currentRow.id + '_' + currentIndex";
+
+export const validationTryCatchInput = {
+  children: [
+    {
+      widgetName: "Table1",
+      type: "TABLE_WIDGET_V2",
+      primaryColumns: {
+        customColumn1: {
+          computedValue: `${oldBindingPrefix("Table1")}${computation}${oldBindingSuffix}`,
+        },
+        customColumn2: {
+          computedValue: "static value", // Should not be modified
+        },
+      },
+    },
+  ],
+} as any as DSLWidget;
+
+export const validationTryCatchOutput = {
+  children: [
+    {
+      widgetName: "Table1",
+      type: "TABLE_WIDGET_V2",
+      primaryColumns: {
+        customColumn1: {
+          computedValue: `${newBindingPrefix("Table1")}${computation}${newBindingSuffix}`,
+        },
+        customColumn2: {
+          computedValue: "static value", // Not modified
+        },
+      },
+    },
+  ],
+} as any as DSLWidget;
diff --git a/app/client/packages/dsl/src/migrate/tests/TableWidgetV2/ValidationTryCatch.test.ts b/app/client/packages/dsl/src/migrate/tests/TableWidgetV2/ValidationTryCatch.test.ts
new file mode 100644
index 000000000000..666513c22501
--- /dev/null
+++ b/app/client/packages/dsl/src/migrate/tests/TableWidgetV2/ValidationTryCatch.test.ts
@@ -0,0 +1,15 @@
+import { migrateTableWidgetV2ValidationTryCatch } from "../../migrations/090-migrate-table-widget-v2-validation-try-catch";
+import {
+  validationTryCatchInput,
+  validationTryCatchOutput,
+} from "./DSLs/ValidationTryCatchDSLs";
+
+describe("migrateTableWidgetV2ValidationTryCatch", () => {
+  it("should add try-catch blocks to table compute value bindings", () => {
+    const migratedDSL = migrateTableWidgetV2ValidationTryCatch(
+      validationTryCatchInput,
+    );
+
+    expect(migratedDSL).toEqual(validationTryCatchOutput);
+  });
+});
diff --git a/app/client/src/IDE/Components/EditableName/RenameMenuItem.tsx b/app/client/src/IDE/Components/EditableName/RenameMenuItem.tsx
index 3c7d6049841a..b290128b5e13 100644
--- a/app/client/src/IDE/Components/EditableName/RenameMenuItem.tsx
+++ b/app/client/src/IDE/Components/EditableName/RenameMenuItem.tsx
@@ -2,6 +2,7 @@ import React, { useCallback } from "react";
 import { MenuItem } from "@appsmith/ads";
 import { useDispatch } from "react-redux";
 import { setRenameEntity } from "actions/ideActions";
+import { CONTEXT_RENAME, createMessage } from "ee/constants/messages";
 
 interface Props {
   disabled?: boolean;
@@ -24,7 +25,7 @@ export const RenameMenuItem = ({ disabled, entityId }: Props) => {
       onSelect={setRename}
       startIcon="input-cursor-move"
     >
-      Rename
+      {createMessage(CONTEXT_RENAME)}
     </MenuItem>
   );
 };
diff --git a/app/client/src/actions/onboardingActions.ts b/app/client/src/actions/onboardingActions.ts
index 2f3412a871ad..59c907edbde5 100644
--- a/app/client/src/actions/onboardingActions.ts
+++ b/app/client/src/actions/onboardingActions.ts
@@ -1,5 +1,4 @@
 import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
-import type { SIGNPOSTING_STEP } from "pages/Editor/FirstTimeUserOnboarding/Utils";
 
 export const toggleInOnboardingWidgetSelection = (payload: boolean) => {
   return {
@@ -58,27 +57,6 @@ export const signpostingMarkAllRead = () => {
   };
 };
 
-export const signpostingStepUpdateInit = (payload: {
-  step: SIGNPOSTING_STEP;
-  completed: boolean;
-}) => {
-  return {
-    type: ReduxActionTypes.SIGNPOSTING_STEP_UPDATE_INIT,
-    payload,
-  };
-};
-
-export const signpostingStepUpdate = (payload: {
-  step: SIGNPOSTING_STEP;
-  completed: boolean;
-  read?: boolean;
-}) => {
-  return {
-    type: ReduxActionTypes.SIGNPOSTING_STEP_UPDATE,
-    payload,
-  };
-};
-
 export const showSignpostingTooltip = (payload: boolean) => {
   return {
     type: ReduxActionTypes.SIGNPOSTING_SHOW_TOOLTIP,
diff --git a/app/client/src/ce/constants/ReduxActionConstants.tsx b/app/client/src/ce/constants/ReduxActionConstants.tsx
index bcb0b248ce1e..a25e2fc70c60 100644
--- a/app/client/src/ce/constants/ReduxActionConstants.tsx
+++ b/app/client/src/ce/constants/ReduxActionConstants.tsx
@@ -389,8 +389,6 @@ const OnboardingActionTypes = {
   UNDO_END_FIRST_TIME_USER_ONBOARDING: "UNDO_END_FIRST_TIME_USER_ONBOARDING",
   SET_SIGNPOSTING_OVERLAY: "SET_SIGNPOSTING_OVERLAY",
   SIGNPOSTING_MARK_ALL_READ: "SIGNPOSTING_MARK_ALL_READ",
-  SIGNPOSTING_STEP_UPDATE_INIT: "SIGNPOSTING_STEP_UPDATE_INIT",
-  SIGNPOSTING_STEP_UPDATE: "SIGNPOSTING_STEP_UPDATE",
   SIGNPOSTING_SHOW_TOOLTIP: "SIGNPOSTING_SHOW_TOOLTIP",
   SHOW_ANONYMOUS_DATA_POPUP: "SHOW_ANONYMOUS_DATA_POPUP",
   FIRST_TIME_USER_ONBOARDING_INIT: "FIRST_TIME_USER_ONBOARDING_INIT",
@@ -1190,8 +1188,6 @@ const AppThemeActionErrorTypes = {
 };
 
 const AppSettingsActionTypes = {
-  OPEN_APP_SETTINGS_PANE: "OPEN_APP_SETTINGS_PANE",
-  CLOSE_APP_SETTINGS_PANE: "CLOSE_APP_SETTINGS_PANE",
   UPDATE_APP_SETTINGS_PANE_SELECTED_TAB:
     "UPDATE_APP_SETTINGS_PANE_SELECTED_TAB",
 };
diff --git a/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/ListItem.tsx b/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/ListItem.tsx
index 65db9a369bd6..0aadd95aa31f 100644
--- a/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/ListItem.tsx
+++ b/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/ListItem.tsx
@@ -1,27 +1,7 @@
 import React from "react";
-import ExplorerJSCollectionEntity from "pages/Editor/Explorer/JSActions/JSActionEntity";
-import { Flex } from "@appsmith/ads";
 import type { EntityItem } from "ee/entities/IDE/constants";
+import { JSEntityItem } from "pages/Editor/IDE/EditorPane/JS/EntityItem/JSEntityItem";
 
-export interface JSListItemProps {
-  item: EntityItem;
-  isActive: boolean;
-  parentEntityId: string;
-}
-
-export const JSListItem = (props: JSListItemProps) => {
-  const { isActive, item, parentEntityId } = props;
-
-  return (
-    <Flex data-testid="t--ide-list-item" flexDirection={"column"}>
-      <ExplorerJSCollectionEntity
-        baseCollectionId={item.key}
-        isActive={isActive}
-        key={item.key}
-        parentEntityId={parentEntityId}
-        searchKeyword={""}
-        step={1}
-      />
-    </Flex>
-  );
+export const JSEntity = (props: { item: EntityItem }) => {
+  return <JSEntityItem {...props} />;
 };
diff --git a/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/old/ListItem.tsx b/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/old/ListItem.tsx
new file mode 100644
index 000000000000..65db9a369bd6
--- /dev/null
+++ b/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/old/ListItem.tsx
@@ -0,0 +1,27 @@
+import React from "react";
+import ExplorerJSCollectionEntity from "pages/Editor/Explorer/JSActions/JSActionEntity";
+import { Flex } from "@appsmith/ads";
+import type { EntityItem } from "ee/entities/IDE/constants";
+
+export interface JSListItemProps {
+  item: EntityItem;
+  isActive: boolean;
+  parentEntityId: string;
+}
+
+export const JSListItem = (props: JSListItemProps) => {
+  const { isActive, item, parentEntityId } = props;
+
+  return (
+    <Flex data-testid="t--ide-list-item" flexDirection={"column"}>
+      <ExplorerJSCollectionEntity
+        baseCollectionId={item.key}
+        isActive={isActive}
+        key={item.key}
+        parentEntityId={parentEntityId}
+        searchKeyword={""}
+        step={1}
+      />
+    </Flex>
+  );
+};
diff --git a/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/utils/getJSContextMenuByIdeType.tsx b/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/utils/getJSContextMenuByIdeType.tsx
new file mode 100644
index 000000000000..d56db7010543
--- /dev/null
+++ b/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/utils/getJSContextMenuByIdeType.tsx
@@ -0,0 +1,20 @@
+import React from "react";
+import { IDE_TYPE, type IDEType } from "ee/entities/IDE/constants";
+import EntityContextMenu from "pages/Editor/IDE/EditorPane/components/EntityContextMenu";
+import { AppJSContextMenuItems } from "pages/Editor/IDE/EditorPane/JS/EntityItem/AppJSContextMenuItems";
+import type { JSCollection } from "entities/JSCollection";
+
+export const getJSContextMenuByIdeType = (
+  ideType: IDEType,
+  jsAction: JSCollection,
+) => {
+  switch (ideType) {
+    case IDE_TYPE.App: {
+      return (
+        <EntityContextMenu>
+          <AppJSContextMenuItems jsAction={jsAction} />
+        </EntityContextMenu>
+      );
+    }
+  }
+};
diff --git a/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/ListItem.tsx b/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/ListItem.tsx
index 90db39393a2a..201d728199f3 100644
--- a/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/ListItem.tsx
+++ b/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/ListItem.tsx
@@ -1,25 +1,7 @@
 import React from "react";
-import ExplorerActionEntity from "pages/Editor/Explorer/Actions/ActionEntity";
+import { QueryEntityItem } from "pages/Editor/IDE/EditorPane/Query/EntityItem/QueryEntityItem";
 import type { EntityItem } from "ee/entities/IDE/constants";
 
-export interface QueryListItemProps {
-  item: EntityItem;
-  isActive: boolean;
-  parentEntityId: string;
-}
-
-export const QueryListItem = (props: QueryListItemProps) => {
-  const { isActive, item, parentEntityId } = props;
-
-  return (
-    <ExplorerActionEntity
-      baseId={item.key}
-      isActive={isActive}
-      key={item.key}
-      parentEntityId={parentEntityId}
-      searchKeyword={""}
-      step={1}
-      type={item.type}
-    />
-  );
+export const ActionEntityItem = (props: { item: EntityItem }) => {
+  return <QueryEntityItem {...props} />;
 };
diff --git a/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/old/ListItem.tsx b/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/old/ListItem.tsx
new file mode 100644
index 000000000000..90db39393a2a
--- /dev/null
+++ b/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/old/ListItem.tsx
@@ -0,0 +1,25 @@
+import React from "react";
+import ExplorerActionEntity from "pages/Editor/Explorer/Actions/ActionEntity";
+import type { EntityItem } from "ee/entities/IDE/constants";
+
+export interface QueryListItemProps {
+  item: EntityItem;
+  isActive: boolean;
+  parentEntityId: string;
+}
+
+export const QueryListItem = (props: QueryListItemProps) => {
+  const { isActive, item, parentEntityId } = props;
+
+  return (
+    <ExplorerActionEntity
+      baseId={item.key}
+      isActive={isActive}
+      key={item.key}
+      parentEntityId={parentEntityId}
+      searchKeyword={""}
+      step={1}
+      type={item.type}
+    />
+  );
+};
diff --git a/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/utils/getQueryContextMenuByIdeType.tsx b/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/utils/getQueryContextMenuByIdeType.tsx
new file mode 100644
index 000000000000..052d6825d145
--- /dev/null
+++ b/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/utils/getQueryContextMenuByIdeType.tsx
@@ -0,0 +1,20 @@
+import React from "react";
+import { IDE_TYPE, type IDEType } from "ee/entities/IDE/constants";
+import type { Action } from "entities/Action";
+import { AppQueryContextMenuItems } from "pages/Editor/IDE/EditorPane/Query/EntityItem/AppQueryContextMenuItems";
+import EntityContextMenu from "pages/Editor/IDE/EditorPane/components/EntityContextMenu";
+
+export const getQueryContextMenuByIdeType = (
+  ideType: IDEType,
+  action: Action,
+) => {
+  switch (ideType) {
+    case IDE_TYPE.App: {
+      return (
+        <EntityContextMenu>
+          <AppQueryContextMenuItems action={action} />
+        </EntityContextMenu>
+      );
+    }
+  }
+};
diff --git a/app/client/src/ce/reducers/uiReducers/explorerReducer.ts b/app/client/src/ce/reducers/uiReducers/explorerReducer.ts
index 79875226f326..7b7867c70ab0 100644
--- a/app/client/src/ce/reducers/uiReducers/explorerReducer.ts
+++ b/app/client/src/ce/reducers/uiReducers/explorerReducer.ts
@@ -196,29 +196,6 @@ export const handlers = {
       active: action.payload,
     };
   },
-  [ReduxActionTypes.OPEN_APP_SETTINGS_PANE]: (
-    state: ExplorerReduxState,
-  ): ExplorerReduxState => {
-    return {
-      ...state,
-      pinnedState:
-        state.pinnedState === ExplorerPinnedState.PINNED
-          ? ExplorerPinnedState.HIDDEN
-          : state.pinnedState,
-      active: false,
-    };
-  },
-  [ReduxActionTypes.CLOSE_APP_SETTINGS_PANE]: (
-    state: ExplorerReduxState,
-  ): ExplorerReduxState => {
-    return {
-      ...state,
-      pinnedState:
-        state.pinnedState === ExplorerPinnedState.HIDDEN
-          ? ExplorerPinnedState.PINNED
-          : state.pinnedState,
-    };
-  },
 };
 
 const explorerReducer = createReducer(initialState, handlers);
diff --git a/app/client/src/components/propertyControls/TableComputeValue.tsx b/app/client/src/components/propertyControls/TableComputeValue.tsx
index 1eba59f89e07..3a70fd704f26 100644
--- a/app/client/src/components/propertyControls/TableComputeValue.tsx
+++ b/app/client/src/components/propertyControls/TableComputeValue.tsx
@@ -100,10 +100,10 @@ function InputText(props: InputTextProp) {
 
 class ComputeTablePropertyControlV2 extends BaseControl<ComputeTablePropertyControlPropsV2> {
   static getBindingPrefix(tableName: string) {
-    return `{{${tableName}.processedTableData.map((currentRow, currentIndex) => ( `;
+    return `{{${tableName}.processedTableData.map((currentRow, currentIndex) => { try { return ( `;
   }
 
-  static bindingSuffix = `))}}`;
+  static bindingSuffix = `); } catch (e) { return null; }})}}`;
 
   render() {
     const {
diff --git a/app/client/src/ee/pages/Editor/IDE/EditorPane/JS/old/ListItem.tsx b/app/client/src/ee/pages/Editor/IDE/EditorPane/JS/old/ListItem.tsx
new file mode 100644
index 000000000000..f105e9a1ae28
--- /dev/null
+++ b/app/client/src/ee/pages/Editor/IDE/EditorPane/JS/old/ListItem.tsx
@@ -0,0 +1 @@
+export * from "ce/pages/Editor/IDE/EditorPane/JS/old/ListItem";
diff --git a/app/client/src/ee/pages/Editor/IDE/EditorPane/JS/utils/getJSContextMenuByIdeType.tsx b/app/client/src/ee/pages/Editor/IDE/EditorPane/JS/utils/getJSContextMenuByIdeType.tsx
new file mode 100644
index 000000000000..99126fb72c65
--- /dev/null
+++ b/app/client/src/ee/pages/Editor/IDE/EditorPane/JS/utils/getJSContextMenuByIdeType.tsx
@@ -0,0 +1 @@
+export * from "ce/pages/Editor/IDE/EditorPane/JS/utils/getJSContextMenuByIdeType";
diff --git a/app/client/src/ee/pages/Editor/IDE/EditorPane/Query/old/ListItem.tsx b/app/client/src/ee/pages/Editor/IDE/EditorPane/Query/old/ListItem.tsx
new file mode 100644
index 000000000000..4157586a5aaa
--- /dev/null
+++ b/app/client/src/ee/pages/Editor/IDE/EditorPane/Query/old/ListItem.tsx
@@ -0,0 +1 @@
+export * from "ce/pages/Editor/IDE/EditorPane/Query/old/ListItem";
diff --git a/app/client/src/ee/pages/Editor/IDE/EditorPane/Query/utils/getQueryContextMenuByIdeType.ts b/app/client/src/ee/pages/Editor/IDE/EditorPane/Query/utils/getQueryContextMenuByIdeType.ts
new file mode 100644
index 000000000000..efb2008a1132
--- /dev/null
+++ b/app/client/src/ee/pages/Editor/IDE/EditorPane/Query/utils/getQueryContextMenuByIdeType.ts
@@ -0,0 +1 @@
+export * from "ce/pages/Editor/IDE/EditorPane/Query/utils/getQueryContextMenuByIdeType";
diff --git a/app/client/src/git/components/OpsModal/TabMerge/TabMergeView.tsx b/app/client/src/git/components/OpsModal/TabMerge/TabMergeView.tsx
index eef1529ac534..9f90411a2b44 100644
--- a/app/client/src/git/components/OpsModal/TabMerge/TabMergeView.tsx
+++ b/app/client/src/git/components/OpsModal/TabMerge/TabMergeView.tsx
@@ -80,6 +80,7 @@ interface TabMergeViewProps {
   mergeStatus: FetchMergeStatusResponseData | null;
   protectedBranches: FetchProtectedBranchesResponseData | null;
   resetMergeState: () => void;
+  resetMergeSuccessState: () => void;
 }
 
 export default function TabMergeView({
@@ -99,6 +100,7 @@ export default function TabMergeView({
   mergeStatus = null,
   protectedBranches = null,
   resetMergeState = noop,
+  resetMergeSuccessState = noop,
 }: TabMergeViewProps) {
   const [selectedBranchOption, setSelectedBranchOption] =
     useState<BranchOption>();
@@ -208,9 +210,15 @@ export default function TabMergeView({
       // when user selects a branch to merge
       if (currentBranch && selectedBranchOption?.value) {
         fetchMergeStatus(currentBranch, selectedBranchOption?.value);
+        resetMergeSuccessState();
       }
     },
-    [currentBranch, selectedBranchOption?.value, fetchMergeStatus],
+    [
+      currentBranch,
+      selectedBranchOption?.value,
+      fetchMergeStatus,
+      resetMergeSuccessState,
+    ],
   );
 
   useEffect(
diff --git a/app/client/src/git/components/OpsModal/TabMerge/index.tsx b/app/client/src/git/components/OpsModal/TabMerge/index.tsx
index 0bb0be806949..dcedd36acad6 100644
--- a/app/client/src/git/components/OpsModal/TabMerge/index.tsx
+++ b/app/client/src/git/components/OpsModal/TabMerge/index.tsx
@@ -16,6 +16,7 @@ export default function TabMerge() {
     mergeError,
     mergeStatus,
     resetMergeState,
+    resetMergeSuccessState,
   } = useMerge();
   const { isFetchStatusLoading, status } = useStatus();
   const { branches, currentBranch, fetchBranches, isFetchBranchesLoading } =
@@ -42,6 +43,7 @@ export default function TabMerge() {
       mergeStatus={mergeStatus}
       protectedBranches={protectedBranches}
       resetMergeState={resetMergeState}
+      resetMergeSuccessState={resetMergeSuccessState}
     />
   );
 }
diff --git a/app/client/src/git/hooks/useMerge.ts b/app/client/src/git/hooks/useMerge.ts
index 1cdbadca28cf..444d5136668e 100644
--- a/app/client/src/git/hooks/useMerge.ts
+++ b/app/client/src/git/hooks/useMerge.ts
@@ -66,6 +66,12 @@ export default function useMerge() {
     }
   }, [artifactDef, dispatch]);
 
+  const resetMergeSuccessState = useCallback(() => {
+    if (artifactDef) {
+      dispatch(gitArtifactActions.resetMergeSuccessState({ artifactDef }));
+    }
+  }, [artifactDef, dispatch]);
+
   return {
     isMergeLoading: mergeState?.loading ?? false,
     mergeError: mergeState?.error ?? null,
@@ -77,5 +83,6 @@ export default function useMerge() {
     clearMergeStatus,
     isMergeSuccess: isMergeSuccess ?? false,
     resetMergeState,
+    resetMergeSuccessState,
   };
 }
diff --git a/app/client/src/git/store/actions/mergeActions.ts b/app/client/src/git/store/actions/mergeActions.ts
index 035651c1bd84..15f7c1a33d6b 100644
--- a/app/client/src/git/store/actions/mergeActions.ts
+++ b/app/client/src/git/store/actions/mergeActions.ts
@@ -40,3 +40,9 @@ export const resetMergeStateAction = createArtifactAction((state) => {
 
   return state;
 });
+
+export const resetMergeSuccessAction = createArtifactAction((state) => {
+  state.ui.mergeSuccess = false;
+
+  return state;
+});
diff --git a/app/client/src/git/store/gitArtifactSlice.ts b/app/client/src/git/store/gitArtifactSlice.ts
index 7109bcfbfee8..e3ad784a29f2 100644
--- a/app/client/src/git/store/gitArtifactSlice.ts
+++ b/app/client/src/git/store/gitArtifactSlice.ts
@@ -85,6 +85,7 @@ import {
   mergeInitAction,
   mergeSuccessAction,
   resetMergeStateAction,
+  resetMergeSuccessAction,
 } from "./actions/mergeActions";
 import {
   pollAutocommitProgressStopAction,
@@ -192,6 +193,7 @@ export const gitArtifactSlice = createSlice({
     mergeSuccess: mergeSuccessAction,
     mergeError: mergeErrorAction,
     resetMergeState: resetMergeStateAction,
+    resetMergeSuccessState: resetMergeSuccessAction,
     pullInit: pullInitAction,
     pullSuccess: pullSuccessAction,
     pullError: pullErrorAction,
diff --git a/app/client/src/pages/Editor/AppPluginActionEditor/components/ConvertToModule/ConvertToModuleCTA.tsx b/app/client/src/pages/Editor/AppPluginActionEditor/components/ContextMenuItems/ConvertToModule.tsx
similarity index 84%
rename from app/client/src/pages/Editor/AppPluginActionEditor/components/ConvertToModule/ConvertToModuleCTA.tsx
rename to app/client/src/pages/Editor/AppPluginActionEditor/components/ContextMenuItems/ConvertToModule.tsx
index bf76c35a3a2d..3d04b8625d3e 100644
--- a/app/client/src/pages/Editor/AppPluginActionEditor/components/ConvertToModule/ConvertToModuleCTA.tsx
+++ b/app/client/src/pages/Editor/AppPluginActionEditor/components/ContextMenuItems/ConvertToModule.tsx
@@ -1,5 +1,4 @@
 import React from "react";
-import { usePluginActionContext } from "PluginActionEditor";
 import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
 import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
 import { useSelector } from "react-redux";
@@ -11,21 +10,27 @@ import {
 import { MODULE_TYPE } from "ee/constants/ModuleConstants";
 import ConvertToModuleInstanceCTA from "ee/pages/Editor/EntityEditor/ConvertToModuleInstanceCTA";
 import { PluginType } from "entities/Plugin";
+import type { Action } from "entities/Action";
 
-const ConvertToModuleCTA = () => {
-  const { action, plugin } = usePluginActionContext();
-  const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
+interface Props {
+  action: Action;
+}
+
+export const ConvertToModule = ({ action }: Props) => {
   const pagePermissions = useSelector(getPagePermissions);
+  const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
+
   const isCreatePermitted = getHasCreateActionPermission(
     isFeatureEnabled,
     pagePermissions,
   );
+
   const isDeletePermitted = getHasDeleteActionPermission(
     isFeatureEnabled,
     action.userPermissions,
   );
 
-  if (plugin.type === PluginType.INTERNAL) {
+  if (action.pluginType === PluginType.INTERNAL) {
     // Workflow queries cannot be converted to modules
     return null;
   }
@@ -39,5 +44,3 @@ const ConvertToModuleCTA = () => {
 
   return <ConvertToModuleInstanceCTA {...convertToModuleProps} />;
 };
-
-export default ConvertToModuleCTA;
diff --git a/app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/Copy.tsx b/app/client/src/pages/Editor/AppPluginActionEditor/components/ContextMenuItems/Copy.tsx
similarity index 73%
rename from app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/Copy.tsx
rename to app/client/src/pages/Editor/AppPluginActionEditor/components/ContextMenuItems/Copy.tsx
index 2847f3481bf9..faaf175b72b8 100644
--- a/app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/Copy.tsx
+++ b/app/client/src/pages/Editor/AppPluginActionEditor/components/ContextMenuItems/Copy.tsx
@@ -1,19 +1,20 @@
+import React from "react";
+import { MenuSub, MenuSubContent, MenuSubTrigger } from "@appsmith/ads";
 import { useDispatch, useSelector } from "react-redux";
-import { getPageList } from "ee/selectors/entitiesSelector";
-import { usePluginActionContext } from "PluginActionEditor";
-import React, { useCallback } from "react";
+import { getPageList } from "selectors/editorSelectors";
+import { PageMenuItem } from "./PageMenuItem";
+import { useCallback } from "react";
+import type { Action } from "entities/Action";
 import { copyActionRequest } from "actions/pluginActionActions";
-import { MenuSub, MenuSubContent, MenuSubTrigger } from "@appsmith/ads";
 import { CONTEXT_COPY, createMessage } from "ee/constants/messages";
-import { PageMenuItem } from "./PageMenuItem";
 
 interface Props {
+  action: Action;
   disabled?: boolean;
 }
 
-export const Copy = ({ disabled }: Props) => {
+export const Copy = ({ action, disabled }: Props) => {
   const menuPages = useSelector(getPageList);
-  const { action } = usePluginActionContext();
   const dispatch = useDispatch();
 
   const copyActionToPage = useCallback(
@@ -30,13 +31,14 @@ export const Copy = ({ disabled }: Props) => {
 
   return (
     <MenuSub>
-      <MenuSubTrigger disabled={disabled} startIcon="duplicate">
+      <MenuSubTrigger startIcon="duplicate">
         {createMessage(CONTEXT_COPY)}
       </MenuSubTrigger>
-      <MenuSubContent>
+      <MenuSubContent style={{ maxHeight: "350px" }} width="220px">
         {menuPages.map((page) => {
           return (
             <PageMenuItem
+              disabled={disabled}
               key={page.basePageId}
               onSelect={copyActionToPage}
               page={page}
diff --git a/app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/Delete.tsx b/app/client/src/pages/Editor/AppPluginActionEditor/components/ContextMenuItems/Delete.tsx
similarity index 54%
rename from app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/Delete.tsx
rename to app/client/src/pages/Editor/AppPluginActionEditor/components/ContextMenuItems/Delete.tsx
index 41c0243856b2..fa22564a65b4 100644
--- a/app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/Delete.tsx
+++ b/app/client/src/pages/Editor/AppPluginActionEditor/components/ContextMenuItems/Delete.tsx
@@ -1,4 +1,3 @@
-import { useHandleDeleteClick } from "PluginActionEditor/hooks";
 import React, { useCallback, useState } from "react";
 import {
   CONFIRM_CONTEXT_DELETE,
@@ -6,19 +5,37 @@ import {
   createMessage,
 } from "ee/constants/messages";
 import { MenuItem } from "@appsmith/ads";
+import { useDispatch } from "react-redux";
+import { deleteAction } from "actions/pluginActionActions";
+import type { Action } from "entities/Action";
 
 interface Props {
+  action: Action;
   disabled?: boolean;
 }
 
-export const Delete = ({ disabled }: Props) => {
-  const { handleDeleteClick } = useHandleDeleteClick();
+export const Delete = ({ action, disabled }: Props) => {
+  const dispatch = useDispatch();
   const [confirmDelete, setConfirmDelete] = useState(false);
 
+  const handleDeleteClick = useCallback(
+    ({ onSuccess }: { onSuccess?: () => void }) => {
+      dispatch(
+        deleteAction({
+          id: action?.id ?? "",
+          name: action?.name ?? "",
+          onSuccess,
+        }),
+      );
+    },
+    [action.id, action.name, dispatch],
+  );
+
   const handleSelect = useCallback(
     (e?: Event) => {
       e?.preventDefault();
       confirmDelete ? handleDeleteClick({}) : setConfirmDelete(true);
+      e?.stopPropagation();
     },
     [confirmDelete, handleDeleteClick],
   );
@@ -29,7 +46,7 @@ export const Delete = ({ disabled }: Props) => {
 
   return (
     <MenuItem
-      className="t--apiFormDeleteBtn error-menuitem"
+      className="t--apiFormDeleteBtn single-select error-menuitem"
       disabled={disabled}
       onSelect={handleSelect}
       startIcon="trash"
diff --git a/app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/Move.tsx b/app/client/src/pages/Editor/AppPluginActionEditor/components/ContextMenuItems/Move.tsx
similarity index 85%
rename from app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/Move.tsx
rename to app/client/src/pages/Editor/AppPluginActionEditor/components/ContextMenuItems/Move.tsx
index 7e2f91d22e0f..080c8d48e10b 100644
--- a/app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/Move.tsx
+++ b/app/client/src/pages/Editor/AppPluginActionEditor/components/ContextMenuItems/Move.tsx
@@ -1,5 +1,4 @@
 import { useDispatch, useSelector } from "react-redux";
-import { usePluginActionContext } from "PluginActionEditor";
 import { getCurrentPageId } from "selectors/editorSelectors";
 import { getPageList } from "ee/selectors/entitiesSelector";
 import React, { useCallback, useMemo } from "react";
@@ -12,14 +11,15 @@ import {
 } from "@appsmith/ads";
 import { CONTEXT_MOVE, createMessage } from "ee/constants/messages";
 import { PageMenuItem } from "./PageMenuItem";
+import type { Action } from "entities/Action";
 
 interface Props {
+  action: Action;
   disabled?: boolean;
 }
 
-export const Move = ({ disabled }: Props) => {
+export const Move = ({ action, disabled }: Props) => {
   const dispatch = useDispatch();
-  const { action } = usePluginActionContext();
 
   const currentPageId = useSelector(getCurrentPageId);
   const allPages = useSelector(getPageList);
@@ -42,14 +42,15 @@ export const Move = ({ disabled }: Props) => {
 
   return (
     <MenuSub>
-      <MenuSubTrigger disabled={disabled} startIcon="swap-horizontal">
+      <MenuSubTrigger startIcon="swap-horizontal">
         {createMessage(CONTEXT_MOVE)}
       </MenuSubTrigger>
-      <MenuSubContent>
+      <MenuSubContent style={{ maxHeight: "350px" }} width="220px">
         {menuPages.length ? (
           menuPages.map((page) => {
             return (
               <PageMenuItem
+                disabled={disabled}
                 key={page.basePageId}
                 onSelect={moveActionToPage}
                 page={page}
diff --git a/app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/PageMenuItem.tsx b/app/client/src/pages/Editor/AppPluginActionEditor/components/ContextMenuItems/PageMenuItem.tsx
similarity index 68%
rename from app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/PageMenuItem.tsx
rename to app/client/src/pages/Editor/AppPluginActionEditor/components/ContextMenuItems/PageMenuItem.tsx
index 129f9c9a2edf..2aec776f4ba5 100644
--- a/app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/PageMenuItem.tsx
+++ b/app/client/src/pages/Editor/AppPluginActionEditor/components/ContextMenuItems/PageMenuItem.tsx
@@ -5,10 +5,15 @@ import { MenuItem } from "@appsmith/ads";
 export const PageMenuItem = (props: {
   page: Page;
   onSelect: (id: string) => void;
+  disabled?: boolean;
 }) => {
   const handleOnSelect = useCallback(() => {
     props.onSelect(props.page.pageId);
   }, [props]);
 
-  return <MenuItem onSelect={handleOnSelect}>{props.page.pageName}</MenuItem>;
+  return (
+    <MenuItem disabled={props.disabled} onSelect={handleOnSelect}>
+      {props.page.pageName}
+    </MenuItem>
+  );
 };
diff --git a/app/client/src/pages/Editor/AppPluginActionEditor/components/ContextMenuItems/Rename.tsx b/app/client/src/pages/Editor/AppPluginActionEditor/components/ContextMenuItems/Rename.tsx
new file mode 100644
index 000000000000..d41f88578c87
--- /dev/null
+++ b/app/client/src/pages/Editor/AppPluginActionEditor/components/ContextMenuItems/Rename.tsx
@@ -0,0 +1,32 @@
+import React, { useCallback } from "react";
+import { MenuItem } from "@appsmith/ads";
+import type { Action } from "entities/Action";
+import { useDispatch } from "react-redux";
+import { initExplorerEntityNameEdit } from "actions/explorerActions";
+import { CONTEXT_RENAME, createMessage } from "ee/constants/messages";
+
+interface Props {
+  action: Action;
+  disabled?: boolean;
+}
+
+export const Rename = ({ action, disabled }: Props) => {
+  const dispatch = useDispatch();
+
+  const setRename = useCallback(() => {
+    // We add a delay to avoid having the focus stuck in the menu trigger
+    setTimeout(() => {
+      dispatch(initExplorerEntityNameEdit(action.id));
+    }, 100);
+  }, [dispatch, action.id]);
+
+  return (
+    <MenuItem
+      disabled={disabled}
+      onSelect={setRename}
+      startIcon="input-cursor-move"
+    >
+      {createMessage(CONTEXT_RENAME)}
+    </MenuItem>
+  );
+};
diff --git a/app/client/src/pages/Editor/AppPluginActionEditor/components/ContextMenuItems/ShowBindings.tsx b/app/client/src/pages/Editor/AppPluginActionEditor/components/ContextMenuItems/ShowBindings.tsx
new file mode 100644
index 000000000000..9520bd595991
--- /dev/null
+++ b/app/client/src/pages/Editor/AppPluginActionEditor/components/ContextMenuItems/ShowBindings.tsx
@@ -0,0 +1,38 @@
+import React, { useCallback } from "react";
+import { CONTEXT_SHOW_BINDING, createMessage } from "ee/constants/messages";
+import { MenuItem } from "@appsmith/ads";
+import type { Action } from "entities/Action";
+import { useDispatch } from "react-redux";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
+import { ENTITY_TYPE } from "ee/entities/AppsmithConsole/utils";
+
+interface Props {
+  action: Action;
+  disabled?: boolean;
+}
+
+export const ShowBindings = ({ action, disabled }: Props) => {
+  const dispatch = useDispatch();
+
+  const handleSelect = useCallback(() => {
+    dispatch({
+      type: ReduxActionTypes.SET_ENTITY_INFO,
+      payload: {
+        entityId: action.id,
+        entityName: action.name,
+        entityType: ENTITY_TYPE.ACTION,
+        show: true,
+      },
+    });
+  }, [action.id, action.name]);
+
+  return (
+    <MenuItem
+      disabled={disabled}
+      onSelect={handleSelect}
+      startIcon="binding-new"
+    >
+      {createMessage(CONTEXT_SHOW_BINDING)}
+    </MenuItem>
+  );
+};
diff --git a/app/client/src/pages/Editor/AppPluginActionEditor/components/ContextMenuItems/index.ts b/app/client/src/pages/Editor/AppPluginActionEditor/components/ContextMenuItems/index.ts
new file mode 100644
index 000000000000..dba139b4290d
--- /dev/null
+++ b/app/client/src/pages/Editor/AppPluginActionEditor/components/ContextMenuItems/index.ts
@@ -0,0 +1,6 @@
+export { Copy } from "./Copy";
+export { Move } from "./Move";
+export { Delete } from "./Delete";
+export { Rename } from "./Rename";
+export { ShowBindings } from "./ShowBindings";
+export { ConvertToModule } from "./ConvertToModule";
diff --git a/app/client/src/pages/Editor/AppPluginActionEditor/components/ConvertToModule/index.tsx b/app/client/src/pages/Editor/AppPluginActionEditor/components/ConvertToModule/index.tsx
index c390c4a5dd63..e0070cdd22a1 100644
--- a/app/client/src/pages/Editor/AppPluginActionEditor/components/ConvertToModule/index.tsx
+++ b/app/client/src/pages/Editor/AppPluginActionEditor/components/ConvertToModule/index.tsx
@@ -1,3 +1,2 @@
-export { default as ConvertToModuleCTA } from "./ConvertToModuleCTA";
 export { default as ConvertToModuleDisabler } from "./ConvertToModuleDisabler";
 export { default as ConvertToModuleCallout } from "./ConvertToModuleCallout";
diff --git a/app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/Rename.tsx b/app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/Rename.tsx
deleted file mode 100644
index 471b6041b26e..000000000000
--- a/app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/Rename.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import React from "react";
-import { MenuItem } from "@appsmith/ads";
-
-interface Props {
-  disabled?: boolean;
-}
-
-export const Rename = ({ disabled }: Props) => {
-  return (
-    <MenuItem disabled={disabled} startIcon="input-cursor-move">
-      Rename
-    </MenuItem>
-  );
-};
diff --git a/app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/ToolbarMenu.tsx b/app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/ToolbarMenu.tsx
index 27121fbacdd3..306e445dd7ee 100644
--- a/app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/ToolbarMenu.tsx
+++ b/app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/ToolbarMenu.tsx
@@ -10,10 +10,7 @@ import {
   usePluginActionContext,
   DocsMenuItem as Docs,
 } from "PluginActionEditor";
-import { ConvertToModuleCTA } from "../ConvertToModule";
-import { Move } from "./Move";
-import { Copy } from "./Copy";
-import { Delete } from "./Delete";
+import { ConvertToModule, Copy, Delete, Move } from "../ContextMenuItems";
 import { RenameMenuItem } from "IDE";
 
 export const ToolbarMenu = () => {
@@ -32,12 +29,12 @@ export const ToolbarMenu = () => {
   return (
     <>
       <RenameMenuItem disabled={!isChangePermitted} entityId={action.id} />
-      <ConvertToModuleCTA />
-      <Copy disabled={!isChangePermitted} />
-      <Move disabled={!isChangePermitted} />
+      <ConvertToModule action={action} />
+      <Copy action={action} disabled={!isChangePermitted} />
+      <Move action={action} disabled={!isChangePermitted} />
       <Docs />
       <MenuSeparator />
-      <Delete disabled={!isDeletePermitted} />
+      <Delete action={action} disabled={!isDeletePermitted} />
     </>
   );
 };
diff --git a/app/client/src/pages/Editor/Explorer/Common/EntityExplorerResizeHandler.tsx b/app/client/src/pages/Editor/Explorer/Common/EntityExplorerResizeHandler.tsx
index 9e4fb680ca57..d8aa2cf21a31 100644
--- a/app/client/src/pages/Editor/Explorer/Common/EntityExplorerResizeHandler.tsx
+++ b/app/client/src/pages/Editor/Explorer/Common/EntityExplorerResizeHandler.tsx
@@ -1,8 +1,10 @@
 import { tailwindLayers } from "constants/Layers";
 import React from "react";
 import styled from "styled-components";
-import type { CallbackResponseType } from "utils/hooks/useResize";
-import useResize, { DIRECTION } from "utils/hooks/useResize";
+import useResize, {
+  DIRECTION,
+  type CallbackResponseType,
+} from "utils/hooks/useResize";
 
 const ResizeHandler = styled.div`
   &:hover {
@@ -33,8 +35,8 @@ export const EntityExplorerResizeHandler = ({
       onMouseDown={() => setMouseDown(true)}
     >
       <ResizeHandler
-        className={`w-full h-1 bg-transparent hover:bg-transparent transform transition
-          ${mouseDown ? "" : ""}
+        className={`w-full h-1 bg-transparent hover:bg-transparent transform transition	
+          ${mouseDown ? "" : ""}	
           `}
       />
     </div>
diff --git a/app/client/src/pages/Editor/Explorer/Common/components.tsx b/app/client/src/pages/Editor/Explorer/Common/components.tsx
index d72fac82c317..270c003f3c4d 100644
--- a/app/client/src/pages/Editor/Explorer/Common/components.tsx
+++ b/app/client/src/pages/Editor/Explorer/Common/components.tsx
@@ -1,7 +1,6 @@
 import styled from "styled-components";
 import Entity, { EntityClassNames } from "../Entity";
 
-export const ENTITY_HEIGHT = 36;
 export const MIN_PAGES_HEIGHT = 60;
 
 export const RelativeContainer = styled.div`
diff --git a/app/client/src/pages/Editor/Explorer/EntityExplorer.tsx b/app/client/src/pages/Editor/Explorer/EntityExplorer.tsx
deleted file mode 100644
index c86c3c293053..000000000000
--- a/app/client/src/pages/Editor/Explorer/EntityExplorer.tsx
+++ /dev/null
@@ -1,132 +0,0 @@
-import React, { useRef, useCallback, useEffect } from "react";
-import styled from "styled-components";
-import { NonIdealState, Classes } from "@blueprintjs/core";
-import { useDispatch, useSelector } from "react-redux";
-
-import { Colors } from "constants/Colors";
-
-import { getIsFirstTimeUserOnboardingEnabled } from "selectors/onboardingSelectors";
-import { toggleInOnboardingWidgetSelection } from "actions/onboardingActions";
-
-import { forceOpenWidgetPanel } from "actions/widgetSidebarActions";
-import Files from "./Files";
-import ExplorerWidgetGroup from "./Widgets/WidgetGroup";
-import { builderURL } from "ee/RouteBuilder";
-import history from "utils/history";
-import {
-  getCurrentBasePageId,
-  getCurrentPageId,
-  getPagePermissions,
-} from "selectors/editorSelectors";
-import { fetchWorkspace } from "ee/actions/workspaceActions";
-import { getCurrentWorkspaceId } from "ee/selectors/selectedWorkspaceSelectors";
-import { importSvg } from "@appsmith/ads-old";
-import AnalyticsUtil from "ee/utils/AnalyticsUtil";
-import { EntityExplorerWrapper } from "./Common/EntityExplorerWrapper";
-import { getCurrentApplicationId } from "selectors/editorSelectors";
-import { FilesContextProvider } from "./Files/FilesContextProvider";
-import { getHasCreateActionPermission } from "ee/utils/BusinessFeatures/permissionPageHelpers";
-import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
-import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
-import { ActionParentEntityType } from "ee/entities/Engine/actionHelpers";
-import { getShowWorkflowFeature } from "ee/selectors/workflowSelectors";
-
-const NoEntityFoundSvg = importSvg(
-  async () => import("assets/svg/no_entities_found.svg"),
-);
-
-const NoResult = styled(NonIdealState)`
-  &.${Classes.NON_IDEAL_STATE} {
-    height: auto;
-    margin: 20px 0;
-
-    .${Classes.NON_IDEAL_STATE_VISUAL} {
-      margin-bottom: 16px;
-      height: 52px;
-
-      svg {
-        height: 52px;
-        width: 144px;
-      }
-    }
-
-    div {
-      color: ${Colors.DOVE_GRAY2};
-    }
-
-    .${Classes.HEADING} {
-      margin-bottom: 4px;
-      color: ${(props) => props.theme.colors.textOnWhiteBG};
-    }
-  }
-`;
-
-function EntityExplorer({ isActive }: { isActive: boolean }) {
-  const dispatch = useDispatch();
-  const explorerRef = useRef<HTMLDivElement | null>(null);
-  const isFirstTimeUserOnboardingEnabled = useSelector(
-    getIsFirstTimeUserOnboardingEnabled,
-  );
-  const noResults = false;
-  const basePageId = useSelector(getCurrentBasePageId);
-  const pageId = useSelector(getCurrentPageId);
-  const showWidgetsSidebar = useCallback(() => {
-    AnalyticsUtil.logEvent("EXPLORER_WIDGET_CLICK");
-    history.push(builderURL({ basePageId }));
-    dispatch(forceOpenWidgetPanel(true));
-
-    if (isFirstTimeUserOnboardingEnabled) {
-      dispatch(toggleInOnboardingWidgetSelection(true));
-    }
-  }, [isFirstTimeUserOnboardingEnabled, basePageId]);
-
-  const currentWorkspaceId = useSelector(getCurrentWorkspaceId);
-
-  useEffect(() => {
-    dispatch(fetchWorkspace(currentWorkspaceId));
-  }, [currentWorkspaceId]);
-
-  const applicationId = useSelector(getCurrentApplicationId);
-
-  const pagePermissions = useSelector(getPagePermissions);
-
-  const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
-
-  const canCreateActions = getHasCreateActionPermission(
-    isFeatureEnabled,
-    pagePermissions,
-  );
-
-  const showWorkflows = useSelector(getShowWorkflowFeature);
-
-  return (
-    <EntityExplorerWrapper explorerRef={explorerRef} isActive={isActive}>
-      <ExplorerWidgetGroup
-        addWidgetsFn={showWidgetsSidebar}
-        searchKeyword=""
-        step={0}
-      />
-      <FilesContextProvider
-        canCreateActions={canCreateActions}
-        editorId={applicationId}
-        parentEntityId={pageId}
-        parentEntityType={ActionParentEntityType.PAGE}
-        showWorkflows={showWorkflows}
-      >
-        <Files />
-      </FilesContextProvider>
-      {noResults && (
-        <NoResult
-          className={Classes.DARK}
-          description="Try modifying the search keyword."
-          icon={<NoEntityFoundSvg />}
-          title="No entities found"
-        />
-      )}
-    </EntityExplorerWrapper>
-  );
-}
-
-EntityExplorer.displayName = "EntityExplorer";
-
-export default EntityExplorer;
diff --git a/app/client/src/pages/Editor/Explorer/Files/index.tsx b/app/client/src/pages/Editor/Explorer/Files/index.tsx
index daca88a00059..24758c651386 100644
--- a/app/client/src/pages/Editor/Explorer/Files/index.tsx
+++ b/app/client/src/pages/Editor/Explorer/Files/index.tsx
@@ -140,7 +140,7 @@ function Files() {
           );
         }
       }),
-    [files, activeActionBaseId, parentEntityId, parentEntityType],
+    [files, activeActionBaseId, parentEntityId],
   );
 
   const handleClick = useCallback(
diff --git a/app/client/src/pages/Editor/Explorer/Pages/index.tsx b/app/client/src/pages/Editor/Explorer/Pages/index.tsx
deleted file mode 100644
index db37964f5f8d..000000000000
--- a/app/client/src/pages/Editor/Explorer/Pages/index.tsx
+++ /dev/null
@@ -1,157 +0,0 @@
-import React, {
-  useCallback,
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-} from "react";
-import { useDispatch, useSelector } from "react-redux";
-import {
-  getCurrentApplicationId,
-  getCurrentPageId,
-} from "selectors/editorSelectors";
-import { EntityClassNames } from "../Entity";
-import { createNewPageFromEntities } from "actions/pageActions";
-import { ADD_PAGE_TOOLTIP, createMessage } from "ee/constants/messages";
-import type { Page } from "entities/Page";
-import { getNextEntityName } from "utils/AppsmithUtils";
-import { getExplorerPinned } from "selectors/explorerSelector";
-import { setExplorerPinnedAction } from "actions/explorerActions";
-import { selectAllPages } from "ee/selectors/entitiesSelector";
-import {
-  getExplorerStatus,
-  saveExplorerStatus,
-} from "ee/pages/Editor/Explorer/helpers";
-import AddPageContextMenu from "./AddPageContextMenu";
-import { useLocation } from "react-router";
-import type { AppState } from "ee/reducers";
-import { getCurrentWorkspaceId } from "ee/selectors/selectedWorkspaceSelectors";
-import { getInstanceId } from "ee//selectors/tenantSelectors";
-import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
-import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
-import { getHasCreatePagePermission } from "ee/utils/BusinessFeatures/permissionPageHelpers";
-import {
-  ENTITY_HEIGHT,
-  RelativeContainer,
-  StyledEntity,
-} from "../Common/components";
-import { EntityExplorerResizeHandler } from "../Common/EntityExplorerResizeHandler";
-import { PageElement } from "pages/Editor/IDE/EditorPane/components/PageElement";
-import { getCurrentApplication } from "ee/selectors/applicationSelectors";
-
-function Pages() {
-  const applicationId = useSelector(getCurrentApplicationId);
-  const pages: Page[] = useSelector(selectAllPages);
-  const currentPageId = useSelector(getCurrentPageId);
-  const pinned = useSelector(getExplorerPinned);
-  const dispatch = useDispatch();
-  const isPagesOpen = getExplorerStatus(applicationId, "pages");
-  const pageResizeRef = useRef<HTMLDivElement>(null);
-  const storedHeightKey = "pagesContainerHeight_" + applicationId;
-  const storedHeight = localStorage.getItem(storedHeightKey);
-  const location = useLocation();
-
-  useEffect(() => {
-    if ((isPagesOpen === null ? true : isPagesOpen) && pageResizeRef.current) {
-      pageResizeRef.current.style.height = storedHeight + "px";
-    }
-  }, [pageResizeRef]);
-
-  useEffect(() => {
-    // scroll to the current page
-    const currentPage = document.getElementById("entity-" + currentPageId);
-
-    if (currentPage) {
-      setTimeout(() => currentPage.scrollIntoView(), 0);
-    }
-  }, [currentPageId]);
-
-  const [isMenuOpen, openMenu] = useState(false);
-
-  const workspaceId = useSelector(getCurrentWorkspaceId);
-  const instanceId = useSelector(getInstanceId);
-
-  const createPageCallback = useCallback(() => {
-    const name = getNextEntityName(
-      "Page",
-      pages.map((page: Page) => page.pageName),
-    );
-
-    dispatch(
-      createNewPageFromEntities(applicationId, name, workspaceId, instanceId),
-    );
-  }, [dispatch, pages, applicationId]);
-
-  const onMenuClose = useCallback(() => openMenu(false), [openMenu]);
-
-  /**
-   * toggles the pinned state of sidebar
-   */
-  const onPin = useCallback(() => {
-    dispatch(setExplorerPinnedAction(!pinned));
-  }, [pinned, dispatch, setExplorerPinnedAction]);
-
-  const onPageToggle = useCallback(
-    (isOpen: boolean) => {
-      saveExplorerStatus(applicationId, "pages", isOpen);
-    },
-    [applicationId],
-  );
-
-  const userAppPermissions = useSelector(
-    (state: AppState) => getCurrentApplication(state)?.userPermissions ?? [],
-  );
-
-  const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
-
-  const canCreatePages = getHasCreatePagePermission(
-    isFeatureEnabled,
-    userAppPermissions,
-  );
-
-  const pageElements = useMemo(
-    () => pages.map((page) => <PageElement key={page.pageId} page={page} />),
-    [pages, location.pathname],
-  );
-
-  return (
-    <RelativeContainer className="border-b pb-1">
-      <StyledEntity
-        addButtonHelptext={createMessage(ADD_PAGE_TOOLTIP)}
-        alwaysShowRightIcon
-        className="pb-0 group pages"
-        collapseRef={pageResizeRef}
-        customAddButton={
-          <AddPageContextMenu
-            className={`${EntityClassNames.ADD_BUTTON} group pages`}
-            createPageCallback={createPageCallback}
-            onMenuClose={onMenuClose}
-            openMenu={isMenuOpen}
-          />
-        }
-        entityId="Pages"
-        entitySize={ENTITY_HEIGHT * pages.length}
-        icon={""}
-        isDefaultExpanded={
-          isPagesOpen === null || isPagesOpen === undefined ? true : isPagesOpen
-        }
-        name="Pages"
-        onClickPreRightIcon={onPin}
-        onToggle={onPageToggle}
-        searchKeyword={""}
-        showAddButton={canCreatePages}
-        step={0}
-      >
-        {pageElements}
-      </StyledEntity>
-      <EntityExplorerResizeHandler
-        resizeRef={pageResizeRef}
-        storedHeightKey={storedHeightKey}
-      />
-    </RelativeContainer>
-  );
-}
-
-Pages.displayName = "Pages";
-
-export default React.memo(Pages);
diff --git a/app/client/src/pages/Editor/Explorer/Widgets/WidgetGroup.tsx b/app/client/src/pages/Editor/Explorer/Widgets/WidgetGroup.tsx
deleted file mode 100644
index 46239a22ca15..000000000000
--- a/app/client/src/pages/Editor/Explorer/Widgets/WidgetGroup.tsx
+++ /dev/null
@@ -1,125 +0,0 @@
-import React, { memo, useCallback, useMemo } from "react";
-import { useSelector } from "react-redux";
-import Entity from "../Entity";
-import WidgetEntity from "./WidgetEntity";
-import {
-  getCurrentApplicationId,
-  getCurrentBasePageId,
-  getPagePermissions,
-} from "selectors/editorSelectors";
-import {
-  ADD_WIDGET_BUTTON,
-  ADD_WIDGET_TOOLTIP,
-  createMessage,
-  EMPTY_WIDGET_BUTTON_TEXT,
-  EMPTY_WIDGET_MAIN_TEXT,
-} from "ee/constants/messages";
-import { selectWidgetsForCurrentPage } from "ee/selectors/entitiesSelector";
-import {
-  getExplorerStatus,
-  saveExplorerStatus,
-} from "ee/pages/Editor/Explorer/helpers";
-import { AddEntity, EmptyComponent } from "../common";
-import { noop } from "lodash";
-import { Icon } from "@appsmith/ads";
-import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
-import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
-import { getHasManagePagePermission } from "ee/utils/BusinessFeatures/permissionPageHelpers";
-
-interface ExplorerWidgetGroupProps {
-  step: number;
-  searchKeyword?: string;
-  addWidgetsFn?: () => void;
-}
-
-export const ExplorerWidgetGroup = memo((props: ExplorerWidgetGroupProps) => {
-  const applicationId = useSelector(getCurrentApplicationId);
-  const basePageId = useSelector(getCurrentBasePageId) || "";
-  const widgets = useSelector(selectWidgetsForCurrentPage);
-  let isWidgetsOpen = getExplorerStatus(applicationId, "widgets");
-
-  if (isWidgetsOpen === null || isWidgetsOpen === undefined) {
-    isWidgetsOpen = widgets?.children?.length === 0;
-    saveExplorerStatus(applicationId, "widgets", isWidgetsOpen);
-  }
-
-  const widgetsInStep = useMemo(() => {
-    return widgets?.children?.map((child) => child.widgetId) || [];
-  }, [widgets?.children]);
-
-  const onWidgetToggle = useCallback(
-    (isOpen: boolean) => {
-      saveExplorerStatus(applicationId, "widgets", isOpen);
-    },
-    [applicationId],
-  );
-
-  const pagePermissions = useSelector(getPagePermissions);
-
-  const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
-
-  const canManagePages = getHasManagePagePermission(
-    isFeatureEnabled,
-    pagePermissions,
-  );
-
-  return (
-    <Entity
-      addButtonHelptext={createMessage(ADD_WIDGET_TOOLTIP)}
-      canEditEntityName={canManagePages}
-      className={`group widgets ${props.addWidgetsFn ? "current" : ""}`}
-      disabled={!widgets && !!props.searchKeyword}
-      entityId={basePageId + "_widgets"}
-      icon={""}
-      isDefaultExpanded={isWidgetsOpen}
-      isSticky
-      key={basePageId + "_widgets"}
-      name="Widgets"
-      onCreate={props.addWidgetsFn}
-      onToggle={onWidgetToggle}
-      searchKeyword={props.searchKeyword}
-      showAddButton={canManagePages}
-      step={props.step}
-    >
-      {widgets?.children?.map((child) => (
-        <WidgetEntity
-          basePageId={basePageId}
-          childWidgets={child.children}
-          key={child.widgetId}
-          searchKeyword={props.searchKeyword}
-          step={props.step + 1}
-          widgetId={child.widgetId}
-          widgetName={child.widgetName}
-          widgetType={child.type}
-          widgetsInStep={widgetsInStep}
-        />
-      ))}
-      {(!widgets?.children || widgets?.children.length === 0) &&
-        !props.searchKeyword && (
-          <EmptyComponent
-            addBtnText={createMessage(EMPTY_WIDGET_BUTTON_TEXT)}
-            addFunction={props.addWidgetsFn || noop}
-            mainText={createMessage(EMPTY_WIDGET_MAIN_TEXT)}
-          />
-        )}
-      {widgets?.children && widgets?.children?.length > 0 && canManagePages && (
-        <AddEntity
-          action={props.addWidgetsFn}
-          entityId={basePageId + "_widgets_add_new_datasource"}
-          icon={<Icon name="plus" />}
-          name={createMessage(ADD_WIDGET_BUTTON)}
-          step={props.step + 1}
-        />
-      )}
-    </Entity>
-  );
-});
-
-ExplorerWidgetGroup.displayName = "ExplorerWidgetGroup";
-// TODO: Fix this the next time the file is edited
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-(ExplorerWidgetGroup as any).whyDidYouRender = {
-  logOnDifferentValues: false,
-};
-
-export default ExplorerWidgetGroup;
diff --git a/app/client/src/pages/Editor/Explorer/index.tsx b/app/client/src/pages/Editor/Explorer/index.tsx
deleted file mode 100644
index 61bc6b77ac4b..000000000000
--- a/app/client/src/pages/Editor/Explorer/index.tsx
+++ /dev/null
@@ -1,103 +0,0 @@
-import React, { useEffect } from "react";
-import { toggleInOnboardingWidgetSelection } from "actions/onboardingActions";
-import { forceOpenWidgetPanel } from "actions/widgetSidebarActions";
-import { SegmentedControl } from "@appsmith/ads";
-import { useDispatch, useSelector } from "react-redux";
-import { useLocation } from "react-router";
-import type { AppState } from "ee/reducers";
-import { builderURL } from "ee/RouteBuilder";
-import { getCurrentBasePageId } from "selectors/editorSelectors";
-import { getIsFirstTimeUserOnboardingEnabled } from "selectors/onboardingSelectors";
-import AnalyticsUtil from "ee/utils/AnalyticsUtil";
-import { trimQueryString } from "utils/helpers";
-import history from "utils/history";
-import EntityExplorer from "./EntityExplorer";
-import { getExplorerSwitchIndex } from "selectors/editorContextSelectors";
-import { setExplorerSwitchIndex } from "actions/editorContextActions";
-import UIEntitySidebar from "../widgetSidebar/UIEntitySidebar";
-import { ExplorerWrapper } from "./Common/ExplorerWrapper";
-
-const selectForceOpenWidgetPanel = (state: AppState) =>
-  state.ui.onBoarding.forceOpenWidgetPanel;
-
-const options = [
-  {
-    value: "explorer",
-    label: "Explorer",
-  },
-  {
-    value: "widgets",
-    label: "Widgets",
-  },
-];
-
-function ExplorerContent() {
-  const dispatch = useDispatch();
-  const isFirstTimeUserOnboardingEnabled = useSelector(
-    getIsFirstTimeUserOnboardingEnabled,
-  );
-  const basePageId = useSelector(getCurrentBasePageId);
-  const location = useLocation();
-  const activeSwitchIndex = useSelector(getExplorerSwitchIndex);
-
-  const setActiveSwitchIndex = (index: number) => {
-    dispatch(setExplorerSwitchIndex(index));
-  };
-  const openWidgetPanel = useSelector(selectForceOpenWidgetPanel);
-
-  useEffect(() => {
-    const currentIndex = openWidgetPanel ? 1 : 0;
-
-    if (currentIndex !== activeSwitchIndex) {
-      setActiveSwitchIndex(currentIndex);
-    }
-  }, [openWidgetPanel]);
-
-  const onChange = (value: string) => {
-    if (value === options[0].value) {
-      dispatch(forceOpenWidgetPanel(false));
-    } else if (value === options[1].value) {
-      if (
-        !(trimQueryString(builderURL({ basePageId })) === location.pathname)
-      ) {
-        history.push(builderURL({ basePageId }));
-        AnalyticsUtil.logEvent("WIDGET_TAB_CLICK", {
-          type: "WIDGET_TAB",
-          fromUrl: location.pathname,
-          toUrl: builderURL({ basePageId }),
-        });
-      }
-
-      AnalyticsUtil.logEvent("EXPLORER_WIDGET_CLICK");
-      dispatch(forceOpenWidgetPanel(true));
-      dispatch(setExplorerSwitchIndex(1));
-
-      if (isFirstTimeUserOnboardingEnabled) {
-        dispatch(toggleInOnboardingWidgetSelection(true));
-      }
-    }
-  };
-  const { value: activeOption } = options[activeSwitchIndex];
-
-  return (
-    <ExplorerWrapper>
-      <div
-        className="flex-shrink-0 p-3 pb-2"
-        data-testid="explorer-tab-options"
-        id="explorer-tab-options"
-      >
-        <SegmentedControl
-          onChange={onChange}
-          options={options}
-          value={activeOption}
-        />
-      </div>
-
-      <UIEntitySidebar isActive={activeOption === "widgets"} />
-
-      <EntityExplorer isActive={activeOption === "explorer"} />
-    </ExplorerWrapper>
-  );
-}
-
-export default ExplorerContent;
diff --git a/app/client/src/pages/Editor/FirstTimeUserOnboarding/Statusbar.test.tsx b/app/client/src/pages/Editor/FirstTimeUserOnboarding/Statusbar.test.tsx
deleted file mode 100644
index 2e0d8384dc9c..000000000000
--- a/app/client/src/pages/Editor/FirstTimeUserOnboarding/Statusbar.test.tsx
+++ /dev/null
@@ -1,238 +0,0 @@
-const dispatch = jest.fn();
-
-import React from "react";
-import { Provider } from "react-redux";
-import { render } from "test/testUtils";
-import OnboardingStatusbar from "./Statusbar";
-import { getStore } from "./testUtils";
-import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
-import { SIGNPOSTING_STEP } from "./Utils";
-import { signpostingStepUpdateInit } from "actions/onboardingActions";
-import * as onboardingSelectors from "selectors/onboardingSelectors";
-
-// TODO: Fix this the next time the file is edited
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-let container: any = null;
-
-jest.mock("react-redux", () => {
-  const originalModule = jest.requireActual("react-redux");
-
-  return {
-    ...originalModule,
-    useDispatch: () => dispatch,
-  };
-});
-
-jest.mock("../../../selectors/onboardingSelectors", () => {
-  const originalModule = jest.requireActual(
-    "../../../selectors/onboardingSelectors",
-  );
-
-  return {
-    ...originalModule,
-    isWidgetActionConnectionPresent: jest.fn(),
-  };
-});
-
-const originalOnboardingSelectors = jest.requireActual(
-  "../../../selectors/onboardingSelectors",
-);
-
-// TODO: Fix this the next time the file is edited
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function renderComponent(store: any) {
-  render(
-    <Provider store={store}>
-      <OnboardingStatusbar />
-    </Provider>,
-    container,
-  );
-}
-
-describe("Statusbar", () => {
-  beforeEach(() => {
-    container = document.createElement("div");
-    document.body.appendChild(container);
-  });
-
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it("is rendered", async () => {
-    renderComponent(getStore(0));
-    expect(dispatch).toHaveBeenCalledTimes(5);
-    expect(dispatch).toHaveBeenCalledWith(
-      expect.objectContaining({
-        payload: {
-          completed: false,
-          step: expect.any(String),
-        },
-        type: ReduxActionTypes.SIGNPOSTING_STEP_UPDATE_INIT,
-      }),
-    );
-  });
-
-  it("on completing first step", async () => {
-    renderComponent(getStore(1));
-    expect(dispatch).toHaveBeenNthCalledWith(
-      1,
-      signpostingStepUpdateInit({
-        step: SIGNPOSTING_STEP.CONNECT_A_DATASOURCE,
-        completed: true,
-      }),
-    );
-  });
-
-  it("on completing second step", async () => {
-    renderComponent(getStore(2));
-    expect(dispatch).toHaveBeenNthCalledWith(
-      2,
-      signpostingStepUpdateInit({
-        step: SIGNPOSTING_STEP.CREATE_A_QUERY,
-        completed: true,
-      }),
-    );
-  });
-
-  it("on completing third step", async () => {
-    renderComponent(getStore(3));
-    expect(dispatch).toHaveBeenNthCalledWith(
-      3,
-      signpostingStepUpdateInit({
-        step: SIGNPOSTING_STEP.ADD_WIDGETS,
-        completed: true,
-      }),
-    );
-  });
-
-  it("on completing fourth step", async () => {
-    const isWidgetActionConnectionPresentSelector = jest.spyOn(
-      onboardingSelectors,
-      "isWidgetActionConnectionPresent",
-    );
-
-    isWidgetActionConnectionPresentSelector.mockImplementation(() => {
-      return true;
-    });
-    renderComponent(getStore(4));
-    expect(dispatch).toHaveBeenNthCalledWith(
-      4,
-      signpostingStepUpdateInit({
-        step: SIGNPOSTING_STEP.CONNECT_DATA_TO_WIDGET,
-        completed: true,
-      }),
-    );
-  });
-
-  it("on completing fifth step", async () => {
-    renderComponent(getStore(5));
-    expect(dispatch).toHaveBeenNthCalledWith(
-      5,
-      signpostingStepUpdateInit({
-        step: SIGNPOSTING_STEP.DEPLOY_APPLICATIONS,
-        completed: true,
-      }),
-    );
-  });
-
-  it("should test useIsWidgetActionConnectionPresent function", () => {
-    // TODO: Fix this the next time the file is edited
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const store = getStore(4).getState() as any;
-    const isWidgetActionConnectionPresentHelper = () => {
-      return originalOnboardingSelectors.isWidgetActionConnectionPresent.resultFunc(
-        store.entities.canvasWidgets,
-        store.entities.actions,
-        store.evaluations.dependencies.inverseDependencyMap,
-      );
-    };
-
-    //Both property and trigger dependency present
-    expect(isWidgetActionConnectionPresentHelper()).toBe(true);
-    //only trigger dependency present
-    store.evaluations.dependencies.inverseDependencyMap = {};
-    expect(isWidgetActionConnectionPresentHelper()).toBe(true);
-    //no dependency present
-    store.entities.canvasWidgets = {};
-    store.entities.actions = [];
-    expect(isWidgetActionConnectionPresentHelper()).toBe(false);
-    //only trigger dependency present
-    store.entities.canvasWidgets = {
-      [Math.random()]: {
-        widgetName: "widget",
-        onClick: "{{Query.run()}}",
-        dynamicTriggerPathList: [
-          {
-            key: "onClick",
-          },
-        ],
-        text: "{{Query.data}}",
-      },
-    };
-    store.entities.actions = [
-      {
-        config: {
-          id: Math.random(),
-          pageId: 1,
-          name: "Query",
-        },
-      },
-    ];
-    expect(isWidgetActionConnectionPresentHelper()).toBe(true);
-    //no dependency present
-    store.entities.canvasWidgets = {};
-    store.entities.actions = [];
-    expect(isWidgetActionConnectionPresentHelper()).toBe(false);
-    //only nested trigger dependency present
-    store.entities.canvasWidgets = {
-      [Math.random()]: {
-        widgetName: "widget",
-        column: {
-          onClick: "{{Query.run()}}",
-        },
-        dynamicTriggerPathList: [
-          {
-            key: "column.onClick",
-          },
-        ],
-        text: "label",
-      },
-    };
-    store.entities.actions = [
-      {
-        config: {
-          id: Math.random(),
-          pageId: 1,
-          name: "Query",
-        },
-      },
-    ];
-    expect(isWidgetActionConnectionPresentHelper()).toBe(true);
-    //no dependency present
-    store.entities.canvasWidgets = {};
-    store.entities.actions = [];
-    expect(isWidgetActionConnectionPresentHelper()).toBe(false);
-    //only property dependency present
-    store.entities.canvasWidgets = {
-      [Math.random()]: {
-        widgetName: "widget",
-        dynamicTriggerPathList: [],
-        text: "{{Query.data}}",
-      },
-    };
-    store.entities.actions = [
-      {
-        config: {
-          id: Math.random(),
-          pageId: 1,
-          name: "Query",
-        },
-      },
-    ];
-    store.evaluations.dependencies.inverseDependencyMap = {
-      "Query.data": ["Query", "widget.text"],
-    };
-    expect(isWidgetActionConnectionPresentHelper()).toBe(true);
-  });
-});
diff --git a/app/client/src/pages/Editor/FirstTimeUserOnboarding/Statusbar.tsx b/app/client/src/pages/Editor/FirstTimeUserOnboarding/Statusbar.tsx
deleted file mode 100644
index c073e8973b27..000000000000
--- a/app/client/src/pages/Editor/FirstTimeUserOnboarding/Statusbar.tsx
+++ /dev/null
@@ -1,115 +0,0 @@
-import { useEffect } from "react";
-import { useDispatch, useSelector } from "react-redux";
-import {
-  getApplicationLastDeployedAt,
-  getCurrentPageId,
-} from "selectors/editorSelectors";
-import {
-  getCanvasWidgets,
-  getPageActions,
-  getSavedDatasources,
-} from "ee/selectors/entitiesSelector";
-import { SIGNPOSTING_STEP } from "./Utils";
-import {
-  getFirstTimeUserOnboardingComplete,
-  isWidgetActionConnectionPresent,
-} from "selectors/onboardingSelectors";
-import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
-import { signpostingStepUpdateInit } from "actions/onboardingActions";
-
-const useStatusListener = () => {
-  const datasources = useSelector(getSavedDatasources);
-  const pageId = useSelector(getCurrentPageId);
-  const actions = useSelector(getPageActions(pageId));
-  const widgets = useSelector(getCanvasWidgets);
-  const isConnectionPresent = useSelector(isWidgetActionConnectionPresent);
-  const isDeployed = !!useSelector(getApplicationLastDeployedAt);
-  const isFirstTimeUserOnboardingComplete = useSelector(
-    getFirstTimeUserOnboardingComplete,
-  );
-  const dispatch = useDispatch();
-
-  let percentage = 0;
-
-  if (datasources.length || actions.length) {
-    percentage += 20;
-  }
-
-  if (actions.length) {
-    percentage += 20;
-  }
-
-  if (Object.keys(widgets).length > 1) {
-    percentage += 20;
-  }
-
-  if (isConnectionPresent) {
-    percentage += 20;
-  }
-
-  if (isDeployed) {
-    percentage += 20;
-  }
-
-  useEffect(() => {
-    dispatch(
-      signpostingStepUpdateInit({
-        step: SIGNPOSTING_STEP.CONNECT_A_DATASOURCE,
-        completed: !!(datasources.length || actions.length),
-      }),
-    );
-  }, [datasources.length, actions.length]);
-
-  useEffect(() => {
-    dispatch(
-      signpostingStepUpdateInit({
-        step: SIGNPOSTING_STEP.CREATE_A_QUERY,
-        completed: !!actions.length,
-      }),
-    );
-  }, [actions.length]);
-
-  useEffect(() => {
-    dispatch(
-      signpostingStepUpdateInit({
-        step: SIGNPOSTING_STEP.ADD_WIDGETS,
-        completed: Object.keys(widgets).length > 1,
-      }),
-    );
-  }, [Object.keys(widgets).length]);
-
-  useEffect(() => {
-    dispatch(
-      signpostingStepUpdateInit({
-        step: SIGNPOSTING_STEP.CONNECT_DATA_TO_WIDGET,
-        completed: isConnectionPresent,
-      }),
-    );
-  }, [isConnectionPresent]);
-
-  useEffect(() => {
-    dispatch(
-      signpostingStepUpdateInit({
-        step: SIGNPOSTING_STEP.DEPLOY_APPLICATIONS,
-        completed: isDeployed,
-      }),
-    );
-  }, [isDeployed]);
-
-  useEffect(() => {
-    if (percentage === 100 && !isFirstTimeUserOnboardingComplete) {
-      dispatch({
-        type: ReduxActionTypes.SET_FIRST_TIME_USER_ONBOARDING_COMPLETE,
-        payload: true,
-      });
-    }
-  }, [percentage, isFirstTimeUserOnboardingComplete]);
-};
-
-export function OnboardingStatusbar() {
-  useStatusListener();
-
-  return null;
-}
-
-export default OnboardingStatusbar;
diff --git a/app/client/src/pages/Editor/FirstTimeUserOnboarding/constants.ts b/app/client/src/pages/Editor/FirstTimeUserOnboarding/constants.ts
index 6b207add1157..22c1f646a704 100644
--- a/app/client/src/pages/Editor/FirstTimeUserOnboarding/constants.ts
+++ b/app/client/src/pages/Editor/FirstTimeUserOnboarding/constants.ts
@@ -1,16 +1,6 @@
-import { SIGNPOSTING_STEP } from "./Utils";
-
 //Hide Anonymous Data Popup after 15 seconds
 export const ANONYMOUS_DATA_POPOP_TIMEOUT = 15000;
 
 //Telemetry Docs Page
 export const TELEMETRY_DOCS_PAGE_URL =
   "https://docs.appsmith.com/product/telemetry";
-
-export const SIGNPOSTING_ANALYTICS_STEP_NAME = {
-  [SIGNPOSTING_STEP.CONNECT_A_DATASOURCE]: "Connect to datasource",
-  [SIGNPOSTING_STEP.CREATE_A_QUERY]: "Created query",
-  [SIGNPOSTING_STEP.ADD_WIDGETS]: "Created Widget",
-  [SIGNPOSTING_STEP.CONNECT_DATA_TO_WIDGET]: "Binding success",
-  [SIGNPOSTING_STEP.DEPLOY_APPLICATIONS]: "Deployed app",
-};
diff --git a/app/client/src/pages/Editor/IDE/EditorPane/JS/EntityItem/AppJSContextMenuItems.tsx b/app/client/src/pages/Editor/IDE/EditorPane/JS/EntityItem/AppJSContextMenuItems.tsx
new file mode 100644
index 000000000000..849144058dee
--- /dev/null
+++ b/app/client/src/pages/Editor/IDE/EditorPane/JS/EntityItem/AppJSContextMenuItems.tsx
@@ -0,0 +1,48 @@
+import React from "react";
+import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
+import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
+import {
+  getHasDeleteActionPermission,
+  getHasManageActionPermission,
+} from "ee/utils/BusinessFeatures/permissionPageHelpers";
+import type { JSCollection } from "entities/JSCollection";
+import {
+  Copy,
+  Delete,
+  Move,
+  Rename,
+  ShowBindings,
+} from "pages/Editor/JSEditor/ContextMenuItems";
+import { MenuSeparator } from "@appsmith/ads";
+
+export interface Props {
+  jsAction: JSCollection;
+}
+
+export function AppJSContextMenuItems(props: Props) {
+  const { jsAction } = props;
+  const jsActionPermissions = jsAction.userPermissions || [];
+
+  const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
+
+  const canDeleteJSAction = getHasDeleteActionPermission(
+    isFeatureEnabled,
+    jsActionPermissions,
+  );
+
+  const canManageJSAction = getHasManageActionPermission(
+    isFeatureEnabled,
+    jsActionPermissions,
+  );
+
+  return (
+    <>
+      <Rename disabled={!canManageJSAction} jsAction={jsAction} />
+      <ShowBindings jsAction={jsAction} />
+      <Copy disabled={!canManageJSAction} jsAction={jsAction} />
+      <Move disabled={!canManageJSAction} jsAction={jsAction} />
+      <MenuSeparator />
+      <Delete disabled={!canDeleteJSAction} jsAction={jsAction} />
+    </>
+  );
+}
diff --git a/app/client/src/pages/Editor/IDE/EditorPane/JS/EntityItem/JSEntityItem.tsx b/app/client/src/pages/Editor/IDE/EditorPane/JS/EntityItem/JSEntityItem.tsx
new file mode 100644
index 000000000000..9a341d91324a
--- /dev/null
+++ b/app/client/src/pages/Editor/IDE/EditorPane/JS/EntityItem/JSEntityItem.tsx
@@ -0,0 +1,109 @@
+import React, { useCallback, useMemo } from "react";
+import { EntityItem } from "@appsmith/ads";
+import type { EntityItem as EntityItemProps } from "ee/entities/IDE/constants";
+import type { AppState } from "ee/reducers";
+import { getJsCollectionByBaseId } from "ee/selectors/entitiesSelector";
+import { useDispatch, useSelector } from "react-redux";
+import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
+import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
+import { getHasManageActionPermission } from "ee/utils/BusinessFeatures/permissionPageHelpers";
+import AnalyticsUtil from "ee/utils/AnalyticsUtil";
+import history, { NavigationMethod } from "utils/history";
+import { saveJSObjectNameBasedOnIdeType } from "ee/actions/helpers";
+import { useNameEditorState } from "pages/Editor/IDE/EditorPane/hooks/useNameEditorState";
+import { useValidateEntityName } from "IDE";
+import { useLocation } from "react-router";
+import { getIDETypeByUrl } from "ee/entities/IDE/utils";
+import { useActiveActionBaseId } from "ee/pages/Editor/Explorer/hooks";
+import { useParentEntityInfo } from "ee/IDE/hooks/useParentEntityInfo";
+import type { JSCollection } from "entities/JSCollection";
+import { jsCollectionIdURL } from "ee/RouteBuilder";
+import { JsFileIconV2 } from "pages/Editor/Explorer/ExplorerIcons";
+import { getJSContextMenuByIdeType } from "ee/pages/Editor/IDE/EditorPane/JS/utils/getJSContextMenuByIdeType";
+
+export const JSEntityItem = ({ item }: { item: EntityItemProps }) => {
+  const jsAction = useSelector((state: AppState) =>
+    getJsCollectionByBaseId(state, item.key),
+  ) as JSCollection;
+  const location = useLocation();
+  const ideType = getIDETypeByUrl(location.pathname);
+  const activeActionBaseId = useActiveActionBaseId();
+  const { parentEntityId } = useParentEntityInfo(ideType);
+
+  const { editingEntity, enterEditMode, exitEditMode, updatingEntity } =
+    useNameEditorState();
+
+  const validateName = useValidateEntityName({
+    entityName: item.title,
+  });
+  const dispatch = useDispatch();
+  const contextMenu = getJSContextMenuByIdeType(ideType, jsAction);
+
+  const jsActionPermissions = jsAction.userPermissions || [];
+
+  const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
+
+  const canManageJSAction = getHasManageActionPermission(
+    isFeatureEnabled,
+    jsActionPermissions,
+  );
+
+  const navigateToUrl = jsCollectionIdURL({
+    baseParentEntityId: parentEntityId,
+    baseCollectionId: jsAction.baseId,
+    params: {},
+  });
+
+  const navigateToJSCollection = useCallback(() => {
+    if (jsAction.baseId) {
+      AnalyticsUtil.logEvent("ENTITY_EXPLORER_CLICK", {
+        type: "JSOBJECT",
+        fromUrl: location.pathname,
+        toUrl: navigateToUrl,
+        name: jsAction.name,
+      });
+      history.push(navigateToUrl, {
+        invokedBy: NavigationMethod.EntityExplorer,
+      });
+    }
+  }, [parentEntityId, jsAction.baseId, jsAction.name, location.pathname]);
+
+  const nameEditorConfig = useMemo(() => {
+    return {
+      canEdit: canManageJSAction && !Boolean(jsAction.isMainJSCollection),
+      isEditing: editingEntity === jsAction.id,
+      isLoading: updatingEntity === jsAction.id,
+      onEditComplete: exitEditMode,
+      onNameSave: (newName: string) =>
+        dispatch(saveJSObjectNameBasedOnIdeType(jsAction.id, newName, ideType)),
+      validateName: (newName: string) => validateName(newName, item.title),
+    };
+  }, [
+    canManageJSAction,
+    editingEntity,
+    exitEditMode,
+    ideType,
+    item.title,
+    jsAction.id,
+    jsAction.isMainJSCollection,
+    dispatch,
+    updatingEntity,
+    validateName,
+  ]);
+
+  return (
+    <EntityItem
+      className="t--jsaction"
+      id={jsAction.id}
+      isSelected={activeActionBaseId === jsAction.id}
+      key={jsAction.id}
+      nameEditorConfig={nameEditorConfig}
+      onClick={navigateToJSCollection}
+      onDoubleClick={() => enterEditMode(jsAction.id)}
+      rightControl={contextMenu}
+      rightControlVisibility="hover"
+      startIcon={JsFileIconV2(16, 16)}
+      title={item.title}
+    />
+  );
+};
diff --git a/app/client/src/pages/Editor/IDE/EditorPane/JS/List.tsx b/app/client/src/pages/Editor/IDE/EditorPane/JS/List.tsx
index f1df474f1654..992afea302bd 100644
--- a/app/client/src/pages/Editor/IDE/EditorPane/JS/List.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorPane/JS/List.tsx
@@ -1,25 +1,31 @@
 import React, { useState } from "react";
 import { useSelector } from "react-redux";
-import { Flex, Text, SearchAndAdd, NoSearchResults } from "@appsmith/ads";
+import {
+  Flex,
+  Text,
+  SearchAndAdd,
+  NoSearchResults,
+  EntityGroupsList,
+} from "@appsmith/ads";
 import styled from "styled-components";
 
 import { selectJSSegmentEditorList } from "ee/selectors/appIDESelectors";
 import { useActiveActionBaseId } from "ee/pages/Editor/Explorer/hooks";
-import {
-  getCurrentApplicationId,
-  getCurrentPageId,
-  getPagePermissions,
-} from "selectors/editorSelectors";
 import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
 import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
-import { getHasCreateActionPermission } from "ee/utils/BusinessFeatures/permissionPageHelpers";
 import { ActionParentEntityType } from "ee/entities/Engine/actionHelpers";
 import { FilesContextProvider } from "pages/Editor/Explorer/Files/FilesContextProvider";
 import { useJSAdd } from "ee/pages/Editor/IDE/EditorPane/JS/hooks";
-import { JSListItem } from "ee/pages/Editor/IDE/EditorPane/JS/ListItem";
+import { JSListItem } from "ee/pages/Editor/IDE/EditorPane/JS/old/ListItem";
 import { BlankState } from "./BlankState";
 import { EDITOR_PANE_TEXTS, createMessage } from "ee/constants/messages";
 import { filterEntityGroupsBySearchTerm } from "IDE/utils";
+import { useLocation } from "react-router";
+import { getIDETypeByUrl } from "ee/entities/IDE/utils";
+import { useParentEntityInfo } from "ee/IDE/hooks/useParentEntityInfo";
+import { useCreateActionsPermissions } from "ee/entities/IDE/hooks/useCreateActionsPermissions";
+import type { EntityItem } from "ee/entities/IDE/constants";
+import { JSEntity } from "ee/pages/Editor/IDE/EditorPane/JS/ListItem";
 
 const JSContainer = styled(Flex)`
   & .t--entity-item {
@@ -30,25 +36,23 @@ const JSContainer = styled(Flex)`
 
 const ListJSObjects = () => {
   const [searchTerm, setSearchTerm] = useState("");
-  const pageId = useSelector(getCurrentPageId);
   const itemGroups = useSelector(selectJSSegmentEditorList);
   const activeActionBaseId = useActiveActionBaseId();
-  const applicationId = useSelector(getCurrentApplicationId);
 
-  const pagePermissions = useSelector(getPagePermissions);
+  const location = useLocation();
+  const ideType = getIDETypeByUrl(location.pathname);
+  const { editorId, parentEntityId } = useParentEntityInfo(ideType);
+  const canCreateActions = useCreateActionsPermissions(ideType);
 
-  const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
+  const isNewADSTemplatesEnabled = useFeatureFlag(
+    FEATURE_FLAG.release_ads_entity_item_enabled,
+  );
 
   const filteredItemGroups = filterEntityGroupsBySearchTerm(
     searchTerm,
     itemGroups,
   );
 
-  const canCreateActions = getHasCreateActionPermission(
-    isFeatureEnabled,
-    pagePermissions,
-  );
-
   const { openAddJS } = useJSAdd();
 
   return (
@@ -70,46 +74,60 @@ const ListJSObjects = () => {
           showAddButton={canCreateActions}
         />
       ) : null}
-
       <Flex
         data-testid="t--ide-list"
         flexDirection="column"
         gap="spaces-4"
         overflowY="auto"
       >
-        {filteredItemGroups.map(({ group, items }) => {
-          return (
-            <Flex flexDirection={"column"} key={group}>
-              {group !== "NA" ? (
-                <Flex py="spaces-1">
-                  <Text
-                    className="overflow-hidden overflow-ellipsis whitespace-nowrap"
-                    kind="body-s"
-                  >
-                    {group}
-                  </Text>
-                </Flex>
-              ) : null}
-              <FilesContextProvider
-                canCreateActions={canCreateActions}
-                editorId={applicationId}
-                parentEntityId={pageId}
-                parentEntityType={ActionParentEntityType.PAGE}
-              >
-                {items.map((item) => {
-                  return (
-                    <JSListItem
-                      isActive={item.key === activeActionBaseId}
-                      item={item}
-                      key={item.key}
-                      parentEntityId={pageId}
-                    />
-                  );
-                })}
-              </FilesContextProvider>
-            </Flex>
-          );
-        })}
+        {isNewADSTemplatesEnabled ? (
+          <EntityGroupsList
+            groups={filteredItemGroups.map(({ group, items }) => {
+              return {
+                groupTitle: group === "NA" ? "" : group,
+                items: items,
+                className: "",
+                renderList: (item: EntityItem) => {
+                  return <JSEntity item={item} />;
+                },
+              };
+            })}
+          />
+        ) : (
+          filteredItemGroups.map(({ group, items }) => {
+            return (
+              <Flex flexDirection={"column"} key={group}>
+                {group !== "NA" ? (
+                  <Flex py="spaces-1">
+                    <Text
+                      className="overflow-hidden overflow-ellipsis whitespace-nowrap"
+                      kind="body-s"
+                    >
+                      {group}
+                    </Text>
+                  </Flex>
+                ) : null}
+                <FilesContextProvider
+                  canCreateActions={canCreateActions}
+                  editorId={editorId}
+                  parentEntityId={parentEntityId}
+                  parentEntityType={ActionParentEntityType.PAGE}
+                >
+                  {items.map((item) => {
+                    return (
+                      <JSListItem
+                        isActive={item.key === activeActionBaseId}
+                        item={item}
+                        key={item.key}
+                        parentEntityId={parentEntityId}
+                      />
+                    );
+                  })}
+                </FilesContextProvider>
+              </Flex>
+            );
+          })
+        )}
         {filteredItemGroups.length === 0 && searchTerm !== "" ? (
           <NoSearchResults
             text={createMessage(
diff --git a/app/client/src/pages/Editor/Explorer/Pages/AddPageContextMenu.tsx b/app/client/src/pages/Editor/IDE/EditorPane/Pages/AddPageContextMenu.tsx
similarity index 96%
rename from app/client/src/pages/Editor/Explorer/Pages/AddPageContextMenu.tsx
rename to app/client/src/pages/Editor/IDE/EditorPane/Pages/AddPageContextMenu.tsx
index e1501da44948..804b04f23a61 100644
--- a/app/client/src/pages/Editor/Explorer/Pages/AddPageContextMenu.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorPane/Pages/AddPageContextMenu.tsx
@@ -1,6 +1,9 @@
 import React, { useMemo, useState } from "react";
-import { AddButtonWrapper, EntityClassNames } from "../Entity";
-import EntityAddButton from "../Entity/AddButton";
+import {
+  AddButtonWrapper,
+  EntityClassNames,
+} from "pages/Editor/Explorer/Entity";
+import EntityAddButton from "pages/Editor/Explorer/Entity/AddButton";
 import styled from "styled-components";
 import { useParams } from "react-router";
 import { useDispatch } from "react-redux";
diff --git a/app/client/src/pages/Editor/Explorer/Pages/PageContextMenu.tsx b/app/client/src/pages/Editor/IDE/EditorPane/Pages/PageContextMenu.tsx
similarity index 100%
rename from app/client/src/pages/Editor/Explorer/Pages/PageContextMenu.tsx
rename to app/client/src/pages/Editor/IDE/EditorPane/Pages/PageContextMenu.tsx
diff --git a/app/client/src/pages/Editor/IDE/EditorPane/components/PageElement.tsx b/app/client/src/pages/Editor/IDE/EditorPane/Pages/PageElement.tsx
similarity index 98%
rename from app/client/src/pages/Editor/IDE/EditorPane/components/PageElement.tsx
rename to app/client/src/pages/Editor/IDE/EditorPane/Pages/PageElement.tsx
index cb880183451b..dcac18c33895 100644
--- a/app/client/src/pages/Editor/IDE/EditorPane/components/PageElement.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorPane/Pages/PageElement.tsx
@@ -7,7 +7,7 @@ import { defaultPageIcon, pageIcon } from "pages/Editor/Explorer/ExplorerIcons";
 import { getHasManagePagePermission } from "ee/utils/BusinessFeatures/permissionPageHelpers";
 import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
 import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
-import PageContextMenu from "pages/Editor/Explorer/Pages/PageContextMenu";
+import PageContextMenu from "./PageContextMenu";
 import {
   getCurrentApplicationId,
   getCurrentPageId,
diff --git a/app/client/src/pages/Editor/IDE/EditorPane/PagesSection.tsx b/app/client/src/pages/Editor/IDE/EditorPane/Pages/PagesSection.tsx
similarity index 95%
rename from app/client/src/pages/Editor/IDE/EditorPane/PagesSection.tsx
rename to app/client/src/pages/Editor/IDE/EditorPane/Pages/PagesSection.tsx
index b1ecd0dd7ede..56c9bf93b7d5 100644
--- a/app/client/src/pages/Editor/IDE/EditorPane/PagesSection.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorPane/Pages/PagesSection.tsx
@@ -13,11 +13,11 @@ import { EntityClassNames } from "pages/Editor/Explorer/Entity";
 import { getCurrentApplication } from "ee/selectors/applicationSelectors";
 import type { AppState } from "ee/reducers";
 import { createNewPageFromEntities } from "actions/pageActions";
-import AddPageContextMenu from "pages/Editor/Explorer/Pages/AddPageContextMenu";
+import AddPageContextMenu from "./AddPageContextMenu";
 import { getNextEntityName } from "utils/AppsmithUtils";
 import { getCurrentWorkspaceId } from "ee/selectors/selectedWorkspaceSelectors";
 import { getInstanceId } from "ee/selectors/tenantSelectors";
-import { PageElement } from "pages/Editor/IDE/EditorPane/components/PageElement";
+import { PageElement } from "./PageElement";
 import { PAGE_ENTITY_NAME } from "ee/constants/messages";
 
 const PagesSection = ({ onItemSelected }: { onItemSelected: () => void }) => {
diff --git a/app/client/src/pages/Editor/IDE/EditorPane/Query/EntityItem/AppQueryContextMenuItems.tsx b/app/client/src/pages/Editor/IDE/EditorPane/Query/EntityItem/AppQueryContextMenuItems.tsx
new file mode 100644
index 000000000000..be190c1ff585
--- /dev/null
+++ b/app/client/src/pages/Editor/IDE/EditorPane/Query/EntityItem/AppQueryContextMenuItems.tsx
@@ -0,0 +1,50 @@
+import React from "react";
+import type { Action } from "entities/Action";
+import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
+import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
+import {
+  getHasDeleteActionPermission,
+  getHasManageActionPermission,
+} from "ee/utils/BusinessFeatures/permissionPageHelpers";
+import {
+  ConvertToModule,
+  Copy,
+  Delete,
+  Move,
+  Rename,
+  ShowBindings,
+} from "pages/Editor/AppPluginActionEditor/components/ContextMenuItems";
+import { MenuSeparator } from "@appsmith/ads";
+
+export interface Props {
+  action: Action;
+}
+
+export function AppQueryContextMenuItems(props: Props) {
+  const { action } = props;
+  const actionPermissions = action.userPermissions || [];
+
+  const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
+
+  const canDeleteAction = getHasDeleteActionPermission(
+    isFeatureEnabled,
+    actionPermissions,
+  );
+
+  const canManageAction = getHasManageActionPermission(
+    isFeatureEnabled,
+    actionPermissions,
+  );
+
+  return (
+    <>
+      <Rename action={action} disabled={!canManageAction} />
+      <ShowBindings action={action} />
+      <ConvertToModule action={action} />
+      <Copy action={action} disabled={!canManageAction} />
+      <Move action={action} disabled={!canManageAction} />
+      <MenuSeparator />
+      <Delete action={action} disabled={!canDeleteAction} />
+    </>
+  );
+}
diff --git a/app/client/src/pages/Editor/IDE/EditorPane/Query/EntityItem/QueryEntityItem.tsx b/app/client/src/pages/Editor/IDE/EditorPane/Query/EntityItem/QueryEntityItem.tsx
new file mode 100644
index 000000000000..f74f53d02d28
--- /dev/null
+++ b/app/client/src/pages/Editor/IDE/EditorPane/Query/EntityItem/QueryEntityItem.tsx
@@ -0,0 +1,122 @@
+import React, { useCallback, useMemo } from "react";
+import { EntityItem } from "@appsmith/ads";
+import type { EntityItem as EntityItemProps } from "ee/entities/IDE/constants";
+import type { AppState } from "ee/reducers";
+import {
+  getActionByBaseId,
+  getDatasource,
+  getPlugins,
+} from "ee/selectors/entitiesSelector";
+import { type Action, type StoredDatasource } from "entities/Action";
+import { useDispatch, useSelector } from "react-redux";
+import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
+import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
+import { getHasManageActionPermission } from "ee/utils/BusinessFeatures/permissionPageHelpers";
+import AnalyticsUtil from "ee/utils/AnalyticsUtil";
+import type { Datasource } from "entities/Datasource";
+import history, { NavigationMethod } from "utils/history";
+import { keyBy } from "lodash";
+import { saveActionNameBasedOnIdeType } from "ee/actions/helpers";
+import { useNameEditorState } from "pages/Editor/IDE/EditorPane/hooks/useNameEditorState";
+import { useValidateEntityName } from "IDE";
+import { useLocation } from "react-router";
+import { getIDETypeByUrl } from "ee/entities/IDE/utils";
+import { getActionConfig } from "pages/Editor/Explorer/Actions/helpers";
+import { useActiveActionBaseId } from "ee/pages/Editor/Explorer/hooks";
+import { PluginType } from "entities/Plugin";
+import { useParentEntityInfo } from "ee/IDE/hooks/useParentEntityInfo";
+import { getQueryContextMenuByIdeType } from "ee/pages/Editor/IDE/EditorPane/Query/utils/getQueryContextMenuByIdeType";
+
+export const QueryEntityItem = ({ item }: { item: EntityItemProps }) => {
+  const action = useSelector((state: AppState) =>
+    getActionByBaseId(state, item.key),
+  ) as Action;
+  const datasource = useSelector((state) =>
+    getDatasource(state, (action?.datasource as StoredDatasource)?.id),
+  ) as Datasource;
+  const plugins = useSelector(getPlugins);
+  const pluginGroups = useMemo(() => keyBy(plugins, "id"), [plugins]);
+  const location = useLocation();
+  const ideType = getIDETypeByUrl(location.pathname);
+  const activeActionBaseId = useActiveActionBaseId();
+  const { parentEntityId } = useParentEntityInfo(ideType);
+
+  const { editingEntity, enterEditMode, exitEditMode, updatingEntity } =
+    useNameEditorState();
+
+  const validateName = useValidateEntityName({
+    entityName: item.title,
+  });
+  const dispatch = useDispatch();
+  const contextMenu = getQueryContextMenuByIdeType(ideType, action);
+
+  const actionPermissions = action.userPermissions || [];
+
+  const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
+
+  const canManageAction = getHasManageActionPermission(
+    isFeatureEnabled,
+    actionPermissions,
+  );
+
+  const config = getActionConfig(action.pluginType);
+  const url = config?.getURL(
+    parentEntityId ?? "",
+    action.baseId,
+    action.pluginType,
+    pluginGroups[action.pluginId],
+  );
+
+  const switchToAction = useCallback(() => {
+    url && history.push(url, { invokedBy: NavigationMethod.EntityExplorer });
+    AnalyticsUtil.logEvent("ENTITY_EXPLORER_CLICK", {
+      type: "QUERIES/APIs",
+      fromUrl: location.pathname,
+      toUrl: url,
+      name: action.name,
+    });
+    AnalyticsUtil.logEvent("EDIT_ACTION_CLICK", {
+      actionId: action?.id,
+      datasourceId: datasource?.id,
+      pluginName: pluginGroups[action?.pluginId]?.name,
+      actionType: action?.pluginType === PluginType.DB ? "Query" : "API",
+      isMock: !!datasource?.isMock,
+    });
+  }, [url, location.pathname, action, datasource, pluginGroups]);
+
+  const nameEditorConfig = useMemo(() => {
+    return {
+      canEdit: canManageAction,
+      isEditing: editingEntity === action.id,
+      isLoading: updatingEntity === action.id,
+      onEditComplete: exitEditMode,
+      onNameSave: (newName: string) =>
+        dispatch(saveActionNameBasedOnIdeType(action.id, newName, ideType)),
+      validateName: (newName: string) => validateName(newName, item.title),
+    };
+  }, [
+    canManageAction,
+    editingEntity,
+    exitEditMode,
+    ideType,
+    item.title,
+    action.id,
+    updatingEntity,
+  ]);
+
+  return (
+    <EntityItem
+      className="action t--action-entity"
+      id={action.id}
+      isSelected={activeActionBaseId === action.id}
+      key={action.id}
+      nameEditorConfig={nameEditorConfig}
+      onClick={switchToAction}
+      onDoubleClick={() => enterEditMode(action.id)}
+      rightControl={contextMenu}
+      rightControlVisibility="hover"
+      startIcon={item.icon}
+      title={item.title}
+    />
+  );
+};
diff --git a/app/client/src/pages/Editor/IDE/EditorPane/Query/List.tsx b/app/client/src/pages/Editor/IDE/EditorPane/Query/List.tsx
index ef5dfccff8e1..a919ad44ad75 100644
--- a/app/client/src/pages/Editor/IDE/EditorPane/Query/List.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorPane/Query/List.tsx
@@ -1,47 +1,55 @@
 import React, { useState } from "react";
-import { Flex, Text, SearchAndAdd, NoSearchResults } from "@appsmith/ads";
+import {
+  Flex,
+  Text,
+  SearchAndAdd,
+  NoSearchResults,
+  EntityGroupsList,
+} from "@appsmith/ads";
 import { useSelector } from "react-redux";
 
-import { getHasCreateActionPermission } from "ee/utils/BusinessFeatures/permissionPageHelpers";
 import { useActiveActionBaseId } from "ee/pages/Editor/Explorer/hooks";
-import {
-  getCurrentApplicationId,
-  getCurrentPageId,
-  getPagePermissions,
-} from "selectors/editorSelectors";
 import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
 import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
 import { selectQuerySegmentEditorList } from "ee/selectors/appIDESelectors";
 import { ActionParentEntityType } from "ee/entities/Engine/actionHelpers";
 import { FilesContextProvider } from "pages/Editor/Explorer/Files/FilesContextProvider";
 import { useQueryAdd } from "ee/pages/Editor/IDE/EditorPane/Query/hooks";
-import { QueryListItem } from "ee/pages/Editor/IDE/EditorPane/Query/ListItem";
+import { QueryListItem } from "ee/pages/Editor/IDE/EditorPane/Query/old/ListItem";
 import { getShowWorkflowFeature } from "ee/selectors/workflowSelectors";
 import { BlankState } from "./BlankState";
 import { EDITOR_PANE_TEXTS, createMessage } from "ee/constants/messages";
 import { filterEntityGroupsBySearchTerm } from "IDE/utils";
+import type { EntityItem } from "ee/entities/IDE/constants";
+import { ActionEntityItem } from "ee/pages/Editor/IDE/EditorPane/Query/ListItem";
+import { useLocation } from "react-router";
+import { getIDETypeByUrl } from "ee/entities/IDE/utils";
+import { useParentEntityInfo } from "ee/IDE/hooks/useParentEntityInfo";
+import { useCreateActionsPermissions } from "ee/entities/IDE/hooks/useCreateActionsPermissions";
+import { objectKeys } from "@appsmith/utils";
 
 const ListQuery = () => {
   const [searchTerm, setSearchTerm] = useState("");
-  const pageId = useSelector(getCurrentPageId) as string;
   const itemGroups = useSelector(selectQuerySegmentEditorList);
   const activeActionBaseId = useActiveActionBaseId();
-  const pagePermissions = useSelector(getPagePermissions);
-  const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
+
+  const location = useLocation();
+  const ideType = getIDETypeByUrl(location.pathname);
+  const { editorId, parentEntityId } = useParentEntityInfo(ideType);
+  const canCreateActions = useCreateActionsPermissions(ideType);
+
+  const showWorkflows = useSelector(getShowWorkflowFeature);
+
+  const isNewADSTemplatesEnabled = useFeatureFlag(
+    FEATURE_FLAG.release_ads_entity_item_enabled,
+  );
 
   const filteredItemGroups = filterEntityGroupsBySearchTerm(
     searchTerm,
     itemGroups,
   );
 
-  const canCreateActions = getHasCreateActionPermission(
-    isFeatureEnabled,
-    pagePermissions,
-  );
-  const applicationId = useSelector(getCurrentApplicationId);
-
   const { openAddQuery } = useQueryAdd();
-  const showWorkflows = useSelector(getShowWorkflowFeature);
 
   return (
     <Flex
@@ -52,7 +60,7 @@ const ListQuery = () => {
       px="spaces-3"
       py="spaces-3"
     >
-      {Object.keys(itemGroups).length === 0 && <BlankState />}
+      {objectKeys(itemGroups).length === 0 && <BlankState />}
 
       {itemGroups.length > 0 ? (
         <SearchAndAdd
@@ -61,39 +69,59 @@ const ListQuery = () => {
           showAddButton={canCreateActions}
         />
       ) : null}
-      <Flex flexDirection={"column"} gap="spaces-4" overflowY="auto">
-        {filteredItemGroups.map(({ group, items }) => {
-          return (
-            <Flex flexDirection={"column"} key={group}>
-              <Flex py="spaces-1">
-                <Text
-                  className="overflow-hidden overflow-ellipsis whitespace-nowrap"
-                  kind="body-s"
+      <Flex
+        data-testid="t--ide-list"
+        flexDirection={"column"}
+        gap="spaces-4"
+        overflowY="auto"
+      >
+        {isNewADSTemplatesEnabled ? (
+          <EntityGroupsList
+            groups={filteredItemGroups.map(({ group, items }) => {
+              return {
+                groupTitle: group,
+                items: items,
+                className: "",
+                renderList: (item: EntityItem) => {
+                  return <ActionEntityItem item={item} />;
+                },
+              };
+            })}
+          />
+        ) : (
+          filteredItemGroups.map(({ group, items }) => {
+            return (
+              <Flex flexDirection={"column"} key={group}>
+                <Flex py="spaces-1">
+                  <Text
+                    className="overflow-hidden overflow-ellipsis whitespace-nowrap"
+                    kind="body-s"
+                  >
+                    {group}
+                  </Text>
+                </Flex>
+                <FilesContextProvider
+                  canCreateActions={canCreateActions}
+                  editorId={editorId}
+                  parentEntityId={parentEntityId}
+                  parentEntityType={ActionParentEntityType.PAGE}
+                  showWorkflows={showWorkflows}
                 >
-                  {group}
-                </Text>
+                  {items.map((file) => {
+                    return (
+                      <QueryListItem
+                        isActive={file.key === activeActionBaseId}
+                        item={file}
+                        key={file.key}
+                        parentEntityId={parentEntityId}
+                      />
+                    );
+                  })}
+                </FilesContextProvider>
               </Flex>
-              <FilesContextProvider
-                canCreateActions={canCreateActions}
-                editorId={applicationId}
-                parentEntityId={pageId}
-                parentEntityType={ActionParentEntityType.PAGE}
-                showWorkflows={showWorkflows}
-              >
-                {items.map((file) => {
-                  return (
-                    <QueryListItem
-                      isActive={file.key === activeActionBaseId}
-                      item={file}
-                      key={file.key}
-                      parentEntityId={pageId}
-                    />
-                  );
-                })}
-              </FilesContextProvider>
-            </Flex>
-          );
-        })}
+            );
+          })
+        )}
         {filteredItemGroups.length === 0 && searchTerm !== "" ? (
           <NoSearchResults
             text={createMessage(
diff --git a/app/client/src/pages/Editor/Explorer/EntityExplorer.test.tsx b/app/client/src/pages/Editor/IDE/EditorPane/UI/List.test.tsx
similarity index 96%
rename from app/client/src/pages/Editor/Explorer/EntityExplorer.test.tsx
rename to app/client/src/pages/Editor/IDE/EditorPane/UI/List.test.tsx
index 04091582d3cd..09b7af082f59 100644
--- a/app/client/src/pages/Editor/Explorer/EntityExplorer.test.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorPane/UI/List.test.tsx
@@ -13,7 +13,7 @@ import { MAIN_CONTAINER_WIDGET_ID } from "constants/WidgetConstants";
 import * as widgetSelectionsActions from "actions/widgetSelectionActions";
 import { SelectionRequestType } from "sagas/WidgetSelectUtils";
 import { NavigationMethod } from "utils/history";
-import WidgetsEditorEntityExplorer from "../WidgetsEditorEntityExplorer";
+import ListWidgets from "./List";
 
 jest.useFakeTimers();
 const pushState = jest.spyOn(window.history, "pushState");
@@ -51,7 +51,9 @@ jest
   .spyOn(explorerSelector, "getExplorerWidth")
   .mockImplementation(() => DEFAULT_ENTITY_EXPLORER_WIDTH);
 
-describe("Entity Explorer tests", () => {
+const setFocusSearchInput = jest.fn();
+
+describe("Widget List in Explorer tests", () => {
   beforeAll(() => {
     runSagaMiddleware();
   });
@@ -83,13 +85,13 @@ describe("Entity Explorer tests", () => {
     });
     const component = render(
       <MockPageDSL dsl={dsl}>
-        <WidgetsEditorEntityExplorer />
+        <ListWidgets setFocusSearchInput={setFocusSearchInput} />
       </MockPageDSL>,
     );
     // TODO: Fix this the next time the file is edited
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const widgetsTree: Element = await component.findByText(
-      "Widgets",
+      children[0].widgetName,
       {
         selector: "div.t--entity-name",
       },
@@ -128,7 +130,7 @@ describe("Entity Explorer tests", () => {
       });
       const component = render(
         <MockPageDSL dsl={dsl}>
-          <WidgetsEditorEntityExplorer />
+          <ListWidgets setFocusSearchInput={setFocusSearchInput} />
         </MockPageDSL>,
       );
       // TODO: Fix this the next time the file is edited
@@ -169,7 +171,7 @@ describe("Entity Explorer tests", () => {
       });
       const component = render(
         <MockPageDSL dsl={dsl}>
-          <WidgetsEditorEntityExplorer />
+          <ListWidgets setFocusSearchInput={setFocusSearchInput} />
         </MockPageDSL>,
       );
       // TODO: Fix this the next time the file is edited
@@ -226,7 +228,7 @@ describe("Entity Explorer tests", () => {
       });
       const component = render(
         <MockPageDSL dsl={dsl}>
-          <WidgetsEditorEntityExplorer />
+          <ListWidgets setFocusSearchInput={setFocusSearchInput} />
         </MockPageDSL>,
       );
 
@@ -320,7 +322,7 @@ describe("Entity Explorer tests", () => {
       });
       const component = render(
         <MockPageDSL dsl={dsl}>
-          <WidgetsEditorEntityExplorer />
+          <ListWidgets setFocusSearchInput={setFocusSearchInput} />
         </MockPageDSL>,
       );
       // TODO: Fix this the next time the file is edited
diff --git a/app/client/src/pages/Editor/IDE/EditorPane/components/EntityContextMenu.tsx b/app/client/src/pages/Editor/IDE/EditorPane/components/EntityContextMenu.tsx
new file mode 100644
index 000000000000..a6b1e5bf6b54
--- /dev/null
+++ b/app/client/src/pages/Editor/IDE/EditorPane/components/EntityContextMenu.tsx
@@ -0,0 +1,50 @@
+import React from "react";
+import { Button, Menu, MenuContent, MenuTrigger, Tooltip } from "@appsmith/ads";
+import { useToggle } from "@mantine/hooks";
+import {
+  createMessage,
+  ENTITY_MORE_ACTIONS_TOOLTIP,
+} from "ee/constants/messages";
+import { EntityClassNames } from "pages/Editor/Explorer/Entity";
+
+interface Props {
+  children?: React.ReactNode[] | React.ReactNode;
+}
+
+const EntityContextMenu = (props: Props) => {
+  const [isMenuOpen, toggleMenuOpen] = useToggle([false, true]);
+
+  return (
+    <Menu onOpenChange={toggleMenuOpen} open={isMenuOpen}>
+      <MenuTrigger className="t--context-menu">
+        <div className="relative">
+          <Tooltip
+            content={createMessage(ENTITY_MORE_ACTIONS_TOOLTIP)}
+            isDisabled={isMenuOpen}
+            mouseLeaveDelay={0}
+            placement="right"
+          >
+            <Button
+              className={EntityClassNames.CONTEXT_MENU}
+              data-testid="t--more-action-trigger"
+              isIconButton
+              kind="tertiary"
+              startIcon="more-2-fill"
+            />
+          </Tooltip>
+        </div>
+      </MenuTrigger>
+      <MenuContent
+        align="start"
+        className={`t--entity-context-menu ${EntityClassNames.CONTEXT_MENU_CONTENT}`}
+        side="right"
+        style={{ maxHeight: "unset" }}
+        width="220px"
+      >
+        {props.children}
+      </MenuContent>
+    </Menu>
+  );
+};
+
+export default EntityContextMenu;
diff --git a/app/client/src/pages/Editor/IDE/EditorTabs/ScreenModeToggle.tsx b/app/client/src/pages/Editor/IDE/EditorTabs/ScreenModeToggle.tsx
index b570b564489e..aa5b78a10ac8 100644
--- a/app/client/src/pages/Editor/IDE/EditorTabs/ScreenModeToggle.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorTabs/ScreenModeToggle.tsx
@@ -15,9 +15,14 @@ import type { AppState } from "ee/reducers";
 import { selectFeatureFlagCheck } from "ee/selectors/featureFlagsSelectors";
 import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
 import { Nudge } from "IDE/Components/Nudge";
-import { useShowSideBySideNudge } from "../hooks";
 
-export const ScreenModeToggle = () => {
+interface Props {
+  showNudge?: boolean;
+  dismissNudge?: () => void;
+}
+
+export const ScreenModeToggle = (props: Props) => {
+  const { dismissNudge, showNudge = false } = props;
   const dispatch = useDispatch();
   const ideViewMode = useSelector(getIDEViewMode);
   const isAnimatedIDEEnabled = useSelector((state: AppState) => {
@@ -43,14 +48,14 @@ export const ScreenModeToggle = () => {
     }
   }, [dispatch, isAnimatedIDEEnabled]);
 
-  const [showNudge, dismissNudge] = useShowSideBySideNudge();
-
   const switchToSplitScreen = useCallback(() => {
     AnalyticsUtil.logEvent("EDITOR_MODE_CHANGE", {
       to: EditorViewMode.SplitScreen,
     });
 
-    dismissNudge();
+    if (dismissNudge) {
+      dismissNudge();
+    }
 
     if ("startViewTransition" in document && isAnimatedIDEEnabled) {
       document.startViewTransition(() => {
@@ -95,7 +100,7 @@ export const ScreenModeToggle = () => {
     );
   }
 
-  if (showNudge) {
+  if (showNudge && dismissNudge) {
     return (
       <Nudge
         align="center"
diff --git a/app/client/src/pages/Editor/IDE/EditorTabs/index.tsx b/app/client/src/pages/Editor/IDE/EditorTabs/index.tsx
index 59dc1a3eebe5..87ece02a1448 100644
--- a/app/client/src/pages/Editor/IDE/EditorTabs/index.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorTabs/index.tsx
@@ -10,7 +10,11 @@ import {
 } from "ee/entities/IDE/constants";
 
 import Container from "./Container";
-import { useCurrentEditorState, useIDETabClickHandlers } from "../hooks";
+import {
+  useCurrentEditorState,
+  useIDETabClickHandlers,
+  useShowSideBySideNudge,
+} from "../hooks";
 import { SCROLL_AREA_OPTIONS, TabSelectors } from "./constants";
 import { AddButton } from "./AddButton";
 import { useLocation } from "react-router";
@@ -32,6 +36,7 @@ const EditorTabs = () => {
   const entities = useSelector(tabsConfig.listSelector, shallowEqual);
   const files = useSelector(tabsConfig.tabsSelector, shallowEqual);
   const isListViewActive = useSelector(getListViewActiveState);
+  const [showNudge, dismissNudge] = useShowSideBySideNudge();
 
   const location = useLocation();
   const dispatch = useDispatch();
@@ -147,7 +152,7 @@ const EditorTabs = () => {
         </ScrollArea>
         {files.length > 0 ? <AddButton /> : null}
         {/* Switch screen mode button */}
-        <ScreenModeToggle />
+        <ScreenModeToggle dismissNudge={dismissNudge} showNudge={showNudge} />
       </Container>
 
       {/* Overflow list */}
diff --git a/app/client/src/pages/Editor/IDE/Header/EditorTitle.tsx b/app/client/src/pages/Editor/IDE/Header/EditorTitle.tsx
index 327b6f72ed35..8817dced4805 100644
--- a/app/client/src/pages/Editor/IDE/Header/EditorTitle.tsx
+++ b/app/client/src/pages/Editor/IDE/Header/EditorTitle.tsx
@@ -2,7 +2,7 @@ import React from "react";
 import { IDEHeaderSwitcher } from "@appsmith/ads";
 
 import { createMessage, HEADER_TITLES } from "ee/constants/messages";
-import { PagesSection } from "../EditorPane/PagesSection";
+import { PagesSection } from "../EditorPane/Pages/PagesSection";
 import { useBoolean } from "usehooks-ts";
 import { useSelector } from "react-redux";
 import { getCurrentPageId, getPageById } from "selectors/editorSelectors";
diff --git a/app/client/src/pages/Editor/JSEditor/AppJSEditorContextMenu.tsx b/app/client/src/pages/Editor/JSEditor/AppJSEditorContextMenu.tsx
index 4604f3c73f4a..e331334d58ca 100644
--- a/app/client/src/pages/Editor/JSEditor/AppJSEditorContextMenu.tsx
+++ b/app/client/src/pages/Editor/JSEditor/AppJSEditorContextMenu.tsx
@@ -1,32 +1,4 @@
-import React, { useCallback, useMemo } from "react";
-import { useBoolean } from "usehooks-ts";
-import { useDispatch, useSelector } from "react-redux";
-import {
-  moveJSCollectionRequest,
-  copyJSCollectionRequest,
-  deleteJSCollection,
-} from "actions/jsActionActions";
-import noop from "lodash/noop";
-import {
-  CONTEXT_COPY,
-  CONTEXT_DELETE,
-  CONFIRM_CONTEXT_DELETE,
-  CONTEXT_MOVE,
-  createMessage,
-  CONTEXT_RENAME,
-} from "ee/constants/messages";
-import { getPageListAsOptions } from "ee/selectors/entitiesSelector";
-import {
-  autoIndentCode,
-  getAutoIndentShortcutKeyText,
-} from "components/editorComponents/CodeEditor/utils/autoIndentUtils";
-import AnalyticsUtil from "ee/utils/AnalyticsUtil";
-import { updateJSCollectionBody } from "actions/jsPaneActions";
-import type { IconName } from "@blueprintjs/icons";
-
-import type { ContextMenuOption } from "./JSEditorContextMenu";
-import JSEditorContextMenu from "./JSEditorContextMenu";
-import equal from "fast-deep-equal/es6";
+import React from "react";
 import {
   getHasDeleteActionPermission,
   getHasManageActionPermission,
@@ -34,26 +6,18 @@ import {
 import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
 import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
 import type { JSCollection } from "entities/JSCollection";
-import { setRenameEntity } from "actions/ideActions";
-import type CodeMirror from "codemirror";
+import { Copy, Delete, Move, Prettify } from "./ContextMenuItems";
+import { RenameMenuItem } from "IDE";
+import { MenuSeparator } from "@appsmith/ads";
+import EntityContextMenu from "../IDE/EditorPane/components/EntityContextMenu";
 
 interface AppJSEditorContextMenuProps {
-  pageId: string;
   jsCollection: JSCollection;
 }
 
-const prettifyCodeKeyboardShortCut = getAutoIndentShortcutKeyText();
-
 export function AppJSEditorContextMenu({
   jsCollection,
-  pageId,
 }: AppJSEditorContextMenuProps) {
-  const {
-    setFalse: cancelConfirmDelete,
-    setValue: setConfirmDelete,
-    value: confirmDelete,
-  } = useBoolean(false);
-  const dispatch = useDispatch();
   const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
   const isDeletePermitted = getHasDeleteActionPermission(
     isFeatureEnabled,
@@ -64,169 +28,18 @@ export function AppJSEditorContextMenu({
     jsCollection?.userPermissions || [],
   );
 
-  const renameJS = useCallback(() => {
-    // We add a delay to avoid having the focus stuck in the menu trigger
-    setTimeout(() => {
-      dispatch(setRenameEntity(jsCollection.id));
-    }, 100);
-  }, [dispatch, jsCollection.id]);
-
-  const copyJSCollectionToPage = useCallback(
-    (actionId: string, actionName: string, pageId: string) => {
-      dispatch(
-        copyJSCollectionRequest({
-          id: actionId,
-          destinationPageId: pageId,
-          name: actionName,
-        }),
-      );
-    },
-    [dispatch],
-  );
-
-  const moveJSCollectionToPage = useCallback(
-    (actionId: string, actionName: string, destinationPageId: string) => {
-      dispatch(
-        moveJSCollectionRequest({
-          id: actionId,
-          destinationPageId,
-          name: actionName,
-        }),
-      );
-    },
-    [dispatch],
-  );
-  const deleteJSCollectionFromPage = useCallback(
-    (actionId: string, actionName: string) => {
-      dispatch(deleteJSCollection({ id: actionId, name: actionName }));
-      setConfirmDelete(false);
-    },
-    [dispatch, setConfirmDelete],
-  );
-
-  const menuPages = useSelector(getPageListAsOptions, equal);
-
-  const options = useMemo(() => {
-    const confirmDeletion = (value: boolean, event?: Event) => {
-      event?.preventDefault?.();
-      setConfirmDelete(value);
-    };
-
-    const renameOption = {
-      icon: "input-cursor-move" as IconName,
-      value: "rename",
-      onSelect: renameJS,
-      label: createMessage(CONTEXT_RENAME),
-      disabled: !isChangePermitted,
-    };
-
-    const copyOption = {
-      icon: "duplicate" as IconName,
-      value: "copy",
-      onSelect: noop,
-      label: createMessage(CONTEXT_COPY),
-      children: menuPages.map((page) => {
-        return {
-          ...page,
-          onSelect: () =>
-            copyJSCollectionToPage(jsCollection.id, jsCollection.name, page.id),
-        };
-      }),
-    };
-
-    const moveOption = {
-      icon: "swap-horizontal" as IconName,
-      value: "move",
-      onSelect: noop,
-      label: createMessage(CONTEXT_MOVE),
-      children:
-        menuPages.length > 1
-          ? menuPages
-              .filter((page) => page.id !== pageId) // Remove current page from the list
-              .map((page) => {
-                return {
-                  ...page,
-                  onSelect: () =>
-                    moveJSCollectionToPage(
-                      jsCollection.id,
-                      jsCollection.name,
-                      page.id,
-                    ),
-                };
-              })
-          : [{ value: "No Pages", onSelect: noop, label: "No Pages" }],
-    };
-
-    const prettifyOptions = {
-      value: "prettify",
-      icon: "code" as IconName,
-      subText: prettifyCodeKeyboardShortCut,
-      onSelect: () => {
-        const editorElement = document.querySelector(".CodeMirror");
-
-        if (
-          editorElement &&
-          "CodeMirror" in editorElement &&
-          editorElement.CodeMirror
-        ) {
-          const editor = editorElement.CodeMirror as CodeMirror.Editor;
-
-          autoIndentCode(editor);
-          dispatch(updateJSCollectionBody(editor.getValue(), jsCollection.id));
-          AnalyticsUtil.logEvent("PRETTIFY_CODE_MANUAL_TRIGGER");
-        }
-      },
-      label: "Prettify code",
-    };
-
-    const deleteOption = {
-      confirmDelete: confirmDelete,
-      icon: "delete-bin-line" as IconName,
-      value: "delete",
-      onSelect: (event?: Event): void => {
-        confirmDelete
-          ? deleteJSCollectionFromPage(jsCollection.id, jsCollection.name)
-          : confirmDeletion(true, event);
-      },
-      label: confirmDelete
-        ? createMessage(CONFIRM_CONTEXT_DELETE)
-        : createMessage(CONTEXT_DELETE),
-      className: "t--apiFormDeleteBtn error-menuitem",
-    };
-
-    const options: ContextMenuOption[] = [renameOption];
-
-    if (isChangePermitted) {
-      options.push(copyOption);
-      options.push(moveOption);
-      options.push(prettifyOptions);
-    }
-
-    if (isDeletePermitted) options.push(deleteOption);
-
-    return options;
-  }, [
-    confirmDelete,
-    copyJSCollectionToPage,
-    deleteJSCollectionFromPage,
-    dispatch,
-    isChangePermitted,
-    isDeletePermitted,
-    jsCollection.id,
-    jsCollection.name,
-    menuPages,
-    moveJSCollectionToPage,
-    pageId,
-    renameJS,
-    setConfirmDelete,
-  ]);
-
   return (
-    <JSEditorContextMenu
-      className="t--more-action-menu"
-      onMenuClose={cancelConfirmDelete}
-      options={options}
-    />
+    <EntityContextMenu>
+      <RenameMenuItem
+        disabled={!isChangePermitted}
+        entityId={jsCollection.id}
+      />
+      <Copy disabled={!isChangePermitted} jsAction={jsCollection} />
+      <Move disabled={!isChangePermitted} jsAction={jsCollection} />
+      <Prettify disabled={!isChangePermitted} jsAction={jsCollection} />
+      <MenuSeparator />
+      <Delete disabled={!isDeletePermitted} jsAction={jsCollection} />
+    </EntityContextMenu>
   );
 }
 
diff --git a/app/client/src/pages/Editor/JSEditor/ContextMenuItems/Copy.tsx b/app/client/src/pages/Editor/JSEditor/ContextMenuItems/Copy.tsx
new file mode 100644
index 000000000000..3150111a9c0b
--- /dev/null
+++ b/app/client/src/pages/Editor/JSEditor/ContextMenuItems/Copy.tsx
@@ -0,0 +1,51 @@
+import React from "react";
+import { MenuSub, MenuSubContent, MenuSubTrigger } from "@appsmith/ads";
+import { useDispatch, useSelector } from "react-redux";
+import { getPageList } from "selectors/editorSelectors";
+import { PageMenuItem } from "./PageMenuItem";
+import { useCallback } from "react";
+import { CONTEXT_COPY, createMessage } from "ee/constants/messages";
+import { copyJSCollectionRequest } from "actions/jsActionActions";
+import type { JSCollection } from "entities/JSCollection";
+
+interface Props {
+  jsAction: JSCollection;
+  disabled?: boolean;
+}
+
+export const Copy = ({ disabled, jsAction }: Props) => {
+  const menuPages = useSelector(getPageList);
+  const dispatch = useDispatch();
+
+  const copyJSActionToPage = useCallback(
+    (pageId: string) =>
+      dispatch(
+        copyJSCollectionRequest({
+          id: jsAction.id,
+          destinationPageId: pageId,
+          name: jsAction.name,
+        }),
+      ),
+    [jsAction.id, jsAction.name, dispatch],
+  );
+
+  return (
+    <MenuSub>
+      <MenuSubTrigger startIcon="duplicate">
+        {createMessage(CONTEXT_COPY)}
+      </MenuSubTrigger>
+      <MenuSubContent style={{ maxHeight: "350px" }} width="220px">
+        {menuPages.map((page) => {
+          return (
+            <PageMenuItem
+              disabled={disabled}
+              key={page.basePageId}
+              onSelect={copyJSActionToPage}
+              page={page}
+            />
+          );
+        })}
+      </MenuSubContent>
+    </MenuSub>
+  );
+};
diff --git a/app/client/src/pages/Editor/JSEditor/ContextMenuItems/Delete.tsx b/app/client/src/pages/Editor/JSEditor/ContextMenuItems/Delete.tsx
new file mode 100644
index 000000000000..e2d481884839
--- /dev/null
+++ b/app/client/src/pages/Editor/JSEditor/ContextMenuItems/Delete.tsx
@@ -0,0 +1,56 @@
+import React, { useCallback, useState } from "react";
+import {
+  CONFIRM_CONTEXT_DELETE,
+  CONTEXT_DELETE,
+  createMessage,
+} from "ee/constants/messages";
+import { MenuItem } from "@appsmith/ads";
+import { useDispatch } from "react-redux";
+import { deleteJSCollection } from "actions/jsActionActions";
+import type { JSCollection } from "entities/JSCollection";
+
+interface Props {
+  jsAction: JSCollection;
+  disabled?: boolean;
+  deleteJSAction?: () => void;
+}
+
+export const Delete = ({ deleteJSAction, disabled, jsAction }: Props) => {
+  const dispatch = useDispatch();
+  const [confirmDelete, setConfirmDelete] = useState(false);
+
+  const handleDeleteClick = useCallback(() => {
+    jsAction.isPublic && deleteJSAction
+      ? deleteJSAction()
+      : dispatch(
+          deleteJSCollection({
+            id: jsAction?.id ?? "",
+            name: jsAction?.name ?? "",
+          }),
+        );
+  }, [jsAction.id, jsAction.name, jsAction.isPublic, deleteJSAction, dispatch]);
+
+  const handleSelect = useCallback(
+    (e?: Event) => {
+      e?.preventDefault();
+      confirmDelete ? handleDeleteClick() : setConfirmDelete(true);
+      e?.stopPropagation();
+    },
+    [confirmDelete, handleDeleteClick],
+  );
+
+  const menuLabel = confirmDelete
+    ? createMessage(CONFIRM_CONTEXT_DELETE)
+    : createMessage(CONTEXT_DELETE);
+
+  return (
+    <MenuItem
+      className="t--apiFormDeleteBtn single-select error-menuitem"
+      disabled={disabled}
+      onSelect={handleSelect}
+      startIcon="trash"
+    >
+      {menuLabel}
+    </MenuItem>
+  );
+};
diff --git a/app/client/src/pages/Editor/JSEditor/ContextMenuItems/Move.tsx b/app/client/src/pages/Editor/JSEditor/ContextMenuItems/Move.tsx
new file mode 100644
index 000000000000..2ef91ee55861
--- /dev/null
+++ b/app/client/src/pages/Editor/JSEditor/ContextMenuItems/Move.tsx
@@ -0,0 +1,65 @@
+import { useDispatch, useSelector } from "react-redux";
+import { getCurrentPageId } from "selectors/editorSelectors";
+import { getPageList } from "ee/selectors/entitiesSelector";
+import React, { useCallback, useMemo } from "react";
+import {
+  MenuItem,
+  MenuSub,
+  MenuSubContent,
+  MenuSubTrigger,
+} from "@appsmith/ads";
+import { CONTEXT_MOVE, createMessage } from "ee/constants/messages";
+import { PageMenuItem } from "./PageMenuItem";
+import { moveJSCollectionRequest } from "actions/jsActionActions";
+import type { JSCollection } from "entities/JSCollection";
+
+interface Props {
+  jsAction: JSCollection;
+  disabled?: boolean;
+}
+
+export const Move = ({ disabled, jsAction }: Props) => {
+  const dispatch = useDispatch();
+
+  const currentPageId = useSelector(getCurrentPageId);
+  const allPages = useSelector(getPageList);
+  const menuPages = useMemo(() => {
+    return allPages.filter((page) => page.pageId !== currentPageId);
+  }, [allPages, currentPageId]);
+
+  const moveJSActionToPage = useCallback(
+    (destinationPageId: string) =>
+      dispatch(
+        moveJSCollectionRequest({
+          id: jsAction.id,
+          destinationPageId,
+          name: jsAction.name,
+        }),
+      ),
+    [dispatch, jsAction.id, jsAction.name],
+  );
+
+  return (
+    <MenuSub>
+      <MenuSubTrigger startIcon="swap-horizontal">
+        {createMessage(CONTEXT_MOVE)}
+      </MenuSubTrigger>
+      <MenuSubContent style={{ maxHeight: "350px" }} width="220px">
+        {menuPages.length ? (
+          menuPages.map((page) => {
+            return (
+              <PageMenuItem
+                disabled={disabled}
+                key={page.basePageId}
+                onSelect={moveJSActionToPage}
+                page={page}
+              />
+            );
+          })
+        ) : (
+          <MenuItem key="no-pages">No pages</MenuItem>
+        )}
+      </MenuSubContent>
+    </MenuSub>
+  );
+};
diff --git a/app/client/src/pages/Editor/JSEditor/ContextMenuItems/PageMenuItem.tsx b/app/client/src/pages/Editor/JSEditor/ContextMenuItems/PageMenuItem.tsx
new file mode 100644
index 000000000000..2aec776f4ba5
--- /dev/null
+++ b/app/client/src/pages/Editor/JSEditor/ContextMenuItems/PageMenuItem.tsx
@@ -0,0 +1,19 @@
+import type { Page } from "entities/Page";
+import React, { useCallback } from "react";
+import { MenuItem } from "@appsmith/ads";
+
+export const PageMenuItem = (props: {
+  page: Page;
+  onSelect: (id: string) => void;
+  disabled?: boolean;
+}) => {
+  const handleOnSelect = useCallback(() => {
+    props.onSelect(props.page.pageId);
+  }, [props]);
+
+  return (
+    <MenuItem disabled={props.disabled} onSelect={handleOnSelect}>
+      {props.page.pageName}
+    </MenuItem>
+  );
+};
diff --git a/app/client/src/pages/Editor/JSEditor/ContextMenuItems/Prettify.tsx b/app/client/src/pages/Editor/JSEditor/ContextMenuItems/Prettify.tsx
new file mode 100644
index 000000000000..606425a53562
--- /dev/null
+++ b/app/client/src/pages/Editor/JSEditor/ContextMenuItems/Prettify.tsx
@@ -0,0 +1,50 @@
+import React, { useCallback } from "react";
+import { MenuItem, Text } from "@appsmith/ads";
+import { useDispatch } from "react-redux";
+import type { JSCollection } from "entities/JSCollection";
+import { updateJSCollectionBody } from "actions/jsPaneActions";
+import {
+  autoIndentCode,
+  getAutoIndentShortcutKeyText,
+} from "components/editorComponents/CodeEditor/utils/autoIndentUtils";
+import AnalyticsUtil from "ee/utils/AnalyticsUtil";
+
+interface Props {
+  jsAction: JSCollection;
+  disabled?: boolean;
+}
+
+const prettifyCodeKeyboardShortCut = getAutoIndentShortcutKeyText();
+
+export const Prettify = ({ disabled, jsAction }: Props) => {
+  const dispatch = useDispatch();
+
+  const handleSelect = useCallback(() => {
+    const editorElement = document.querySelector(".CodeMirror");
+
+    if (
+      editorElement &&
+      "CodeMirror" in editorElement &&
+      editorElement.CodeMirror
+    ) {
+      const editor = editorElement.CodeMirror as CodeMirror.Editor;
+
+      autoIndentCode(editor);
+      dispatch(updateJSCollectionBody(editor.getValue(), jsAction.id));
+      AnalyticsUtil.logEvent("PRETTIFY_CODE_MANUAL_TRIGGER");
+    }
+  }, [jsAction.id, jsAction.name]);
+
+  return (
+    <MenuItem disabled={disabled} onSelect={handleSelect} startIcon="code">
+      <Text color={"var(--ads-v2-color-fg)"}>Prettify code</Text>
+      <Text
+        color={"var(--ads-v2-color-fg-muted)"}
+        kind="body-s"
+        style={{ marginLeft: "7px" }}
+      >
+        {prettifyCodeKeyboardShortCut}
+      </Text>
+    </MenuItem>
+  );
+};
diff --git a/app/client/src/pages/Editor/JSEditor/ContextMenuItems/Rename.tsx b/app/client/src/pages/Editor/JSEditor/ContextMenuItems/Rename.tsx
new file mode 100644
index 000000000000..60e8131fe0d5
--- /dev/null
+++ b/app/client/src/pages/Editor/JSEditor/ContextMenuItems/Rename.tsx
@@ -0,0 +1,32 @@
+import React, { useCallback } from "react";
+import { MenuItem } from "@appsmith/ads";
+import { useDispatch } from "react-redux";
+import { initExplorerEntityNameEdit } from "actions/explorerActions";
+import { CONTEXT_RENAME, createMessage } from "ee/constants/messages";
+import type { JSCollection } from "entities/JSCollection";
+
+interface Props {
+  jsAction: JSCollection;
+  disabled?: boolean;
+}
+
+export const Rename = ({ disabled, jsAction }: Props) => {
+  const dispatch = useDispatch();
+
+  const setRename = useCallback(() => {
+    // We add a delay to avoid having the focus stuck in the menu trigger
+    setTimeout(() => {
+      dispatch(initExplorerEntityNameEdit(jsAction.id));
+    }, 100);
+  }, [dispatch, jsAction.id]);
+
+  return (
+    <MenuItem
+      disabled={disabled}
+      onSelect={setRename}
+      startIcon="input-cursor-move"
+    >
+      {createMessage(CONTEXT_RENAME)}
+    </MenuItem>
+  );
+};
diff --git a/app/client/src/pages/Editor/JSEditor/ContextMenuItems/ShowBindings.tsx b/app/client/src/pages/Editor/JSEditor/ContextMenuItems/ShowBindings.tsx
new file mode 100644
index 000000000000..5a71e80848e8
--- /dev/null
+++ b/app/client/src/pages/Editor/JSEditor/ContextMenuItems/ShowBindings.tsx
@@ -0,0 +1,38 @@
+import React, { useCallback } from "react";
+import { CONTEXT_SHOW_BINDING, createMessage } from "ee/constants/messages";
+import { MenuItem } from "@appsmith/ads";
+import { useDispatch } from "react-redux";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
+import { ENTITY_TYPE } from "ee/entities/AppsmithConsole/utils";
+import type { JSCollection } from "entities/JSCollection";
+
+interface Props {
+  jsAction: JSCollection;
+  disabled?: boolean;
+}
+
+export const ShowBindings = ({ disabled, jsAction }: Props) => {
+  const dispatch = useDispatch();
+
+  const handleSelect = useCallback(() => {
+    dispatch({
+      type: ReduxActionTypes.SET_ENTITY_INFO,
+      payload: {
+        entityId: jsAction.id,
+        entityName: jsAction.name,
+        entityType: ENTITY_TYPE.JSACTION,
+        show: true,
+      },
+    });
+  }, [jsAction.id, jsAction.name]);
+
+  return (
+    <MenuItem
+      disabled={disabled}
+      onSelect={handleSelect}
+      startIcon="binding-new"
+    >
+      {createMessage(CONTEXT_SHOW_BINDING)}
+    </MenuItem>
+  );
+};
diff --git a/app/client/src/pages/Editor/JSEditor/ContextMenuItems/index.tsx b/app/client/src/pages/Editor/JSEditor/ContextMenuItems/index.tsx
new file mode 100644
index 000000000000..9d7cf3e78950
--- /dev/null
+++ b/app/client/src/pages/Editor/JSEditor/ContextMenuItems/index.tsx
@@ -0,0 +1,6 @@
+export { Copy } from "./Copy";
+export { Move } from "./Move";
+export { Delete } from "./Delete";
+export { Rename } from "./Rename";
+export { ShowBindings } from "./ShowBindings";
+export { Prettify } from "./Prettify";
diff --git a/app/client/src/pages/Editor/JSEditor/JSEditorContextMenu.tsx b/app/client/src/pages/Editor/JSEditor/JSEditorContextMenu.tsx
deleted file mode 100644
index 27fc6be61268..000000000000
--- a/app/client/src/pages/Editor/JSEditor/JSEditorContextMenu.tsx
+++ /dev/null
@@ -1,116 +0,0 @@
-import React from "react";
-import type { IconName } from "@blueprintjs/icons";
-
-import {
-  Button,
-  Menu,
-  MenuContent,
-  MenuItem,
-  MenuSub,
-  MenuSubContent,
-  MenuSubTrigger,
-  MenuTrigger,
-  Text,
-} from "@appsmith/ads";
-
-export interface ContextMenuOption {
-  id?: string;
-  icon: IconName;
-  value: string;
-  onSelect?: (event?: Event) => void;
-  label: string;
-  subText?: string;
-  className?: string;
-  children?: Omit<ContextMenuOption, "children" | "icon">[];
-}
-
-interface EntityContextMenuProps {
-  className?: string;
-  options: ContextMenuOption[];
-  onMenuClose: (() => void) | undefined;
-}
-
-export function JSEditorContextMenu({
-  className,
-  onMenuClose,
-  options,
-}: EntityContextMenuProps) {
-  if (options.length === 0) {
-    return null;
-  }
-
-  return (
-    <Menu
-      className={className}
-      onOpenChange={(open) => {
-        if (!open) {
-          onMenuClose?.();
-        }
-      }}
-    >
-      <MenuTrigger>
-        <Button
-          data-testid="t--more-action-trigger"
-          isIconButton
-          kind="tertiary"
-          size={"sm"}
-          startIcon={"more-2-fill"}
-        />
-      </MenuTrigger>
-      <MenuContent align="end" avoidCollisions>
-        {options.map((option, index) => {
-          if (option.children) {
-            return (
-              <MenuSub key={index}>
-                <MenuSubTrigger startIcon={option.icon}>
-                  {option.label}
-                </MenuSubTrigger>
-                <MenuSubContent>
-                  {option.children.map((children) => (
-                    <MenuItem key={children.value} onSelect={children.onSelect}>
-                      {children.label}
-                    </MenuItem>
-                  ))}
-                </MenuSubContent>
-              </MenuSub>
-            );
-          }
-
-          return (
-            <MenuItem
-              className={option?.className}
-              key={option.value}
-              // TODO: Fix this the next time the file is edited
-              // eslint-disable-next-line @typescript-eslint/no-explicit-any
-              onSelect={option.onSelect as any}
-              startIcon={option.icon}
-            >
-              <div>
-                <Text
-                  color={
-                    option?.value === "delete"
-                      ? "var(--ads-v2-color-fg-error)"
-                      : "var(--ads-v2-color-fg)"
-                  }
-                >
-                  {option.label}
-                </Text>
-                {option.subText && (
-                  <Text
-                    color={"var(--ads-v2-color-fg-muted)"}
-                    kind="body-s"
-                    style={{ marginLeft: "7px" }}
-                  >
-                    {option.subText}
-                  </Text>
-                )}
-              </div>
-            </MenuItem>
-          );
-        })}
-      </MenuContent>
-    </Menu>
-  );
-}
-
-export default JSEditorContextMenu;
diff --git a/app/client/src/pages/Editor/JSEditor/index.tsx b/app/client/src/pages/Editor/JSEditor/index.tsx
index 6fcd8956119b..220e58e21394 100644
--- a/app/client/src/pages/Editor/JSEditor/index.tsx
+++ b/app/client/src/pages/Editor/JSEditor/index.tsx
@@ -3,10 +3,7 @@ import type { RouteComponentProps } from "react-router";
 import { useDispatch, useSelector } from "react-redux";
 import JsEditorForm from "./Form";
 import * as Sentry from "@sentry/react";
-import {
-  getCurrentPageId,
-  getJSCollectionDataByBaseId,
-} from "selectors/editorSelectors";
+import { getJSCollectionDataByBaseId } from "selectors/editorSelectors";
 import CenteredWrapper from "components/designSystems/appsmith/CenteredWrapper";
 import Spinner from "components/editorComponents/Spinner";
 import styled from "styled-components";
@@ -27,7 +24,6 @@ type Props = RouteComponentProps<{
 
 function JSEditor(props: Props) {
   const { baseCollectionId } = props.match.params;
-  const pageId = useSelector(getCurrentPageId);
   const dispatch = useDispatch();
   const jsCollectionData = useSelector((state) =>
     getJSCollectionDataByBaseId(state, baseCollectionId),
@@ -40,10 +36,8 @@ function JSEditor(props: Props) {
       return null;
     }
 
-    return (
-      <AppJSEditorContextMenu jsCollection={jsCollection} pageId={pageId} />
-    );
-  }, [jsCollection, pageId]);
+    return <AppJSEditorContextMenu jsCollection={jsCollection} />;
+  }, [jsCollection]);
 
   if (isCreating) {
     return (
diff --git a/app/client/src/pages/Editor/WidgetsEditorEntityExplorer.tsx b/app/client/src/pages/Editor/WidgetsEditorEntityExplorer.tsx
deleted file mode 100644
index 7826c0a6fac0..000000000000
--- a/app/client/src/pages/Editor/WidgetsEditorEntityExplorer.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import React from "react";
-import { useSelector } from "react-redux";
-
-import EntityProperties from "./Explorer/Entity/EntityProperties";
-import Explorer from "./Explorer";
-import OnboardingStatusbar from "./FirstTimeUserOnboarding/Statusbar";
-import Pages from "./Explorer/Pages";
-import EntityExplorerSidebar from "components/editorComponents/EntityExplorerSidebar";
-import { getIsFirstTimeUserOnboardingEnabled } from "selectors/onboardingSelectors";
-
-function WidgetsEditorEntityExplorer() {
-  const enableFirstTimeUserOnboarding = useSelector(
-    getIsFirstTimeUserOnboardingEnabled,
-  );
-
-  return (
-    <EntityExplorerSidebar>
-      {enableFirstTimeUserOnboarding && <OnboardingStatusbar />}
-      {/* PagesContainer */}
-      <Pages />
-      {/* Popover that contains the bindings info */}
-      <EntityProperties />
-      {/* Contains entity explorer & widgets library along with a switcher*/}
-      <Explorer />
-    </EntityExplorerSidebar>
-  );
-}
-
-export default WidgetsEditorEntityExplorer;
diff --git a/app/client/src/reducers/uiReducers/appSettingsPaneReducer.ts b/app/client/src/reducers/uiReducers/appSettingsPaneReducer.ts
index c49045b8bfcd..17689a2b4cf3 100644
--- a/app/client/src/reducers/uiReducers/appSettingsPaneReducer.ts
+++ b/app/client/src/reducers/uiReducers/appSettingsPaneReducer.ts
@@ -11,25 +11,6 @@ const initialState: AppSettingsPaneReduxState = {
 };
 
 const appSettingsPaneReducer = createReducer(initialState, {
-  [ReduxActionTypes.OPEN_APP_SETTINGS_PANE]: (
-    state: AppSettingsPaneReduxState,
-    action: ReduxAction<AppSettingsPaneContext>,
-  ): AppSettingsPaneReduxState => {
-    return {
-      ...state,
-      isOpen: true,
-      context: action.payload,
-    };
-  },
-  [ReduxActionTypes.CLOSE_APP_SETTINGS_PANE]: (
-    state: AppSettingsPaneReduxState,
-  ): AppSettingsPaneReduxState => {
-    return {
-      ...state,
-      isOpen: false,
-      context: undefined,
-    };
-  },
   [ReduxActionTypes.UPDATE_APP_SETTINGS_PANE_SELECTED_TAB]: (
     state: AppSettingsPaneReduxState,
     action: ReduxAction<AppSettingsPaneReduxState>,
diff --git a/app/client/src/reducers/uiReducers/onBoardingReducer.ts b/app/client/src/reducers/uiReducers/onBoardingReducer.ts
index 7f3c295713ac..41be43fdbac1 100644
--- a/app/client/src/reducers/uiReducers/onBoardingReducer.ts
+++ b/app/client/src/reducers/uiReducers/onBoardingReducer.ts
@@ -77,26 +77,6 @@ const onboardingReducer = createReducer(initialState, {
   ) => {
     return { ...state, forceOpenWidgetPanel: action.payload };
   },
-  [ReduxActionTypes.SIGNPOSTING_STEP_UPDATE]: (
-    state: OnboardingState,
-    action: ReduxAction<StepState>,
-  ) => {
-    const index = state.stepState.findIndex(
-      (stepState) => stepState.step === action.payload.step,
-    );
-    const newArray = [...state.stepState];
-
-    if (index >= 0) {
-      newArray[index] = action.payload;
-    } else {
-      newArray.push(action.payload);
-    }
-
-    return {
-      ...state,
-      stepState: newArray,
-    };
-  },
   [ReduxActionTypes.SIGNPOSTING_MARK_ALL_READ]: (state: OnboardingState) => {
     return {
       ...state,
diff --git a/app/client/src/sagas/ActionSagas.ts b/app/client/src/sagas/ActionSagas.ts
index 5f6b224f259b..274faa639cc6 100644
--- a/app/client/src/sagas/ActionSagas.ts
+++ b/app/client/src/sagas/ActionSagas.ts
@@ -1062,6 +1062,7 @@ function* handleMoveOrCopySaga(actionPayload: ReduxAction<Action>) {
   const isApi = pluginType === PluginType.API;
   const isQuery = pluginType === PluginType.DB;
   const isSaas = pluginType === PluginType.SAAS;
+  const isInternal = pluginType === PluginType.INTERNAL;
   const { parentEntityId } = resolveParentEntityMetadata(actionPayload.payload);
 
   if (!parentEntityId) return;
@@ -1080,7 +1081,7 @@ function* handleMoveOrCopySaga(actionPayload: ReduxAction<Action>) {
     );
   }
 
-  if (isQuery) {
+  if (isQuery || isInternal) {
     history.push(
       queryEditorIdURL({
         baseParentEntityId,
diff --git a/app/client/src/sagas/OnboardingSagas.ts b/app/client/src/sagas/OnboardingSagas.ts
index 3e8389329478..8e9c8b84e6c0 100644
--- a/app/client/src/sagas/OnboardingSagas.ts
+++ b/app/client/src/sagas/OnboardingSagas.ts
@@ -22,13 +22,10 @@ import {
 import { getCurrentUser } from "selectors/usersSelectors";
 import history from "utils/history";
 
-import { getSignpostingStepStateByStep } from "selectors/onboardingSelectors";
 import {
   disableStartSignpostingAction,
   removeFirstTimeUserOnboardingApplicationId as removeFirstTimeUserOnboardingApplicationIdAction,
   setSignpostingOverlay,
-  showSignpostingTooltip,
-  signpostingStepUpdate,
 } from "actions/onboardingActions";
 import {
   getCurrentApplicationId,
@@ -37,11 +34,7 @@ import {
 import AnalyticsUtil from "ee/utils/AnalyticsUtil";
 import type { User } from "constants/userConstants";
 import { builderURL } from "ee/RouteBuilder";
-import type { SIGNPOSTING_STEP } from "pages/Editor/FirstTimeUserOnboarding/Utils";
-import type { StepState } from "reducers/uiReducers/onBoardingReducer";
-import { isUndefined } from "lodash";
 import { isAirgapped } from "ee/utils/airgapHelpers";
-import { SIGNPOSTING_ANALYTICS_STEP_NAME } from "pages/Editor/FirstTimeUserOnboarding/constants";
 
 // Signposting sagas
 function* setFirstTimeUserOnboardingApplicationId(action: ReduxAction<string>) {
@@ -150,42 +143,6 @@ function* disableStartFirstTimeUserOnboardingSaga() {
   yield call(setEnableStartSignposting, false);
 }
 
-function* setSignpostingStepStateSaga(
-  action: ReduxAction<{ step: SIGNPOSTING_STEP; completed: boolean }>,
-) {
-  const { completed, step } = action.payload;
-  const stepState: StepState | undefined = yield select(
-    getSignpostingStepStateByStep,
-    step,
-  );
-
-  // No changes to update so we ignore
-  if (stepState && stepState.completed === completed) return;
-
-  const readProps = completed
-    ? {
-        read: false,
-      }
-    : {};
-
-  yield put(
-    signpostingStepUpdate({
-      ...action.payload,
-      ...readProps,
-    }),
-  );
-
-  // Show tooltip when a step is completed
-  if (!isUndefined(readProps.read) && !readProps.read) {
-    // Show tooltip after a small delay to not be abrupt
-    yield delay(1000);
-    AnalyticsUtil.logEvent("SIGNPOSTING_STEP_COMPLETE", {
-      step_name: SIGNPOSTING_ANALYTICS_STEP_NAME[step],
-    });
-    yield put(showSignpostingTooltip(true));
-  }
-}
-
 export default function* onboardingActionSagas() {
   yield all([
     takeLatest(
@@ -216,9 +173,5 @@ export default function* onboardingActionSagas() {
       ReduxActionTypes.DISABLE_START_SIGNPOSTING,
       disableStartFirstTimeUserOnboardingSaga,
     ),
-    takeLatest(
-      ReduxActionTypes.SIGNPOSTING_STEP_UPDATE_INIT,
-      setSignpostingStepStateSaga,
-    ),
   ]);
 }
diff --git a/app/client/src/widgets/TableWidgetV2/widget/reactTableUtils/transformDataPureFn.tsx b/app/client/src/widgets/TableWidgetV2/widget/reactTableUtils/transformDataPureFn.tsx
index 1454694ce8b3..ff2200f4857d 100644
--- a/app/client/src/widgets/TableWidgetV2/widget/reactTableUtils/transformDataPureFn.tsx
+++ b/app/client/src/widgets/TableWidgetV2/widget/reactTableUtils/transformDataPureFn.tsx
@@ -16,9 +16,7 @@ export const transformDataPureFn = (
 ): tableData => {
   if (isArray(tableData)) {
     return tableData.map((row, rowIndex) => {
-      // TODO: Fix this the next time the file is edited
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const newRow: { [key: string]: any } = {};
+      const newRow: { [key: string]: unknown } = {};
 
       columns.forEach((column) => {
         const { alias } = column;
diff --git a/app/client/src/widgets/TableWidgetV2/widget/utilities.ts b/app/client/src/widgets/TableWidgetV2/widget/utilities.ts
index 502c8527779a..13e8e8d12d29 100644
--- a/app/client/src/widgets/TableWidgetV2/widget/utilities.ts
+++ b/app/client/src/widgets/TableWidgetV2/widget/utilities.ts
@@ -210,9 +210,9 @@ export function getDefaultColumnProperties(
     isDiscardVisible: true,
     computedValue: isDerived
       ? ""
-      : `{{${widgetName}.processedTableData.map((currentRow, currentIndex) => ( currentRow["${escapeString(
+      : `{{${widgetName}.processedTableData.map((currentRow, currentIndex) => { try { return ( currentRow["${escapeString(
           id,
-        )}"]))}}`,
+        )}"]); } catch (e) { return null; }})}}`,
     sticky: StickyType.NONE,
     validation: {},
     currencyCode: "USD",
diff --git a/app/server/appsmith-git/src/main/java/com/appsmith/git/files/FileUtilsCEImpl.java b/app/server/appsmith-git/src/main/java/com/appsmith/git/files/FileUtilsCEImpl.java
index 7d68aaf19e50..8b92efa2fb0b 100644
--- a/app/server/appsmith-git/src/main/java/com/appsmith/git/files/FileUtilsCEImpl.java
+++ b/app/server/appsmith-git/src/main/java/com/appsmith/git/files/FileUtilsCEImpl.java
@@ -63,11 +63,13 @@
 import static com.appsmith.external.git.constants.GitConstants.ACTION_COLLECTION_LIST;
 import static com.appsmith.external.git.constants.GitConstants.ACTION_LIST;
 import static com.appsmith.external.git.constants.GitConstants.CUSTOM_JS_LIB_LIST;
+import static com.appsmith.external.git.constants.GitConstants.GitMetricConstants.ACTION_COLLECTION_BODY;
+import static com.appsmith.external.git.constants.GitConstants.GitMetricConstants.NEW_ACTION_BODY;
+import static com.appsmith.external.git.constants.GitConstants.GitMetricConstants.RESOURCE_TYPE;
 import static com.appsmith.external.git.constants.GitConstants.NAME_SEPARATOR;
 import static com.appsmith.external.git.constants.GitConstants.PAGE_LIST;
-import static com.appsmith.external.git.constants.ce.GitConstantsCE.GitMetricConstantsCE.ACTION_COLLECTION_BODY;
-import static com.appsmith.external.git.constants.ce.GitConstantsCE.GitMetricConstantsCE.NEW_ACTION_BODY;
-import static com.appsmith.external.git.constants.ce.GitConstantsCE.GitMetricConstantsCE.RESOURCE_TYPE;
+import static com.appsmith.external.git.constants.GitConstants.README_FILE_NAME;
+import static com.appsmith.git.constants.CommonConstants.JSON_EXTENSION;
 import static com.appsmith.git.constants.GitDirectories.ACTION_COLLECTION_DIRECTORY;
 import static com.appsmith.git.constants.GitDirectories.ACTION_DIRECTORY;
 import static com.appsmith.git.constants.GitDirectories.DATASOURCE_DIRECTORY;
@@ -265,7 +267,8 @@ protected Set<String> getExistingFilesInRepo(Path baseRepo) throws IOException {
         try (Stream<Path> stream = Files.walk(baseRepo).parallel()) {
             return stream.filter(path -> {
                         try {
-                            return Files.isRegularFile(path) || FileUtils.isEmptyDirectory(path.toFile());
+                            return !path.toString().contains(".git" + File.separator)
+                                    && (Files.isRegularFile(path) || FileUtils.isEmptyDirectory(path.toFile()));
                         } catch (IOException e) {
                             log.error("Unable to find file details. Please check the file at file path: {}", path);
                             log.error("Assuming that it does not exist for now ...");
@@ -291,7 +294,7 @@ protected Set<String> updateEntitiesInRepo(GitResourceMap gitResourceMap, Path b
         // Remove all files that need to be serialized from the existing files list, as well as the README file
         // What we are left with are all the files to be deleted
         filesInRepo.removeAll(updatedFilesToBeSerialized);
-        filesInRepo.remove("README.md");
+        filesInRepo.remove(README_FILE_NAME);
 
         // Delete all the files because they are no longer needed
         // This covers both older structures of storing files and,
@@ -345,15 +348,13 @@ protected Set<String> updateEntitiesInRepo(ApplicationGitReference applicationGi
         // Save application
         saveResource(
                 applicationGitReference.getApplication(),
-                baseRepo.resolve(CommonConstants.APPLICATION + CommonConstants.JSON_EXTENSION));
+                baseRepo.resolve(CommonConstants.APPLICATION + JSON_EXTENSION));
 
         // Save application metadata
         fileOperations.saveMetadataResource(applicationGitReference, baseRepo);
 
         // Save application theme
-        saveResource(
-                applicationGitReference.getTheme(),
-                baseRepo.resolve(CommonConstants.THEME + CommonConstants.JSON_EXTENSION));
+        saveResource(applicationGitReference.getTheme(), baseRepo.resolve(CommonConstants.THEME + JSON_EXTENSION));
 
         // Save pages
         Path pageDirectory = baseRepo.resolve(PAGE_DIRECTORY);
@@ -369,9 +370,7 @@ protected Set<String> updateEntitiesInRepo(ApplicationGitReference applicationGi
                     modifiedResources != null && modifiedResources.isResourceUpdated(PAGE_LIST, pageName);
             if (Boolean.TRUE.equals(isResourceUpdated)) {
                 // Save page metadata
-                saveResource(
-                        pageResource.getValue(),
-                        pageSpecificDirectory.resolve(pageName + CommonConstants.JSON_EXTENSION));
+                saveResource(pageResource.getValue(), pageSpecificDirectory.resolve(pageName + JSON_EXTENSION));
                 Map<String, JSONObject> result = DSLTransformerHelper.flatten(
                         new JSONObject(applicationGitReference.getPageDsl().get(pageName)));
                 result.keySet().parallelStream().forEach(key -> {
@@ -390,8 +389,7 @@ protected Set<String> updateEntitiesInRepo(ApplicationGitReference applicationGi
                         pageSpecificDirectory.resolve(CommonConstants.WIDGETS).toFile(), validWidgetToParentMap);
 
                 // Remove the canvas.json from the file system since the value is stored in the page.json
-                fileOperations.deleteFile(
-                        pageSpecificDirectory.resolve(CommonConstants.CANVAS + CommonConstants.JSON_EXTENSION));
+                fileOperations.deleteFile(pageSpecificDirectory.resolve(CommonConstants.CANVAS + JSON_EXTENSION));
             }
             validPages.add(pageName);
         }
@@ -416,7 +414,7 @@ protected Set<String> updateEntitiesInRepo(ApplicationGitReference applicationGi
                 String uidString = jsLibEntry.getKey();
                 boolean isResourceUpdated = modifiedResources.isResourceUpdated(CUSTOM_JS_LIB_LIST, uidString);
 
-                String fileNameWithExtension = getJsLibFileName(uidString) + CommonConstants.JSON_EXTENSION;
+                String fileNameWithExtension = getJsLibFileName(uidString) + JSON_EXTENSION;
 
                 Path jsLibSpecificFile = jsLibDirectory.resolve(fileNameWithExtension);
                 if (isResourceUpdated) {
@@ -463,9 +461,8 @@ protected Set<String> updateEntitiesInRepo(ApplicationGitReference applicationGi
                             queryName,
                             actionSpecificDirectory.resolve(queryName));
                     // Delete the resource from the old file structure v2
-                    fileOperations.deleteFile(pageSpecificDirectory
-                            .resolve(ACTION_DIRECTORY)
-                            .resolve(queryName + CommonConstants.JSON_EXTENSION));
+                    fileOperations.deleteFile(
+                            pageSpecificDirectory.resolve(ACTION_DIRECTORY).resolve(queryName + JSON_EXTENSION));
                 }
             }
         });
@@ -504,8 +501,8 @@ protected Set<String> updateEntitiesInRepo(ApplicationGitReference applicationGi
                                     actionCollectionName,
                                     actionCollectionSpecificDirectory.resolve(actionCollectionName));
                             // Delete the resource from the old file structure v2
-                            fileOperations.deleteFile(actionCollectionSpecificDirectory.resolve(
-                                    actionCollectionName + CommonConstants.JSON_EXTENSION));
+                            fileOperations.deleteFile(
+                                    actionCollectionSpecificDirectory.resolve(actionCollectionName + JSON_EXTENSION));
                         }
                     }
                 });
@@ -522,8 +519,8 @@ protected Set<String> updateEntitiesInRepo(ApplicationGitReference applicationGi
                 applicationGitReference.getDatasources().entrySet()) {
             saveResource(
                     resource.getValue(),
-                    baseRepo.resolve(DATASOURCE_DIRECTORY).resolve(resource.getKey() + CommonConstants.JSON_EXTENSION));
-            validDatasourceFileNames.add(resource.getKey() + CommonConstants.JSON_EXTENSION);
+                    baseRepo.resolve(DATASOURCE_DIRECTORY).resolve(resource.getKey() + JSON_EXTENSION));
+            validDatasourceFileNames.add(resource.getKey() + JSON_EXTENSION);
         }
         // Scan datasource directory and delete any unwanted files if present
         if (!applicationGitReference.getDatasources().isEmpty()) {
@@ -594,7 +591,7 @@ private boolean saveActionCollection(Object sourceEntity, String body, String re
             }
 
             // Write metadata for the jsObject
-            Path metadataPath = path.resolve(CommonConstants.METADATA + CommonConstants.JSON_EXTENSION);
+            Path metadataPath = path.resolve(CommonConstants.METADATA + JSON_EXTENSION);
             return fileOperations.writeToFile(sourceEntity, metadataPath);
         } catch (IOException e) {
             log.debug(e.getMessage());
@@ -630,7 +627,7 @@ private boolean saveActions(Object sourceEntity, String body, String resourceNam
             }
 
             // Write metadata for the actions
-            Path metadataPath = path.resolve(CommonConstants.METADATA + CommonConstants.JSON_EXTENSION);
+            Path metadataPath = path.resolve(CommonConstants.METADATA + JSON_EXTENSION);
             return fileOperations.writeToFile(sourceEntity, metadataPath);
         } catch (IOException e) {
             log.error("Error while reading file {} with message {} with cause", path, e.getMessage(), e.getCause());
@@ -769,9 +766,8 @@ private Map<String, Object> readActionCollection(
                 if (resourcePath.toFile().exists()) {
                     body = fileOperations.readFileAsString(resourcePath);
                 }
-                Object file = fileOperations.readFile(directoryPath
-                        .resolve(resourceName)
-                        .resolve(CommonConstants.METADATA + CommonConstants.JSON_EXTENSION));
+                Object file = fileOperations.readFile(
+                        directoryPath.resolve(resourceName).resolve(CommonConstants.METADATA + JSON_EXTENSION));
                 actionCollectionBodyMap.put(resourceName + keySuffix, body);
                 resource.put(resourceName + keySuffix, file);
             }
@@ -799,9 +795,8 @@ private Map<String, Object> readAction(
                 if (queryPath.toFile().exists()) {
                     body = fileOperations.readFileAsString(queryPath);
                 }
-                Object file = fileOperations.readFile(directoryPath
-                        .resolve(resourceName)
-                        .resolve(CommonConstants.METADATA + CommonConstants.JSON_EXTENSION));
+                Object file = fileOperations.readFile(
+                        directoryPath.resolve(resourceName).resolve(CommonConstants.METADATA + JSON_EXTENSION));
                 actionCollectionBodyMap.put(resourceName + keySuffix, body);
                 resource.put(resourceName + keySuffix, file);
             }
@@ -811,13 +806,12 @@ private Map<String, Object> readAction(
 
     private Object readPageMetadata(Path directoryPath) {
         return fileOperations.readFile(
-                directoryPath.resolve(directoryPath.toFile().getName() + CommonConstants.JSON_EXTENSION));
+                directoryPath.resolve(directoryPath.toFile().getName() + JSON_EXTENSION));
     }
 
     protected GitResourceMap fetchGitResourceMap(Path baseRepoPath) throws IOException {
         // Extract application metadata from the json
-        Object metadata = fileOperations.readFile(
-                baseRepoPath.resolve(CommonConstants.METADATA + CommonConstants.JSON_EXTENSION));
+        Object metadata = fileOperations.readFile(baseRepoPath.resolve(CommonConstants.METADATA + JSON_EXTENSION));
         Integer fileFormatVersion = fileOperations.getFileFormatVersion(metadata);
         // Check if fileFormat of the saved files in repo is compatible
         if (!isFileFormatCompatible(fileFormatVersion)) {
@@ -828,6 +822,9 @@ protected GitResourceMap fetchGitResourceMap(Path baseRepoPath) throws IOExcepti
         Map<GitResourceIdentity, Object> resourceMap = gitResourceMap.getGitResourceMap();
 
         Set<String> filesInRepo = getExistingFilesInRepo(baseRepoPath);
+        // Remove all files that need not be fetched to the git resource map
+        // i.e. ->  README.md
+        filesInRepo.remove(README_FILE_NAME);
 
         filesInRepo.parallelStream()
                 .filter(path -> !Files.isDirectory(baseRepoPath.resolve(path)))
@@ -853,7 +850,7 @@ protected Tuple2<GitResourceIdentity, Object> getGitResourceIdentity(Path baseRe
         } else if (filePath.matches(JS_LIB_DIRECTORY + "/.*")) {
             String fileName = FilenameUtils.getBaseName(filePath);
             identity = new GitResourceIdentity(GitResourceType.JSLIB_CONFIG, fileName, filePath);
-        } else if (filePath.matches(PAGE_DIRECTORY + "/[^/]*/[^/]*.json]")) {
+        } else if (filePath.matches(PAGE_DIRECTORY + "/[^/]*/[^/]*.json")) {
             String gitSyncId =
                     objectMapper.valueToTree(contents).get("gitSyncId").asText();
             identity = new GitResourceIdentity(GitResourceType.CONTEXT_CONFIG, gitSyncId, filePath);
@@ -866,6 +863,7 @@ protected Tuple2<GitResourceIdentity, Object> getGitResourceIdentity(Path baseRe
             String gitSyncId =
                     objectMapper.valueToTree(configContents).get("gitSyncId").asText();
             identity = new GitResourceIdentity(GitResourceType.QUERY_DATA, gitSyncId, filePath);
+            contents = fileOperations.readFileAsString(path);
         } else if (filePath.matches(PAGE_DIRECTORY + "/[^/]*/" + ACTION_COLLECTION_DIRECTORY + "/.*/metadata.json")) {
             String gitSyncId =
                     objectMapper.valueToTree(contents).get("gitSyncId").asText();
@@ -875,6 +873,7 @@ protected Tuple2<GitResourceIdentity, Object> getGitResourceIdentity(Path baseRe
             String gitSyncId =
                     objectMapper.valueToTree(configContents).get("gitSyncId").asText();
             identity = new GitResourceIdentity(GitResourceType.JSOBJECT_DATA, gitSyncId, filePath);
+            contents = fileOperations.readFileAsString(path);
         } else if (filePath.matches(PAGE_DIRECTORY + "/[^/]*/widgets/.*\\.json")) {
             Pattern pageDirPattern = Pattern.compile("(" + PAGE_DIRECTORY + "/([^/]*))/widgets/.*\\.json");
             Matcher matcher = pageDirPattern.matcher(filePath);
@@ -886,7 +885,7 @@ protected Tuple2<GitResourceIdentity, Object> getGitResourceIdentity(Path baseRe
             String gitSyncId =
                     objectMapper.valueToTree(configContents).get("gitSyncId").asText();
             String widgetId = objectMapper.valueToTree(contents).get("widgetId").asText();
-            identity = new GitResourceIdentity(GitResourceType.JSOBJECT_DATA, gitSyncId + "-" + widgetId, filePath);
+            identity = new GitResourceIdentity(GitResourceType.WIDGET_CONFIG, gitSyncId + "-" + widgetId, filePath);
         } else return null;
 
         return Tuples.of(identity, contents);
@@ -895,18 +894,17 @@ protected Tuple2<GitResourceIdentity, Object> getGitResourceIdentity(Path baseRe
     private ApplicationGitReference fetchApplicationReference(Path baseRepoPath) {
         ApplicationGitReference applicationGitReference = new ApplicationGitReference();
         // Extract application metadata from the json
-        Object metadata = fileOperations.readFile(
-                baseRepoPath.resolve(CommonConstants.METADATA + CommonConstants.JSON_EXTENSION));
+        Object metadata = fileOperations.readFile(baseRepoPath.resolve(CommonConstants.METADATA + JSON_EXTENSION));
         Integer fileFormatVersion = fileOperations.getFileFormatVersion(metadata);
         // Check if fileFormat of the saved files in repo is compatible
         if (!isFileFormatCompatible(fileFormatVersion)) {
             throw new AppsmithPluginException(AppsmithPluginError.INCOMPATIBLE_FILE_FORMAT);
         }
         // Extract application data from the json
-        applicationGitReference.setApplication(fileOperations.readFile(
-                baseRepoPath.resolve(CommonConstants.APPLICATION + CommonConstants.JSON_EXTENSION)));
+        applicationGitReference.setApplication(
+                fileOperations.readFile(baseRepoPath.resolve(CommonConstants.APPLICATION + JSON_EXTENSION)));
         applicationGitReference.setTheme(
-                fileOperations.readFile(baseRepoPath.resolve(CommonConstants.THEME + CommonConstants.JSON_EXTENSION)));
+                fileOperations.readFile(baseRepoPath.resolve(CommonConstants.THEME + JSON_EXTENSION)));
         Path pageDirectory = baseRepoPath.resolve(PAGE_DIRECTORY);
         // Reconstruct application from given file format
         switch (fileFormatVersion) {
@@ -965,8 +963,7 @@ private void updateGitApplicationReference(
             for (File page : Objects.requireNonNull(directory.listFiles())) {
                 pageMap.put(
                         page.getName(),
-                        fileOperations.readFile(
-                                page.toPath().resolve(CommonConstants.CANVAS + CommonConstants.JSON_EXTENSION)));
+                        fileOperations.readFile(page.toPath().resolve(CommonConstants.CANVAS + JSON_EXTENSION)));
 
                 if (fileFormatVersion >= 4) {
                     actionMap.putAll(
@@ -1107,7 +1104,7 @@ private void deleteWidgets(File directory, Map<String, String> validWidgetToPare
                 deleteWidgets(file, validWidgetToParentMap);
             }
 
-            String name = file.getName().replace(CommonConstants.JSON_EXTENSION, CommonConstants.EMPTY_STRING);
+            String name = file.getName().replace(JSON_EXTENSION, CommonConstants.EMPTY_STRING);
             // If input widget was inside a container before, but the user moved it out of the container
             // then we need to delete the widget from the container directory
             // The check here is to validate if the parent is correct or not
@@ -1192,8 +1189,8 @@ public Mono<Object> reconstructMetadataFromGitRepo(
 
             metadataMono = gitResetMono.map(isSwitched -> {
                 Path baseRepoPath = Paths.get(gitServiceConfig.getGitRootPath()).resolve(baseRepoSuffix);
-                Object metadata = fileOperations.readFile(
-                        baseRepoPath.resolve(CommonConstants.METADATA + CommonConstants.JSON_EXTENSION));
+                Object metadata =
+                        fileOperations.readFile(baseRepoPath.resolve(CommonConstants.METADATA + JSON_EXTENSION));
                 return metadata;
             });
         } catch (GitAPIException | IOException exception) {
@@ -1222,8 +1219,7 @@ public Mono<Object> reconstructPageFromGitRepo(
                         .resolve(baseRepoSuffixPath)
                         .resolve(pageSuffix);
 
-                Object pageObject =
-                        fileOperations.readFile(repoPath.resolve(pageName + CommonConstants.JSON_EXTENSION));
+                Object pageObject = fileOperations.readFile(repoPath.resolve(pageName + JSON_EXTENSION));
 
                 return pageObject;
             });
diff --git a/app/server/appsmith-git/src/main/java/com/appsmith/git/files/operations/FileOperationsCEv2Impl.java b/app/server/appsmith-git/src/main/java/com/appsmith/git/files/operations/FileOperationsCEv2Impl.java
index eefaa66f571a..8fd33e9b3d0f 100644
--- a/app/server/appsmith-git/src/main/java/com/appsmith/git/files/operations/FileOperationsCEv2Impl.java
+++ b/app/server/appsmith-git/src/main/java/com/appsmith/git/files/operations/FileOperationsCEv2Impl.java
@@ -167,9 +167,9 @@ public Integer getFileFormatVersion(Object metadata) {
         if (metadata == null) {
             return 1;
         }
+
         JsonNode json = objectMapper.valueToTree(metadata);
-        int fileFormatVersion = json.get(CommonConstants.FILE_FORMAT_VERSION).asInt();
-        return fileFormatVersion;
+        return json.get(CommonConstants.FILE_FORMAT_VERSION).asInt();
     }
 
     @Override
diff --git a/app/server/appsmith-git/src/main/java/com/appsmith/git/handler/ce/FSGitHandlerCEImpl.java b/app/server/appsmith-git/src/main/java/com/appsmith/git/handler/ce/FSGitHandlerCEImpl.java
index a1be0d583302..9a87e3323f55 100644
--- a/app/server/appsmith-git/src/main/java/com/appsmith/git/handler/ce/FSGitHandlerCEImpl.java
+++ b/app/server/appsmith-git/src/main/java/com/appsmith/git/handler/ce/FSGitHandlerCEImpl.java
@@ -436,12 +436,13 @@ public Mono<Boolean> checkoutToBranch(Path repoSuffix, String branchName) {
         return Mono.using(
                         () -> Git.open(createRepoPath(repoSuffix).toFile()),
                         git -> Mono.fromCallable(() -> {
-                                    log.debug(Thread.currentThread().getName() + ": Switching to the branch "
-                                            + branchName);
+                                    log.info(
+                                            "{}: Switching to the branch {}",
+                                            Thread.currentThread().getName(),
+                                            branchName);
+
                                     // We can safely assume that repo has been already initialised either in commit or
-                                    // clone flow and
-                                    // can directly
-                                    // open the repo
+                                    // clone flow and can directly open the repo
                                     if (StringUtils.equalsIgnoreCase(
                                             branchName, git.getRepository().getBranch())) {
                                         return TRUE;
@@ -611,8 +612,12 @@ public Mono<GitStatusDTO> getStatus(Path repoPath, String branchName) {
         return Mono.using(
                         () -> Git.open(repoPath.toFile()),
                         git -> Mono.fromCallable(() -> {
-                                    log.debug(Thread.currentThread().getName() + ": Get status for repo  " + repoPath
-                                            + ", branch " + branchName);
+                                    log.info(
+                                            "{}: Get status for repo {}, {}",
+                                            Thread.currentThread().getName(),
+                                            repoPath,
+                                            branchName);
+
                                     Status status = git.status().call();
                                     GitStatusDTO response = new GitStatusDTO();
 
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ConsolidatedApiSpanNames.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ConsolidatedApiSpanNames.java
index a25206928a92..2e6cb13de68e 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ConsolidatedApiSpanNames.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ConsolidatedApiSpanNames.java
@@ -1,34 +1,9 @@
 package com.appsmith.external.constants.spans;
 
-import static com.appsmith.external.constants.spans.BaseSpan.APPSMITH_SPAN_PREFIX;
+import com.appsmith.external.constants.spans.ce.ConsolidatedApiSpanNamesCE;
 
 /**
  * Please make sure that all span names start with `appsmith.` because span with any other naming format would get
  * dropped / ignored as defined in TracingConfig.java
  */
-public class ConsolidatedApiSpanNames {
-    public static final String CONSOLIDATED_API_PREFIX = APPSMITH_SPAN_PREFIX + "consolidated-api.";
-    public static final String VIEW = "view.";
-    public static final String EDIT = "edit.";
-    public static final String ROOT = "root";
-    public static final String CONSOLIDATED_API_ROOT_EDIT = CONSOLIDATED_API_PREFIX + EDIT + ROOT;
-    public static final String CONSOLIDATED_API_ROOT_VIEW = CONSOLIDATED_API_PREFIX + VIEW + ROOT;
-    public static final String USER_PROFILE_SPAN = "user_profile";
-    public static final String FEATURE_FLAG_SPAN = "feature_flag";
-    public static final String TENANT_SPAN = "tenant";
-    public static final String PRODUCT_ALERT_SPAN = "product_alert";
-    public static final String APPLICATION_ID_SPAN = "application_id";
-    public static final String PAGES_SPAN = "pages";
-    public static final String PAGES_DSL_SPAN = "pages_dsl_list";
-    public static final String CURRENT_THEME_SPAN = "current_theme";
-    public static final String THEMES_SPAN = "themes";
-    public static final String CUSTOM_JS_LIB_SPAN = "js_libs";
-    public static final String CURRENT_PAGE_SPAN = "current_page";
-    public static final String ACTIONS_SPAN = "actions";
-    public static final String ACTION_COLLECTIONS_SPAN = "action_collections";
-    public static final String PLUGINS_SPAN = "plugins";
-    public static final String WORKSPACE_SPAN = "workspace";
-    public static final String DATASOURCES_SPAN = "datasources";
-    public static final String FORM_CONFIG_SPAN = "form_config";
-    public static final String MOCK_DATASOURCES_SPAN = "mock_datasources";
-}
+public class ConsolidatedApiSpanNames extends ConsolidatedApiSpanNamesCE {}
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/ConsolidatedApiSpanNamesCE.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/ConsolidatedApiSpanNamesCE.java
new file mode 100644
index 000000000000..e757e73bab51
--- /dev/null
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/ConsolidatedApiSpanNamesCE.java
@@ -0,0 +1,34 @@
+package com.appsmith.external.constants.spans.ce;
+
+import static com.appsmith.external.constants.spans.BaseSpan.APPSMITH_SPAN_PREFIX;
+
+/**
+ * Please make sure that all span names start with `appsmith.` because span with any other naming format would get
+ * dropped / ignored as defined in TracingConfig.java
+ */
+public class ConsolidatedApiSpanNamesCE {
+    public static final String CONSOLIDATED_API_PREFIX = APPSMITH_SPAN_PREFIX + "consolidated-api.";
+    public static final String VIEW = "view.";
+    public static final String EDIT = "edit.";
+    public static final String ROOT = "root";
+    public static final String CONSOLIDATED_API_ROOT_EDIT = CONSOLIDATED_API_PREFIX + EDIT + ROOT;
+    public static final String CONSOLIDATED_API_ROOT_VIEW = CONSOLIDATED_API_PREFIX + VIEW + ROOT;
+    public static final String USER_PROFILE_SPAN = "user_profile";
+    public static final String FEATURE_FLAG_SPAN = "feature_flag";
+    public static final String TENANT_SPAN = "tenant";
+    public static final String PRODUCT_ALERT_SPAN = "product_alert";
+    public static final String APPLICATION_ID_SPAN = "application_id";
+    public static final String PAGES_SPAN = "pages";
+    public static final String PAGES_DSL_SPAN = "pages_dsl_list";
+    public static final String CURRENT_THEME_SPAN = "current_theme";
+    public static final String THEMES_SPAN = "themes";
+    public static final String CUSTOM_JS_LIB_SPAN = "js_libs";
+    public static final String CURRENT_PAGE_SPAN = "current_page";
+    public static final String ACTIONS_SPAN = "actions";
+    public static final String ACTION_COLLECTIONS_SPAN = "action_collections";
+    public static final String PLUGINS_SPAN = "plugins";
+    public static final String WORKSPACE_SPAN = "workspace";
+    public static final String DATASOURCES_SPAN = "datasources";
+    public static final String FORM_CONFIG_SPAN = "form_config";
+    public static final String MOCK_DATASOURCES_SPAN = "mock_datasources";
+}
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/git/constants/ce/GitConstantsCE.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/git/constants/ce/GitConstantsCE.java
index e77db0e04f29..039714e4a3c7 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/git/constants/ce/GitConstantsCE.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/git/constants/ce/GitConstantsCE.java
@@ -9,6 +9,8 @@ public class GitConstantsCE {
     public static final String ACTION_LIST = "actionList";
     public static final String ACTION_COLLECTION_LIST = "actionCollectionList";
 
+    public static final String README_FILE_NAME = "README.md";
+
     public static final String DEFAULT_COMMIT_MESSAGE = "System generated commit, ";
     public static final String EMPTY_COMMIT_ERROR_MESSAGE = "On current branch nothing to commit, working tree clean";
     public static final String MERGE_CONFLICT_BRANCH_NAME = "_mergeConflict";
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/git/ApplicationGitFileUtilsCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/git/ApplicationGitFileUtilsCEImpl.java
index 2ba44cc6e66c..928442349a44 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/git/ApplicationGitFileUtilsCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/git/ApplicationGitFileUtilsCEImpl.java
@@ -67,10 +67,12 @@
 import static com.appsmith.external.helpers.AppsmithBeanUtils.copyNestedNonNullProperties;
 import static com.appsmith.external.helpers.AppsmithBeanUtils.copyProperties;
 import static com.appsmith.git.constants.CommonConstants.DELIMITER_PATH;
+import static com.appsmith.git.constants.CommonConstants.FILE_FORMAT_VERSION;
 import static com.appsmith.git.constants.CommonConstants.JSON_EXTENSION;
 import static com.appsmith.git.constants.CommonConstants.MAIN_CONTAINER;
 import static com.appsmith.git.constants.CommonConstants.WIDGETS;
-import static com.appsmith.git.constants.ce.GitDirectoriesCE.PAGE_DIRECTORY;
+import static com.appsmith.git.constants.CommonConstants.fileFormatVersion;
+import static com.appsmith.git.constants.GitDirectories.PAGE_DIRECTORY;
 import static com.appsmith.server.constants.FieldName.ACTION_COLLECTION_LIST;
 import static com.appsmith.server.constants.FieldName.ACTION_LIST;
 import static com.appsmith.server.constants.FieldName.CHILDREN;
@@ -189,6 +191,10 @@ public void setArtifactDependentResources(
         copyProperties(applicationJson, applicationMetadata, keys);
         final String metadataFilePath = CommonConstants.METADATA + JSON_EXTENSION;
         ObjectNode metadata = objectMapper.valueToTree(applicationMetadata);
+
+        // put file format version;
+        metadata.put(FILE_FORMAT_VERSION, fileFormatVersion);
+
         GitResourceIdentity metadataIdentity =
                 new GitResourceIdentity(GitResourceType.ROOT_CONFIG, metadataFilePath, metadataFilePath);
         resourceMap.put(metadataIdentity, metadata);
@@ -717,7 +723,6 @@ public void setArtifactDependentPropertiesInJson(
         artifactExchangeJson.setContextList(pageList);
 
         // widgets
-
         pageList.parallelStream().forEach(newPage -> {
             Map<String, org.json.JSONObject> widgetsData = resourceMap.entrySet().stream()
                     .filter(entry -> {
@@ -730,13 +735,23 @@ public void setArtifactDependentPropertiesInJson(
                                     .getFilePath()
                                     .replaceFirst(
                                             PAGE_DIRECTORY
+                                                    + DELIMITER_PATH
                                                     + newPage.getUnpublishedPage()
                                                             .getName()
                                                     + DELIMITER_PATH
                                                     + WIDGETS
                                                     + DELIMITER_PATH,
                                             MAIN_CONTAINER + DELIMITER_PATH),
-                            entry -> (org.json.JSONObject) entry.getValue()));
+                            entry -> {
+                                try {
+                                    return new org.json.JSONObject(objectMapper.writeValueAsString(entry.getValue()));
+                                } catch (JsonProcessingException jsonProcessingException) {
+                                    log.error(
+                                            "Error while deserializing widget with file path {}",
+                                            entry.getKey().getFilePath());
+                                    throw new RuntimeException(jsonProcessingException);
+                                }
+                            }));
 
             Layout layout = newPage.getUnpublishedPage().getLayouts().get(0);
             org.json.JSONObject mainContainer;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Tenant.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Tenant.java
index f4a005bbff76..e0ad66274d17 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Tenant.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Tenant.java
@@ -10,6 +10,7 @@
 import org.springframework.data.annotation.Transient;
 import org.springframework.data.mongodb.core.mapping.Document;
 
+import java.io.Serial;
 import java.io.Serializable;
 
 @Getter
@@ -20,6 +21,11 @@
 @FieldNameConstants
 public class Tenant extends BaseDomain implements Serializable {
 
+    // When changing tenant object, update the serialization version number to ensure that in a multi pod
+    // deployment, new pods only read the new tenant object and not the old one from redis cache.
+    @Serial
+    private static final long serialVersionUID = 1459916000401322518L;
+
     @Unique String slug;
 
     String displayName;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/CentralGitServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/CentralGitServiceCEImpl.java
index a8471e978b27..c4d576b3c6ad 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/CentralGitServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/CentralGitServiceCEImpl.java
@@ -8,6 +8,7 @@
 import com.appsmith.external.dtos.MergeStatusDTO;
 import com.appsmith.external.git.constants.GitConstants;
 import com.appsmith.external.git.constants.GitSpan;
+import com.appsmith.external.git.constants.ce.GitConstantsCE;
 import com.appsmith.external.git.constants.ce.RefType;
 import com.appsmith.external.git.dtos.FetchRemoteDTO;
 import com.appsmith.external.models.Datasource;
@@ -78,7 +79,6 @@
 import reactor.util.function.Tuple3;
 
 import java.io.IOException;
-import java.nio.file.Path;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -95,9 +95,9 @@
 import static com.appsmith.external.helpers.AppsmithBeanUtils.copyNestedNonNullProperties;
 import static com.appsmith.server.constants.FieldName.BRANCH_NAME;
 import static com.appsmith.server.constants.FieldName.DEFAULT;
+import static com.appsmith.server.constants.FieldName.REF_NAME;
+import static com.appsmith.server.constants.FieldName.REF_TYPE;
 import static com.appsmith.server.constants.SerialiseArtifactObjective.VERSION_CONTROL;
-import static com.appsmith.server.constants.ce.FieldNameCE.REF_NAME;
-import static com.appsmith.server.constants.ce.FieldNameCE.REF_TYPE;
 import static java.lang.Boolean.FALSE;
 import static java.lang.Boolean.TRUE;
 import static org.springframework.util.StringUtils.hasText;
@@ -510,13 +510,13 @@ private Mono<? extends Artifact> checkoutRemoteReference(
         final String workspaceId = baseArtifact.getWorkspaceId();
         final String finalRemoteRefName = gitRefDTO.getRefName().replaceFirst(ORIGIN, REMOTE_NAME_REPLACEMENT);
 
-        ArtifactJsonTransformationDTO jsonTransformationDTO = new ArtifactJsonTransformationDTO();
-        jsonTransformationDTO.setRepoName(repoName);
+        ArtifactJsonTransformationDTO jsonTransformationDTO = new ArtifactJsonTransformationDTO(
+                workspaceId, baseArtifactId, repoName, baseArtifact.getArtifactType());
+
         jsonTransformationDTO.setRefType(gitRefDTO.getRefType());
         jsonTransformationDTO.setRefName(finalRemoteRefName);
-        jsonTransformationDTO.setWorkspaceId(workspaceId);
-        jsonTransformationDTO.setBaseArtifactId(baseArtifactId);
-        jsonTransformationDTO.setArtifactType(baseArtifact.getArtifactType());
+
+        FetchRemoteDTO fetchRemoteDTO = new FetchRemoteDTO(List.of(finalRemoteRefName), gitRefDTO.getRefType(), false);
 
         Mono<? extends Artifact> artifactMono;
         if (baseRefName.equals(finalRemoteRefName)) {
@@ -528,11 +528,12 @@ private Mono<? extends Artifact> checkoutRemoteReference(
             artifactMono = Mono.just(baseArtifact);
         } else {
             // create new Artifact
-            artifactMono = gitArtifactHelper.createNewArtifactForCheckout(baseArtifact, finalRemoteRefName);
+            artifactMono = generateArtifactForRefCreation(baseArtifact, finalRemoteRefName, gitRefDTO.getRefType());
         }
 
         Mono<? extends Artifact> checkedOutRemoteArtifactMono = gitHandlingService
-                .fetchRemoteReferences(jsonTransformationDTO, baseGitMetadata.getGitAuth(), false)
+                .fetchRemoteReferences(jsonTransformationDTO, fetchRemoteDTO, baseGitMetadata.getGitAuth())
+                .flatMap(ignoredFetchString -> gitHandlingService.checkoutRemoteReference(jsonTransformationDTO))
                 .onErrorResume(error -> Mono.error(
                         new AppsmithException(AppsmithError.GIT_ACTION_FAILED, "checkout branch", error.getMessage())))
                 .flatMap(ignoreRemoteChanges -> {
@@ -600,18 +601,6 @@ protected Mono<? extends Artifact> createReference(
         GitArtifactMetadata baseGitMetadata = baseArtifact.getGitArtifactMetadata();
         GitAuth baseGitAuth = baseGitMetadata.getGitAuth();
         GitArtifactMetadata sourceGitMetadata = sourceArtifact.getGitArtifactMetadata();
-        ArtifactType artifactType = baseArtifact.getArtifactType();
-
-        GitArtifactHelper<?> gitArtifactHelper = gitArtifactHelperResolver.getArtifactHelper(artifactType);
-        GitHandlingService gitHandlingService = gitHandlingServiceResolver.getGitHandlingService(gitType);
-
-        ArtifactJsonTransformationDTO jsonTransformationDTO = new ArtifactJsonTransformationDTO();
-        jsonTransformationDTO.setWorkspaceId(baseArtifact.getWorkspaceId());
-        jsonTransformationDTO.setBaseArtifactId(baseGitMetadata.getDefaultArtifactId());
-        jsonTransformationDTO.setRepoName(baseGitMetadata.getRepoName());
-        jsonTransformationDTO.setArtifactType(baseArtifact.getArtifactType());
-        jsonTransformationDTO.setRefType(refType);
-        jsonTransformationDTO.setRefName(refDTO.getRefName());
 
         if (sourceGitMetadata == null
                 || !hasText(sourceGitMetadata.getDefaultArtifactId())
@@ -622,19 +611,40 @@ protected Mono<? extends Artifact> createReference(
                     "Unable to find the parent reference. Please create a reference from other available references"));
         }
 
+        ArtifactType artifactType = baseArtifact.getArtifactType();
+        String workspaceId = baseArtifact.getWorkspaceId();
+        String baseArtifactId = baseGitMetadata.getDefaultArtifactId();
+        String repoName = baseGitMetadata.getRepoName();
+
+        String sourceArtifactId = sourceArtifact.getId();
+
+        GitArtifactHelper<?> gitArtifactHelper = gitArtifactHelperResolver.getArtifactHelper(artifactType);
+        GitHandlingService gitHandlingService = gitHandlingServiceResolver.getGitHandlingService(gitType);
+
+        ArtifactJsonTransformationDTO baseRefTransformationDTO =
+                new ArtifactJsonTransformationDTO(workspaceId, baseArtifactId, repoName, artifactType);
+        baseRefTransformationDTO.setRefName(sourceGitMetadata.getRefName());
+        baseRefTransformationDTO.setRefType(refType);
+
+        ArtifactJsonTransformationDTO createRefTransformationDTO =
+                new ArtifactJsonTransformationDTO(workspaceId, baseArtifactId, repoName, artifactType);
+        createRefTransformationDTO.setRefType(refType);
+        createRefTransformationDTO.setRefName(refDTO.getRefName());
+
         Mono<Boolean> acquireGitLockMono = gitRedisUtils.acquireGitLock(
                 artifactType,
                 baseGitMetadata.getDefaultArtifactId(),
                 GitConstants.GitCommandConstants.CREATE_BRANCH,
                 FALSE);
+
         Mono<String> fetchRemoteMono =
-                gitHandlingService.fetchRemoteReferences(jsonTransformationDTO, baseGitAuth, TRUE);
+                gitHandlingService.fetchRemoteReferences(baseRefTransformationDTO, baseGitAuth, TRUE);
 
         Mono<? extends Artifact> createBranchMono = acquireGitLockMono
                 .flatMap(ignoreLockAcquisition -> fetchRemoteMono.onErrorResume(
                         error -> Mono.error(new AppsmithException(AppsmithError.GIT_ACTION_FAILED, "fetch", error))))
                 .flatMap(ignoreFetchString -> gitHandlingService
-                        .listReferences(jsonTransformationDTO, TRUE)
+                        .listReferences(createRefTransformationDTO, TRUE)
                         .flatMap(refList -> {
                             boolean isDuplicateName = refList.stream()
                                     // We are only supporting origin as the remote name so this is safe
@@ -655,11 +665,10 @@ protected Mono<? extends Artifact> createReference(
 
                             Mono<? extends ArtifactExchangeJson> artifactExchangeJsonMono =
                                     exportService.exportByArtifactId(
-                                            sourceArtifact.getId(), VERSION_CONTROL, baseArtifact.getArtifactType());
+                                            sourceArtifactId, VERSION_CONTROL, baseArtifact.getArtifactType());
 
-                            Mono<? extends Artifact> newArtifactFromSourceMono =
-                                    // TODO: add refType support over here
-                                    gitArtifactHelper.createNewArtifactForCheckout(sourceArtifact, refDTO.getRefName());
+                            Mono<? extends Artifact> newArtifactFromSourceMono = generateArtifactForRefCreation(
+                                    sourceArtifact, refDTO.getRefName(), refDTO.getRefType());
 
                             return refCreationValidationMono.flatMap(isOkayToProceed -> {
                                 if (!TRUE.equals(isOkayToProceed)) {
@@ -675,7 +684,7 @@ protected Mono<? extends Artifact> createReference(
                     Artifact newRefArtifact = tuple.getT1();
 
                     Mono<String> refCreationMono = gitHandlingService
-                            .createGitReference(jsonTransformationDTO, refDTO)
+                            .createGitReference(createRefTransformationDTO, baseGitMetadata, refDTO)
                             // TODO: this error could be shipped to handling layer as well?
                             .onErrorResume(error -> Mono.error(new AppsmithException(
                                     AppsmithError.GIT_ACTION_FAILED, "ref creation preparation", error.getMessage())));
@@ -694,13 +703,11 @@ protected Mono<? extends Artifact> createReference(
                             })
                             // after the branch is created, we need to reset the older branch to the
                             // clean status, i.e. last commit
-                            .flatMap(newImportedArtifact -> discardChanges(sourceArtifact, gitType));
+                            .flatMap(newImportedArtifact ->
+                                    discardChanges(sourceArtifact, gitType).thenReturn(newImportedArtifact));
                 })
                 .flatMap(newImportedArtifact -> gitRedisUtils
-                        .releaseFileLock(
-                                artifactType,
-                                newImportedArtifact.getGitArtifactMetadata().getDefaultArtifactId(),
-                                TRUE)
+                        .releaseFileLock(artifactType, baseArtifactId, TRUE)
                         .then(gitAnalyticsUtils.addAnalyticsForGitOperation(
                                 AnalyticsEvents.GIT_CREATE_BRANCH,
                                 newImportedArtifact,
@@ -708,7 +715,7 @@ protected Mono<? extends Artifact> createReference(
                 .onErrorResume(error -> {
                     log.error("An error occurred while creating reference. error {}", error.getMessage());
                     return gitRedisUtils
-                            .releaseFileLock(artifactType, baseGitMetadata.getDefaultArtifactId(), TRUE)
+                            .releaseFileLock(artifactType, baseArtifactId, TRUE)
                             .then(Mono.error(new AppsmithException(AppsmithError.GIT_ACTION_FAILED, "checkout")));
                 })
                 .name(GitSpan.OPS_CREATE_BRANCH)
@@ -1066,7 +1073,7 @@ public Mono<? extends Artifact> connectArtifactToGit(
                     jsonTransformationDTO.setArtifactType(artifactType);
                     jsonTransformationDTO.setRepoName(repoName);
 
-                    final String README_FILE_NAME = "README.md";
+                    final String README_FILE_NAME = GitConstantsCE.README_FILE_NAME;
                     Mono<Boolean> readMeIntialisationMono = gitHandlingService.initialiseReadMe(
                             jsonTransformationDTO, artifact, README_FILE_NAME, originHeader);
 
@@ -1095,30 +1102,31 @@ public Mono<? extends Artifact> connectArtifactToGit(
                                 commitDTO.setMessage(commitMessage);
 
                                 return this.commitArtifact(commitDTO, artifact.getId(), artifactType, gitType)
-                                        .onErrorResume(error ->
-                                                // If the push fails remove all the cloned files from local repo
-                                                this.detachRemote(baseArtifactId, artifactType, gitType)
-                                                        .flatMap(isDeleted -> {
-                                                            if (error instanceof TransportException) {
-                                                                return gitAnalyticsUtils
-                                                                        .addAnalyticsForGitOperation(
-                                                                                AnalyticsEvents.GIT_CONNECT,
-                                                                                artifact,
-                                                                                error.getClass()
-                                                                                        .getName(),
-                                                                                error.getMessage(),
-                                                                                artifact.getGitArtifactMetadata()
-                                                                                        .getIsRepoPrivate())
-                                                                        .then(Mono.error(new AppsmithException(
-                                                                                AppsmithError
-                                                                                        .INVALID_GIT_SSH_CONFIGURATION,
-                                                                                error.getMessage())));
-                                                            }
-                                                            return Mono.error(new AppsmithException(
-                                                                    AppsmithError.GIT_ACTION_FAILED,
-                                                                    "push",
-                                                                    error.getMessage()));
-                                                        }));
+                                        .onErrorResume(error -> {
+                                            log.error("Error while committing", error);
+                                            // If the push fails remove all the cloned files from local repo
+                                            return this.detachRemote(baseArtifactId, artifactType, gitType)
+                                                    .flatMap(isDeleted -> {
+                                                        if (error instanceof TransportException) {
+                                                            return gitAnalyticsUtils
+                                                                    .addAnalyticsForGitOperation(
+                                                                            AnalyticsEvents.GIT_CONNECT,
+                                                                            artifact,
+                                                                            error.getClass()
+                                                                                    .getName(),
+                                                                            error.getMessage(),
+                                                                            artifact.getGitArtifactMetadata()
+                                                                                    .getIsRepoPrivate())
+                                                                    .then(Mono.error(new AppsmithException(
+                                                                            AppsmithError.INVALID_GIT_SSH_CONFIGURATION,
+                                                                            error.getMessage())));
+                                                        }
+                                                        return Mono.error(new AppsmithException(
+                                                                AppsmithError.GIT_ACTION_FAILED,
+                                                                "push",
+                                                                error.getMessage()));
+                                                    });
+                                        });
                             })
                             .then(gitAnalyticsUtils.addAnalyticsForGitOperation(
                                     AnalyticsEvents.GIT_CONNECT,
@@ -1429,23 +1437,26 @@ public Mono<? extends Artifact> detachRemote(
                     jsonTransformationDTO.setRefName(gitArtifactMetadata.getRefName());
 
                     // Remove the git contents from file system
-                    return Mono.zip(gitHandlingService.listBranches(jsonTransformationDTO), Mono.just(baseArtifact));
+                    return Mono.zip(
+                            gitHandlingService.listReferences(jsonTransformationDTO, false), Mono.just(baseArtifact));
                 })
                 .flatMap(tuple -> {
                     List<String> localBranches = tuple.getT1();
                     Artifact baseArtifact = tuple.getT2();
 
+                    GitArtifactMetadata baseGitMetadata = baseArtifact.getGitArtifactMetadata();
+                    localBranches.remove(baseGitMetadata.getRefName());
+
                     baseArtifact.setGitArtifactMetadata(null);
                     gitArtifactHelper.resetAttributeInBaseArtifact(baseArtifact);
 
-                    GitArtifactMetadata gitArtifactMetadata = baseArtifact.getGitArtifactMetadata();
                     ArtifactJsonTransformationDTO jsonTransformationDTO = new ArtifactJsonTransformationDTO();
                     jsonTransformationDTO.setRefType(RefType.branch);
                     jsonTransformationDTO.setWorkspaceId(baseArtifact.getWorkspaceId());
-                    jsonTransformationDTO.setBaseArtifactId(gitArtifactMetadata.getDefaultArtifactId());
-                    jsonTransformationDTO.setRepoName(gitArtifactMetadata.getRepoName());
+                    jsonTransformationDTO.setBaseArtifactId(baseGitMetadata.getDefaultArtifactId());
+                    jsonTransformationDTO.setRepoName(baseGitMetadata.getRepoName());
                     jsonTransformationDTO.setArtifactType(baseArtifact.getArtifactType());
-                    jsonTransformationDTO.setRefName(gitArtifactMetadata.getRefName());
+                    jsonTransformationDTO.setRefName(baseGitMetadata.getRefName());
 
                     // Remove the parent artifact branch name from the list
                     Mono<Boolean> removeRepoMono = gitHandlingService.removeRepository(jsonTransformationDTO);
@@ -1523,7 +1534,6 @@ protected Mono<GitStatusDTO> getStatus(
             GitType gitType) {
 
         ArtifactType artifactType = baseArtifact.getArtifactType();
-        GitArtifactHelper<?> gitArtifactHelper = gitArtifactHelperResolver.getArtifactHelper(artifactType);
         GitHandlingService gitHandlingService = gitHandlingServiceResolver.getGitHandlingService(gitType);
 
         GitArtifactMetadata baseGitMetadata = baseArtifact.getGitArtifactMetadata();
@@ -1738,14 +1748,12 @@ private Mono<GitPullDTO> pullAndRehydrateArtifact(
         jsonTransformationDTO.setBaseArtifactId(baseArtifactId);
         jsonTransformationDTO.setArtifactType(baseArtifact.getArtifactType());
 
-        Path repoSuffix = gitArtifactHelper.getRepoSuffixPath(workspaceId, baseArtifactId, repoName);
-
         return Mono.defer(() -> {
                     // Rehydrate the artifact from git system
-
                     Mono<MergeStatusDTO> mergeStatusDTOMono = gitHandlingService
                             .pullArtifact(jsonTransformationDTO, baseGitMetadata)
                             .cache();
+
                     Mono<ArtifactExchangeJson> artifactExchangeJsonMono = mergeStatusDTOMono.flatMap(status ->
                             gitHandlingService.reconstructArtifactJsonFromGitRepository(jsonTransformationDTO));
 
@@ -1766,25 +1774,27 @@ private Mono<GitPullDTO> pullAndRehydrateArtifact(
                                             .getGitArtifactMetadata()
                                             .getIsRepoPrivate()))
                             .flatMap(importedBranchedArtifact -> {
-                                CommitDTO commitDTO = new CommitDTO();
-                                commitDTO.setMessage(DEFAULT_COMMIT_MESSAGE
-                                        + GitDefaultCommitMessage.SYNC_WITH_REMOTE_AFTER_PULL.getReason());
-
-                                GitPullDTO gitPullDTO = new GitPullDTO();
-                                gitPullDTO.setMergeStatus(status);
-                                gitPullDTO.setArtifact(importedBranchedArtifact);
-
                                 return gitArtifactHelper
                                         .publishArtifact(importedBranchedArtifact, false)
-                                        // TODO: Verify if we need to commit after pulling? (Gonna be a product
-                                        // decision, hence got
-                                        .then(Mono.defer(() -> commitArtifact(
-                                                        commitDTO,
-                                                        baseArtifact,
-                                                        importedBranchedArtifact,
-                                                        gitType,
-                                                        false))
-                                                .thenReturn(gitPullDTO));
+                                        .then(getGitUserForArtifactId(baseArtifactId))
+                                        .flatMap(gitAuthor -> {
+                                            CommitDTO commitDTO = new CommitDTO();
+                                            commitDTO.setMessage(DEFAULT_COMMIT_MESSAGE
+                                                    + GitDefaultCommitMessage.SYNC_WITH_REMOTE_AFTER_PULL.getReason());
+                                            commitDTO.setAuthor(gitAuthor);
+
+                                            GitPullDTO gitPullDTO = new GitPullDTO();
+                                            gitPullDTO.setMergeStatus(status);
+                                            gitPullDTO.setArtifact(importedBranchedArtifact);
+
+                                            return Mono.defer(() -> commitArtifact(
+                                                            commitDTO,
+                                                            baseArtifact,
+                                                            importedBranchedArtifact,
+                                                            gitType,
+                                                            false))
+                                                    .thenReturn(gitPullDTO);
+                                        });
                             });
                 });
     }
@@ -1960,20 +1970,21 @@ private Mono<GitUser> getGitUserForArtifactId(String baseArtifactId) {
     }
 
     private Mono<? extends Artifact> updateArtifactWithGitMetadataGivenPermission(
-            Artifact artifact, GitArtifactMetadata gitMetadata) {
+            Artifact branchedArtifact, GitArtifactMetadata branchedGitMetadata) {
 
-        if (gitMetadata == null) {
+        if (branchedGitMetadata == null) {
             return Mono.error(
                     new AppsmithException(AppsmithError.INVALID_PARAMETER, "Git metadata values cannot be null"));
         }
 
-        artifact.setGitArtifactMetadata(gitMetadata);
-        // For base artifact we expect a GitAuth to be a part of gitMetadata. We are using save method to leverage
-        // @Encrypted annotation used for private SSH keys
+        branchedGitMetadata.setLastCommittedAt(Instant.now());
+        branchedArtifact.setGitArtifactMetadata(branchedGitMetadata);
+        // For base branchedArtifact we expect a GitAuth to be a part of branchedGitMetadata.
+        // We are using save method to leverage @Encrypted annotation used for private SSH keys
         // saveArtifact method sets the transient fields so no need to set it again from this method
         return gitArtifactHelperResolver
-                .getArtifactHelper(artifact.getArtifactType())
-                .saveArtifact(artifact);
+                .getArtifactHelper(branchedArtifact.getArtifactType())
+                .saveArtifact(branchedArtifact);
     }
 
     /**
@@ -2356,7 +2367,7 @@ private Mono<List<GitBranchDTO>> getBranchListWithDefaultBranchName(
                         TRUE)
                 .flatMap(ignoredLock -> {
                     Mono<List<String>> listBranchesMono =
-                            Mono.defer(() -> gitHandlingService.listReferences(jsonTransformationDTO, false));
+                            Mono.defer(() -> gitHandlingService.listReferences(jsonTransformationDTO, true));
 
                     if (TRUE.equals(pruneBranches)) {
                         return gitHandlingService
@@ -2578,6 +2589,17 @@ public Mono<GitArtifactMetadata> getGitArtifactMetadata(String baseArtifactId, A
         });
     }
 
+    protected Mono<? extends Artifact> generateArtifactForRefCreation(
+            Artifact branchedArtifact, String refName, RefType refType) {
+        ArtifactType artifactType = branchedArtifact.getArtifactType();
+        GitArtifactHelper<?> gitArtifactHelper = gitArtifactHelperResolver.getArtifactHelper(artifactType);
+        AclPermission editPermission = gitArtifactHelper.getArtifactEditPermission();
+
+        return gitArtifactHelper
+                .getArtifactById(branchedArtifact.getId(), editPermission)
+                .flatMap(sourceArtifact -> gitArtifactHelper.createNewArtifactForCheckout(sourceArtifact, refName));
+    }
+
     /**
      * In some scenarios:
      * connect: after loading the modal, keyTypes is not available, so a network call has to be made to ssh-keypair.
@@ -2703,7 +2725,7 @@ public Mono<MergeStatusDTO> mergeBranch(
                                                             baseArtifact, destinationArtifact, false, false, gitType)
                                                     .flatMap(destinationBranchStatus -> {
                                                         if (destinationBranchStatus.getIsClean()) {
-                                                            Mono.just(destinationBranchStatus);
+                                                            return Mono.just(destinationBranchStatus);
                                                         }
 
                                                         AppsmithException statusFailureException;
@@ -2723,7 +2745,8 @@ public Mono<MergeStatusDTO> mergeBranch(
                                                         return Mono.error(statusFailureException);
                                                     }));
 
-                                            return sourceBranchStatusMono.zipWith(destinationBranchStatusMono);
+                                            return sourceBranchStatusMono.zipWhen(
+                                                    sourceStatusDTO -> destinationBranchStatusMono);
                                         })
                                         .onErrorResume(error -> {
                                             log.error(
@@ -2802,7 +2825,8 @@ public Mono<MergeStatusDTO> mergeBranch(
                                                                         commitDTO,
                                                                         importedDestinationArtifact.getId(),
                                                                         artifactType,
-                                                                        gitType)
+                                                                        gitType,
+                                                                        false)
                                                                 .then(gitAnalyticsUtils.addAnalyticsForGitOperation(
                                                                         AnalyticsEvents.GIT_MERGE,
                                                                         importedDestinationArtifact,
@@ -2965,7 +2989,8 @@ public Mono<MergeStatusDTO> isBranchMergable(
                                                                 .then(Mono.error(uncleanStatusException));
                                                     }));
 
-                                            return sourceBranchStatusMono.zipWith(destinationBranchStatusMono);
+                                            return sourceBranchStatusMono.zipWhen(
+                                                    sourceStatusDTO -> destinationBranchStatusMono);
                                         })
                                         .onErrorResume(error -> {
                                             log.error(
@@ -2980,32 +3005,30 @@ public Mono<MergeStatusDTO> isBranchMergable(
                                                     AppsmithError.GIT_ACTION_FAILED, "status", error));
                                         });
 
-                                return statusTupleMono.flatMap(statusTuple -> {
-                                    GitMergeDTO mergeDTO = new GitMergeDTO();
-                                    mergeDTO.setSourceBranch(sourceBranch);
-                                    mergeDTO.setDestinationBranch(destinationBranch);
-
-                                    Mono<MergeStatusDTO> isBranchMergable =
-                                            gitHandlingService.isBranchMergable(jsonTransformationDTO, mergeDTO);
-
-                                    return isBranchMergable.onErrorResume(error -> {
-                                        MergeStatusDTO mergeStatus = new MergeStatusDTO();
-                                        mergeStatus.setMergeAble(false);
-                                        mergeStatus.setStatus("Merge check failed!");
-                                        mergeStatus.setMessage(error.getMessage());
-
-                                        return gitAnalyticsUtils
-                                                .addAnalyticsForGitOperation(
-                                                        AnalyticsEvents.GIT_MERGE_CHECK,
-                                                        baseArtifact,
-                                                        error.getClass().getName(),
-                                                        error.getMessage(),
-                                                        baseGitMetadata.getIsRepoPrivate(),
-                                                        false,
-                                                        false)
-                                                .thenReturn(mergeStatus);
-                                    });
-                                });
+                                return statusTupleMono
+                                        .flatMap(statusTuple -> {
+                                            GitMergeDTO mergeDTO = new GitMergeDTO();
+                                            mergeDTO.setSourceBranch(sourceBranch);
+                                            mergeDTO.setDestinationBranch(destinationBranch);
+                                            return gitHandlingService.isBranchMergable(jsonTransformationDTO, mergeDTO);
+                                        })
+                                        .onErrorResume(error -> {
+                                            MergeStatusDTO mergeStatus = new MergeStatusDTO();
+                                            mergeStatus.setMergeAble(false);
+                                            mergeStatus.setStatus("Merge check failed!");
+                                            mergeStatus.setMessage(error.getMessage());
+
+                                            return gitAnalyticsUtils
+                                                    .addAnalyticsForGitOperation(
+                                                            AnalyticsEvents.GIT_MERGE_CHECK,
+                                                            baseArtifact,
+                                                            error.getClass().getName(),
+                                                            error.getMessage(),
+                                                            baseGitMetadata.getIsRepoPrivate(),
+                                                            false,
+                                                            false)
+                                                    .thenReturn(mergeStatus);
+                                        });
                             },
                             ignoreLock -> gitRedisUtils.releaseFileLock(artifactType, baseArtifactId, TRUE));
                 });
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/GitHandlingServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/GitHandlingServiceCE.java
index 473d5f81ec36..5c84bb374e4c 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/GitHandlingServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/GitHandlingServiceCE.java
@@ -87,7 +87,10 @@ Mono<? extends ArtifactExchangeJson> recreateArtifactJsonFromLastCommit(
 
     Mono<GitStatusDTO> getStatus(ArtifactJsonTransformationDTO jsonTransformationDTO);
 
-    Mono<String> createGitReference(ArtifactJsonTransformationDTO artifactJsonTransformationDTO, GitRefDTO gitRefDTO);
+    Mono<String> createGitReference(
+            ArtifactJsonTransformationDTO artifactJsonTransformationDTO,
+            GitArtifactMetadata baseGitData,
+            GitRefDTO gitRefDTO);
 
     Mono<String> checkoutRemoteReference(ArtifactJsonTransformationDTO jsonTransformationDTO);
 
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/common/CommonGitServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/common/CommonGitServiceCEImpl.java
index e82280ace665..b1bfadbd6ec4 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/common/CommonGitServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/common/CommonGitServiceCEImpl.java
@@ -101,8 +101,9 @@
 import static com.appsmith.external.git.constants.GitConstants.EMPTY_COMMIT_ERROR_MESSAGE;
 import static com.appsmith.external.git.constants.GitConstants.GIT_CONFIG_ERROR;
 import static com.appsmith.external.git.constants.GitConstants.GIT_PROFILE_ERROR;
-import static com.appsmith.external.git.constants.ce.GitSpanCE.OPS_COMMIT;
-import static com.appsmith.external.git.constants.ce.GitSpanCE.OPS_STATUS;
+import static com.appsmith.external.git.constants.GitConstants.README_FILE_NAME;
+import static com.appsmith.external.git.constants.GitSpan.OPS_COMMIT;
+import static com.appsmith.external.git.constants.GitSpan.OPS_STATUS;
 import static com.appsmith.external.helpers.AppsmithBeanUtils.copyNestedNonNullProperties;
 import static com.appsmith.server.constants.ArtifactType.APPLICATION;
 import static com.appsmith.server.constants.SerialiseArtifactObjective.VERSION_CONTROL;
@@ -761,7 +762,7 @@ public Mono<? extends Artifact> connectArtifactToGit(
                 .flatMap(artifact -> {
                     String repoName = GitUtils.getRepoName(gitConnectDTO.getRemoteUrl());
                     Path readMePath = gitArtifactHelper.getRepoSuffixPath(
-                            artifact.getWorkspaceId(), baseArtifactId, repoName, "README.md");
+                            artifact.getWorkspaceId(), baseArtifactId, repoName, README_FILE_NAME);
                     try {
                         Mono<Path> readMeMono = gitArtifactHelper.intialiseReadMe(artifact, readMePath, originHeader);
                         return Mono.zip(readMeMono, currentUserMono)
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/dtos/ArtifactJsonTransformationDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/dtos/ArtifactJsonTransformationDTO.java
index a4a1470ffeae..be65b81dc0d2 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/dtos/ArtifactJsonTransformationDTO.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/dtos/ArtifactJsonTransformationDTO.java
@@ -34,4 +34,12 @@ public ArtifactJsonTransformationDTO(String workspaceId, String baseArtifactId,
         this.baseArtifactId = baseArtifactId;
         this.repoName = repoName;
     }
+
+    public ArtifactJsonTransformationDTO(
+            String workspaceId, String baseArtifactId, String repoName, ArtifactType artifactType) {
+        this.workspaceId = workspaceId;
+        this.baseArtifactId = baseArtifactId;
+        this.repoName = repoName;
+        this.artifactType = artifactType;
+    }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/fs/GitFSServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/fs/GitFSServiceCEImpl.java
index 541c57058ceb..b30f1fb0dd8b 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/fs/GitFSServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/fs/GitFSServiceCEImpl.java
@@ -321,7 +321,8 @@ public Mono<Boolean> initialiseReadMe(
         Path readmePath = gitArtifactHelper.getRepoSuffixPath(
                 jsonTransformationDTO.getWorkspaceId(),
                 jsonTransformationDTO.getBaseArtifactId(),
-                jsonTransformationDTO.getRepoName());
+                jsonTransformationDTO.getRepoName(),
+                readmeFileName);
         try {
             return gitArtifactHelper
                     .intialiseReadMe(artifact, readmePath, originHeader)
@@ -688,16 +689,25 @@ public Mono<GitStatusDTO> getStatus(ArtifactJsonTransformationDTO jsonTransforma
     }
 
     @Override
-    public Mono<String> createGitReference(ArtifactJsonTransformationDTO jsonTransformationDTO, GitRefDTO gitRefDTO) {
+    public Mono<String> createGitReference(
+            ArtifactJsonTransformationDTO jsonTransformationDTO, GitArtifactMetadata baseGitData, GitRefDTO gitRefDTO) {
         GitArtifactHelper<?> gitArtifactHelper =
                 gitArtifactHelperResolver.getArtifactHelper(jsonTransformationDTO.getArtifactType());
 
+        String remoteUrl = baseGitData.getRemoteUrl();
+        String publicKey = baseGitData.getGitAuth().getPublicKey();
+        String privateKey = baseGitData.getGitAuth().getPrivateKey();
+
         Path repoSuffix = gitArtifactHelper.getRepoSuffixPath(
                 jsonTransformationDTO.getWorkspaceId(),
                 jsonTransformationDTO.getBaseArtifactId(),
                 jsonTransformationDTO.getRepoName());
 
-        return fsGitHandler.createAndCheckoutReference(repoSuffix, gitRefDTO);
+        // TODO: add the checkout to the current branch as well.
+        return fsGitHandler
+                .createAndCheckoutReference(repoSuffix, gitRefDTO)
+                .then(fsGitHandler.pushApplication(
+                        repoSuffix, remoteUrl, publicKey, privateKey, gitRefDTO.getRefName()));
     }
 
     @Override
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/CommonGitFileUtilsCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/CommonGitFileUtilsCE.java
index 37bdd06a6262..260a0a8c5bf5 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/CommonGitFileUtilsCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/CommonGitFileUtilsCE.java
@@ -630,8 +630,9 @@ public Mono<? extends ArtifactExchangeJson> constructArtifactExchangeJsonFromGit
      */
     protected void copyMetadataToArtifactExchangeJson(
             GitResourceMap gitResourceMap, ArtifactExchangeJson artifactExchangeJson) {
+        final String metadataFilePath = CommonConstants.METADATA + JSON_EXTENSION;
         GitResourceIdentity metadataIdentity =
-                new GitResourceIdentity(GitResourceType.ROOT_CONFIG, METADATA + JSON_EXTENSION, "");
+                new GitResourceIdentity(GitResourceType.ROOT_CONFIG, metadataFilePath, metadataFilePath);
         Object metadata = gitResourceMap.getGitResourceMap().get(metadataIdentity);
 
         Gson gson = new Gson();
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/TenantServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/TenantServiceCEImpl.java
index d37b761f1aba..2592b08a00fe 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/TenantServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/TenantServiceCEImpl.java
@@ -186,7 +186,8 @@ public Mono<Tenant> getDefaultTenant() {
                 .tap(Micrometer.observation(observationRegistry))
                 .flatMap(tenant -> repository.setUserPermissionsInObject(tenant).switchIfEmpty(Mono.just(tenant)))
                 .onErrorResume(e -> {
-                    log.error("Error fetching default tenant from redis!", e);
+                    e.printStackTrace();
+                    log.error("Error fetching default tenant from redis : {}", e.getMessage());
                     // If there is an error fetching the tenant from the cache, then evict the cache and fetching from
                     // the db. This handles the case for deserialization errors. This prevents the entire instance to
                     // go down if tenant cache is corrupted.
@@ -194,12 +195,14 @@ public Mono<Tenant> getDefaultTenant() {
                     log.info("Evicting the default tenant from cache and fetching from the database!");
                     return cacheableRepositoryHelper
                             .evictCachedTenant(tenantId)
-                            .then(repository.findBySlug(FieldName.DEFAULT).map(tenant -> {
-                                if (tenant.getTenantConfiguration() == null) {
-                                    tenant.setTenantConfiguration(new TenantConfiguration());
-                                }
-                                return tenant;
-                            }))
+                            .then(cacheableRepositoryHelper
+                                    .fetchDefaultTenant(tenantId)
+                                    .map(tenant -> {
+                                        if (tenant.getTenantConfiguration() == null) {
+                                            tenant.setTenantConfiguration(new TenantConfiguration());
+                                        }
+                                        return tenant;
+                                    }))
                             .name(FETCH_TENANT_CACHE_POST_DESERIALIZATION_ERROR_SPAN)
                             .tap(Micrometer.observation(observationRegistry))
                             .flatMap(tenant -> repository
diff --git a/app/server/appsmith-server/src/test/it/com/appsmith/server/git/GitBranchesITWithCentralService.java b/app/server/appsmith-server/src/test/it/com/appsmith/server/git/GitBranchesITWithCentralService.java
new file mode 100644
index 000000000000..c6ba7e8ae458
--- /dev/null
+++ b/app/server/appsmith-server/src/test/it/com/appsmith/server/git/GitBranchesITWithCentralService.java
@@ -0,0 +1,618 @@
+package com.appsmith.server.git;
+
+import com.appsmith.external.dtos.GitBranchDTO;
+import com.appsmith.external.dtos.GitRefDTO;
+import com.appsmith.external.dtos.GitStatusDTO;
+import com.appsmith.external.dtos.MergeStatusDTO;
+import com.appsmith.external.git.constants.ce.RefType;
+import com.appsmith.git.configurations.GitServiceConfig;
+import com.appsmith.git.dto.CommitDTO;
+import com.appsmith.server.applications.base.ApplicationService;
+import com.appsmith.server.configurations.ProjectProperties;
+import com.appsmith.server.constants.ArtifactType;
+import com.appsmith.server.constants.FieldName;
+import com.appsmith.server.constants.GitDefaultCommitMessage;
+import com.appsmith.server.domains.Application;
+import com.appsmith.server.domains.Artifact;
+import com.appsmith.server.domains.GitArtifactMetadata;
+import com.appsmith.server.domains.GitProfile;
+import com.appsmith.server.dtos.AutoCommitResponseDTO;
+import com.appsmith.server.dtos.GitConnectDTO;
+import com.appsmith.server.dtos.GitMergeDTO;
+import com.appsmith.server.dtos.GitPullDTO;
+import com.appsmith.server.git.autocommit.AutoCommitService;
+import com.appsmith.server.git.central.CentralGitService;
+import com.appsmith.server.git.central.GitType;
+import com.appsmith.server.git.resolver.GitArtifactHelperResolver;
+import com.appsmith.server.git.templates.contexts.GitContext;
+import com.appsmith.server.git.templates.providers.GitBranchesTestTemplateProvider;
+import com.appsmith.server.services.ConsolidatedAPIService;
+import com.appsmith.server.services.GitArtifactHelper;
+import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.api.Status;
+import org.eclipse.jgit.api.errors.GitAPIException;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.TestTemplate;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.security.test.context.support.WithUserDetails;
+import org.testcontainers.junit.jupiter.Testcontainers;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Iterator;
+import java.util.List;
+
+import static com.appsmith.external.git.constants.GitConstants.DEFAULT_COMMIT_MESSAGE;
+import static com.appsmith.external.git.constants.GitConstants.EMPTY_COMMIT_ERROR_MESSAGE;
+import static com.appsmith.server.exceptions.AppsmithError.GIT_MERGE_FAILED_LOCAL_CHANGES;
+import static com.appsmith.server.git.autocommit.AutoCommitEventHandlerImpl.AUTO_COMMIT_MSG_FORMAT;
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * This integration test suite validates the end-to-end Git workflow for artifacts, performing a sequence of
+ * operations that test repository setup, branch management, status validation, and cleanup. The operations
+ * proceed as follows:
+ *
+ * 1. **Connect Artifact to Git**:
+ *    - The artifact is connected to an empty Git repository using a remote URL provided by the Git server initializer.
+ *    - A system-generated commit is created as part of the connection process.
+ *    - Auto-commit is enabled by default, as verified in the artifact metadata.
+ *    - The repository is checked to confirm a single system-generated commit and a clean working directory.
+ *
+ * 2. **Verify Initial Repository State**:
+ *    - The default branch is initialized, and its name is verified to match the metadata.
+ *    - The repository status is confirmed to be clean with no uncommitted changes.
+ *
+ * 3. **Trigger and Validate Auto-Commit**:
+ *    - Auto-commit is triggered, and the resulting commit is validated in the Git log.
+ *    - Commit history is checked to confirm the auto-commit appears as a second commit following the initial system-generated commit.
+ *
+ * 4. **Perform Status, Pull, and Commit Operations on the Default Branch (`master`)**:
+ *    - The repository status is checked to confirm no changes (`isClean = true`).
+ *    - A `pull` operation is executed to ensure synchronization, even when no updates are available.
+ *    - A `commit` is attempted with no changes, and the response is validated to confirm no new commits were created.
+ *
+ * 5. **Create and Verify Branches**:
+ *    - A new branch `foo` is created from the default branch (`master`).
+ *    - Metadata for `foo` is validated, and the commit history confirms that `foo` starts from the latest commit on `master`.
+ *    - A second branch `bar` is created from `foo`. Its metadata is verified, and the commit log confirms it starts from the latest commit on `foo`.
+ *
+ * 6. **Test Merging Scenarios**:
+ *    - A merge from `bar` to `foo` is validated and shows no action required (`ALREADY_UP_TO_DATE`), as no changes exist.
+ *    - Additional changes made to `bar` are merged back into `foo` successfully.
+ *
+ * 7. **Branch Deletion and Repopulation**:
+ *    - The branch `foo` is deleted locally but repopulated from the remote repository.
+ *    - The latest commit on `foo` is verified to match the changes made on `foo` before deletion.
+ *    - An attempt to delete the currently checked-out branch (`master`) fails as expected.
+ *
+ * 8. **Make Changes and Validate Commits**:
+ *    - Changes are made to the artifact on `foo` to trigger diffs.
+ *    - The repository status is validated as `isClean = false` with pending changes.
+ *    - A commit is created with a custom message, and the Git log confirms the commit as the latest on `foo`.
+ *    - Changes are successfully discarded, restoring the repository to a clean state.
+ *
+ * 9. **Set and Test Branch Protection**:
+ *    - The `master` branch is marked as protected. Commits directly to `master` are restricted.
+ *    - Attempts to commit to `master` fail with the appropriate error message.
+ *
+ * 10. **Merge Branches (`baz` to `bar`)**:
+ *     - A new branch `baz` is created from `bar`, and its commit log is verified.
+ *     - Changes are made to `baz` and successfully merged into `bar` via a fast-forward merge.
+ *     - The commit history confirms the merge, and the top commit matches the changes made in `baz`.
+ *
+ * 11. **Disconnect Artifact and Cleanup**:
+ *     - The artifact is disconnected from the Git repository.
+ *     - All repository branches (`foo`, `bar`, `baz`) except `master` are removed.
+ *     - The file system is verified to confirm all repository data is cleaned up.
+ *     - Applications associated with the deleted branches are also removed.
+ *
+ * This test suite ensures comprehensive coverage of Git workflows, including repository connection, branch creation,
+ * branch protection, merging, status validation, and repository cleanup. Each operation includes detailed assertions
+ * to validate expected outcomes and handle edge cases.
+ */
+
+@Testcontainers
+@SpringBootTest
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class GitBranchesITWithCentralService {
+
+    @Autowired
+    @RegisterExtension
+    GitBranchesTestTemplateProvider templateProvider;
+
+    @Autowired
+    @RegisterExtension
+    ArtifactBuilderExtension artifactBuilderExtension;
+
+    @Autowired
+    @RegisterExtension
+    GitServerInitializerExtension gitServerInitializerExtension;
+
+    @Autowired
+    CentralGitService centralGitService;
+    @Autowired
+    GitTestUtils gitTestUtils;
+    @Autowired
+    GitArtifactHelperResolver gitArtifactHelperResolver;
+    @Autowired
+    GitServiceConfig gitServiceConfig;
+    @Autowired
+    AutoCommitService autoCommitService;
+    @Autowired
+    ProjectProperties projectProperties;
+    @Autowired
+    ApplicationService applicationService;
+    @Autowired
+    ConsolidatedAPIService consolidatedAPIService;
+
+    final String ORIGIN = "https://foo.bar.com";
+
+    @TestTemplate
+    @WithUserDetails(value = "api_user")
+    void test(GitContext gitContext, ExtensionContext extensionContext) throws IOException, GitAPIException, InterruptedException {
+
+        ExtensionContext.Store contextStore = extensionContext.getStore(ExtensionContext.Namespace.create(ArtifactBuilderExtension.class));
+        String artifactId = contextStore.get(FieldName.ARTIFACT_ID, String.class);
+
+        GitConnectDTO connectDTO = new GitConnectDTO();
+        connectDTO.setRemoteUrl(gitServerInitializerExtension.getGitSshUrl("test" + artifactId));
+        GitProfile gitProfile = new GitProfile("foo bar", "foo@bar.com", null);
+        connectDTO.setGitProfile(gitProfile);
+
+        // TODO:
+        //  - Move the filePath variable to be relative, so that template name and repo name is prettier
+        //  - Is it possible to use controller layer here? Might help with also including web filters in IT
+        Artifact artifact = centralGitService.connectArtifactToGit(artifactId, gitContext.getArtifactType(), connectDTO, ORIGIN, GitType.FILE_SYSTEM)
+            .block();
+
+        assertThat(artifact).isNotNull();
+
+        ArtifactType artifactType = artifact.getArtifactType();
+        GitArtifactMetadata artifactMetadata = artifact.getGitArtifactMetadata();
+        GitArtifactHelper<?> artifactHelper = gitArtifactHelperResolver.getArtifactHelper(artifactType);
+        Path repoSuffix = artifactHelper.getRepoSuffixPath(
+            artifact.getWorkspaceId(),
+            artifactMetadata.getDefaultArtifactId(),
+            artifactMetadata.getRepoName());
+
+        // Auto-commit should be turned on by default
+        assertThat(artifactMetadata.getAutoCommitConfig().getEnabled()).isTrue();
+
+        Path path = Path.of(gitServiceConfig.getGitRootPath()).resolve(repoSuffix);
+        String branch;
+        ObjectId topOfCommits;
+
+        try (Git git = Git.open(path.toFile())) {
+            branch = git.log().getRepository().getBranch();
+            assertThat(branch).isEqualTo(artifactMetadata.getRefName());
+
+            // Assert only single system generated commit exists on FS
+            Iterable<RevCommit> commits = git.log().call();
+            Iterator<RevCommit> commitIterator = commits.iterator();
+            assertThat(commitIterator.hasNext()).isTrue();
+
+            RevCommit firstCommit = commitIterator.next();
+            assertThat(firstCommit.getFullMessage()).isEqualTo(DEFAULT_COMMIT_MESSAGE + GitDefaultCommitMessage.CONNECT_FLOW.getReason());
+            topOfCommits = firstCommit.getId();
+
+            // TODO: Check why there is ane extra commit
+            assertThat(commitIterator.hasNext()).isTrue();
+
+            // Assert that git directory is clean
+            Status status = git.status().call();
+            assertThat(status.isClean()).isTrue();
+        }
+
+        // Assert that the artifact does have auto-commit requirements, and auto-commit gets initiated
+        AutoCommitResponseDTO autoCommitResponseDTO = autoCommitService.autoCommitApplication(artifactId).block();
+
+        assertThat(autoCommitResponseDTO).isNotNull();
+        AutoCommitResponseDTO.AutoCommitResponse autoCommitProgress = autoCommitResponseDTO.getAutoCommitResponse();
+        // This check requires RTS to be running on your local since client side changes come in from there
+        // Please make sure to run RTS before triggering this test
+        assertThat(autoCommitProgress).isEqualTo(AutoCommitResponseDTO.AutoCommitResponse.PUBLISHED);
+
+        // Wait for auto-commit to complete
+        // This should not take more than 2 seconds, we're checking every 500 ms
+        long startTime = System.currentTimeMillis(), currentTime = System.currentTimeMillis();
+        while (!autoCommitProgress.equals(AutoCommitResponseDTO.AutoCommitResponse.IDLE)) {
+            Thread.sleep(500);
+            //TODO: Undo this
+            if (currentTime - startTime > 2000) {
+//                fail("Auto-commit took too long");
+            }
+            autoCommitProgress = getAutocommitProgress(artifactId, artifact, artifactMetadata);
+            currentTime = System.currentTimeMillis();
+        }
+
+        // Now there should be two commits in the git log response
+        try (Git git = Git.open(path.toFile())) {
+            branch = git.log().getRepository().getBranch();
+            assertThat(branch).isEqualTo(artifactMetadata.getRefName());
+
+            Iterable<RevCommit> commits = git.log().call();
+            Iterator<RevCommit> commitIterator = commits.iterator();
+            assertThat(commitIterator.hasNext()).isTrue();
+
+            RevCommit autoCommit = commitIterator.next();
+            /*
+            org.opentest4j.AssertionFailedError:
+            expected: "System generated commit, to support new features in Appsmith UNKNOWN"
+             but was: "System generated commit, initial commit"
+            Expected :"System generated commit, to support new features in Appsmith UNKNOWN"
+            Actual   :"System generated commit, initial commit"
+            <Click to see difference>
+             */
+            assertThat(autoCommit.getFullMessage()).isEqualTo(String.format(AUTO_COMMIT_MSG_FORMAT, projectProperties.getVersion()));
+            assertThat(commitIterator.hasNext()).isTrue();
+            RevCommit firstCommit = commitIterator.next();
+            assertThat(firstCommit.getId()).isEqualTo(topOfCommits);
+
+            topOfCommits = autoCommit.getId();
+        }
+
+        // Assert that the initialized branch is set as default
+        assertThat(artifactMetadata.getRefName()).isEqualTo(artifactMetadata.getDefaultBranchName());
+
+        // Assert that the branch is not protected by default
+        assertThat(artifactMetadata.getBranchProtectionRules()).isNullOrEmpty();
+
+        // Check that the status is clean
+        GitStatusDTO statusDTO = centralGitService.getStatus(artifactId, artifactType, true, GitType.FILE_SYSTEM).block();
+        assertThat(statusDTO).isNotNull();
+        assertThat(statusDTO.getIsClean()).isTrue();
+        assertThat(statusDTO.getAheadCount()).isEqualTo(0);
+        assertThat(statusDTO.getBehindCount()).isEqualTo(0);
+
+        // Check that pull when not required, still goes through
+        GitPullDTO gitPullDTO = centralGitService.pullArtifact(artifactId, artifactType, GitType.FILE_SYSTEM).block();
+        assertThat(gitPullDTO).isNotNull();
+
+        // Check that commit says that there is nothing to commit
+        CommitDTO newCommitDTO = new CommitDTO();
+        newCommitDTO.setMessage("Unused message");
+        String commitResponse = centralGitService.commitArtifact(newCommitDTO, artifactId, artifactType, GitType.FILE_SYSTEM)
+            .block();
+
+        assertThat(commitResponse).contains(EMPTY_COMMIT_ERROR_MESSAGE);
+
+        // Check that the previous attempt didn't actually go through
+        try (Git git = Git.open(path.toFile())) {
+            branch = git.log().getRepository().getBranch();
+            assertThat(branch).isEqualTo(artifactMetadata.getRefName());
+
+            Iterable<RevCommit> commits = git.log().call();
+            assertThat(commits.iterator().next().getId()).isEqualTo(topOfCommits);
+        }
+
+        // Check that discard, even when not required, goes through
+        Artifact discardedArtifact = centralGitService.discardChanges(artifactId, artifactType, GitType.FILE_SYSTEM).block();
+        assertThat(discardedArtifact).isNotNull();
+
+        // Make a change in the artifact to trigger a diff
+        gitTestUtils.createADiffInArtifact(artifact).block();
+
+        // Check that the status is not clean
+        GitStatusDTO statusDTO2 = centralGitService.getStatus(artifactId, artifactType, true, GitType.FILE_SYSTEM).block();
+        assertThat(statusDTO2).isNotNull();
+        assertThat(statusDTO2.getIsClean()).isFalse();
+        assertThat(statusDTO2.getAheadCount()).isEqualTo(0);
+        assertThat(statusDTO2.getBehindCount()).isEqualTo(0);
+
+        // Check that commit makes the custom message be the top of the log
+        CommitDTO commitDTO2 = new CommitDTO();
+        commitDTO2.setMessage("Custom message");
+        String commitResponse2 = centralGitService.commitArtifact(commitDTO2, artifactId, artifactType, GitType.FILE_SYSTEM)
+            .block();
+
+        assertThat(commitResponse2).contains("Committed successfully!");
+
+        try (Git git = Git.open(path.toFile())) {
+            branch = git.log().getRepository().getBranch();
+            assertThat(branch).isEqualTo(artifactMetadata.getRefName());
+
+            Iterable<RevCommit> commits = git.log().call();
+            Iterator<RevCommit> commitIterator = commits.iterator();
+            RevCommit newCommit = commitIterator.next();
+            assertThat(newCommit.getFullMessage()).isEqualTo("Custom message");
+
+            assertThat(commitIterator.next().getId()).isEqualTo(topOfCommits);
+
+            topOfCommits = newCommit.getId();
+        }
+
+        // Check that status is clean again
+        GitStatusDTO statusDTO3 = centralGitService.getStatus(artifactId, artifactType, true, GitType.FILE_SYSTEM).block();
+        assertThat(statusDTO3).isNotNull();
+        assertThat(statusDTO3.getIsClean()).isTrue();
+        assertThat(statusDTO3.getAheadCount()).isEqualTo(0);
+        assertThat(statusDTO3.getBehindCount()).isEqualTo(0);
+
+        // Make another change to trigger a diff
+        gitTestUtils.createADiffInArtifact(artifact).block();
+
+        // Check that status in not clean
+        GitStatusDTO statusDTO4 = centralGitService.getStatus(artifactId, artifactType, true, GitType.FILE_SYSTEM ).block();
+        assertThat(statusDTO4).isNotNull();
+        assertThat(statusDTO4.getIsClean()).isFalse();
+        assertThat(statusDTO4.getAheadCount()).isEqualTo(0);
+        assertThat(statusDTO4.getBehindCount()).isEqualTo(0);
+
+        // Protect the master branch
+        List<String> protectedBranches = centralGitService.updateProtectedBranches(artifactId, artifactType, List.of(branch)).block();
+        assertThat(protectedBranches).containsExactly(branch);
+
+        // Now try to commit, and check that it fails
+        CommitDTO commitDTO3 = new CommitDTO();
+        commitDTO3.setMessage("Failed commit");
+        Mono<String> commitResponse3Mono = centralGitService.commitArtifact(commitDTO3, artifactId, artifactType, GitType.FILE_SYSTEM);
+        StepVerifier.create(commitResponse3Mono)
+            .expectErrorSatisfies(e -> assertThat(e.getMessage()).contains("Cannot commit to protected branch"))
+            .verify();
+
+        // Create a new branch foo from master, check that the commit for new branch is created as system generated
+        // On top of the previous custom commit
+        GitRefDTO gitRefDTO = new GitRefDTO();
+        gitRefDTO.setRefName("foo");
+        gitRefDTO.setRefType(RefType.branch);
+        Artifact fooArtifact = centralGitService.createReference(artifactId, artifactType, gitRefDTO, GitType.FILE_SYSTEM).block();
+        assertThat(fooArtifact).isNotNull();
+
+        String fooArtifactId = fooArtifact.getId();
+        GitArtifactMetadata fooMetadata = fooArtifact.getGitArtifactMetadata();
+        assertThat(fooMetadata.getRefName()).isEqualTo("foo");
+
+        try (Git git = Git.open(path.toFile())) {
+            // since the new flow discards the parent branch,
+            // the parent branch is checkedOut at last.
+
+            Iterable<RevCommit> commits = git.log().call();
+            Iterator<RevCommit> commitIterator = commits.iterator();
+            RevCommit newCommit = commitIterator.next();
+            assertThat(newCommit.getId()).isEqualTo(topOfCommits);
+        }
+
+        // Since the status
+        // Check that status on foo, it should be dirty
+        GitStatusDTO statusDTO5 = centralGitService.getStatus(fooArtifactId, artifactType, true, GitType.FILE_SYSTEM).block();
+        assertThat(statusDTO5).isNotNull();
+        assertThat(statusDTO5.getIsClean()).isFalse();
+        assertThat(statusDTO5.getAheadCount()).isEqualTo(0);
+        assertThat(statusDTO5.getBehindCount()).isEqualTo(0);
+
+        // Create another branch bar from foo
+        GitRefDTO barBranchDTO = new GitRefDTO();
+        barBranchDTO.setRefName("bar");
+        barBranchDTO.setRefType(RefType.branch);
+        Artifact barArtifact = centralGitService.createReference(fooArtifactId, artifactType, barBranchDTO, GitType.FILE_SYSTEM).block();
+        assertThat(barArtifact).isNotNull();
+
+        String barArtifactId = barArtifact.getId();
+        GitArtifactMetadata barMetadata = barArtifact.getGitArtifactMetadata();
+        assertThat(barMetadata.getRefName()).isEqualTo("bar");
+
+        try (Git git = Git.open(path.toFile())) {
+            Iterable<RevCommit> commits = git.log().call();
+            Iterator<RevCommit> commitIterator = commits.iterator();
+            assertThat(commitIterator.next().getId()).isEqualTo(topOfCommits);
+        }
+
+        // Check that status on foo,
+        // it should be clean as the diff is transferred to new branch bar
+        GitStatusDTO fooStatusDTO = centralGitService.getStatus(fooArtifactId, artifactType, true, GitType.FILE_SYSTEM).block();
+        assertThat(fooStatusDTO).isNotNull();
+        assertThat(fooStatusDTO.getIsClean()).isTrue();
+        assertThat(fooStatusDTO.getAheadCount()).isEqualTo(0);
+        assertThat(fooStatusDTO.getBehindCount()).isEqualTo(0);
+
+        // Check that status on bar, it should be dirty
+        GitStatusDTO barStatusDTO = centralGitService.getStatus(barArtifactId, artifactType, true, GitType.FILE_SYSTEM).block();
+        assertThat(barStatusDTO).isNotNull();
+        assertThat(barStatusDTO.getIsClean()).isFalse();
+        assertThat(barStatusDTO.getAheadCount()).isEqualTo(0);
+        assertThat(barStatusDTO.getBehindCount()).isEqualTo(0);
+
+        Artifact discardBarBranch = centralGitService.discardChanges(barArtifactId, artifactType, GitType.FILE_SYSTEM).block();
+        assertThat(discardBarBranch).isNotNull();
+
+        // Check merge status to foo shows no action required
+        // bar -> foo
+        GitMergeDTO gitMergeDTO = new GitMergeDTO();
+        gitMergeDTO.setDestinationBranch("foo");
+        gitMergeDTO.setSourceBranch("bar");
+        MergeStatusDTO mergeStatusDTO = centralGitService.isBranchMergable(barArtifactId, artifactType, gitMergeDTO, GitType.FILE_SYSTEM ).block();
+        assertThat(mergeStatusDTO).isNotNull();
+        assertThat(mergeStatusDTO.getStatus()).isEqualTo("ALREADY_UP_TO_DATE");
+
+        // Delete foo locally and re-populate from remote
+        List<String> branchList = centralGitService.listBranchForArtifact(artifactId, artifactType, false, GitType.FILE_SYSTEM)
+            .flatMapMany(Flux::fromIterable)
+            .map(GitBranchDTO::getBranchName)
+            .collectList()
+            .block();
+        assertThat(branchList).containsExactlyInAnyOrder(
+            artifactMetadata.getRefName(),
+            "origin/" + artifactMetadata.getRefName(),
+            fooMetadata.getRefName(),
+            "origin/" + fooMetadata.getRefName(),
+            barMetadata.getRefName(),
+            "origin/" + barMetadata.getRefName());
+
+        Mono<? extends Artifact> deleteBranchAttemptMono = centralGitService.deleteGitReference(artifactId, artifactType, gitRefDTO, GitType.FILE_SYSTEM);
+        StepVerifier
+            .create(deleteBranchAttemptMono)
+            .expectErrorSatisfies(e -> assertThat(e.getMessage()).contains("Cannot delete current checked out branch"))
+            .verify();
+
+        // TODO: I'm having to checkout myself to be able to delete the branch.
+        //  Are we relying on auto-commit check to do this otherwise?
+        //  Is this a potential bug?
+        try (Git git = Git.open(path.toFile())) {
+            git.checkout().setName("bar").call();
+        }
+
+        GitRefDTO deleteFooDTO = new GitRefDTO();
+        deleteFooDTO.setRefType(RefType.branch);
+        deleteFooDTO.setRefName("foo");
+        centralGitService.deleteGitReference(artifactId, artifactType, deleteFooDTO, GitType.FILE_SYSTEM).block();
+
+        List<String> branchList2 = centralGitService.listBranchForArtifact(artifactId, artifactType, false, GitType.FILE_SYSTEM)
+            .flatMapMany(Flux::fromIterable)
+            .map(GitBranchDTO::getBranchName)
+            .collectList()
+            .block();
+        assertThat(branchList2).containsExactlyInAnyOrder(
+            artifactMetadata.getRefName(),
+            "origin/" + artifactMetadata.getRefName(),
+            "origin/" + fooMetadata.getRefName(),
+            barMetadata.getRefName(),
+            "origin/" + barMetadata.getRefName());
+
+        GitRefDTO checkoutFooDTO = new GitRefDTO();
+        checkoutFooDTO.setRefName("origin/foo");
+        checkoutFooDTO.setRefType(RefType.branch);
+        Artifact checkedOutFooArtifact = centralGitService.checkoutReference(artifactId, artifactType, checkoutFooDTO, true, GitType.FILE_SYSTEM).block();
+
+        assertThat(checkedOutFooArtifact).isNotNull();
+        List<String> branchList3 = centralGitService.listBranchForArtifact(artifactId, artifactType, false, GitType.FILE_SYSTEM)
+            .flatMapMany(Flux::fromIterable)
+            .map(GitBranchDTO::getBranchName)
+            .collectList()
+            .block();
+        assertThat(branchList3).containsExactlyInAnyOrder(
+            artifactMetadata.getRefName(),
+            "origin/" + artifactMetadata.getRefName(),
+            fooMetadata.getRefName(),
+            "origin/" + fooMetadata.getRefName(),
+            barMetadata.getRefName(),
+            "origin/" + barMetadata.getRefName());
+
+        // Verify latest commit on foo should be same as changes made on foo previously
+        try (Git git = Git.open(path.toFile())) {
+            branch = git.log().getRepository().getBranch();
+            assertThat(branch).isEqualTo(fooMetadata.getRefName());
+
+            Iterable<RevCommit> commits = git.log().call();
+            Iterator<RevCommit> commitIterator = commits.iterator();
+
+            assertThat(commitIterator.next().getId()).isEqualTo(topOfCommits);
+        }
+
+        // Make more changes on foo and attempt discard
+        gitTestUtils.createADiffInArtifact(checkedOutFooArtifact).block();
+
+        GitStatusDTO discardableStatus = centralGitService.getStatus(checkedOutFooArtifact.getId(), artifactType, false, GitType.FILE_SYSTEM).block();
+
+        assertThat(discardableStatus).isNotNull();
+        assertThat(discardableStatus.getIsClean()).isFalse();
+
+        Artifact discardedFoo = centralGitService.discardChanges(checkedOutFooArtifact.getId(), artifactType, GitType.FILE_SYSTEM).block();
+
+        GitStatusDTO discardedStatus = centralGitService.getStatus(checkedOutFooArtifact.getId(), artifactType, false, GitType.FILE_SYSTEM).block();
+
+        assertThat(discardedStatus).isNotNull();
+        // TODO: Why is this not clean?
+        //  There is an on page load that gets triggered here that is causing a diff
+        //  This should ideally have already been fixed on initial artifact import
+//        assertThat(discardedStatus.getIsClean()).isTrue();
+
+        // Make a change to trigger a diff on bar
+        gitTestUtils.createADiffInArtifact(barArtifact).block();
+
+        // Check merge status to master shows not merge-able
+        GitMergeDTO gitMergeDTO2 = new GitMergeDTO();
+        gitMergeDTO2.setSourceBranch("bar");
+        gitMergeDTO2.setDestinationBranch("master");
+        MergeStatusDTO mergeStatusDTO2 = centralGitService.isBranchMergable(barArtifactId, artifactType, gitMergeDTO2, GitType.FILE_SYSTEM).block();
+
+        assertThat(mergeStatusDTO2).isNotNull();
+        assertThat(mergeStatusDTO2.isMergeAble()).isFalse();
+        assertThat(mergeStatusDTO2.getMessage()).contains(GIT_MERGE_FAILED_LOCAL_CHANGES.getMessage("bar"));
+
+        // Create a new branch baz and check for new commit
+        GitRefDTO gitBranchDTO = new GitRefDTO();
+        gitBranchDTO.setRefName("baz");
+        gitBranchDTO.setRefType(RefType.branch);
+        Artifact bazArtifact = centralGitService.createReference(barArtifactId, artifactType, gitBranchDTO, GitType.FILE_SYSTEM).block();
+        assertThat(bazArtifact).isNotNull();
+
+        try (Git git = Git.open(path.toFile())) {
+            Iterable<RevCommit> commits = git.log().call();
+            Iterator<RevCommit> commitIterator = commits.iterator();
+            RevCommit newCommit = commitIterator.next();
+            assertThat(newCommit.getId()).isEqualTo(topOfCommits);
+        }
+
+        GitStatusDTO bazStatus = centralGitService.getStatus(bazArtifact.getId(), artifactType, true, GitType.FILE_SYSTEM).block();
+        assertThat(bazStatus).isNotNull();
+        assertThat(bazStatus.getIsClean()).isFalse();
+
+        centralGitService.discardChanges(bazArtifact.getId(), artifactType, GitType.FILE_SYSTEM).block();
+
+        GitStatusDTO bazStatus2 = centralGitService.getStatus(bazArtifact.getId(), artifactType, true, GitType.FILE_SYSTEM).block();
+        assertThat(bazStatus2).isNotNull();
+        assertThat(bazStatus2.getIsClean()).isTrue();
+
+        GitMergeDTO gitMergeDTO3 = new GitMergeDTO();
+        gitMergeDTO3.setSourceBranch("baz");
+        gitMergeDTO3.setDestinationBranch("bar");
+
+        MergeStatusDTO mergeStatusDTO3 = centralGitService.isBranchMergable(bazArtifact.getId(), artifactType, gitMergeDTO3, GitType.FILE_SYSTEM).block();
+        assertThat(mergeStatusDTO3).isNotNull();
+        assertThat(mergeStatusDTO3.isMergeAble()).isTrue();
+
+        GitStatusDTO barStatus2 = centralGitService.getStatus(barArtifactId, artifactType, true, GitType.FILE_SYSTEM).block();
+        assertThat(barStatus2).isNotNull();
+        assertThat(barStatus2.getIsClean()).isTrue();
+
+        MergeStatusDTO barToBazMergeStatus = centralGitService.mergeBranch(bazArtifact.getId(), artifactType, gitMergeDTO3, GitType.FILE_SYSTEM).block();
+
+        assertThat(barToBazMergeStatus).isNotNull();
+        assertThat(barToBazMergeStatus.isMergeAble()).isTrue();
+        assertThat(barToBazMergeStatus.getStatus()).contains("ALREADY_UP_TO_DATE");
+
+        // Since fast-forward should succeed here, top of commit should not change
+        try (Git git = Git.open(path.toFile())) {
+            Iterable<RevCommit> commits = git.log().call();
+            Iterator<RevCommit> commitIterator = commits.iterator();
+            assertThat(commitIterator.next().getId()).isEqualTo(topOfCommits);
+        }
+
+        // Disconnect artifact and verify non-existence of `foo`, `bar` and `baz`
+        Artifact disconnectedArtifact = centralGitService.detachRemote(artifactId, artifactType, GitType.FILE_SYSTEM).block();
+
+        assertThat(disconnectedArtifact).isNotNull();
+        assertThat(disconnectedArtifact.getGitArtifactMetadata()).isNull();
+
+        // TODO: This needs to be generified for artifacts
+        Application deletedFooArtifact = applicationService.findById(checkedOutFooArtifact.getId()).block();
+        assertThat(deletedFooArtifact).isNull();
+        Application deletedBarArtifact = applicationService.findById(barArtifactId).block();
+        assertThat(deletedBarArtifact).isNull();
+        Application deletedBazArtifact = applicationService.findById(bazArtifact.getId()).block();
+        assertThat(deletedBazArtifact).isNull();
+        Application existingMasterArtifact = applicationService.findById(artifactId).block();
+        assertThat(existingMasterArtifact).isNotNull();
+
+        // Verify FS is clean after disconnect
+        boolean repoDirectoryNotExists = Files.notExists(path);
+        assertThat(repoDirectoryNotExists).isTrue();
+    }
+
+    private AutoCommitResponseDTO.AutoCommitResponse getAutocommitProgress(String artifactId, Artifact artifact, GitArtifactMetadata artifactMetadata) {
+        AutoCommitResponseDTO autoCommitProgress = centralGitService.getAutoCommitProgress(artifactId, artifact.getArtifactType(), artifactMetadata.getRefName()).block();
+
+        assertThat(autoCommitProgress).isNotNull();
+        return autoCommitProgress.getAutoCommitResponse();
+    }
+}