diff --git a/.coderabbit.yaml b/.coderabbit.yaml
index 308553066b61..12abe96745f8 100644
--- a/.coderabbit.yaml
+++ b/.coderabbit.yaml
@@ -1,7 +1,7 @@
 # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json
 language: "en-US"
 early_access: false
-tone_instructions: 'You must talk like teacher.'
+tone_instructions: 'You are an expert code reviewer in Java, TypeScript, JavaScript, and NodeJS. You work in an enterprise software developer team, providing concise and clear code review advice.You only elaborate or provide detailed explanations when requested.' 
 reviews:
   profile: "chill"
   request_changes_workflow: false
@@ -12,6 +12,7 @@ reviews:
   auto_review:
     enabled: true
     drafts: false
+    base_branches: ["pg", "release"]
   path_instructions:
     - path: "app/client/cypress/**/**.*"
       instructions: |
@@ -34,4 +35,4 @@ reviews:
         - Do not use duplicate filenames even with different paths.
         - Avoid using agHelper.Sleep, this.Sleep in any file in code.
 chat:
-  auto_reply: true
\ No newline at end of file
+  auto_reply: true
diff --git a/.github/config.json b/.github/config.json
index 7117d4ab6143..1e541bd76b49 100644
--- a/.github/config.json
+++ b/.github/config.json
@@ -1 +1 @@
-{"runners":[{"versioning":{"source":"milestones","type":"SemVer"},"prereleaseName":"alpha","issue":{"labels":{"Widgets Product":{"conditions":[{"label":"Button Widget","type":"hasLabel","value":true},{"label":"Chart Widget","type":"hasLabel","value":true},{"label":"Container Widget","type":"hasLabel","value":true},{"label":"Date Picker Widget","type":"hasLabel","value":true},{"label":"Select Widget","type":"hasLabel","value":true},{"label":"File Picker Widget","type":"hasLabel","value":true},{"label":"Form Widget","type":"hasLabel","value":true},{"label":"Image Widget","type":"hasLabel","value":true},{"label":"Input Widget","type":"hasLabel","value":true},{"label":"List Widget","type":"hasLabel","value":true},{"label":"MultiSelect Widget","type":"hasLabel","value":true},{"label":"Map Widget","type":"hasLabel","value":true},{"label":"Modal Widget","type":"hasLabel","value":true},{"label":"Radio Widget","type":"hasLabel","value":true},{"label":"Rich Text Editor Widget","type":"hasLabel","value":true},{"label":"Tab Widget","type":"hasLabel","value":true},{"label":"Table Widget","type":"hasLabel","value":true},{"label":"Text Widget","type":"hasLabel","value":true},{"label":"Video Widget","type":"hasLabel","value":true},{"label":"iFrame","type":"hasLabel","value":true},{"label":"Menu Button","type":"hasLabel","value":true},{"label":"Rating","type":"hasLabel","value":true},{"label":"Widget Validation","type":"hasLabel","value":true},{"label":"New Widget","type":"hasLabel","value":true},{"label":"Switch widget","type":"hasLabel","value":true},{"label":"Audio Widget","type":"hasLabel","value":true},{"label":"Icon Button Widget","type":"hasLabel","value":true},{"label":"Stat Box Widget","type":"hasLabel","value":true},{"label":"Voice Recorder Widget","type":"hasLabel","value":true},{"label":"Calendar Widget","type":"hasLabel","value":true},{"label":"Menu Button Widget","type":"hasLabel","value":true},{"label":"Divider Widget","type":"hasLabel","value":true},{"label":"Rating Widget","type":"hasLabel","value":true},{"label":"View Mode","type":"hasLabel","value":true},{"label":"Widget Property","type":"hasLabel","value":true},{"label":"Document Viewer Widget","type":"hasLabel","value":true},{"label":"Radio Group Widget","type":"hasLabel","value":true},{"label":"Currency Input Widget","type":"hasLabel","value":true},{"label":"TreeSelect","type":"hasLabel","value":true},{"label":"MultiTree Select Widget","type":"hasLabel","value":true},{"label":"Phone Input Widget","type":"hasLabel","value":true},{"label":"JSON Form","type":"hasLabel","value":true},{"label":"All Widgets","type":"hasLabel","value":true},{"label":"Button Group widget","type":"hasLabel","value":true},{"label":"Progress bar widget","type":"hasLabel","value":true},{"label":"Audio Recorder Widget","type":"hasLabel","value":true},{"label":"Camera Widget","type":"hasLabel","value":true},{"label":"Table Widget V2","type":"hasLabel","value":true},{"label":"Map Chart Widget","type":"hasLabel","value":true},{"label":"Code Scanner Widget","type":"hasLabel","value":true},{"label":"Widget keyboard accessibility","type":"hasLabel","value":true},{"label":"List Widget V2","type":"hasLabel","value":true},{"label":"Slider Widget","type":"hasLabel","value":true},{"label":"One-click Binding","type":"hasLabel","value":true},{"label":"Old widget version","type":"hasLabel","value":true},{"label":"Widget Discoverability","type":"hasLabel","value":true},{"label":"Switch Group Widget","type":"hasLabel","value":true},{"label":"Checkbox Group widget","type":"hasLabel","value":true},{"label":"Checkbox Widget","type":"hasLabel","value":true},{"label":"Table Inline Edit","type":"hasLabel","value":true},{"label":"Custom Widgets","type":"hasLabel","value":true}],"requires":1},"Javascript Product":{"conditions":[{"label":"JS Linting & Errors","type":"hasLabel","value":true},{"label":"Autocomplete","type":"hasLabel","value":true},{"label":"Evaluated Value","type":"hasLabel","value":true},{"label":"Slash Command","type":"hasLabel","value":true},{"label":"New JS Function","type":"hasLabel","value":true},{"label":"JS Usability","type":"hasLabel","value":true},{"label":"Framework Functions","type":"hasLabel","value":true},{"label":"JS Objects","type":"hasLabel","value":true},{"label":"JS Evaluation","type":"hasLabel","value":true},{"label":"Custom JS Libraries","type":"hasLabel","value":true},{"label":"Action Selector","type":"hasLabel","value":true},{"label":"Widget setter method","type":"hasLabel","value":true},{"label":"Entity Refactor","type":"hasLabel","value":true},{"label":"AST-frontend","type":"hasLabel","value":true},{"label":"Sniping Mode","type":"hasLabel","value":true},{"label":"AST-backend","type":"hasLabel","value":true}],"requires":1},"IDE Product":{"conditions":[{"label":"IDE Product","type":"hasLabel","value":true},{"label":"IDE Infra","type":"hasLabel","value":true},{"label":"IDE Navigation","type":"hasLabel","value":true},{"label":"IDE tabs","type":"hasLabel","value":true},{"label":"Omnibar","type":"hasLabel","value":true},{"label":"Entity Explorer","type":"hasLabel","value":true},{"label":"Page Management","type":"hasLabel","value":true},{"label":"Preview mode","type":"hasLabel","value":true}],"requires":1},"Accelerators Product":{"conditions":[{"label":"Generate Page","type":"hasLabel","value":true},{"label":"Building blocks","type":"hasLabel","value":true}],"requires":1},"Templates Product":{"conditions":[{"label":"Partial-import-export","type":"hasLabel","value":true},{"label":"Templates Product","type":"hasLabel","value":true}],"requires":1},"Design System Product":{"conditions":[{"label":"Design System Product","type":"hasLabel","value":true},{"label":"ADS Component Issue","type":"hasLabel","value":true},{"label":"Keyboard accessibility ","type":"hasLabel","value":true},{"label":"Toggle button","type":"hasLabel","value":true},{"label":"ADS Category Token","type":"hasLabel","value":true},{"label":"ADS Component Documentation","type":"hasLabel","value":true},{"label":"ADS Migration","type":"hasLabel","value":true},{"label":"ADS Deduplication ","type":"hasLabel","value":true},{"label":"ADS Revamp","type":"hasLabel","value":true},{"label":"ADS Deduplication","type":"hasLabel","value":true},{"label":"ADS Unit Test","type":"hasLabel","value":true},{"label":"ADS Components","type":"hasLabel","value":true},{"label":"ADS Grayscale","type":"hasLabel","value":true},{"label":"Design System","type":"hasLabel","value":true},{"label":"ADS Typography","type":"hasLabel","value":true},{"label":"ADS Visual Styles","type":"hasLabel","value":true},{"label":"ADS Component Design","type":"hasLabel","value":true},{"label":"Modal Component","type":"hasLabel","value":true},{"label":"ADS Spacing","type":"hasLabel","value":true},{"label":"ads unit test","type":"hasLabel","value":true},{"label":"ads revamp","type":"hasLabel","value":true},{"label":"ads deduplication","type":"hasLabel","value":true}],"requires":1},"RBAC Product":{"conditions":[{"label":"Invite users","type":"hasLabel","value":true},{"label":"RBAC Product","type":"hasLabel","value":true}],"requires":1},"Workspace Product":{"conditions":[{"label":"Home Page","type":"hasLabel","value":true},{"label":"Workspace Product","type":"hasLabel","value":true}],"requires":1},"Billing & Licensing Product":{"conditions":[{"label":"Customer Portal","type":"hasLabel","value":true},{"label":"Cloud Services","type":"hasLabel","value":true},{"label":"Billing","type":"hasLabel","value":true},{"label":"Self Serve","type":"hasLabel","value":true},{"label":"Enterprise Billing","type":"hasLabel","value":true},{"label":"Analytics Improvements","type":"hasLabel","value":true},{"label":"Self Serve 1.0","type":"hasLabel","value":true},{"label":"License","type":"hasLabel","value":true},{"label":"BE instance","type":"hasLabel","value":true},{"label":"Invite flow","type":"hasLabel","value":true},{"label":"CE Instance Usage","type":"hasLabel","value":true},{"label":"Feature Flagging","type":"hasLabel","value":true}],"requires":1},"Packages Product":{"conditions":[{"label":"Packages Product","type":"hasLabel","value":true}],"requires":1},"Environments Product":{"conditions":[{"label":"Environments Product","type":"hasLabel","value":true}],"requires":1},"UI Building Product":{"conditions":[{"label":"Property Pane","type":"hasLabel","value":true},{"label":"Copy Paste","type":"hasLabel","value":true},{"label":"Drag & Drop","type":"hasLabel","value":true},{"label":"Undo/Redo","type":"hasLabel","value":true},{"label":"Widgets Pane","type":"hasLabel","value":true},{"label":"UI Performance","type":"hasLabel","value":true},{"label":"Widget Grouping","type":"hasLabel","value":true},{"label":"Reflow & Resize","type":"hasLabel","value":true},{"label":"Canvas / Grid","type":"hasLabel","value":true},{"label":"Auto Height","type":"hasLabel","value":true},{"label":"Browser specific","type":"hasLabel","value":true},{"label":"Auto Layout","type":"hasLabel","value":true},{"label":"Fixed layout","type":"hasLabel","value":true},{"label":"App Navigation","type":"hasLabel","value":true}],"requires":1},"Onboarding Product":{"conditions":[{"label":"Welcome Screen","type":"hasLabel","value":true}],"requires":1},"Git Product":{"conditions":[{"label":"Git Product","type":"hasLabel","value":true},{"label":"Git Auto-commit","type":"hasLabel","value":true},{"label":"Auto-commit","type":"hasLabel","value":true},{"label":"Continuous Deployment","type":"hasLabel","value":true},{"label":"Default branch","type":"hasLabel","value":true},{"label":"Git status","type":"hasLabel","value":true},{"label":"Git performance","type":"hasLabel","value":true},{"label":"SDLC","type":"hasLabel","value":true},{"label":"Git IA","type":"hasLabel","value":true},{"label":"Branch management","type":"hasLabel","value":true}],"requires":1},"Embedding Apps Product":{"conditions":[{"label":"Embedding Apps Product","type":"hasLabel","value":true}],"requires":1},"Integrations Product":{"conditions":[{"label":"New Datasource","type":"hasLabel","value":true},{"label":"Firestore","type":"hasLabel","value":true},{"label":"Google Sheets","type":"hasLabel","value":true},{"label":"Mongo","type":"hasLabel","value":true},{"label":"Redshift","type":"hasLabel","value":true},{"label":"snowflake","type":"hasLabel","value":true},{"label":"S3","type":"hasLabel","value":true},{"label":"Redis","type":"hasLabel","value":true},{"label":"Postgres","type":"hasLabel","value":true},{"label":"GraphQL Plugin","type":"hasLabel","value":true},{"label":"ArangoDB","type":"hasLabel","value":true},{"label":"MsSQL","type":"hasLabel","value":true},{"label":"Elastic Search","type":"hasLabel","value":true},{"label":"OAuth","type":"hasLabel","value":true},{"label":"Airtable","type":"hasLabel","value":true},{"label":"CURL","type":"hasLabel","value":true},{"label":"DynamoDB","type":"hasLabel","value":true},{"label":"Zendesk","type":"hasLabel","value":true},{"label":"Hubspot","type":"hasLabel","value":true},{"label":"Query Forms","type":"hasLabel","value":true},{"label":"Twilio","type":"hasLabel","value":true},{"label":"MySQL","type":"hasLabel","value":true},{"label":"Connection pool","type":"hasLabel","value":true},{"label":"MariaDB","type":"hasLabel","value":true},{"label":"Integrations Pod General","type":"hasLabel","value":true},{"label":"SMTP plugin","type":"hasLabel","value":true},{"label":"Oracle SQL DB","type":"hasLabel","value":true},{"label":"Query filter","type":"hasLabel","value":true},{"label":"Activation - datasources","type":"hasLabel","value":true},{"label":"REST API","type":"hasLabel","value":true},{"label":"REST API","type":"hasLabel","value":true},{"label":"Datasources","type":"hasLabel","value":true},{"label":"REST API plugin","type":"hasLabel","value":true},{"label":"Prepared statements","type":"hasLabel","value":true},{"label":"Query Generation","type":"hasLabel","value":true},{"label":"Core Query Execution","type":"hasLabel","value":true},{"label":"Query Management","type":"hasLabel","value":true},{"label":"Query Settings","type":"hasLabel","value":true},{"label":"Query performance","type":"hasLabel","value":true},{"label":"Datatype issue","type":"hasLabel","value":true},{"label":"SmartSubstitution","type":"hasLabel","value":true},{"label":"Suggested Widgets","type":"hasLabel","value":true},{"label":"SAAS Plugins","type":"hasLabel","value":true},{"label":"Reconnect DS modal","type":"hasLabel","value":true},{"label":"OnPageLoad","type":"hasLabel","value":true},{"label":"File upload issues","type":"hasLabel","value":true},{"label":"AI","type":"hasLabel","value":true},{"label":"Appsmith AI","type":"hasLabel","value":true},{"label":"Database Schema","type":"hasLabel","value":true}],"requires":1},"Identity & Authentication Product":{"conditions":[{"label":"Login / Signup","type":"hasLabel","value":true},{"label":"SSO","type":"hasLabel","value":true},{"label":"SCIM","type":"hasLabel","value":true},{"label":"Email verification","type":"hasLabel","value":true}],"requires":1},"Artifact Platform Product":{"conditions":[{"label":"Fork App","type":"hasLabel","value":true},{"label":"Publish App","type":"hasLabel","value":true},{"label":"Secret Management","type":"hasLabel","value":true},{"label":"Import-Export-App","type":"hasLabel","value":true}],"requires":1},"DevOps Pod":{"conditions":[{"label":"Docker","type":"hasLabel","value":true},{"label":"Super Admin","type":"hasLabel","value":true},{"label":"Deployment","type":"hasLabel","value":true},{"label":"K8s","type":"hasLabel","value":true},{"label":"Email Config","type":"hasLabel","value":true},{"label":"Backup & Restore","type":"hasLabel","value":true},{"label":"AWS AMI","type":"hasLabel","value":true},{"label":"Observability","type":"hasLabel","value":true},{"label":"Heroku","type":"hasLabel","value":true},{"label":"New Deployment Mode","type":"hasLabel","value":true},{"label":"Supervisor","type":"hasLabel","value":true},{"label":"Deployment Certificates","type":"hasLabel","value":true},{"label":"Mock Data","type":"hasLabel","value":true},{"label":"AWS ECS","type":"hasLabel","value":true},{"label":"Ingress","type":"hasLabel","value":true},{"label":"Nginx","type":"hasLabel","value":true}],"requires":1},"Performance Pod":{"conditions":[{"label":"Performance","type":"hasLabel","value":true},{"label":"Performance infra","type":"hasLabel","value":true}],"requires":1},"Git Platform Pod":{"conditions":[{"label":"Environments Product","type":"hasLabel","value":true},{"label":"Git Product","type":"hasLabel","value":true},{"label":"Artifact Platform Product","type":"hasLabel","value":true}],"requires":1},"IDE Pod":{"conditions":[{"label":"Telemetry","type":"hasLabel","value":true},{"label":"i18n","type":"hasLabel","value":true},{"label":"IDE Product","type":"hasLabel","value":true},{"label":"App setting","type":"hasLabel","value":true},{"label":"Debugger Product","type":"hasLabel","value":true},{"label":"Embedding Apps Product","type":"hasLabel","value":true}],"requires":1},"Platform Administration Pod":{"conditions":[{"label":"Airgap","type":"hasLabel","value":true},{"label":"Enterprise Edition","type":"hasLabel","value":true},{"label":"Invite flow","type":"hasLabel","value":true},{"label":"User Profile","type":"hasLabel","value":true},{"label":"User Session ","type":"hasLabel","value":true},{"label":"User Session","type":"hasLabel","value":true},{"label":"Admin Settings Product","type":"hasLabel","value":true},{"label":"RBAC Product","type":"hasLabel","value":true},{"label":"Workspace Product","type":"hasLabel","value":true},{"label":"Branding Product","type":"hasLabel","value":true},{"label":"Audit Logs Product","type":"hasLabel","value":true},{"label":"Identity & Authentication Product","type":"hasLabel","value":true}],"requires":1},"DB Infrastructure Pod":{"conditions":[{"label":"Move to Postgres","type":"hasLabel","value":true}],"requires":1},"Widgets & Accelerators Pod":{"conditions":[{"label":"Accelerators Product","type":"hasLabel","value":true},{"label":"Templates Product","type":"hasLabel","value":true},{"label":"Widgets Product","type":"hasLabel","value":true},{"label":"App Theming Product","type":"hasLabel","value":true}],"requires":1},"Packages Pod":{"conditions":[{"label":"Module creator","type":"hasLabel","value":true},{"label":"Module consumer","type":"hasLabel","value":true},{"label":"Package versioning","type":"hasLabel","value":true},{"label":"Convert to module","type":"hasLabel","value":true},{"label":"Query module","type":"hasLabel","value":true},{"label":"JS module","type":"hasLabel","value":true},{"label":"UI module","type":"hasLabel","value":true},{"label":"Packages Pod","type":"hasLabel","value":true},{"label":"Packages Product","type":"hasLabel","value":true}],"requires":1},"Workflows Pod":{"conditions":[{"label":"Workflows Product","type":"hasLabel","value":true}],"requires":1},"Query & JS Pod":{"conditions":[{"label":"Javascript Product","type":"hasLabel","value":true},{"label":"Onboarding Product","type":"hasLabel","value":true},{"label":"Integrations Product","type":"hasLabel","value":true},{"label":"Reconfigure Datasource Modal","type":"hasLabel","value":true}],"requires":1},"QA Pod":{"conditions":[{"label":"QA","type":"hasLabel","value":true},{"label":"Automation Test","type":"hasLabel","value":true},{"label":"TestGap","type":"hasLabel","value":true},{"label":"Automation failures","type":"hasLabel","value":true},{"label":"Needs automation","type":"hasLabel","value":true}],"requires":1},"Anvil POD":{"conditions":[{"label":"Checkbox Component","type":"hasLabel","value":true},{"label":"WDS team","type":"hasLabel","value":true},{"label":"Anvil POD","type":"hasLabel","value":true},{"label":"WDS - all widgets","type":"hasLabel","value":true},{"label":"WDS - input widget","type":"hasLabel","value":true},{"label":"WDS - paragraph widget","type":"hasLabel","value":true},{"label":"WDS - statbox widget","type":"hasLabel","value":true},{"label":"WDS - modal widget","type":"hasLabel","value":true},{"label":"WDS - icon widget","type":"hasLabel","value":true},{"label":"WDS - checkbox widget","type":"hasLabel","value":true},{"label":"WDS - table widget","type":"hasLabel","value":true},{"label":"WDS - keyValue widget","type":"hasLabel","value":true},{"label":"WDS - switch group widget","type":"hasLabel","value":true},{"label":"WDS - theming","type":"hasLabel","value":true},{"label":"Anvil layout","type":"hasLabel","value":true},{"label":"Anvil - theming","type":"hasLabel","value":true},{"label":"Anvil - vertical alignment","type":"hasLabel","value":true},{"label":"Anvil - layout component","type":"hasLabel","value":true},{"label":"Anvil - drag & drop","type":"hasLabel","value":true},{"label":"Anvil - zones & sections","type":"hasLabel","value":true},{"label":"Anvil - copy paste experience","type":"hasLabel","value":true},{"label":"WDS  - phone widget","type":"hasLabel","value":true},{"label":"WDS - responsive widget","type":"hasLabel","value":true},{"label":"Anvil - responsive viewport","type":"hasLabel","value":true},{"label":"WDS  - widget styling","type":"hasLabel","value":true},{"label":"Anvil - spacing","type":"hasLabel","value":true},{"label":"Anvil - responsive canvas","type":"hasLabel","value":true},{"label":"WDS - inline button widget","type":"hasLabel","value":true},{"label":"Anvil team","type":"hasLabel","value":true}],"requires":1},"Activation Pod":{"conditions":[{"label":"Activation","type":"hasLabel","value":true}],"requires":1},"Stability Pod":{"conditions":[{"label":"Stability Issue","type":"hasLabel","value":true},{"label":"cypress-flaky-fix","type":"hasLabel","value":true},{"label":"Cypress flaky tests","type":"hasLabel","value":true}],"requires":1},"Documentation Pod":{"conditions":[{"label":"Documentation","type":"hasLabel","value":true}],"requires":1}}},"root":"."}],"labels":{"Tab Widget":{"color":"e2c76c","name":"Tab Widget","description":""},"Dont merge":{"color":"ADB39C","name":"Dont merge","description":""},"Epic":{"color":"3E4B9E","name":"Epic","description":"A zenhub epic that describes a project"},"Menu Button Widget":{"color":"235708","name":"Menu Button Widget","description":"Issues related to Menu Button widget"},"Checkbox Group widget":{"color":"bbeecd","name":"Checkbox Group widget","description":"Issues related to Checkbox Group Widget"},"Input Widget":{"color":"ae65d8","name":"Input Widget","description":""},"Security":{"color":"99139C","name":"Security","description":""},"QA":{"color":"","name":"QA","description":"Needs QA attention"},"Verified":{"color":"9bf416","name":"Verified","description":""},"Wont Fix":{"color":"ffffff","name":"Wont Fix","description":"This will not be worked on"},"MySQL":{"color":"c9ddc6","name":"MySQL","description":"Issues related to MySQL plugin"},"Development":{"color":"9F8A02","name":"Development","description":""},"Help Wanted":{"color":"008672","name":"Help Wanted","description":"Extra attention is needed"},"Home Page":{"color":"","name":"Home Page","description":"Issues related to the application home page"},"Rating Widget":{"color":"235708","name":"Rating Widget","description":"Issues related to the rating widget"},"Stat Box Widget":{"color":"f1c9ce","name":"Stat Box Widget","description":"Issues related to stat box"},"Enhancement":{"color":"a2eeef","name":"Enhancement","description":"New feature or request"},"Fork App":{"color":"af87c7","name":"Fork App","description":"Issues related to forking apps"},"Container Widget":{"color":"19AD0D","name":"Container Widget","description":"Container widget"},"Papercut":{"color":"B562F6","name":"Papercut","description":""},"Needs Design":{"color":"bfd4f2","name":"Needs Design","description":"needs design or changes to design"},"i18n":{"color":"1799b0","name":"i18n","description":"Represents issues that need to be tackled to handle internationalization"},"Rich Text Editor Widget":{"color":"f72cac","name":"Rich Text Editor Widget","description":""},"skip-changelog":{"color":"06086F","name":"skip-changelog","description":"Adding this label to a PR prevents it from being listed in the changelog"},"Low":{"color":"79e53b","name":"Low","description":"An issue that is neither critical nor breaks a user flow"},"potential-duplicate":{"color":"d3cb2e","name":"potential-duplicate","description":"This label marks issues that are potential duplicates of already open issues"},"Audio Widget":{"color":"447B9A","name":"Audio Widget","description":"Issues related to Audio Widget"},"Firestore":{"color":"8078b0","name":"Firestore","description":"Issues related to the firestore Integration"},"New Widget":{"color":"be4cf2","name":"New Widget","description":"A request for a new widget"},"Modal Widget":{"color":"03846f","name":"Modal Widget","description":""},"UX Improvement":{"color":"f4a089","name":"UX Improvement","description":""},"S3":{"color":"8078b0","name":"S3","description":"Issues related to the S3 plugin"},"Release Blocker":{"color":"5756bf","name":"Release Blocker","description":"This issue must be resolved before the release"},"safari":{"color":"51C6AA","name":"safari","description":"Bugs seen on safari browser"},"Example Apps":{"color":"1799b0","name":"Example Apps","description":"Example apps created for new signups"},"MultiSelect Widget":{"color":"AB62D4","name":"MultiSelect Widget","description":"Issues related to MultiSelect Widget"},"Calendar Widget":{"color":"8c6644","name":"Calendar Widget","description":""},"Website":{"color":"151720","name":"Website","description":"Related to www.appsmith.com website"},"Low effort":{"color":"8B59F0","name":"Low effort","description":"Something that'll take a few days to build"},"Checkbox Widget":{"color":"bbeecd","name":"Checkbox Widget","description":""},"Spam":{"color":"620faf","name":"Spam","description":""},"Voice Recorder Widget":{"color":"85bc87","name":"Voice Recorder Widget","description":""},"Select Widget":{"color":"0c669e","name":"Select Widget","description":"Select or dropdown widget"},"Bug":{"color":"8ba6fd","name":"Bug","description":"Something isn't right"},"Widget Validation":{"color":"6990BC","name":"Widget Validation","description":"Issues related to widget property validation"},"Generate Page":{"color":"2b4664","name":"Generate Page","description":"Issures related to page generation"},"File Picker Widget":{"color":"6ae4f2","name":"File Picker Widget","description":""},"snowflake":{"color":"8078b0","name":"snowflake","description":"Issues related to the snowflake Integration"},"Automation":{"color":"CCAF60","name":"Automation","description":""},"hotfix":{"color":"BA3F1D","name":"hotfix","description":""},"Import-Export-App":{"color":"48883f","name":"Import-Export-App","description":"Issues related to importing and exporting apps"},"High effort":{"color":"A7E87B","name":"High effort","description":"Something that'll take more than a month to build"},"Telemetry":{"color":"bc70f9","name":"Telemetry","description":"Issues related to instrumenting appsmith"},"Radio Widget":{"color":"91ef15","name":"Radio Widget","description":""},"Omnibar":{"color":"1bb96a","name":"Omnibar","description":"Issues related to the omnibar for navigation"},"Button Widget":{"color":"34efae","name":"Button Widget","description":""},"Switch widget":{"color":"33A8CE","name":"Switch widget","description":"The switch widget"},"Map Widget":{"color":"7eef7a","name":"Map Widget","description":""},"Task":{"color":"085630","name":"Task","description":"A simple Todo"},"Design System":{"color":"2958a4","name":"Design System","description":"Design system"},"opera":{"color":"C63F5B","name":"opera","description":"Any issues identified on the opera browser"},"Login / Signup":{"color":"","name":"Login / Signup","description":"Authentication flows"},"Image Widget":{"color":"8de8ad","name":"Image Widget","description":""},"firefox":{"color":"6d56e2","name":"firefox","description":""},"Property Pane":{"color":"b356ff","name":"Property Pane","description":"Issues related to the behaviour of the property pane"},"Deployment":{"color":"93491f","name":"Deployment","description":"Installation process of appsmith"},"Production":{"color":"b60205","name":"Production","description":""},"Dependencies":{"color":"0366d6","name":"Dependencies","description":"Pull requests that update a dependency file"},"Google Sheets":{"color":"8078b0","name":"Google Sheets","description":"Issues related to Google Sheets"},"Icon Button Widget":{"color":"D319CE","name":"Icon Button Widget","description":"Issues related to the icon button widget"},"Mongo":{"color":"8078b0","name":"Mongo","description":"Issues related to Mongo DB plugin"},"Documentation":{"color":"a8dff7","name":"Documentation","description":"Improvements or additions to documentation"},"TestGap":{"color":"","name":"TestGap","description":"Issues identified for test plan improvement"},"keyboard shortcut":{"color":"0688B6","name":"keyboard shortcut","description":""},"Reopen":{"color":"897548","name":"Reopen","description":""},"Redshift":{"color":"8078b0","name":"Redshift","description":"Issues related to the redshift integration"},"Date Picker Widget":{"color":"ef1ce1","name":"Date Picker Widget","description":""},"Entity Explorer":{"color":"1bb96a","name":"Entity Explorer","description":"Issues related to navigation using the entity explorer"},"JS Linting & Errors":{"color":"E56AA5","name":"JS Linting & Errors","description":"Issues related to JS Linting and errors"},"iFrame":{"color":"3CD1DB","name":"iFrame","description":"Issues related to iFrame"},"Stale":{"color":"ededed","name":"Stale","description":null},"Text Widget":{"color":"d130d1","name":"Text Widget","description":""},"Video Widget":{"color":"23dd4b","name":"Video Widget","description":""},"Datasources":{"color":"3d590f","name":"Datasources","description":"Issues related to configuring datasource on appsmith"},"error":{"color":"B66773","name":"error","description":"All issues connected to error messages"},"Form Widget":{"color":"09ed77","name":"Form Widget","description":""},"Needs Triaging":{"color":"e8b851","name":"Needs Triaging","description":"Needs attention from maintainers to triage"},"Autocomplete":{"color":"235708","name":"Autocomplete","description":"Issues related to the autocomplete"},"hacktoberfest":{"color":"0052cc","name":"hacktoberfest","description":"All issues that can be solved by the community during Hacktoberfest"},"Medium effort":{"color":"D31156","name":"Medium effort","description":"Something that'll take more than a week but less than a month to build"},"Release":{"color":"57e5e0","name":"Release","description":""},"High":{"color":"c94d14","name":"High","description":"This issue blocks a user from building or impacts a lot of users"},"UI Performance":{"color":"1799b0","name":"UI Performance","description":"Issues related to UI performance"},"Deploy Preview":{"color":"bfdadc","name":"Deploy Preview","description":"Issues found in Deploy Preview"},"Needs Tests":{"color":"8ee263","name":"Needs Tests","description":"Needs automated tests to assert a feature/bug fix"},"Refactor":{"color":"B96662","name":"Refactor","description":"needs refactoring of code"},"Divider Widget":{"color":"235708","name":"Divider Widget","description":"Issues related to the divider widget"},"Table Widget":{"color":"2eead1","name":"Table Widget","description":""},"Needs More Info":{"color":"e54c10","name":"Needs More Info","description":"Needs additional information"},"Good First Issue":{"color":"7057ff","name":"Good First Issue","description":"Good for newcomers"},"UI Improvement":{"color":"9aeef4","name":"UI Improvement","description":""},"Backend":{"color":"d4c5f9","name":"Backend","description":"This marks the issue or pull request to reference server code"},"Frontend":{"color":"87c7f2","name":"Frontend","description":"This label marks the issue or pull request to reference client code"},"Chart Widget":{"color":"616ecc","name":"Chart Widget","description":""},"List Widget":{"color":"8508A0","name":"List Widget","description":"Issues related to the list widget"},"Duplicate":{"color":"cfd3d7","name":"Duplicate","description":"This issue or pull request already exists"},"JS Snippets":{"color":"8d62d2","name":"JS Snippets","description":"issues related to JS Snippets"},"Copy Paste":{"name":"Copy Paste","description":"Issues related to copy paste","color":"b4f0a9"},"Drag & Drop":{"name":"Drag & Drop","description":"Issues related to the drag & drop experience","color":"92115a"},"Sniping Mode":{"name":"Sniping Mode","description":"Issues related to sniping mode","color":"48883f"},"Redis":{"name":"Redis","description":"Issues related to Redis","color":"8078b0"},"New Datasource":{"color":"60b14c","name":"New Datasource","description":"Requests for new datasources"},"Evaluated Value":{"name":"Evaluated Value","description":"Issues related to evaluated values","color":"39f6e7"},"Undo/Redo":{"name":"Undo/Redo","description":"Issues related to undo/redo","color":"f25880"},"App Navigation":{"name":"App Navigation","description":"Issues related to the topbar navigation and configuring it","color":"4773ab"},"Widgets Pane":{"name":"Widgets Pane","description":"Issues related to the discovery and organisation of widgets","color":"ad5d78"},"View Mode":{"color":"1799b0","name":"View Mode","description":"Issues related to the view mode"},"Content":{"name":"Content","description":"For content related topics i.e blogs, templates, videos","color":"a8dff7"},"Slash Command":{"name":"Slash Command","description":"Issues related to the slash command","color":"a0608e"},"Widget Property":{"name":"Widget Property","description":"Issues related to adding / modifying widget properties across widgets","color":"5e92cb"},"Windows":{"name":"Windows","description":"Issues related exclusively to Windows systems","color":"b4cb8a"},"Old App Issues":{"name":"Old App Issues","description":"Issues related to apps old apps a few weeks old and app issues in stale browser session","color":"87ab18"},"Document Viewer Widget":{"name":"Document Viewer Widget","description":"Issues related to Document Viewer Widget","color":"899d4b"},"Radio Group Widget":{"name":"Radio Group Widget","description":"Issues related to radio group widget","color":"b68495"},"Super Admin":{"name":"Super Admin","description":"Issues related to the super admin page","color":"aa95cf"},"Postgres":{"name":"Postgres","description":"Postgres related issues","color":"8078b0"},"New JS Function":{"name":"New JS Function","description":"Issues related to adding a JS Function","color":"8e8aa4"},"Cannot Reproduce Issue":{"color":"93c9cc","name":"Cannot Reproduce Issue","description":"Issues that cannot be reproduced"},"Widget Grouping":{"name":"Widget Grouping","description":"Issues related to Widget Grouping","color":"a49951"},"K8s":{"name":"K8s","description":"Kubernetes related issues","color":"5f318a"},"Docker":{"name":"Docker","description":"Issues related to docker","color":"89b808"},"Camera Widget":{"name":"Camera Widget","description":"Issues and enhancements related to camera widget","color":"e6038e"},"SAAS Plugins":{"name":"SAAS Plugins","description":"Issues related to SAAS Plugins","color":"80e18f"},"JS Promises":{"name":"JS Promises","description":"Issues related to promises","color":"d7771f"},"OnPageLoad":{"name":"OnPageLoad","description":"OnPageLoad issues on functions and queries","color":"2b4664"},"JS Usability":{"name":"JS Usability","description":"usability issues with JS editor and JS elsewhere","color":"a302b0"},"Currency Input Widget":{"name":"Currency Input Widget","description":"Issues related to currency input widget","color":"b2164f"},"TreeSelect":{"name":"TreeSelect","description":"Issues related to TreeSelect Widget","color":"a1633e"},"MultiTree Select Widget":{"name":"MultiTree Select Widget","description":"Issues related to MultiTree Select Widget","color":"a1633e"},"Welcome Screen":{"name":"Welcome Screen","description":"Issues related to the welcome screen","color":"48883f"},"Realtime Commenting":{"color":"a70b86","name":"Realtime Commenting","description":"In-app communication between teams"},"Phone Input Widget":{"name":"Phone Input Widget","description":"Issues related to the Phone Input widget","color":"a70b86"},"JSON Form":{"name":"JSON Form","description":"Issue / features related to the JSON form wiget","color":"46b209"},"All Widgets":{"name":"All Widgets","description":"Issues related to all widgets","color":"972b36"},"V1":{"name":"V1","description":"V1","color":"67ab2e"},"Reflow & Resize":{"name":"Reflow & Resize","description":"All issues related to reflow and resize experience","color":"748a13"},"SSO":{"name":"SSO","description":"Issues, requests and enhancements around Single sign-on.","color":""},"Multi User Realtime":{"name":"Multi User Realtime","description":"Issues related to multiple users using or editing an application","color":"e7b6ce"},"Ready for design":{"name":"Ready for design","description":"this issue is ready for design: it contains clear problem statements and other required information","color":"ebf442"},"Support":{"name":"Support","description":"Issues created by the A-force team to address user queries","color":"1740f3"},"Button Group widget":{"name":"Button Group widget","description":"Issue and enhancements related to the button group widget","color":"f17025"},"GraphQL Plugin":{"name":"GraphQL Plugin","description":"Issues related to GraphQL plugin","color":"8078b0"},"DevOps Pod":{"name":"DevOps Pod","description":"Issues related to devops","color":"d956c7"},"medium":{"name":"medium","description":"Issues that frustrate users due to poor UX","color":"23dfd9"},"ArangoDB":{"name":"ArangoDB","description":"Issues related to arangoDB","color":"8078b0"},"Code Refactoring":{"name":"Code Refactoring","description":"Issues related to code refactoring","color":"76310e"},"Progress bar widget":{"name":"Progress bar widget","description":"To track issues related to progress bar","color":"2d7abf"},"Audio Recorder Widget":{"name":"Audio Recorder Widget","description":"Issues related to Audio Recorder Widget","color":"9accef"},"Airtable":{"name":"Airtable","description":"Issues for Airtable","color":"60885f"},"Canvas / Grid":{"name":"Canvas / Grid","description":"Issues related to the canvas","color":"16b092"},"Email Config":{"name":"Email Config","description":"Issues related to configuring the email service","color":"2a21d1"},"CURL":{"name":"CURL","description":"Issues related to CURL impor","color":"60885f"},"Canvas Zooms":{"name":"Canvas Zooms","description":"Issues related to zooming the canvas","color":"e6038e"},"business":{"name":"business","description":"Features that will be a part of our business edition","color":"cd59eb"},"Action Pod":{"name":"Action Pod","description":"","color":"ee2e36"},"AutomationGap1":{"color":"a5e07c","name":"AutomationGap1","description":"Issues that needs automated tests"},"A-Force11":{"name":"A-Force11","description":"Issues raised by A-Force team","color":"d667b6"},"Business Edition":{"name":"Business Edition","description":"Features that will be a part of our business edition","color":"89bb6c"},"storeValue":{"name":"storeValue","description":"Issues related to the store value function","color":"5d3e66"},"DynamoDB":{"name":"DynamoDB","description":"Issues that are related to DynamoDB should have this label","color":"60885f"},"Backup & Restore":{"name":"Backup & Restore","description":"Issues related to backup and restore","color":"86874d"},"Billing":{"name":"Billing","description":"Billing infrastructure and flows for Business Edition and Trial users","color":"d2bc40"},"Datatype issue":{"name":"Datatype issue","description":"Issues that have risen because data types weren't handled","color":"cef66b"},"OAuth":{"name":"OAuth","description":"OAuth related bugs or features","color":"60885f"},"Table Widget V2":{"name":"Table Widget V2","description":"Issues related to Table Widget V2","color":"3a7192"},"IDE Navigation":{"name":"IDE Navigation","description":"Issues/feature requests related to IDE navigation, and context switching","color":"1bb96a"},"Query performance":{"name":"Query performance","description":"Issues that have to do with lack in performance of query execution","color":"cef66b"},"SAAS Manager App":{"name":"SAAS Manager App","description":"Issues with the SAAS manager app","color":"d427db"},"Twilio":{"name":"Twilio","description":"Issues related to Twilio integration","color":"23ba8d"},"Hubspot":{"name":"Hubspot","description":"Issues related to Hubspot integration","color":"60885f"},"Zendesk":{"name":"Zendesk","description":"Issues related to Zendesk integration","color":"60885f"},"Entity Refactor":{"name":"Entity Refactor","description":"Issues related to refactor logic","color":"705a2c"},"Map Chart Widget":{"name":"Map Chart Widget","description":"Issues related to Map Chart Widgets","color":"c8397f"},"Product Catchup":{"name":"Product Catchup","description":"Issues created in the product catchup","color":"29cd2c"},"Framework Functions":{"name":"Framework Functions","description":"Issues related to internal functions like showAlert(), navigateTo() etc...","color":"c25a09"},"Frontend Libraries Upgrade":{"name":"Frontend Libraries Upgrade","description":"Issues related to frontend libraries upgrade","color":"ede1fc"},"MsSQL":{"name":"MsSQL","description":"Issues related to MsSQL plugin","color":"8078b0"},"Elastic Search":{"name":"Elastic Search","description":"Issues related to the elastic search datasource","color":"8078b0"},"Core Query Execution":{"color":"cef66b","name":"Core Query Execution","description":"Issues related to the execution of all queries"},"Query Management":{"name":"Query Management","description":"Issues related to the CRUD of actions or queries","color":"cef66b"},"Query Settings":{"name":"Query Settings","description":"Issues related to the settings of all queries","color":"cef66b"},"Code Editor":{"name":"Code Editor","description":"Issues related to the code editor","color":"4ca16e"},"Query Forms":{"color":"12b253","name":"Query Forms","description":"Isuses related to the query forms"},"JS Objects":{"color":"22962c","name":"JS Objects","description":"Issues related to JS Objects"},"JS Evaluation":{"color":"22962c","name":"JS Evaluation","description":"Issues related to JS evaluation on the platform"},"SmartSubstitution":{"name":"SmartSubstitution","description":"Issues related to Smart substitution of mustache bindings in queries","color":"bae511"},"Query Generation":{"name":"Query Generation","description":"Issues related to query generation","color":"cef66b"},"Suggested Widgets":{"name":"Suggested Widgets","description":"Issues related to suggesting widgets based on query response","color":"6ac063"},"Code Scanner Widget":{"name":"Code Scanner Widget","description":"Issues related to code scanner widget","color":"9bc1a0"},"Clean URLs":{"name":"Clean URLs","description":"Issues related to clean URLs epic","color":"112623"},"Widget keyboard accessibility":{"name":"Widget keyboard accessibility","description":"All issues related to keyboard accessibility in widgets","color":"b626fd"},"Connection pool":{"name":"Connection pool","description":"issues to do with connection pooling of various plugins","color":"94fe36"},"List Widget V2":{"name":"List Widget V2","description":"Issues related to the list widget v2","color":"adaaf7"},"Auto Height":{"name":"Auto Height","description":"Issues related to dynamic height of widgets","color":"5149cf"},"cypress_failed_test":{"name":"cypress_failed_test","description":"Cypress failed tests","color":"4745d5"},"Needs validation":{"name":"Needs validation","description":"Needs problem validation before being picked up","color":"66673d"},"Slider Widget":{"name":"Slider Widget","description":"Issues raised for slider widgets.","color":"2eef5f"},"Multitenancy":{"name":"Multitenancy","description":"Support multitenancy within single appsmith instance","color":"8c49a9"},"Conversion Algorithm":{"name":"Conversion Algorithm","description":"All issue related to converting app from fixed to flex mode & vice versa","color":"d12d2e"},"Browser specific":{"name":"Browser specific","description":"All issue related to browser","color":"d12d2e"},"Performance infra":{"name":"Performance infra","description":"all issue related to the performance infra","color":"8a60f6"},"DSL Update":{"name":"DSL Update","description":"Issues related to storing and updating the DSL","color":"e16cf3"},"AST-frontend":{"name":"AST-frontend","description":"Issues related to maintaining AST logic","color":"2b4664"},"AST-backend":{"name":"AST-backend","description":"Backend issues related to AST parsing","color":"48883f"},"MariaDB":{"name":"MariaDB","description":"MariaDB datasource","color":"8428c3"},"ADS Component Issue":{"name":"ADS Component Issue","description":"Issues which are caused due to ADS components","color":"d89119"},"Regressed":{"color":"723fd0","name":"Regressed","description":"Scenarios that were working before but have now regressed"},"Needs RCA":{"name":"Needs RCA","description":"a critical or high priority issue that needs an RCA","color":"2cc68f"},"Custom JS Libraries":{"name":"Custom JS Libraries","description":"Issues related to adding custom JS library","color":"bacb6d"},"Integrations Pod General":{"name":"Integrations Pod General","description":"Issues related to the Integrations Pod that don't fit into other tags.","color":"287823"},"Performance Pod":{"name":"Performance Pod","description":"All things related to Appsmith performance","color":"b5a25d"},"Performance":{"name":"Performance","description":"Issues related to performance","color":"9a18d7"},"File upload issues":{"name":"File upload issues","description":"Issues related to uploading any type of files from within Appsmith","color":"2b4664"},"Action Selector":{"name":"Action Selector","description":"Issues related to action selector on the property pane","color":"2f9e20"},"Community Reported":{"name":"Community Reported","description":"issues reported by community members","color":"1402e5"},"JS Function execution":{"name":"JS Function execution","description":"JS function execution","color":"7c2de1"},"Self Serve":{"name":"Self Serve","description":"For all issues related to self-serve flow for business edition","color":"4dacfc"},"Self Serve 1.0":{"name":"Self Serve 1.0","description":"For all issues related to v1 of the self serve project","color":"ae839e"},"Customer Portal":{"name":"Customer Portal","description":"For all tasks/issues pertaining to customer.appsmith.com","color":"d2bc40"},"Cloud Services":{"name":"Cloud Services","description":"For all tasks/issues on Appsmith cloud-services relating to licensing, usage and billing","color":"d2bc40"},"One-click Binding":{"name":"One-click Binding","description":"Issues related to the One click binding epic","color":"f1661c"},"Airgap":{"name":"Airgap","description":"Tickets related to supporting air-gapped Appsmith instances","color":"1cb294"},"SMTP plugin":{"name":"SMTP plugin","description":"Issues related to SMTP plugin","color":"541457"},"AWS AMI":{"name":"AWS AMI","description":"Issues Related to AWS AMI","color":"b44680"},"Old widget version":{"name":"Old widget version","description":"Use this label to raise issue specific only to an older version of a widget","color":"ff3814"},"Enterprise Billing":{"name":"Enterprise Billing","description":"To track all tasks/issues related to licensing & billing for enterprise customers","color":"14c156"},"Oracle SQL DB":{"name":"Oracle SQL DB","description":"Issues related to the Oracle plugin","color":"cbabcb"},"Community Contributor":{"name":"Community Contributor","description":"Meant to track issues that are assigned to external contributors","color":"149ab6"},"widget vertical alignment":{"name":"widget vertical alignment","description":"All issue related widget vertical alignment on the auto layout canvas","color":"d12d2e"},"Observability":{"name":"Observability","description":"Issues related to observability on the Appsmith instance","color":"dff913"},"Checkbox Component":{"name":"Checkbox Component","description":"This labels deals with checkbox component in wds package","color":"75a401"},"Analytics Improvements":{"name":"Analytics Improvements","description":"For all tasks focused on improving our overall analytics and fixing any issues ","color":"29b8ed"},"WDS team":{"name":"WDS team","description":"","color":"8d675a"},"Enterprise Edition":{"name":"Enterprise Edition","description":"Features that will be supported in Enterprise Edition only","color":"984f5e"},"Query filter":{"name":"Query filter","description":"Issues related to query filtering, e.g., WHERE clause","color":"a15134"},"Keyboard accessibility ":{"name":"Keyboard accessibility ","description":"All issue related to ADS component keyboard accessibility","color":"2ba696"},"Toggle button":{"name":"Toggle button","description":"All issue related to ADS toggle button","color":"edc47f"},"SCIM":{"name":"SCIM","description":"Label to collate our SCIM issues","color":"48883f"},"ADS Category Token":{"name":"ADS Category Token","description":"All issues related appsmith design system category tokens","color":"920961"},"ADS Component Documentation":{"name":"ADS Component Documentation","description":"All issues Appsmith design system component documentation","color":"64c46a"},"ADS Migration":{"name":"ADS Migration","description":"All issues related to Appsmith design system migration","color":"b082d6"},"ADS Deduplication ":{"name":"ADS Deduplication ","description":"Replacing component with ADS components","color":"b082d6"},"ADS Revamp":{"name":"ADS Revamp","description":"All issues related to ads revamp. ","color":"b082d6"},"ADS Deduplication":{"name":"ADS Deduplication","description":"Replacing component with ADS components","color":"b082d6"},"ADS Grayscale":{"name":"ADS Grayscale","description":"Support grayscale color changes","color":"b03577"},"ADS Unit Test":{"name":"ADS Unit Test","description":"All issue related ads unit cases ","color":"b082d6"},"ADS Components":{"name":"ADS Components","description":"All issues related ADS components","color":"b082d6"},"Widget Discoverability":{"name":"Widget Discoverability","description":"Issues related to Widget Discoverability","color":"7b55ce"},"Widget setter method":{"name":"Widget setter method","description":"Issues with widget property setters","color":"8dce87"},"License":{"name":"License","description":"For all issues/tasks related to licensing of appsmith-ee edition","color":"90ee98"},"Platformization":{"name":"Platformization","description":"Issues or tasks related to platformization of Appsmith codebase","color":"4e972b"},"Activation - datasources":{"name":"Activation - datasources","description":"issues related to activation projects","color":"7c7ace"},"Partial-import-export":{"name":"Partial-import-export","description":"Label for granular reusability.","color":"717732"},"AI":{"name":"AI","description":"All tasks related to AI","color":"2b4664"},"ADS Typography":{"name":"ADS Typography","description":"All issue related typographical changes","color":"2dbe8d"},"Auto Layout":{"name":"Auto Layout","description":"Issues relates to auto layout","color":"92cf8c"},"Heroku":{"name":"Heroku","description":"Issues related to Heroku","color":"a81b69"},"ADS Visual Styles":{"name":"ADS Visual Styles","description":"All issues related to ADS visual styles","color":"d3da89"},"ADS Component Design":{"name":"ADS Component Design","description":"All issue related to component design","color":"5cc91e"},"Modal Component":{"name":"Modal Component","description":"All issue related to ads modal component","color":"ee63f3"},"App setting":{"name":"App setting","description":"Related to app settings panel within the app","color":"174f98"},"BE instance":{"name":"BE instance","description":"For all issues related to license, billing on BE instance","color":"ae8f98"},"Fixed layout":{"name":"Fixed layout","description":"issues related to fixed layout","color":"b66681"},"Anvil layout":{"name":"Anvil layout","description":"issues related to the new layout system anvil","color":"5e0904"},"New Deployment Mode":{"name":"New Deployment Mode","description":"Support a new mode of deployment","color":"108033"},"Custom widgets":{"name":"Custom widgets","description":"For all issues related to the custom widget project","color":"c9db9c"},"Homepage Experience V2":{"name":"Homepage Experience V2","description":"Label for reporting new tasks and bug fixes related to revamped homepage experience","color":"c55d54"},"Customer Success":{"name":"Customer Success","description":"Issues that the success team cares about","color":"6ccabd"},"Invite flow":{"name":"Invite flow","description":"Invite users flow and any associated actions","color":"881b35"},"Invite users":{"name":"Invite users","description":"Invite users flow and any associated actions","color":""},"Workflows Pod":{"name":"Workflows Pod","description":"Issues that the workflows team owns","color":"446925"},"DailyPromotionBlocker":{"name":"DailyPromotionBlocker","description":"DailyPromotion Blocker","color":"9b2280"},"JS Binding":{"name":"JS Binding","description":"All issues related to the JS Binding experience","color":"422fed"},"REST API":{"name":"REST API","description":"REST API plugin related issues","color":"e3ede5"},"Critical":{"color":"a1e3db","name":"Critical","description":"This issue breaks existing apps. Drop everything else to resolve"},"Module creator":{"name":"Module creator","description":"Issues related to the module creator side","color":"bb2c05"},"Module consumer":{"name":"Module consumer","description":"Issues related to the module consumer side","color":"83d3c5"},"Package versioning":{"name":"Package versioning","description":"ISsues related to how we manage versions for packages","color":"4c5218"},"Convert to module":{"name":"Convert to module","description":"Issues related to the module creation flow using conversion","color":"4c5218"},"Query module":{"name":"Query module","description":"Issues affecting query modules or its instances","color":"b11a7e"},"JS module":{"name":"JS module","description":"Issues affecting JS modules or its instances","color":"bf76f6"},"Secret Management":{"name":"Secret Management","description":"Issues related to secret management","color":"2b4664"},"REST API plugin":{"name":"REST API plugin","description":"REST API plugin related issues","color":"b5948a"},"UI module":{"name":"UI module","description":"Issues affecting UI modules or its instances","color":"d2acee"},"Preview mode":{"name":"Preview mode","description":"Issues related to app previews","color":"48883f"},"Git Auto-commit":{"name":"Git Auto-commit","description":"Issues related to autocommit","color":"717732"},"QA Pod":{"name":"QA Pod","description":"Issues under the QA Pod","color":"717732"},"Automation Test":{"name":"Automation Test","description":"","color":""},"Automation failures":{"name":"Automation failures","description":"","color":""},"Needs automation":{"name":"Needs automation","description":"Issues that needs automated tests","color":""},"Prepared statements":{"name":"Prepared statements","description":"Issues related to prepared statement flow","color":""},"Switch Group Widget":{"name":"Switch Group Widget","description":"Issues related to Switch group Widget","color":""},"Supervisor":{"name":"Supervisor","description":"Issues related to supervisor","color":"2c5813"},"Deployment Certificates":{"name":"Deployment Certificates","description":"Issues related to lets encrypt","color":"e148aa"},"Mock Data":{"name":"Mock Data","description":"Issues related to mock databases","color":"ebf251"},"AWS ECS":{"name":"AWS ECS","description":"Issues related to ECS Fargate","color":"e506ff"},"Publish App":{"name":"Publish App","description":"Issues related to app deployment","color":"2b4664"},"IDE Infra":{"name":"IDE Infra","description":"Issues related to the IDE infrastructure like saving changes","color":"1bb96a"},"User Profile":{"name":"User Profile","description":"Issues related to a user profile","color":"a60d34"},"Page Management":{"color":"1bb96a","name":"Page Management","description":"Issues related to configuring pages"},"Ingress":{"name":"Ingress","description":"Ingress Controller","color":"a86802"},"Nginx":{"name":"Nginx","description":"Issues related to Nginx","color":"e54195"},"Building blocks":{"name":"Building blocks","description":"Building blocks on cavas, on templates listing or drag and drop of building blocks.","color":"48883f"},"Table Inline Edit":{"name":"Table Inline Edit","description":"Issues related to inline editing","color":"60895a"},"User Session ":{"name":"User Session ","description":"For all issues/tasks related to user sessions","color":"65a3f5"},"WDS - all widgets":{"name":"WDS - all widgets","description":"all widget present in WDS","color":"2670ae"},"WDS - input widget":{"name":"WDS - input widget","description":"Issues related to input widget on WDS","color":"2670ae"},"WDS - paragraph widget":{"name":"WDS - paragraph widget","description":"issues related to paragraph widget on WDS","color":"2670ae"},"WDS - statbox widget":{"name":"WDS - statbox widget","description":"issues related to statbox widget on WDS","color":"2670ae"},"WDS - modal widget":{"name":"WDS - modal widget","description":"Issues related to modal widget on WDS","color":"2670ae"},"WDS - icon widget":{"name":"WDS - icon widget","description":"Issues related to icon widget on WDS","color":"2670ae"},"WDS - checkbox widget":{"name":"WDS - checkbox widget","description":"Issues related to checkbox widget on WDS","color":"2670ae"},"WDS - table widget":{"name":"WDS - table widget","description":"Issues related to table widget on WDS","color":"2670ae"},"WDS - keyValue widget":{"name":"WDS - keyValue widget","description":"Issues related to key-value widget on WDS","color":"2670ae"},"WDS - switch group widget":{"name":"WDS - switch group widget","description":"Issues related to switch group widget on WDS","color":"2670ae"},"WDS - theming":{"name":"WDS - theming","description":"Issues related to theming on the Anvil instance","color":"2670ae"},"Anvil POD":{"name":"Anvil POD","description":"Issue related to Anvil project","color":"5e0904"},"Anvil - theming":{"name":"Anvil - theming","description":"Issues related to theming on the Anvil instance","color":"c28de5"},"Anvil - vertical alignment":{"name":"Anvil - vertical alignment","description":"Issues related to vertical alignment on the Anvil layout","color":"c28de5"},"Anvil - layout component":{"name":"Anvil - layout component","description":"Issues related to layout component on the Anvil layout","color":"c28de5"},"Anvil - drag & drop":{"name":"Anvil - drag & drop","description":"Issues related to drag & drop experience on Anvil","color":"c28de5"},"Anvil - zones & sections":{"name":"Anvil - zones & sections","description":"Issues related to zones and sections on the Anvil layout","color":"c28de5"},"Anvil - copy paste experience":{"name":"Anvil - copy paste experience","description":"Issues related to copy paste experience on the Anvil layout","color":"c28de5"},"WDS  - phone widget":{"name":"WDS  - phone widget","description":"Issues related to phone widget on WDS","color":"c28de5"},"WDS - responsive widget":{"name":"WDS - responsive widget","description":"All issues related to widget responsiveness","color":"11ee05"},"Anvil - responsive viewport":{"color":"11ee05","name":"Anvil - responsive viewport","description":"Issues seen on different viewports like mobile"},"WDS  - widget styling":{"color":"11ee05","name":"WDS  - widget styling","description":"all about widget styling"},"Anvil - spacing":{"name":"Anvil - spacing","description":"Related to spacing between widgets in auto layout","color":"11ee05"},"Anvil - responsive canvas":{"name":"Anvil - responsive canvas","description":"All issues related to canvas responsiveness","color":"11ee05"},"WDS - inline button widget":{"name":"WDS - inline button widget","description":"Issues related to inline button widget on WDS","color":"7cef83"},"Activation Pod":{"name":"Activation Pod","description":"for Activation group","color":"d67d00"},"Activation":{"name":"Activation","description":"for Activation group","color":"d67d00"},"Tests":{"name":"Tests","description":"Test issues","color":"4fc7b6"},"Ballpark: XXS":{"name":"Ballpark: XXS","description":"~1xDev in 1/2xSprint","color":""},"Ballpark: XS":{"name":"Ballpark: XS","description":"~1xDev in 1xSprint","color":"53bf71"},"Ballpark: S":{"name":"Ballpark: S","description":"~2xDev in 1xSprint","color":"6e9e65"},"Ballpark: M":{"name":"Ballpark: M","description":"~1xPOD in 1xSprint","color":"2229e6"},"Ballpark: L":{"name":"Ballpark: L","description":"~1xPOD in 3xSprint or 2xPODs in 1xSprint","color":"49962f"},"Ballpark: XL":{"name":"Ballpark: XL","description":"~1xPOD in 1xQuarter or 2xPODs in 2xSprint","color":"b524c9"},"Ballpark: XXL":{"name":"Ballpark: XXL","description":"~2xPODs in 1xQuarter","color":"22092c"},"Auto-commit":{"name":"Auto-commit","description":"Issues related to auto-generated commits showing up on git ","color":"e25b89"},"Continuous Deployment":{"name":"Continuous Deployment","description":"Issues related to CD pipeline on git","color":"aea47c"},"Default branch":{"name":"Default branch","description":"Issues related to using a default branch on git","color":"195737"},"Git status":{"name":"Git status","description":"Issues related to information shown on git status modal or number of changes appearing in a branch","color":"c851b8"},"Git performance":{"name":"Git performance","description":"Issues related to perceived performance on any git operation","color":"189af6"},"Anvil team":{"name":"Anvil team","description":"issues related to the new layout system anvil","color":"798200"},"SDLC":{"name":"SDLC","description":"Issues related to software development lifecycle experiences","color":"bae511"},"Reconnect DS modal":{"name":"Reconnect DS modal","description":"Issues related to reconnect datasource modal post app import","color":"2e398b"},"Stability Pod":{"name":"Stability Pod","description":"For all issues/tasks to be prioritized under Stability pod","color":"86ddf6"},"Stability Issue":{"name":"Stability Issue","description":"Every issue handle by Stability Pod","color":"4d024a"},"Move to Postgres":{"name":"Move to Postgres","description":"Issues required to be solved for the move to Postgres as repository layer","color":"4e13ac"},"User Session":{"name":"User Session","description":"Issues related to user sessions","color":"8255e5"},"IDE tabs":{"name":"IDE tabs","description":"query and js tabs","color":"1bb96a"},"Inviting Contribution":{"name":"Inviting Contribution","description":"Issues that we would like contributions to","color":""},"cypress-flaky-fix":{"name":"cypress-flaky-fix","description":"This label is auto-added when a PR which only has Cypress fixes are merged to release","color":"722cbc"},"Cypress flaky tests":{"name":"Cypress flaky tests","description":"Test scripts that need to be fixed on Cypress by dev or SDET","color":"722cbc"},"Help enterprise":{"name":"Help enterprise","description":"Requested by Appsmith customers or prospects","color":"FF8C00"},"Learnability":{"name":"Learnability","description":"Issues affecting the product learnability, making the product harder for new users.","color":"800c2f"},"ADS Spacing":{"name":"ADS Spacing","description":"","color":"686ebb"},"ads unit test":{"name":"ads unit test","description":"All issue related ads unit cases","color":"686ebb"},"ads revamp":{"name":"ads revamp","description":"All issues related to ads revamp.","color":"686ebb"},"Javascript Product":{"color":"709a21","name":"Javascript Product","description":"Issues related to users writing javascript in appsmith"},"IDE Product":{"color":"1bb96a","name":"IDE Product","description":"Issues related to the IDE Product"},"IDE Pod":{"color":"1bb96a","name":"IDE Pod","description":"Issues that new developers face while exploring the IDE"},"Accelerators Product":{"name":"Accelerators Product","description":"Issues related to app building accelerators","color":"f3fce6"},"Templates Product":{"name":"Templates Product","description":"Issues related to Templates","color":"f3fce6"},"Design System Product":{"name":"Design System Product","description":"Appsmith design system related issues","color":"2b4664"},"ads deduplication":{"name":"ads deduplication","description":"Replacing component with ADS components","color":"708943"},"Admin Settings Product":{"color":"708943","name":"Admin Settings Product","description":"Issues in admin settings pages"},"Appsmith AI":{"name":"Appsmith AI","description":"All issues related to the Appsmith AI datasource","color":"708943"},"Query & JS Pod":{"color":"709a21","name":"Query & JS Pod","description":"Issues related to the query & JS Pod"},"RBAC Product":{"name":"RBAC Product","description":"Issues, requests and enhancements around RBAC.","color":""},"Workspace Product":{"name":"Workspace Product","description":"Issues related to workspaces","color":""},"CE Instance Usage":{"name":"CE Instance Usage","description":"For all issues relating to usage, licensing or billing on the CE instance","color":""},"Billing & Licensing Product":{"name":"Billing & Licensing Product","description":"Issues pertaining to licensing, billing and usage across self serve and enterprise customers","color":"446925"},"Platform Administration Pod":{"color":"446925","name":"Platform Administration Pod","description":"Issues related to platform administration & management"},"DB Infrastructure Pod":{"name":"DB Infrastructure Pod","description":"Pod to handle database infrastructure","color":"446925"},"Packages Product":{"name":"Packages Product","description":"Issues related to packages","color":"446925"},"Workflows Product":{"name":"Workflows Product","description":"Issues related to the workflows product","color":"446925"},"Debugger Product":{"color":"857f58","name":"Debugger Product","description":"Issues related to the debugger"},"Packages Pod":{"name":"Packages Pod","description":"issues that belong to the packages pod","color":"857f58"},"Environments Product":{"name":"Environments Product","description":"Issues related to datasource environments","color":"857f58"},"Custom Widgets":{"name":"Custom Widgets","description":"For all issues related to the custom widget project","color":"857f58"},"Branding Product":{"name":"Branding Product","description":"All issues under branding and whitelabelling appsmith ecosystem","color":"857f58"},"Widgets & Accelerators Pod":{"name":"Widgets & Accelerators Pod","description":"Issues related to widgets & Accelerators","color":"27496a"},"Widgets Product":{"name":"Widgets Product","description":"This label groups issues related to widgets","color":"f3fce6"},"App Theming Product":{"name":"App Theming Product","description":"Items that are related to the App level theming controls epic","color":"48883f"},"UI Building Product":{"color":"48883f","name":"UI Building Product","description":"Issues related to the UI Building experience"},"Onboarding Product":{"color":"48883f","name":"Onboarding Product","description":"Issues related to onboarding new developers"},"Database Schema":{"name":"Database Schema","description":"Issues related to database schema","color":"48883f"},"Git Product":{"color":"48883f","name":"Git Product","description":"Issues related to version control product"},"Git Platform Pod":{"name":"Git Platform Pod","description":"Issues related to the git & the app platform ","color":"48883f"},"Embedding Apps Product":{"name":"Embedding Apps Product","description":"Issues related to embedding","color":"48883f"},"Integrations Product":{"name":"Integrations Product","description":"Issues related to a specific integration","color":"b9f21c"},"Feature Flagging":{"name":"Feature Flagging","description":"Anything related feature flagging","color":"4574ae"},"Audit Logs Product":{"name":"Audit Logs Product","description":"Audit trails to ensure data security","color":"4574ae"},"Identity & Authentication Product":{"name":"Identity & Authentication Product","description":"Issues related to user identity & authentication","color":"4574ae"},"Email verification":{"name":"Email verification","description":"Email verification issues","color":"4574ae"},"Artifact Platform Product":{"name":"Artifact Platform Product","description":"Issues related to the application platform","color":"4574ae"},"Git IA":{"name":"Git IA","description":"Issues related to Git IA changes","color":"df8bd6"},"Documentation Pod":{"name":"Documentation Pod","description":"Issues related to user education","color":"8c8c02"},"Branch management":{"name":"Branch management","description":"Issues related to using a branch management on git","color":"ebe6af"},"Reconfigure Datasource Modal":{"name":"Reconfigure Datasource Modal","description":"Issues related to reconfigure DS modal that comes after importing applications","color":"5ac17b"}},"success":true}
\ No newline at end of file
+{"runners":[{"versioning":{"source":"milestones","type":"SemVer"},"prereleaseName":"alpha","issue":{"labels":{"Widgets Product":{"conditions":[{"label":"Button Widget","type":"hasLabel","value":true},{"label":"Chart Widget","type":"hasLabel","value":true},{"label":"Container Widget","type":"hasLabel","value":true},{"label":"Date Picker Widget","type":"hasLabel","value":true},{"label":"Select Widget","type":"hasLabel","value":true},{"label":"File Picker Widget","type":"hasLabel","value":true},{"label":"Form Widget","type":"hasLabel","value":true},{"label":"Image Widget","type":"hasLabel","value":true},{"label":"Input Widget","type":"hasLabel","value":true},{"label":"List Widget","type":"hasLabel","value":true},{"label":"MultiSelect Widget","type":"hasLabel","value":true},{"label":"Map Widget","type":"hasLabel","value":true},{"label":"Modal Widget","type":"hasLabel","value":true},{"label":"Radio Widget","type":"hasLabel","value":true},{"label":"Rich Text Editor Widget","type":"hasLabel","value":true},{"label":"Tab Widget","type":"hasLabel","value":true},{"label":"Table Widget","type":"hasLabel","value":true},{"label":"Text Widget","type":"hasLabel","value":true},{"label":"Video Widget","type":"hasLabel","value":true},{"label":"iFrame","type":"hasLabel","value":true},{"label":"Menu Button","type":"hasLabel","value":true},{"label":"Rating","type":"hasLabel","value":true},{"label":"Widget Validation","type":"hasLabel","value":true},{"label":"New Widget","type":"hasLabel","value":true},{"label":"Switch widget","type":"hasLabel","value":true},{"label":"Audio Widget","type":"hasLabel","value":true},{"label":"Icon Button Widget","type":"hasLabel","value":true},{"label":"Stat Box Widget","type":"hasLabel","value":true},{"label":"Voice Recorder Widget","type":"hasLabel","value":true},{"label":"Calendar Widget","type":"hasLabel","value":true},{"label":"Menu Button Widget","type":"hasLabel","value":true},{"label":"Divider Widget","type":"hasLabel","value":true},{"label":"Rating Widget","type":"hasLabel","value":true},{"label":"View Mode","type":"hasLabel","value":true},{"label":"Widget Property","type":"hasLabel","value":true},{"label":"Document Viewer Widget","type":"hasLabel","value":true},{"label":"Radio Group Widget","type":"hasLabel","value":true},{"label":"Currency Input Widget","type":"hasLabel","value":true},{"label":"TreeSelect","type":"hasLabel","value":true},{"label":"MultiTree Select Widget","type":"hasLabel","value":true},{"label":"Phone Input Widget","type":"hasLabel","value":true},{"label":"JSON Form","type":"hasLabel","value":true},{"label":"All Widgets","type":"hasLabel","value":true},{"label":"Button Group widget","type":"hasLabel","value":true},{"label":"Progress bar widget","type":"hasLabel","value":true},{"label":"Audio Recorder Widget","type":"hasLabel","value":true},{"label":"Camera Widget","type":"hasLabel","value":true},{"label":"Table Widget V2","type":"hasLabel","value":true},{"label":"Map Chart Widget","type":"hasLabel","value":true},{"label":"Code Scanner Widget","type":"hasLabel","value":true},{"label":"Widget keyboard accessibility","type":"hasLabel","value":true},{"label":"List Widget V2","type":"hasLabel","value":true},{"label":"Slider Widget","type":"hasLabel","value":true},{"label":"One-click Binding","type":"hasLabel","value":true},{"label":"Old widget version","type":"hasLabel","value":true},{"label":"Widget Discoverability","type":"hasLabel","value":true},{"label":"Switch Group Widget","type":"hasLabel","value":true},{"label":"Checkbox Group widget","type":"hasLabel","value":true},{"label":"Checkbox Widget","type":"hasLabel","value":true},{"label":"Table Inline Edit","type":"hasLabel","value":true},{"label":"Custom Widgets","type":"hasLabel","value":true}],"requires":1},"Javascript Product":{"conditions":[{"label":"JS Linting & Errors","type":"hasLabel","value":true},{"label":"Autocomplete","type":"hasLabel","value":true},{"label":"Evaluated Value","type":"hasLabel","value":true},{"label":"Slash Command","type":"hasLabel","value":true},{"label":"New JS Function","type":"hasLabel","value":true},{"label":"JS Usability","type":"hasLabel","value":true},{"label":"Framework Functions","type":"hasLabel","value":true},{"label":"JS Objects","type":"hasLabel","value":true},{"label":"JS Evaluation","type":"hasLabel","value":true},{"label":"Custom JS Libraries","type":"hasLabel","value":true},{"label":"Action Selector","type":"hasLabel","value":true},{"label":"Widget setter method","type":"hasLabel","value":true},{"label":"Entity Refactor","type":"hasLabel","value":true},{"label":"AST-frontend","type":"hasLabel","value":true},{"label":"Sniping Mode","type":"hasLabel","value":true},{"label":"AST-backend","type":"hasLabel","value":true}],"requires":1},"IDE Product":{"conditions":[{"label":"IDE Product","type":"hasLabel","value":true},{"label":"IDE Infra","type":"hasLabel","value":true},{"label":"IDE Navigation","type":"hasLabel","value":true},{"label":"IDE tabs","type":"hasLabel","value":true},{"label":"Omnibar","type":"hasLabel","value":true},{"label":"Entity Explorer","type":"hasLabel","value":true},{"label":"Page Management","type":"hasLabel","value":true},{"label":"Preview mode","type":"hasLabel","value":true}],"requires":1},"Accelerators Product":{"conditions":[{"label":"Generate Page","type":"hasLabel","value":true},{"label":"Building blocks","type":"hasLabel","value":true}],"requires":1},"Templates Product":{"conditions":[{"label":"Partial-import-export","type":"hasLabel","value":true},{"label":"Templates Product","type":"hasLabel","value":true}],"requires":1},"Design System Product":{"conditions":[{"label":"Design System Product","type":"hasLabel","value":true},{"label":"ADS Component Issue","type":"hasLabel","value":true},{"label":"Keyboard accessibility ","type":"hasLabel","value":true},{"label":"Toggle button","type":"hasLabel","value":true},{"label":"ADS Category Token","type":"hasLabel","value":true},{"label":"ADS Component Documentation","type":"hasLabel","value":true},{"label":"ADS Migration","type":"hasLabel","value":true},{"label":"ADS Deduplication ","type":"hasLabel","value":true},{"label":"ADS Revamp","type":"hasLabel","value":true},{"label":"ADS Deduplication","type":"hasLabel","value":true},{"label":"ADS Unit Test","type":"hasLabel","value":true},{"label":"ADS Components","type":"hasLabel","value":true},{"label":"ADS Grayscale","type":"hasLabel","value":true},{"label":"Design System","type":"hasLabel","value":true},{"label":"ADS Typography","type":"hasLabel","value":true},{"label":"ADS Visual Styles","type":"hasLabel","value":true},{"label":"ADS Component Design","type":"hasLabel","value":true},{"label":"Modal Component","type":"hasLabel","value":true},{"label":"ADS Spacing","type":"hasLabel","value":true},{"label":"ads unit test","type":"hasLabel","value":true},{"label":"ads revamp","type":"hasLabel","value":true},{"label":"ads deduplication","type":"hasLabel","value":true}],"requires":1},"RBAC Product":{"conditions":[{"label":"Invite users","type":"hasLabel","value":true},{"label":"RBAC Product","type":"hasLabel","value":true}],"requires":1},"Workspace Product":{"conditions":[{"label":"Home Page","type":"hasLabel","value":true},{"label":"Workspace Product","type":"hasLabel","value":true}],"requires":1},"Billing & Licensing Product":{"conditions":[{"label":"Customer Portal","type":"hasLabel","value":true},{"label":"Cloud Services","type":"hasLabel","value":true},{"label":"Billing","type":"hasLabel","value":true},{"label":"Self Serve","type":"hasLabel","value":true},{"label":"Enterprise Billing","type":"hasLabel","value":true},{"label":"Analytics Improvements","type":"hasLabel","value":true},{"label":"Self Serve 1.0","type":"hasLabel","value":true},{"label":"License","type":"hasLabel","value":true},{"label":"BE instance","type":"hasLabel","value":true},{"label":"Invite flow","type":"hasLabel","value":true},{"label":"CE Instance Usage","type":"hasLabel","value":true},{"label":"Feature Flagging","type":"hasLabel","value":true}],"requires":1},"Packages Product":{"conditions":[{"label":"Packages Product","type":"hasLabel","value":true}],"requires":1},"Environments Product":{"conditions":[{"label":"Environments Product","type":"hasLabel","value":true}],"requires":1},"UI Building Product":{"conditions":[{"label":"Property Pane","type":"hasLabel","value":true},{"label":"Copy Paste","type":"hasLabel","value":true},{"label":"Drag & Drop","type":"hasLabel","value":true},{"label":"Undo/Redo","type":"hasLabel","value":true},{"label":"Widgets Pane","type":"hasLabel","value":true},{"label":"UI Performance","type":"hasLabel","value":true},{"label":"Widget Grouping","type":"hasLabel","value":true},{"label":"Reflow & Resize","type":"hasLabel","value":true},{"label":"Canvas / Grid","type":"hasLabel","value":true},{"label":"Auto Height","type":"hasLabel","value":true},{"label":"Browser specific","type":"hasLabel","value":true},{"label":"Auto Layout","type":"hasLabel","value":true},{"label":"Fixed layout","type":"hasLabel","value":true},{"label":"App Navigation","type":"hasLabel","value":true}],"requires":1},"Onboarding Product":{"conditions":[{"label":"Welcome Screen","type":"hasLabel","value":true}],"requires":1},"Git Product":{"conditions":[{"label":"Git Product","type":"hasLabel","value":true},{"label":"Git Auto-commit","type":"hasLabel","value":true},{"label":"Auto-commit","type":"hasLabel","value":true},{"label":"Continuous Deployment","type":"hasLabel","value":true},{"label":"Default branch","type":"hasLabel","value":true},{"label":"Git status","type":"hasLabel","value":true},{"label":"Git performance","type":"hasLabel","value":true},{"label":"SDLC","type":"hasLabel","value":true},{"label":"Git IA","type":"hasLabel","value":true},{"label":"Branch management","type":"hasLabel","value":true}],"requires":1},"Embedding Apps Product":{"conditions":[{"label":"Embedding Apps Product","type":"hasLabel","value":true}],"requires":1},"Integrations Product":{"conditions":[{"label":"New Datasource","type":"hasLabel","value":true},{"label":"Firestore","type":"hasLabel","value":true},{"label":"Google Sheets","type":"hasLabel","value":true},{"label":"Mongo","type":"hasLabel","value":true},{"label":"Redshift","type":"hasLabel","value":true},{"label":"snowflake","type":"hasLabel","value":true},{"label":"S3","type":"hasLabel","value":true},{"label":"Redis","type":"hasLabel","value":true},{"label":"Postgres","type":"hasLabel","value":true},{"label":"GraphQL Plugin","type":"hasLabel","value":true},{"label":"ArangoDB","type":"hasLabel","value":true},{"label":"MsSQL","type":"hasLabel","value":true},{"label":"Elastic Search","type":"hasLabel","value":true},{"label":"OAuth","type":"hasLabel","value":true},{"label":"Airtable","type":"hasLabel","value":true},{"label":"CURL","type":"hasLabel","value":true},{"label":"DynamoDB","type":"hasLabel","value":true},{"label":"Zendesk","type":"hasLabel","value":true},{"label":"Hubspot","type":"hasLabel","value":true},{"label":"Query Forms","type":"hasLabel","value":true},{"label":"Twilio","type":"hasLabel","value":true},{"label":"MySQL","type":"hasLabel","value":true},{"label":"Connection pool","type":"hasLabel","value":true},{"label":"MariaDB","type":"hasLabel","value":true},{"label":"Integrations Pod General","type":"hasLabel","value":true},{"label":"SMTP plugin","type":"hasLabel","value":true},{"label":"Oracle SQL DB","type":"hasLabel","value":true},{"label":"Query filter","type":"hasLabel","value":true},{"label":"Activation - datasources","type":"hasLabel","value":true},{"label":"REST API","type":"hasLabel","value":true},{"label":"REST API","type":"hasLabel","value":true},{"label":"Datasources","type":"hasLabel","value":true},{"label":"REST API plugin","type":"hasLabel","value":true},{"label":"Prepared statements","type":"hasLabel","value":true},{"label":"Query Generation","type":"hasLabel","value":true},{"label":"Core Query Execution","type":"hasLabel","value":true},{"label":"Query Management","type":"hasLabel","value":true},{"label":"Query Settings","type":"hasLabel","value":true},{"label":"Query performance","type":"hasLabel","value":true},{"label":"Datatype issue","type":"hasLabel","value":true},{"label":"SmartSubstitution","type":"hasLabel","value":true},{"label":"Suggested Widgets","type":"hasLabel","value":true},{"label":"SAAS Plugins","type":"hasLabel","value":true},{"label":"Reconnect DS modal","type":"hasLabel","value":true},{"label":"OnPageLoad","type":"hasLabel","value":true},{"label":"File upload issues","type":"hasLabel","value":true},{"label":"AI","type":"hasLabel","value":true},{"label":"Appsmith AI","type":"hasLabel","value":true},{"label":"Database Schema","type":"hasLabel","value":true}],"requires":1},"Identity & Authentication Product":{"conditions":[{"label":"Login / Signup","type":"hasLabel","value":true},{"label":"SSO","type":"hasLabel","value":true},{"label":"SCIM","type":"hasLabel","value":true},{"label":"Email verification","type":"hasLabel","value":true}],"requires":1},"Artifact Platform Product":{"conditions":[{"label":"Fork App","type":"hasLabel","value":true},{"label":"Publish App","type":"hasLabel","value":true},{"label":"Secret Management","type":"hasLabel","value":true},{"label":"Import-Export-App","type":"hasLabel","value":true}],"requires":1},"DevOps Pod":{"conditions":[{"label":"Docker","type":"hasLabel","value":true},{"label":"Super Admin","type":"hasLabel","value":true},{"label":"Deployment","type":"hasLabel","value":true},{"label":"K8s","type":"hasLabel","value":true},{"label":"Email Config","type":"hasLabel","value":true},{"label":"Backup & Restore","type":"hasLabel","value":true},{"label":"AWS AMI","type":"hasLabel","value":true},{"label":"Observability","type":"hasLabel","value":true},{"label":"Heroku","type":"hasLabel","value":true},{"label":"New Deployment Mode","type":"hasLabel","value":true},{"label":"Supervisor","type":"hasLabel","value":true},{"label":"Deployment Certificates","type":"hasLabel","value":true},{"label":"Mock Data","type":"hasLabel","value":true},{"label":"AWS ECS","type":"hasLabel","value":true},{"label":"Ingress","type":"hasLabel","value":true},{"label":"Nginx","type":"hasLabel","value":true},{"label":"Setup Issues","type":"hasLabel","value":true}],"requires":1},"Performance Pod":{"conditions":[{"label":"Performance","type":"hasLabel","value":true},{"label":"Performance infra","type":"hasLabel","value":true}],"requires":1},"IDE Pod":{"conditions":[{"label":"Telemetry","type":"hasLabel","value":true},{"label":"i18n","type":"hasLabel","value":true},{"label":"IDE Product","type":"hasLabel","value":true},{"label":"App setting","type":"hasLabel","value":true},{"label":"Debugger Product","type":"hasLabel","value":true},{"label":"Embedding Apps Product","type":"hasLabel","value":true}],"requires":1},"Platform Administration Pod":{"conditions":[{"label":"Airgap","type":"hasLabel","value":true},{"label":"Enterprise Edition","type":"hasLabel","value":true},{"label":"Invite flow","type":"hasLabel","value":true},{"label":"User Profile","type":"hasLabel","value":true},{"label":"User Session ","type":"hasLabel","value":true},{"label":"User Session","type":"hasLabel","value":true},{"label":"Admin Settings Product","type":"hasLabel","value":true},{"label":"RBAC Product","type":"hasLabel","value":true},{"label":"Workspace Product","type":"hasLabel","value":true},{"label":"Branding Product","type":"hasLabel","value":true},{"label":"Audit Logs Product","type":"hasLabel","value":true},{"label":"Identity & Authentication Product","type":"hasLabel","value":true}],"requires":1},"DB Infrastructure Pod":{"conditions":[{"label":"Move to Postgres","type":"hasLabel","value":true}],"requires":1},"Widgets & Accelerators Pod":{"conditions":[{"label":"Accelerators Product","type":"hasLabel","value":true},{"label":"Templates Product","type":"hasLabel","value":true},{"label":"Widgets Product","type":"hasLabel","value":true},{"label":"App Theming Product","type":"hasLabel","value":true}],"requires":1},"Packages Pod":{"conditions":[{"label":"Module creator","type":"hasLabel","value":true},{"label":"Module consumer","type":"hasLabel","value":true},{"label":"Package versioning","type":"hasLabel","value":true},{"label":"Convert to module","type":"hasLabel","value":true},{"label":"Query module","type":"hasLabel","value":true},{"label":"JS module","type":"hasLabel","value":true},{"label":"UI module","type":"hasLabel","value":true},{"label":"Packages Pod","type":"hasLabel","value":true}],"requires":1},"Workflows Pod":{"conditions":[{"label":"Workflows Product","type":"hasLabel","value":true}],"requires":1},"Query & JS Pod":{"conditions":[{"label":"Javascript Product","type":"hasLabel","value":true},{"label":"Onboarding Product","type":"hasLabel","value":true},{"label":"Integrations Product","type":"hasLabel","value":true},{"label":"Reconfigure Datasource Modal","type":"hasLabel","value":true}],"requires":1},"QA Pod":{"conditions":[{"label":"QA","type":"hasLabel","value":true},{"label":"Automation Test","type":"hasLabel","value":true},{"label":"TestGap","type":"hasLabel","value":true},{"label":"Automation failures","type":"hasLabel","value":true},{"label":"Needs automation","type":"hasLabel","value":true}],"requires":1},"Anvil POD":{"conditions":[{"label":"Checkbox Component","type":"hasLabel","value":true},{"label":"WDS team","type":"hasLabel","value":true},{"label":"Anvil POD","type":"hasLabel","value":true},{"label":"WDS - all widgets","type":"hasLabel","value":true},{"label":"WDS - input widget","type":"hasLabel","value":true},{"label":"WDS - paragraph widget","type":"hasLabel","value":true},{"label":"WDS - statbox widget","type":"hasLabel","value":true},{"label":"WDS - modal widget","type":"hasLabel","value":true},{"label":"WDS - icon widget","type":"hasLabel","value":true},{"label":"WDS - checkbox widget","type":"hasLabel","value":true},{"label":"WDS - table widget","type":"hasLabel","value":true},{"label":"WDS - keyValue widget","type":"hasLabel","value":true},{"label":"WDS - switch group widget","type":"hasLabel","value":true},{"label":"WDS - theming","type":"hasLabel","value":true},{"label":"Anvil layout","type":"hasLabel","value":true},{"label":"Anvil - theming","type":"hasLabel","value":true},{"label":"Anvil - vertical alignment","type":"hasLabel","value":true},{"label":"Anvil - layout component","type":"hasLabel","value":true},{"label":"Anvil - drag & drop","type":"hasLabel","value":true},{"label":"Anvil - zones & sections","type":"hasLabel","value":true},{"label":"Anvil - copy paste experience","type":"hasLabel","value":true},{"label":"WDS  - phone widget","type":"hasLabel","value":true},{"label":"WDS - responsive widget","type":"hasLabel","value":true},{"label":"Anvil - responsive viewport","type":"hasLabel","value":true},{"label":"WDS  - widget styling","type":"hasLabel","value":true},{"label":"Anvil - spacing","type":"hasLabel","value":true},{"label":"Anvil - responsive canvas","type":"hasLabel","value":true},{"label":"WDS - inline button widget","type":"hasLabel","value":true},{"label":"Anvil team","type":"hasLabel","value":true}],"requires":1},"Activation Pod":{"conditions":[{"label":"Activation","type":"hasLabel","value":true}],"requires":1},"Stability Pod":{"conditions":[{"label":"Stability Issue","type":"hasLabel","value":true},{"label":"cypress-flaky-fix","type":"hasLabel","value":true},{"label":"Cypress flaky tests","type":"hasLabel","value":true}],"requires":1},"Documentation Pod":{"conditions":[{"label":"Documentation","type":"hasLabel","value":true}],"requires":1},"Packages & Git Pod":{"conditions":[{"label":"Packages Pod","type":"hasLabel","value":true},{"label":"Git Product","type":"hasLabel","value":true},{"label":"Packages Product","type":"hasLabel","value":true},{"label":"Git Platform","type":"hasLabel","value":true}],"requires":1},"Git Platform":{"conditions":[{"label":"Environments Product","type":"hasLabel","value":true},{"label":"Artifact Platform Product","type":"hasLabel","value":true}],"requires":1}}},"root":"."}],"labels":{"Tab Widget":{"color":"e2c76c","name":"Tab Widget","description":""},"Dont merge":{"color":"ADB39C","name":"Dont merge","description":""},"Epic":{"color":"3E4B9E","name":"Epic","description":"A zenhub epic that describes a project"},"Menu Button Widget":{"color":"235708","name":"Menu Button Widget","description":"Issues related to Menu Button widget"},"Checkbox Group widget":{"color":"bbeecd","name":"Checkbox Group widget","description":"Issues related to Checkbox Group Widget"},"Input Widget":{"color":"ae65d8","name":"Input Widget","description":""},"Security":{"color":"99139C","name":"Security","description":""},"QA":{"color":"","name":"QA","description":"Needs QA attention"},"Verified":{"color":"9bf416","name":"Verified","description":""},"Wont Fix":{"color":"ffffff","name":"Wont Fix","description":"This will not be worked on"},"MySQL":{"color":"c9ddc6","name":"MySQL","description":"Issues related to MySQL plugin"},"Development":{"color":"9F8A02","name":"Development","description":""},"Help Wanted":{"color":"008672","name":"Help Wanted","description":"Extra attention is needed"},"Home Page":{"color":"","name":"Home Page","description":"Issues related to the application home page"},"Rating Widget":{"color":"235708","name":"Rating Widget","description":"Issues related to the rating widget"},"Stat Box Widget":{"color":"f1c9ce","name":"Stat Box Widget","description":"Issues related to stat box"},"Enhancement":{"color":"a2eeef","name":"Enhancement","description":"New feature or request"},"Fork App":{"color":"af87c7","name":"Fork App","description":"Issues related to forking apps"},"Container Widget":{"color":"19AD0D","name":"Container Widget","description":"Container widget"},"Papercut":{"color":"B562F6","name":"Papercut","description":""},"Needs Design":{"color":"bfd4f2","name":"Needs Design","description":"needs design or changes to design"},"i18n":{"color":"1799b0","name":"i18n","description":"Represents issues that need to be tackled to handle internationalization"},"Rich Text Editor Widget":{"color":"f72cac","name":"Rich Text Editor Widget","description":""},"skip-changelog":{"color":"06086F","name":"skip-changelog","description":"Adding this label to a PR prevents it from being listed in the changelog"},"Low":{"color":"79e53b","name":"Low","description":"An issue that is neither critical nor breaks a user flow"},"potential-duplicate":{"color":"d3cb2e","name":"potential-duplicate","description":"This label marks issues that are potential duplicates of already open issues"},"Audio Widget":{"color":"447B9A","name":"Audio Widget","description":"Issues related to Audio Widget"},"Firestore":{"color":"8078b0","name":"Firestore","description":"Issues related to the firestore Integration"},"New Widget":{"color":"be4cf2","name":"New Widget","description":"A request for a new widget"},"Modal Widget":{"color":"03846f","name":"Modal Widget","description":""},"UX Improvement":{"color":"f4a089","name":"UX Improvement","description":""},"S3":{"color":"8078b0","name":"S3","description":"Issues related to the S3 plugin"},"Release Blocker":{"color":"5756bf","name":"Release Blocker","description":"This issue must be resolved before the release"},"safari":{"color":"51C6AA","name":"safari","description":"Bugs seen on safari browser"},"Example Apps":{"color":"1799b0","name":"Example Apps","description":"Example apps created for new signups"},"MultiSelect Widget":{"color":"AB62D4","name":"MultiSelect Widget","description":"Issues related to MultiSelect Widget"},"Calendar Widget":{"color":"8c6644","name":"Calendar Widget","description":""},"Website":{"color":"151720","name":"Website","description":"Related to www.appsmith.com website"},"Low effort":{"color":"8B59F0","name":"Low effort","description":"Something that'll take a few days to build"},"Checkbox Widget":{"color":"bbeecd","name":"Checkbox Widget","description":""},"Spam":{"color":"620faf","name":"Spam","description":""},"Voice Recorder Widget":{"color":"85bc87","name":"Voice Recorder Widget","description":""},"Select Widget":{"color":"0c669e","name":"Select Widget","description":"Select or dropdown widget"},"Bug":{"color":"8ba6fd","name":"Bug","description":"Something isn't right"},"Widget Validation":{"color":"6990BC","name":"Widget Validation","description":"Issues related to widget property validation"},"Generate Page":{"color":"2b4664","name":"Generate Page","description":"Issures related to page generation"},"File Picker Widget":{"color":"6ae4f2","name":"File Picker Widget","description":""},"snowflake":{"color":"8078b0","name":"snowflake","description":"Issues related to the snowflake Integration"},"Automation":{"color":"CCAF60","name":"Automation","description":""},"hotfix":{"color":"BA3F1D","name":"hotfix","description":""},"Import-Export-App":{"color":"48883f","name":"Import-Export-App","description":"Issues related to importing and exporting apps"},"High effort":{"color":"A7E87B","name":"High effort","description":"Something that'll take more than a month to build"},"Telemetry":{"color":"bc70f9","name":"Telemetry","description":"Issues related to instrumenting appsmith"},"Radio Widget":{"color":"91ef15","name":"Radio Widget","description":""},"Omnibar":{"color":"1bb96a","name":"Omnibar","description":"Issues related to the omnibar for navigation"},"Button Widget":{"color":"34efae","name":"Button Widget","description":""},"Switch widget":{"color":"33A8CE","name":"Switch widget","description":"The switch widget"},"Map Widget":{"color":"7eef7a","name":"Map Widget","description":""},"Task":{"color":"085630","name":"Task","description":"A simple Todo"},"Design System":{"color":"2958a4","name":"Design System","description":"Design system"},"opera":{"color":"C63F5B","name":"opera","description":"Any issues identified on the opera browser"},"Login / Signup":{"color":"","name":"Login / Signup","description":"Authentication flows"},"Image Widget":{"color":"8de8ad","name":"Image Widget","description":""},"firefox":{"color":"6d56e2","name":"firefox","description":""},"Property Pane":{"color":"b356ff","name":"Property Pane","description":"Issues related to the behaviour of the property pane"},"Deployment":{"color":"93491f","name":"Deployment","description":"Installation process of appsmith"},"Production":{"color":"b60205","name":"Production","description":""},"Dependencies":{"color":"0366d6","name":"Dependencies","description":"Pull requests that update a dependency file"},"Google Sheets":{"color":"8078b0","name":"Google Sheets","description":"Issues related to Google Sheets"},"Icon Button Widget":{"color":"D319CE","name":"Icon Button Widget","description":"Issues related to the icon button widget"},"Mongo":{"color":"8078b0","name":"Mongo","description":"Issues related to Mongo DB plugin"},"Documentation":{"color":"a8dff7","name":"Documentation","description":"Improvements or additions to documentation"},"TestGap":{"color":"","name":"TestGap","description":"Issues identified for test plan improvement"},"keyboard shortcut":{"color":"0688B6","name":"keyboard shortcut","description":""},"Reopen":{"color":"897548","name":"Reopen","description":""},"Redshift":{"color":"8078b0","name":"Redshift","description":"Issues related to the redshift integration"},"Date Picker Widget":{"color":"ef1ce1","name":"Date Picker Widget","description":""},"Entity Explorer":{"color":"1bb96a","name":"Entity Explorer","description":"Issues related to navigation using the entity explorer"},"JS Linting & Errors":{"color":"E56AA5","name":"JS Linting & Errors","description":"Issues related to JS Linting and errors"},"iFrame":{"color":"3CD1DB","name":"iFrame","description":"Issues related to iFrame"},"Stale":{"color":"ededed","name":"Stale","description":null},"Text Widget":{"color":"d130d1","name":"Text Widget","description":""},"Video Widget":{"color":"23dd4b","name":"Video Widget","description":""},"Datasources":{"color":"3d590f","name":"Datasources","description":"Issues related to configuring datasource on appsmith"},"error":{"color":"B66773","name":"error","description":"All issues connected to error messages"},"Form Widget":{"color":"09ed77","name":"Form Widget","description":""},"Needs Triaging":{"color":"e8b851","name":"Needs Triaging","description":"Needs attention from maintainers to triage"},"Autocomplete":{"color":"235708","name":"Autocomplete","description":"Issues related to the autocomplete"},"hacktoberfest":{"color":"0052cc","name":"hacktoberfest","description":"All issues that can be solved by the community during Hacktoberfest"},"Medium effort":{"color":"D31156","name":"Medium effort","description":"Something that'll take more than a week but less than a month to build"},"Release":{"color":"57e5e0","name":"Release","description":""},"High":{"color":"c94d14","name":"High","description":"This issue blocks a user from building or impacts a lot of users"},"UI Performance":{"color":"1799b0","name":"UI Performance","description":"Issues related to UI performance"},"Deploy Preview":{"color":"bfdadc","name":"Deploy Preview","description":"Issues found in Deploy Preview"},"Needs Tests":{"color":"8ee263","name":"Needs Tests","description":"Needs automated tests to assert a feature/bug fix"},"Refactor":{"color":"B96662","name":"Refactor","description":"needs refactoring of code"},"Divider Widget":{"color":"235708","name":"Divider Widget","description":"Issues related to the divider widget"},"Table Widget":{"color":"2eead1","name":"Table Widget","description":""},"Needs More Info":{"color":"e54c10","name":"Needs More Info","description":"Needs additional information"},"Good First Issue":{"color":"7057ff","name":"Good First Issue","description":"Good for newcomers"},"UI Improvement":{"color":"9aeef4","name":"UI Improvement","description":""},"Backend":{"color":"d4c5f9","name":"Backend","description":"This marks the issue or pull request to reference server code"},"Frontend":{"color":"87c7f2","name":"Frontend","description":"This label marks the issue or pull request to reference client code"},"Chart Widget":{"color":"616ecc","name":"Chart Widget","description":""},"List Widget":{"color":"8508A0","name":"List Widget","description":"Issues related to the list widget"},"Duplicate":{"color":"cfd3d7","name":"Duplicate","description":"This issue or pull request already exists"},"JS Snippets":{"color":"8d62d2","name":"JS Snippets","description":"issues related to JS Snippets"},"Copy Paste":{"name":"Copy Paste","description":"Issues related to copy paste","color":"b4f0a9"},"Drag & Drop":{"name":"Drag & Drop","description":"Issues related to the drag & drop experience","color":"92115a"},"Sniping Mode":{"name":"Sniping Mode","description":"Issues related to sniping mode","color":"48883f"},"Redis":{"name":"Redis","description":"Issues related to Redis","color":"8078b0"},"New Datasource":{"color":"60b14c","name":"New Datasource","description":"Requests for new datasources"},"Evaluated Value":{"name":"Evaluated Value","description":"Issues related to evaluated values","color":"39f6e7"},"Undo/Redo":{"name":"Undo/Redo","description":"Issues related to undo/redo","color":"f25880"},"App Navigation":{"name":"App Navigation","description":"Issues related to the topbar navigation and configuring it","color":"4773ab"},"Widgets Pane":{"name":"Widgets Pane","description":"Issues related to the discovery and organisation of widgets","color":"ad5d78"},"View Mode":{"color":"1799b0","name":"View Mode","description":"Issues related to the view mode"},"Content":{"name":"Content","description":"For content related topics i.e blogs, templates, videos","color":"a8dff7"},"Slash Command":{"name":"Slash Command","description":"Issues related to the slash command","color":"a0608e"},"Widget Property":{"name":"Widget Property","description":"Issues related to adding / modifying widget properties across widgets","color":"5e92cb"},"Windows":{"name":"Windows","description":"Issues related exclusively to Windows systems","color":"b4cb8a"},"Old App Issues":{"name":"Old App Issues","description":"Issues related to apps old apps a few weeks old and app issues in stale browser session","color":"87ab18"},"Document Viewer Widget":{"name":"Document Viewer Widget","description":"Issues related to Document Viewer Widget","color":"899d4b"},"Radio Group Widget":{"name":"Radio Group Widget","description":"Issues related to radio group widget","color":"b68495"},"Super Admin":{"name":"Super Admin","description":"Issues related to the super admin page","color":"aa95cf"},"Postgres":{"name":"Postgres","description":"Postgres related issues","color":"8078b0"},"New JS Function":{"name":"New JS Function","description":"Issues related to adding a JS Function","color":"8e8aa4"},"Cannot Reproduce Issue":{"color":"93c9cc","name":"Cannot Reproduce Issue","description":"Issues that cannot be reproduced"},"Widget Grouping":{"name":"Widget Grouping","description":"Issues related to Widget Grouping","color":"a49951"},"K8s":{"name":"K8s","description":"Kubernetes related issues","color":"5f318a"},"Docker":{"name":"Docker","description":"Issues related to docker","color":"89b808"},"Camera Widget":{"name":"Camera Widget","description":"Issues and enhancements related to camera widget","color":"e6038e"},"SAAS Plugins":{"name":"SAAS Plugins","description":"Issues related to SAAS Plugins","color":"80e18f"},"JS Promises":{"name":"JS Promises","description":"Issues related to promises","color":"d7771f"},"OnPageLoad":{"name":"OnPageLoad","description":"OnPageLoad issues on functions and queries","color":"2b4664"},"JS Usability":{"name":"JS Usability","description":"usability issues with JS editor and JS elsewhere","color":"a302b0"},"Currency Input Widget":{"name":"Currency Input Widget","description":"Issues related to currency input widget","color":"b2164f"},"TreeSelect":{"name":"TreeSelect","description":"Issues related to TreeSelect Widget","color":"a1633e"},"MultiTree Select Widget":{"name":"MultiTree Select Widget","description":"Issues related to MultiTree Select Widget","color":"a1633e"},"Welcome Screen":{"name":"Welcome Screen","description":"Issues related to the welcome screen","color":"48883f"},"Realtime Commenting":{"color":"a70b86","name":"Realtime Commenting","description":"In-app communication between teams"},"Phone Input Widget":{"name":"Phone Input Widget","description":"Issues related to the Phone Input widget","color":"a70b86"},"JSON Form":{"name":"JSON Form","description":"Issue / features related to the JSON form wiget","color":"46b209"},"All Widgets":{"name":"All Widgets","description":"Issues related to all widgets","color":"972b36"},"V1":{"name":"V1","description":"V1","color":"67ab2e"},"Reflow & Resize":{"name":"Reflow & Resize","description":"All issues related to reflow and resize experience","color":"748a13"},"SSO":{"name":"SSO","description":"Issues, requests and enhancements around Single sign-on.","color":""},"Multi User Realtime":{"name":"Multi User Realtime","description":"Issues related to multiple users using or editing an application","color":"e7b6ce"},"Ready for design":{"name":"Ready for design","description":"this issue is ready for design: it contains clear problem statements and other required information","color":"ebf442"},"Support":{"name":"Support","description":"Issues created by the A-force team to address user queries","color":"1740f3"},"Button Group widget":{"name":"Button Group widget","description":"Issue and enhancements related to the button group widget","color":"f17025"},"GraphQL Plugin":{"name":"GraphQL Plugin","description":"Issues related to GraphQL plugin","color":"8078b0"},"DevOps Pod":{"name":"DevOps Pod","description":"Issues related to devops","color":"d956c7"},"medium":{"name":"medium","description":"Issues that frustrate users due to poor UX","color":"23dfd9"},"ArangoDB":{"name":"ArangoDB","description":"Issues related to arangoDB","color":"8078b0"},"Code Refactoring":{"name":"Code Refactoring","description":"Issues related to code refactoring","color":"76310e"},"Progress bar widget":{"name":"Progress bar widget","description":"To track issues related to progress bar","color":"2d7abf"},"Audio Recorder Widget":{"name":"Audio Recorder Widget","description":"Issues related to Audio Recorder Widget","color":"9accef"},"Airtable":{"name":"Airtable","description":"Issues for Airtable","color":"60885f"},"Canvas / Grid":{"name":"Canvas / Grid","description":"Issues related to the canvas","color":"16b092"},"Email Config":{"name":"Email Config","description":"Issues related to configuring the email service","color":"2a21d1"},"CURL":{"name":"CURL","description":"Issues related to CURL impor","color":"60885f"},"Canvas Zooms":{"name":"Canvas Zooms","description":"Issues related to zooming the canvas","color":"e6038e"},"business":{"name":"business","description":"Features that will be a part of our business edition","color":"cd59eb"},"Action Pod":{"name":"Action Pod","description":"","color":"ee2e36"},"AutomationGap1":{"color":"a5e07c","name":"AutomationGap1","description":"Issues that needs automated tests"},"A-Force11":{"name":"A-Force11","description":"Issues raised by A-Force team","color":"d667b6"},"Business Edition":{"name":"Business Edition","description":"Features that will be a part of our business edition","color":"89bb6c"},"storeValue":{"name":"storeValue","description":"Issues related to the store value function","color":"5d3e66"},"DynamoDB":{"name":"DynamoDB","description":"Issues that are related to DynamoDB should have this label","color":"60885f"},"Backup & Restore":{"name":"Backup & Restore","description":"Issues related to backup and restore","color":"86874d"},"Billing":{"name":"Billing","description":"Billing infrastructure and flows for Business Edition and Trial users","color":"d2bc40"},"Datatype issue":{"name":"Datatype issue","description":"Issues that have risen because data types weren't handled","color":"cef66b"},"OAuth":{"name":"OAuth","description":"OAuth related bugs or features","color":"60885f"},"Table Widget V2":{"name":"Table Widget V2","description":"Issues related to Table Widget V2","color":"3a7192"},"IDE Navigation":{"name":"IDE Navigation","description":"Issues/feature requests related to IDE navigation, and context switching","color":"1bb96a"},"Query performance":{"name":"Query performance","description":"Issues that have to do with lack in performance of query execution","color":"cef66b"},"SAAS Manager App":{"name":"SAAS Manager App","description":"Issues with the SAAS manager app","color":"d427db"},"Twilio":{"name":"Twilio","description":"Issues related to Twilio integration","color":"23ba8d"},"Hubspot":{"name":"Hubspot","description":"Issues related to Hubspot integration","color":"60885f"},"Zendesk":{"name":"Zendesk","description":"Issues related to Zendesk integration","color":"60885f"},"Entity Refactor":{"name":"Entity Refactor","description":"Issues related to refactor logic","color":"705a2c"},"Map Chart Widget":{"name":"Map Chart Widget","description":"Issues related to Map Chart Widgets","color":"c8397f"},"Product Catchup":{"name":"Product Catchup","description":"Issues created in the product catchup","color":"29cd2c"},"Framework Functions":{"name":"Framework Functions","description":"Issues related to internal functions like showAlert(), navigateTo() etc...","color":"c25a09"},"Frontend Libraries Upgrade":{"name":"Frontend Libraries Upgrade","description":"Issues related to frontend libraries upgrade","color":"ede1fc"},"MsSQL":{"name":"MsSQL","description":"Issues related to MsSQL plugin","color":"8078b0"},"Elastic Search":{"name":"Elastic Search","description":"Issues related to the elastic search datasource","color":"8078b0"},"Core Query Execution":{"color":"cef66b","name":"Core Query Execution","description":"Issues related to the execution of all queries"},"Query Management":{"name":"Query Management","description":"Issues related to the CRUD of actions or queries","color":"cef66b"},"Query Settings":{"name":"Query Settings","description":"Issues related to the settings of all queries","color":"cef66b"},"Code Editor":{"name":"Code Editor","description":"Issues related to the code editor","color":"4ca16e"},"Query Forms":{"color":"12b253","name":"Query Forms","description":"Isuses related to the query forms"},"JS Objects":{"color":"22962c","name":"JS Objects","description":"Issues related to JS Objects"},"JS Evaluation":{"color":"22962c","name":"JS Evaluation","description":"Issues related to JS evaluation on the platform"},"SmartSubstitution":{"name":"SmartSubstitution","description":"Issues related to Smart substitution of mustache bindings in queries","color":"bae511"},"Query Generation":{"name":"Query Generation","description":"Issues related to query generation","color":"cef66b"},"Suggested Widgets":{"name":"Suggested Widgets","description":"Issues related to suggesting widgets based on query response","color":"6ac063"},"Code Scanner Widget":{"name":"Code Scanner Widget","description":"Issues related to code scanner widget","color":"9bc1a0"},"Clean URLs":{"name":"Clean URLs","description":"Issues related to clean URLs epic","color":"112623"},"Widget keyboard accessibility":{"name":"Widget keyboard accessibility","description":"All issues related to keyboard accessibility in widgets","color":"b626fd"},"Connection pool":{"name":"Connection pool","description":"issues to do with connection pooling of various plugins","color":"94fe36"},"List Widget V2":{"name":"List Widget V2","description":"Issues related to the list widget v2","color":"adaaf7"},"Auto Height":{"name":"Auto Height","description":"Issues related to dynamic height of widgets","color":"5149cf"},"cypress_failed_test":{"name":"cypress_failed_test","description":"Cypress failed tests","color":"4745d5"},"Needs validation":{"name":"Needs validation","description":"Needs problem validation before being picked up","color":"66673d"},"Slider Widget":{"name":"Slider Widget","description":"Issues raised for slider widgets.","color":"2eef5f"},"Multitenancy":{"name":"Multitenancy","description":"Support multitenancy within single appsmith instance","color":"8c49a9"},"Conversion Algorithm":{"name":"Conversion Algorithm","description":"All issue related to converting app from fixed to flex mode & vice versa","color":"d12d2e"},"Browser specific":{"name":"Browser specific","description":"All issue related to browser","color":"d12d2e"},"Performance infra":{"name":"Performance infra","description":"all issue related to the performance infra","color":"8a60f6"},"DSL Update":{"name":"DSL Update","description":"Issues related to storing and updating the DSL","color":"e16cf3"},"AST-frontend":{"name":"AST-frontend","description":"Issues related to maintaining AST logic","color":"2b4664"},"AST-backend":{"name":"AST-backend","description":"Backend issues related to AST parsing","color":"48883f"},"MariaDB":{"name":"MariaDB","description":"MariaDB datasource","color":"8428c3"},"ADS Component Issue":{"name":"ADS Component Issue","description":"Issues which are caused due to ADS components","color":"d89119"},"Regressed":{"color":"723fd0","name":"Regressed","description":"Scenarios that were working before but have now regressed"},"Needs RCA":{"name":"Needs RCA","description":"a critical or high priority issue that needs an RCA","color":"2cc68f"},"Custom JS Libraries":{"name":"Custom JS Libraries","description":"Issues related to adding custom JS library","color":"bacb6d"},"Integrations Pod General":{"name":"Integrations Pod General","description":"Issues related to the Integrations Pod that don't fit into other tags.","color":"287823"},"Performance Pod":{"name":"Performance Pod","description":"All things related to Appsmith performance","color":"b5a25d"},"Performance":{"name":"Performance","description":"Issues related to performance","color":"9a18d7"},"File upload issues":{"name":"File upload issues","description":"Issues related to uploading any type of files from within Appsmith","color":"2b4664"},"Action Selector":{"name":"Action Selector","description":"Issues related to action selector on the property pane","color":"2f9e20"},"Community Reported":{"name":"Community Reported","description":"issues reported by community members","color":"1402e5"},"JS Function execution":{"name":"JS Function execution","description":"JS function execution","color":"7c2de1"},"Self Serve":{"name":"Self Serve","description":"For all issues related to self-serve flow for business edition","color":"4dacfc"},"Self Serve 1.0":{"name":"Self Serve 1.0","description":"For all issues related to v1 of the self serve project","color":"ae839e"},"Customer Portal":{"name":"Customer Portal","description":"For all tasks/issues pertaining to customer.appsmith.com","color":"d2bc40"},"Cloud Services":{"name":"Cloud Services","description":"For all tasks/issues on Appsmith cloud-services relating to licensing, usage and billing","color":"d2bc40"},"One-click Binding":{"name":"One-click Binding","description":"Issues related to the One click binding epic","color":"f1661c"},"Airgap":{"name":"Airgap","description":"Tickets related to supporting air-gapped Appsmith instances","color":"1cb294"},"SMTP plugin":{"name":"SMTP plugin","description":"Issues related to SMTP plugin","color":"541457"},"AWS AMI":{"name":"AWS AMI","description":"Issues Related to AWS AMI","color":"b44680"},"Old widget version":{"name":"Old widget version","description":"Use this label to raise issue specific only to an older version of a widget","color":"ff3814"},"Enterprise Billing":{"name":"Enterprise Billing","description":"To track all tasks/issues related to licensing & billing for enterprise customers","color":"14c156"},"Oracle SQL DB":{"name":"Oracle SQL DB","description":"Issues related to the Oracle plugin","color":"cbabcb"},"Community Contributor":{"name":"Community Contributor","description":"Meant to track issues that are assigned to external contributors","color":"149ab6"},"widget vertical alignment":{"name":"widget vertical alignment","description":"All issue related widget vertical alignment on the auto layout canvas","color":"d12d2e"},"Observability":{"name":"Observability","description":"Issues related to observability on the Appsmith instance","color":"dff913"},"Checkbox Component":{"name":"Checkbox Component","description":"This labels deals with checkbox component in wds package","color":"75a401"},"Analytics Improvements":{"name":"Analytics Improvements","description":"For all tasks focused on improving our overall analytics and fixing any issues ","color":"29b8ed"},"WDS team":{"name":"WDS team","description":"","color":"8d675a"},"Enterprise Edition":{"name":"Enterprise Edition","description":"Features that will be supported in Enterprise Edition only","color":"984f5e"},"Query filter":{"name":"Query filter","description":"Issues related to query filtering, e.g., WHERE clause","color":"a15134"},"Keyboard accessibility ":{"name":"Keyboard accessibility ","description":"All issue related to ADS component keyboard accessibility","color":"2ba696"},"Toggle button":{"name":"Toggle button","description":"All issue related to ADS toggle button","color":"edc47f"},"SCIM":{"name":"SCIM","description":"Label to collate our SCIM issues","color":"48883f"},"ADS Category Token":{"name":"ADS Category Token","description":"All issues related appsmith design system category tokens","color":"920961"},"ADS Component Documentation":{"name":"ADS Component Documentation","description":"All issues Appsmith design system component documentation","color":"64c46a"},"ADS Migration":{"name":"ADS Migration","description":"All issues related to Appsmith design system migration","color":"b082d6"},"ADS Deduplication ":{"name":"ADS Deduplication ","description":"Replacing component with ADS components","color":"b082d6"},"ADS Revamp":{"name":"ADS Revamp","description":"All issues related to ads revamp. ","color":"b082d6"},"ADS Deduplication":{"name":"ADS Deduplication","description":"Replacing component with ADS components","color":"b082d6"},"ADS Grayscale":{"name":"ADS Grayscale","description":"Support grayscale color changes","color":"b03577"},"ADS Unit Test":{"name":"ADS Unit Test","description":"All issue related ads unit cases ","color":"b082d6"},"ADS Components":{"name":"ADS Components","description":"All issues related ADS components","color":"b082d6"},"Widget Discoverability":{"name":"Widget Discoverability","description":"Issues related to Widget Discoverability","color":"7b55ce"},"Widget setter method":{"name":"Widget setter method","description":"Issues with widget property setters","color":"8dce87"},"License":{"name":"License","description":"For all issues/tasks related to licensing of appsmith-ee edition","color":"90ee98"},"Platformization":{"name":"Platformization","description":"Issues or tasks related to platformization of Appsmith codebase","color":"4e972b"},"Activation - datasources":{"name":"Activation - datasources","description":"issues related to activation projects","color":"7c7ace"},"Partial-import-export":{"name":"Partial-import-export","description":"Label for granular reusability.","color":"717732"},"AI":{"name":"AI","description":"All tasks related to AI","color":"2b4664"},"ADS Typography":{"name":"ADS Typography","description":"All issue related typographical changes","color":"2dbe8d"},"Auto Layout":{"name":"Auto Layout","description":"Issues relates to auto layout","color":"92cf8c"},"Heroku":{"name":"Heroku","description":"Issues related to Heroku","color":"a81b69"},"ADS Visual Styles":{"name":"ADS Visual Styles","description":"All issues related to ADS visual styles","color":"d3da89"},"ADS Component Design":{"name":"ADS Component Design","description":"All issue related to component design","color":"5cc91e"},"Modal Component":{"name":"Modal Component","description":"All issue related to ads modal component","color":"ee63f3"},"App setting":{"name":"App setting","description":"Related to app settings panel within the app","color":"174f98"},"BE instance":{"name":"BE instance","description":"For all issues related to license, billing on BE instance","color":"ae8f98"},"Fixed layout":{"name":"Fixed layout","description":"issues related to fixed layout","color":"b66681"},"Anvil layout":{"name":"Anvil layout","description":"issues related to the new layout system anvil","color":"5e0904"},"New Deployment Mode":{"name":"New Deployment Mode","description":"Support a new mode of deployment","color":"108033"},"Custom widgets":{"name":"Custom widgets","description":"For all issues related to the custom widget project","color":"c9db9c"},"Homepage Experience V2":{"name":"Homepage Experience V2","description":"Label for reporting new tasks and bug fixes related to revamped homepage experience","color":"c55d54"},"Customer Success":{"name":"Customer Success","description":"Issues that the success team cares about","color":"6ccabd"},"Invite flow":{"name":"Invite flow","description":"Invite users flow and any associated actions","color":"881b35"},"Invite users":{"name":"Invite users","description":"Invite users flow and any associated actions","color":""},"Workflows Pod":{"name":"Workflows Pod","description":"Issues that the workflows team owns","color":"446925"},"DailyPromotionBlocker":{"name":"DailyPromotionBlocker","description":"DailyPromotion Blocker","color":"9b2280"},"JS Binding":{"name":"JS Binding","description":"All issues related to the JS Binding experience","color":"422fed"},"REST API":{"name":"REST API","description":"REST API plugin related issues","color":"e3ede5"},"Critical":{"color":"a1e3db","name":"Critical","description":"This issue breaks existing apps. Drop everything else to resolve"},"Module creator":{"name":"Module creator","description":"Issues related to the module creator side","color":"bb2c05"},"Module consumer":{"name":"Module consumer","description":"Issues related to the module consumer side","color":"83d3c5"},"Package versioning":{"name":"Package versioning","description":"ISsues related to how we manage versions for packages","color":"4c5218"},"Convert to module":{"name":"Convert to module","description":"Issues related to the module creation flow using conversion","color":"4c5218"},"Query module":{"name":"Query module","description":"Issues affecting query modules or its instances","color":"b11a7e"},"JS module":{"name":"JS module","description":"Issues affecting JS modules or its instances","color":"bf76f6"},"Secret Management":{"name":"Secret Management","description":"Issues related to secret management","color":"2b4664"},"REST API plugin":{"name":"REST API plugin","description":"REST API plugin related issues","color":"b5948a"},"UI module":{"name":"UI module","description":"Issues affecting UI modules or its instances","color":"d2acee"},"Preview mode":{"name":"Preview mode","description":"Issues related to app previews","color":"48883f"},"Git Auto-commit":{"name":"Git Auto-commit","description":"Issues related to autocommit","color":"717732"},"QA Pod":{"name":"QA Pod","description":"Issues under the QA Pod","color":"717732"},"Automation Test":{"name":"Automation Test","description":"","color":""},"Automation failures":{"name":"Automation failures","description":"","color":""},"Needs automation":{"name":"Needs automation","description":"Issues that needs automated tests","color":""},"Prepared statements":{"name":"Prepared statements","description":"Issues related to prepared statement flow","color":""},"Switch Group Widget":{"name":"Switch Group Widget","description":"Issues related to Switch group Widget","color":""},"Supervisor":{"name":"Supervisor","description":"Issues related to supervisor","color":"2c5813"},"Deployment Certificates":{"name":"Deployment Certificates","description":"Issues related to lets encrypt","color":"e148aa"},"Mock Data":{"name":"Mock Data","description":"Issues related to mock databases","color":"ebf251"},"AWS ECS":{"name":"AWS ECS","description":"Issues related to ECS Fargate","color":"e506ff"},"Publish App":{"name":"Publish App","description":"Issues related to app deployment","color":"2b4664"},"IDE Infra":{"name":"IDE Infra","description":"Issues related to the IDE infrastructure like saving changes","color":"1bb96a"},"User Profile":{"name":"User Profile","description":"Issues related to a user profile","color":"a60d34"},"Page Management":{"color":"1bb96a","name":"Page Management","description":"Issues related to configuring pages"},"Ingress":{"name":"Ingress","description":"Ingress Controller","color":"a86802"},"Nginx":{"name":"Nginx","description":"Issues related to Nginx","color":"e54195"},"Building blocks":{"name":"Building blocks","description":"Building blocks on cavas, on templates listing or drag and drop of building blocks.","color":"48883f"},"Table Inline Edit":{"name":"Table Inline Edit","description":"Issues related to inline editing","color":"60895a"},"User Session ":{"name":"User Session ","description":"For all issues/tasks related to user sessions","color":"65a3f5"},"WDS - all widgets":{"name":"WDS - all widgets","description":"all widget present in WDS","color":"2670ae"},"WDS - input widget":{"name":"WDS - input widget","description":"Issues related to input widget on WDS","color":"2670ae"},"WDS - paragraph widget":{"name":"WDS - paragraph widget","description":"issues related to paragraph widget on WDS","color":"2670ae"},"WDS - statbox widget":{"name":"WDS - statbox widget","description":"issues related to statbox widget on WDS","color":"2670ae"},"WDS - modal widget":{"name":"WDS - modal widget","description":"Issues related to modal widget on WDS","color":"2670ae"},"WDS - icon widget":{"name":"WDS - icon widget","description":"Issues related to icon widget on WDS","color":"2670ae"},"WDS - checkbox widget":{"name":"WDS - checkbox widget","description":"Issues related to checkbox widget on WDS","color":"2670ae"},"WDS - table widget":{"name":"WDS - table widget","description":"Issues related to table widget on WDS","color":"2670ae"},"WDS - keyValue widget":{"name":"WDS - keyValue widget","description":"Issues related to key-value widget on WDS","color":"2670ae"},"WDS - switch group widget":{"name":"WDS - switch group widget","description":"Issues related to switch group widget on WDS","color":"2670ae"},"WDS - theming":{"name":"WDS - theming","description":"Issues related to theming on the Anvil instance","color":"2670ae"},"Anvil POD":{"name":"Anvil POD","description":"Issue related to Anvil project","color":"5e0904"},"Anvil - theming":{"name":"Anvil - theming","description":"Issues related to theming on the Anvil instance","color":"c28de5"},"Anvil - vertical alignment":{"name":"Anvil - vertical alignment","description":"Issues related to vertical alignment on the Anvil layout","color":"c28de5"},"Anvil - layout component":{"name":"Anvil - layout component","description":"Issues related to layout component on the Anvil layout","color":"c28de5"},"Anvil - drag & drop":{"name":"Anvil - drag & drop","description":"Issues related to drag & drop experience on Anvil","color":"c28de5"},"Anvil - zones & sections":{"name":"Anvil - zones & sections","description":"Issues related to zones and sections on the Anvil layout","color":"c28de5"},"Anvil - copy paste experience":{"name":"Anvil - copy paste experience","description":"Issues related to copy paste experience on the Anvil layout","color":"c28de5"},"WDS  - phone widget":{"name":"WDS  - phone widget","description":"Issues related to phone widget on WDS","color":"c28de5"},"WDS - responsive widget":{"name":"WDS - responsive widget","description":"All issues related to widget responsiveness","color":"11ee05"},"Anvil - responsive viewport":{"color":"11ee05","name":"Anvil - responsive viewport","description":"Issues seen on different viewports like mobile"},"WDS  - widget styling":{"color":"11ee05","name":"WDS  - widget styling","description":"all about widget styling"},"Anvil - spacing":{"name":"Anvil - spacing","description":"Related to spacing between widgets in auto layout","color":"11ee05"},"Anvil - responsive canvas":{"name":"Anvil - responsive canvas","description":"All issues related to canvas responsiveness","color":"11ee05"},"WDS - inline button widget":{"name":"WDS - inline button widget","description":"Issues related to inline button widget on WDS","color":"7cef83"},"Activation Pod":{"name":"Activation Pod","description":"for Activation group","color":"d67d00"},"Activation":{"name":"Activation","description":"for Activation group","color":"d67d00"},"Tests":{"name":"Tests","description":"Test issues","color":"4fc7b6"},"Ballpark: XXS":{"name":"Ballpark: XXS","description":"~1xDev in 1/2xSprint","color":""},"Ballpark: XS":{"name":"Ballpark: XS","description":"~1xDev in 1xSprint","color":"53bf71"},"Ballpark: S":{"name":"Ballpark: S","description":"~2xDev in 1xSprint","color":"6e9e65"},"Ballpark: M":{"name":"Ballpark: M","description":"~1xPOD in 1xSprint","color":"2229e6"},"Ballpark: L":{"name":"Ballpark: L","description":"~1xPOD in 3xSprint or 2xPODs in 1xSprint","color":"49962f"},"Ballpark: XL":{"name":"Ballpark: XL","description":"~1xPOD in 1xQuarter or 2xPODs in 2xSprint","color":"b524c9"},"Ballpark: XXL":{"name":"Ballpark: XXL","description":"~2xPODs in 1xQuarter","color":"22092c"},"Auto-commit":{"name":"Auto-commit","description":"Issues related to auto-generated commits showing up on git ","color":"e25b89"},"Continuous Deployment":{"name":"Continuous Deployment","description":"Issues related to CD pipeline on git","color":"aea47c"},"Default branch":{"name":"Default branch","description":"Issues related to using a default branch on git","color":"195737"},"Git status":{"name":"Git status","description":"Issues related to information shown on git status modal or number of changes appearing in a branch","color":"c851b8"},"Git performance":{"name":"Git performance","description":"Issues related to perceived performance on any git operation","color":"189af6"},"Anvil team":{"name":"Anvil team","description":"issues related to the new layout system anvil","color":"798200"},"SDLC":{"name":"SDLC","description":"Issues related to software development lifecycle experiences","color":"bae511"},"Reconnect DS modal":{"name":"Reconnect DS modal","description":"Issues related to reconnect datasource modal post app import","color":"2e398b"},"Stability Pod":{"name":"Stability Pod","description":"For all issues/tasks to be prioritized under Stability pod","color":"86ddf6"},"Stability Issue":{"name":"Stability Issue","description":"Every issue handle by Stability Pod","color":"4d024a"},"Move to Postgres":{"name":"Move to Postgres","description":"Issues required to be solved for the move to Postgres as repository layer","color":"4e13ac"},"User Session":{"name":"User Session","description":"Issues related to user sessions","color":"8255e5"},"IDE tabs":{"name":"IDE tabs","description":"query and js tabs","color":"1bb96a"},"Inviting Contribution":{"name":"Inviting Contribution","description":"Issues that we would like contributions to","color":""},"cypress-flaky-fix":{"name":"cypress-flaky-fix","description":"This label is auto-added when a PR which only has Cypress fixes are merged to release","color":"722cbc"},"Cypress flaky tests":{"name":"Cypress flaky tests","description":"Test scripts that need to be fixed on Cypress by dev or SDET","color":"722cbc"},"Help enterprise":{"name":"Help enterprise","description":"Requested by Appsmith customers or prospects","color":"FF8C00"},"Learnability":{"name":"Learnability","description":"Issues affecting the product learnability, making the product harder for new users.","color":"800c2f"},"ADS Spacing":{"name":"ADS Spacing","description":"","color":"686ebb"},"ads unit test":{"name":"ads unit test","description":"All issue related ads unit cases","color":"686ebb"},"ads revamp":{"name":"ads revamp","description":"All issues related to ads revamp.","color":"686ebb"},"Javascript Product":{"color":"709a21","name":"Javascript Product","description":"Issues related to users writing javascript in appsmith"},"IDE Product":{"color":"1bb96a","name":"IDE Product","description":"Issues related to the IDE Product"},"IDE Pod":{"color":"1bb96a","name":"IDE Pod","description":"Issues that new developers face while exploring the IDE"},"Accelerators Product":{"name":"Accelerators Product","description":"Issues related to app building accelerators","color":"f3fce6"},"Templates Product":{"name":"Templates Product","description":"Issues related to Templates","color":"f3fce6"},"Design System Product":{"name":"Design System Product","description":"Appsmith design system related issues","color":"2b4664"},"ads deduplication":{"name":"ads deduplication","description":"Replacing component with ADS components","color":"708943"},"Admin Settings Product":{"color":"708943","name":"Admin Settings Product","description":"Issues in admin settings pages"},"Appsmith AI":{"name":"Appsmith AI","description":"All issues related to the Appsmith AI datasource","color":"708943"},"Query & JS Pod":{"color":"709a21","name":"Query & JS Pod","description":"Issues related to the query & JS Pod"},"RBAC Product":{"name":"RBAC Product","description":"Issues, requests and enhancements around RBAC.","color":""},"Workspace Product":{"name":"Workspace Product","description":"Issues related to workspaces","color":""},"CE Instance Usage":{"name":"CE Instance Usage","description":"For all issues relating to usage, licensing or billing on the CE instance","color":""},"Billing & Licensing Product":{"name":"Billing & Licensing Product","description":"Issues pertaining to licensing, billing and usage across self serve and enterprise customers","color":"446925"},"Platform Administration Pod":{"color":"446925","name":"Platform Administration Pod","description":"Issues related to platform administration & management"},"DB Infrastructure Pod":{"name":"DB Infrastructure Pod","description":"Pod to handle database infrastructure","color":"446925"},"Packages Product":{"name":"Packages Product","description":"Issues related to packages","color":"7e018f"},"Workflows Product":{"name":"Workflows Product","description":"Issues related to the workflows product","color":"446925"},"Debugger Product":{"color":"857f58","name":"Debugger Product","description":"Issues related to the debugger"},"Packages Pod":{"name":"Packages Pod","description":"issues that belong to the packages pod","color":"53742c"},"Environments Product":{"name":"Environments Product","description":"Issues related to datasource environments","color":"857f58"},"Custom Widgets":{"name":"Custom Widgets","description":"For all issues related to the custom widget project","color":"857f58"},"Branding Product":{"name":"Branding Product","description":"All issues under branding and whitelabelling appsmith ecosystem","color":"857f58"},"Widgets & Accelerators Pod":{"name":"Widgets & Accelerators Pod","description":"Issues related to widgets & Accelerators","color":"27496a"},"Widgets Product":{"name":"Widgets Product","description":"This label groups issues related to widgets","color":"f3fce6"},"App Theming Product":{"name":"App Theming Product","description":"Items that are related to the App level theming controls epic","color":"48883f"},"UI Building Product":{"color":"48883f","name":"UI Building Product","description":"Issues related to the UI Building experience"},"Onboarding Product":{"color":"48883f","name":"Onboarding Product","description":"Issues related to onboarding new developers"},"Database Schema":{"name":"Database Schema","description":"Issues related to database schema","color":"48883f"},"Git Product":{"color":"7e018f","name":"Git Product","description":"Issues related to version control product"},"Embedding Apps Product":{"name":"Embedding Apps Product","description":"Issues related to embedding","color":"48883f"},"Integrations Product":{"name":"Integrations Product","description":"Issues related to a specific integration","color":"b9f21c"},"Feature Flagging":{"name":"Feature Flagging","description":"Anything related feature flagging","color":"4574ae"},"Audit Logs Product":{"name":"Audit Logs Product","description":"Audit trails to ensure data security","color":"4574ae"},"Identity & Authentication Product":{"name":"Identity & Authentication Product","description":"Issues related to user identity & authentication","color":"4574ae"},"Email verification":{"name":"Email verification","description":"Email verification issues","color":"4574ae"},"Artifact Platform Product":{"name":"Artifact Platform Product","description":"Issues related to the application platform","color":"4574ae"},"Git IA":{"name":"Git IA","description":"Issues related to Git IA changes","color":"df8bd6"},"Documentation Pod":{"name":"Documentation Pod","description":"Issues related to user education","color":"8c8c02"},"Branch management":{"name":"Branch management","description":"Issues related to using a branch management on git","color":"ebe6af"},"Reconfigure Datasource Modal":{"name":"Reconfigure Datasource Modal","description":"Issues related to reconfigure DS modal that comes after importing applications","color":"5ac17b"},"Setup Issues":{"name":"Setup Issues","description":"Issues related to setting up appsmith","color":"3fc837"},"Packages & Git Pod":{"name":"Packages & Git Pod","description":"All issues belonging to Packages and Git","color":"46ac0e"},"Git Platform":{"name":"Git Platform","description":"Issues related to the git & the app platform","color":"c9ab80"}},"success":true}
\ No newline at end of file
diff --git a/.github/workflows/ad-hoc-docker-image.yml b/.github/workflows/ad-hoc-docker-image.yml
index 38afa93839ae..44cfce8435ee 100644
--- a/.github/workflows/ad-hoc-docker-image.yml
+++ b/.github/workflows/ad-hoc-docker-image.yml
@@ -14,6 +14,11 @@ on:
         required: false
         type: string
         default: ad-hoc
+      pg_tag:
+        description: Postgres tag to use for image
+        required: false
+        type: string
+        default: pg
 
 jobs:
   server-build:
@@ -90,6 +95,16 @@ jobs:
             scripts/generate_info_json.sh
           fi
 
+      - name: Place server artifacts-es
+        run: |
+          run: |
+          if [[ -f scripts/prepare_server_artifacts.sh ]]; then
+            PG_TAG=${{ inputs.pg_tag }} scripts/prepare_server_artifacts.sh
+          else
+            echo "No script found to prepare server artifacts"
+            exit 1
+          fi
+
       - name: Set up Depot CLI
         uses: depot/setup-action@v1
 
diff --git a/.github/workflows/ci-test-custom-script.yml b/.github/workflows/ci-test-custom-script.yml
index ef8aea989ea0..ffcaea802a40 100644
--- a/.github/workflows/ci-test-custom-script.yml
+++ b/.github/workflows/ci-test-custom-script.yml
@@ -148,6 +148,7 @@ jobs:
         working-directory: "."
         run: |
           sudo /etc/init.d/ssh stop ;
+          sudo systemctl disable --now ssh.socket
           mkdir -p ~/git-server/keys
           ted_tag="${{inputs.ted_tag}}"
           docker run --name test-event-driver -d -p 22:22 -p 5001:5001 -p 3306:3306 \
@@ -197,6 +198,21 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version-file: app/client/package.json
+      
+      - name: Check DB URL
+        if: steps.run_result.outputs.run_result != 'success'
+        run: |
+          db_url=$(grep -oP 'APPSMITH_DB_URL=\K[^ ]+' cicontainerlocal/stacks/configuration/docker.env || echo "")
+          if [[ -z "$db_url" ]]; then
+            echo "::error::APPSMITH_DB_URL not found in the environment file"
+          fi
+          if [[ $db_url == "postgresql"* ]]; then
+            echo "Database type: Postgres. Ensure PostgreSQL-specific configurations are in place."
+          elif [[ $db_url == "mongo"* ]]; then
+            echo "Database type: MongoDB. Verify MongoDB connection settings if issues arise."
+          else
+            echo "::warning::Unknown database type. Please verify the database configuration."
+          fi
 
       # actions/setup-node@v4 doesn’t work properly with Yarn 3
       # when the project lives in a subdirectory: https://github.com/actions/setup-node/issues/488
diff --git a/.github/workflows/ci-test-limited-with-count.yml b/.github/workflows/ci-test-limited-with-count.yml
index 65af0adfb198..b7786c07aa5a 100644
--- a/.github/workflows/ci-test-limited-with-count.yml
+++ b/.github/workflows/ci-test-limited-with-count.yml
@@ -266,16 +266,18 @@ jobs:
       - name: Set Commit Message
         env:
           EVENT_COMMITS: ${{ toJson(github.event.commits[0].message) }}
+          COMMIT_INFO_AUTHOR: ${{ github.event.commits[0].author.name }}
         run: |
-          if [[ ${{ inputs.pr }} -ne 0 && ${{github.event_name}} == 'repository_dispatch' ]]; then
-            echo "COMMIT_INFO_MESSAGE=${{ env.COMMIT_INFO_MESSAGE }}" >> $GITHUB_ENV
-          elif [[ ${{ inputs.pr }} -ne 0 && ${{github.event_name}} == 'workflow_dispatch' ]]; then
+          if [[ ${{ inputs.pr }} -ne 0 && ${{ github.event_name }} == 'repository_dispatch' ]]; then
+            echo "COMMIT_INFO_MESSAGE=$COMMIT_INFO_MESSAGE" >> $GITHUB_ENV
+          elif [[ ${{ inputs.pr }} -ne 0 && ${{ github.event_name }} == 'workflow_dispatch' ]]; then
             echo "COMMIT_INFO_MESSAGE=Workflow run on PR# ${{ inputs.pr }}" >> $GITHUB_ENV
           else
-            if [[ '${{env.EVENT_COMMITS}}' == 'null' ]]; then
-              echo "COMMIT_INFO_MESSAGE=${{ github.event_name }} by ${{ env.COMMIT_INFO_AUTHOR }}" >> $GITHUB_ENV
+            if [[ "$EVENT_COMMITS" == "null" ]]; then
+              echo "COMMIT_INFO_MESSAGE=${{ github.event_name }} by $COMMIT_INFO_AUTHOR" >> $GITHUB_ENV
             else
-              echo "COMMIT_INFO_MESSAGE=$(echo \"${{ env.EVENT_COMMITS }}\" | awk -F '\\\\n' '{print $1}' | sed 's/^\"//')" >> $GITHUB_ENV
+              COMMIT_FIRST_LINE=$(echo "$EVENT_COMMITS" | awk -F '\\\\n' '{print $1}' | sed 's/^\"//')
+              echo "COMMIT_INFO_MESSAGE=$COMMIT_FIRST_LINE" >> $GITHUB_ENV
             fi
           fi
 
diff --git a/.github/workflows/ci-test-limited.yml b/.github/workflows/ci-test-limited.yml
index 9f62ff2a0059..b9cdeaf90f13 100644
--- a/.github/workflows/ci-test-limited.yml
+++ b/.github/workflows/ci-test-limited.yml
@@ -256,16 +256,18 @@ jobs:
       - name: Set Commit Message
         env:
           EVENT_COMMITS: ${{ toJson(github.event.commits[0].message) }}
+          COMMIT_INFO_AUTHOR: ${{ github.event.commits[0].author.name }}
         run: |
-          if [[ ${{ inputs.pr }} -ne 0 && ${{github.event_name}} == 'repository_dispatch' ]]; then
-            echo "COMMIT_INFO_MESSAGE=${{ env.COMMIT_INFO_MESSAGE }}" >> $GITHUB_ENV
-          elif [[ ${{ inputs.pr }} -ne 0 && ${{github.event_name}} == 'workflow_dispatch' ]]; then
+          if [[ ${{ inputs.pr }} -ne 0 && ${{ github.event_name }} == 'repository_dispatch' ]]; then
+            echo "COMMIT_INFO_MESSAGE=$COMMIT_INFO_MESSAGE" >> $GITHUB_ENV
+          elif [[ ${{ inputs.pr }} -ne 0 && ${{ github.event_name }} == 'workflow_dispatch' ]]; then
             echo "COMMIT_INFO_MESSAGE=Workflow run on PR# ${{ inputs.pr }}" >> $GITHUB_ENV
           else
-            if [[ '${{env.EVENT_COMMITS}}' == 'null' ]]; then
-              echo "COMMIT_INFO_MESSAGE=${{ github.event_name }} by ${{ env.COMMIT_INFO_AUTHOR }}" >> $GITHUB_ENV
+            if [[ "$EVENT_COMMITS" == "null" ]]; then
+              echo "COMMIT_INFO_MESSAGE=${{ github.event_name }} by $COMMIT_INFO_AUTHOR" >> $GITHUB_ENV
             else
-              echo "COMMIT_INFO_MESSAGE=$(echo \"${{ env.EVENT_COMMITS }}\" | awk -F '\\\\n' '{print $1}' | sed 's/^\"//')" >> $GITHUB_ENV
+              COMMIT_FIRST_LINE=$(echo "$EVENT_COMMITS" | awk -F '\\\\n' '{print $1}' | sed 's/^\"//')
+              echo "COMMIT_INFO_MESSAGE=$COMMIT_FIRST_LINE" >> $GITHUB_ENV
             fi
           fi
 
diff --git a/.github/workflows/server-build.yml b/.github/workflows/server-build.yml
index 0a74e1eb5a35..68c439738348 100644
--- a/.github/workflows/server-build.yml
+++ b/.github/workflows/server-build.yml
@@ -23,6 +23,27 @@ on:
         type: string
         default: "false"
 
+  workflow_dispatch:
+    inputs:
+      pr:
+        description: "PR number for the workflow"
+        required: false
+        type: number
+      skip-tests:
+        description: "Skip tests flag"
+        required: false
+        type: string
+        default: "false"
+      branch:
+        description: "Branch for the build"
+        required: false
+        type: string
+      is-pg-build:
+        description: "Flag for PG build"
+        required: false
+        type: string
+        default: "false"
+
 # Change the working directory for all the jobs in this workflow
 defaults:
   run:
@@ -72,6 +93,9 @@ jobs:
 
       - name: Figure out the PR number
         run: echo ${{ inputs.pr }}
+      
+      - name: Default database URL
+        run: echo "Is this a PG build? ${{ inputs.is-pg-build }}"
 
       - name: Print the Github event
         run: echo ${{ github.event_name }}
@@ -175,39 +199,104 @@ jobs:
           APPSMITH_ENVFILE_PATH: /tmp/dummy.env
           APPSMITH_VERBOSE_LOGGING_ENABLED: false
         run: |
-          if [[ "${{ inputs.is-pg-build }}" == "true" ]]; then
-            export APPSMITH_DB_URL="postgresql://postgres:password@localhost:5432/postgres"
-          else
-            export APPSMITH_DB_URL="mongodb://localhost:27017/mobtools"
-          fi
-          args=()
-          if [[ "${{ steps.run_result.outputs.run_result }}" == "failedtest" ]]; then
-            failed_tests="${{ steps.failed_tests.outputs.tests }}"
-            args+=("-DfailIfNoTests=false" "-Dsurefire.failIfNoSpecifiedTests=false" "-Dtest=${failed_tests}")
-          fi
-          if ! mvn test "${args[@]}"; then
-            echo "Generating failed test list:"
-            failed_tests_file="$PWD/failed-server-tests.txt"
+            if [[ "${{ inputs.is-pg-build }}" == "true" ]]; then
+                export APPSMITH_DB_URL="postgresql://postgres:password@localhost:5432/postgres"
+            else
+                export APPSMITH_DB_URL="mongodb://localhost:27017/mobtools"
+            fi
+
+            args=()
+            if [[ "${{ steps.run_result.outputs.run_result }}" == "failedtest" ]]; then
+                failed_tests="${{ steps.failed_tests.outputs.tests }}"
+                args+=("-DfailIfNoTests=false" "-Dsurefire.failIfNoSpecifiedTests=false" "-Dtest=${failed_tests}")
+            fi
+
+            # Run tests and capture logs
+            mvn test "${args[@]}" | tee mvn_test.log
+            
+            # Check for "BUILD FAILURE" in the mvn_test.log
+            if grep -q "BUILD FAILURE" mvn_test.log; then
+                test_result="failed"
+            else
+                test_result="passed"
+            fi
+
+            echo "test_result variable value: ${test_result}"
+
+            # Prepare output file for failed tests and ensure a fresh file is created
+            OUTPUT_FILE="failed-server-tests.txt"
+            rm -f "$OUTPUT_FILE"
+            touch "$OUTPUT_FILE"
+
+            failed_modules=()
+            skipped_modules=()
+
+            # Process mvn_test.log for FAILURE and SKIPPED statuses
+            while IFS= read -r line; do
+                if [[ $line == *"FAILURE"* ]]; then
+                    module_name=$(echo "$line" | awk '{print $2}')
+                    failed_modules+=("$module_name")
+                elif [[ $line == *"SKIPPED"* ]]; then
+                    module_name=$(echo "$line" | awk '{print $2}')
+                    skipped_modules+=("$module_name")
+                fi
+            done < mvn_test.log
+
+            echo "Failed Modules: ${failed_modules[*]}"
+            echo "Skipped Modules: ${skipped_modules[*]}"
+
+            # Handle older approach for reading failed tests from XML files
+            failed_tests_from_xml="$PWD/failed-tests-from-xml.txt"
             gawk -F\" '/<testcase / {cur_test = $4 "#" $2} /<(failure|error) / {print cur_test}' $(find . -type f -name 'TEST-*.xml') \
               | sort -u \
-              | tee "$failed_tests_file"
-            echo "Saved to $failed_tests_file"
-            if [[ -s $failed_tests_file ]]; then
-              content="$(
-                echo "## Failed server tests"
-                echo
-                sed 's/^/- /' "$failed_tests_file"
-              )"
-              echo "$content" >> "$GITHUB_STEP_SUMMARY"
-              # Add a comment to the PR with the list of failed tests.
-              curl --silent --show-error \
-                --header "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
-                --data "$(jq -n --arg body "$content" '$ARGS.named')" \
-                "https://api.github.com/repos/$GITHUB_REPOSITORY/issues/${{ inputs.pr }}/comments" \
-                > /dev/null
+              | tee "$failed_tests_from_xml"
+
+            # Filter out failed modules and add only relevant tests to the final failed list
+            for module in "${failed_modules[@]}"; do
+                grep -v "$module" "$failed_tests_from_xml" > temp_file && mv temp_file "$failed_tests_from_xml"
+            done
+
+            # Include all skipped module test files in the final list
+            for module in "${skipped_modules[@]}"; do
+                module_directories=$(find . -path "*/${module}*/src/test/java/*" -type f -name "*Test.java" -exec dirname {} \; | sort -u)
+                for module_directory in $module_directories; do
+                    test_classes=$(find "$module_directory" -type f -name "*Test.java" | sed 's|.*/src/test/java/||; s|\.java$||; s|/|.|g')
+                    for class_name in $test_classes; do
+                        if [[ ${#class_name} -le 240 ]] && ! grep -Fxq "$class_name#" "$OUTPUT_FILE"; then
+                            echo "${class_name}#" >> "$OUTPUT_FILE"
+                        fi
+                    done
+                done
+            done
+
+            # Combine the XML file test cases and skipped module test files into the final output file
+            cat "$failed_tests_from_xml" >> "$OUTPUT_FILE"
+            
+            # Print the final output
+            cat "$OUTPUT_FILE"
+
+            if [[ -s $OUTPUT_FILE ]]; then
+                content="$(
+                    echo "## Failed server tests"
+                    echo
+                    sed 's/^/- /' "$OUTPUT_FILE"
+                )"
+                echo "$content" >> "$GITHUB_STEP_SUMMARY"
+                
+                # Post a comment to the PR
+                curl --silent --show-error \
+                    --header "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
+                    --data "$(jq -n --arg body "$content" '$ARGS.named')" \
+                    "https://api.github.com/repos/$GITHUB_REPOSITORY/issues/${{ inputs.pr }}/comments" \
+                    > /dev/null
             fi
-            exit 1
-          fi
+
+            # Fail the script if tests did not pass
+            if [[ "$test_result" == "failed" ]]; then
+                echo "Tests failed, exiting with status 1."
+                exit 1
+            fi
+
 
       # Set status = failedtest
       - name: Set fail if there are test failures
diff --git a/.github/workflows/sync-release-to-pg.yml b/.github/workflows/sync-release-to-pg.yml
index f5ad35e0669c..e4cc227b29e9 100644
--- a/.github/workflows/sync-release-to-pg.yml
+++ b/.github/workflows/sync-release-to-pg.yml
@@ -50,7 +50,36 @@ jobs:
       - name: Push changes
         if: env.MERGE_CONFLICT == 'false'
         run: |
-          git push origin pg
+          set -e
+          git push https://${{ secrets.PAT_GITHUB }}@github.com/${{ github.repository }} HEAD:pg || echo "PUSH_FAILURE=true" >> $GITHUB_ENV
+
+      - name: Capture push failure message
+        if: env.PUSH_FAILURE == 'true'
+        run: |
+          # Capture the last git error message
+          push_error_message=$(git push https://${{ secrets.PAT_GITHUB }}@github.com/${{ github.repository }} HEAD:pg 2>&1 | tail -n 1)
+          echo "PUSH_ERROR_MESSAGE=$push_error_message" >> $GITHUB_ENV
+
+      - name: Notify on push failure
+        if: env.PUSH_FAILURE == 'true'
+        env:
+          SLACK_MESSAGE: "Push to pg branch failed: ${{ env.PUSH_ERROR_MESSAGE }}"
+        run: |
+          # Format the Slack message
+          slack_message="${{ env.SLACK_MESSAGE }}"
+
+          # Set the Slack message body with channel ID and text
+          body="$(jq -nc \
+            --arg channel C07JMLWEXDJ \
+            --arg text "$slack_message" \
+            '$ARGS.named'
+          )"
+
+          # Send the message to Slack
+          curl -v https://slack.com/api/chat.postMessage \
+            --header "Authorization: Bearer ${{ secrets.SLACK_APPSMITH_ALERTS_TOKEN }}" \
+            --header "Content-Type: application/json; charset=utf-8" \
+            --data-raw "$body"
 
       - name: Notify on merge conflicts
         if: env.MERGE_CONFLICT == 'true'
@@ -59,9 +88,9 @@ jobs:
           CONFLICTING_COMMIT: ${{ env.CONFLICTING_COMMIT }}
         run: |
           # Prepare the message for Slack
-          message="Merge conflict detected while merging release into pg branch. Conflicted commits:\n"
+          message="Merge conflict detected while merging release into pg branch. Conflicted commits:"
           commit_url="$REPOSITORY_URL/commit/$CONFLICTING_COMMIT"
-          message+="$commit_url\n"
+          message+="$commit_url"
 
           # Send the message to Slack
           # This unwieldy horror of a sed command, converts standard Markdown links to Slack's unwieldy link syntax.
diff --git a/.github/workflows/test-build-docker-image.yml b/.github/workflows/test-build-docker-image.yml
index e3c21798e6a7..bf55ec8a429f 100644
--- a/.github/workflows/test-build-docker-image.yml
+++ b/.github/workflows/test-build-docker-image.yml
@@ -499,3 +499,32 @@ jobs:
             --header 'Authorization: Bearer ${{ secrets.SLACK_APPSMITH_ALERTS_TOKEN }}' \
             --header 'Content-Type: application/json; charset=utf-8' \
             --data-raw "$body"
+
+
+  notify-slack-for-pg:
+    needs: ci-test-result
+    runs-on: ubuntu-latest
+
+    if: ( failure() && github.ref == 'refs/heads/pg' )
+
+    steps:
+      - name: Notify failure on workflow run and on Slack
+        run: |
+          set -o errexit
+          set -o nounset
+          set -o xtrace
+
+          run_url='${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}/attempts/${{ github.run_attempt }}'
+          slack_message="🚨 TBP workflow failed in <$run_url|${{ vars.EDITION }} attempt ${{ github.run_attempt }} (run ${{ github.run_id }})>."
+
+          # This is the ChannelId of the proj-postgres-sync channel.
+          body="$(jq -nc \
+            --arg channel C07JMLWEXDJ \
+            --arg text "$slack_message" \
+            '$ARGS.named'
+          )"
+          curl -v https://slack.com/api/chat.postMessage \
+            --fail-with-body \
+            --header 'Authorization: Bearer ${{ secrets.SLACK_APPSMITH_ALERTS_TOKEN }}' \
+            --header 'Content-Type: application/json; charset=utf-8' \
+            --data-raw "$body"
diff --git a/.github/workflows/test-vulnerabilities-data.yml b/.github/workflows/test-vulnerabilities-data.yml
new file mode 100644
index 000000000000..f0ad5395cf23
--- /dev/null
+++ b/.github/workflows/test-vulnerabilities-data.yml
@@ -0,0 +1,84 @@
+name: Run Vulnerability Data Script with Parameters and Update PR
+
+on:
+  workflow_dispatch:
+    inputs:
+      image_name:
+        description: 'Docker image name to scan'
+        required: true
+        default: 'appsmith/appsmith-ce:release'
+
+jobs:
+  run-and-update-pr:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '20'
+      
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}    
+
+      - name: Install pg
+        run: npm install pg
+
+      # Run Scout vulnerability data script
+      - name: Run Scout vulnerability data script
+        if: always()
+        env:
+          DB_HOST: ${{ secrets.CYPRESS_DB_HOST }}
+          DB_NAME: ${{ secrets.CYPRESS_DB_NAME }}
+          DB_USER: ${{ secrets.CYPRESS_DB_USER }}
+          DB_PWD: ${{ secrets.CYPRESS_DB_PWD }}
+        run: |
+          chmod +x scripts/scout_vulnerabilities_data.sh
+          ./scripts/scout_vulnerabilities_data.sh \
+            "${{ inputs.image_name }}" \
+            "${{ github.event.pull_request.number }}" \
+            "${{ github.event.pull_request.html_url }}" \
+            "${{ github.run_id }}"
+
+      - name: Run Trivy vulnerability data script
+        if: always()
+        env:
+          DB_HOST: ${{ secrets.CYPRESS_DB_HOST }}
+          DB_NAME: ${{ secrets.CYPRESS_DB_NAME }}
+          DB_USER: ${{ secrets.CYPRESS_DB_USER }}
+          DB_PWD: ${{ secrets.CYPRESS_DB_PWD }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u "${{ github.actor }}" --password-stdin
+          chmod +x scripts/trivy_vulnerabilities_data.sh
+          ./scripts/trivy_vulnerabilities_data.sh \
+            "${{ inputs.image_name }}" \
+            "${{ github.event.pull_request.number }}" \
+            "${{ github.event.pull_request.html_url }}" \
+            "${{ github.run_id }}"
+      
+      - name: Check for new vulnerabilities in Scout and Trivy files
+        if: always()
+        run: |
+          # Check if Scout vulnerabilities file has data after the header
+          if [ $(tail -n +2 scout_new_vulnerabilities.csv | wc -l) -gt 0 ]; then
+            echo "Scout vulnerabilities detected."
+            cat scout_new_vulnerabilities.csv
+            exit 1  # Fail the job if data exists
+          else
+            echo "No new Scout vulnerabilities detected."
+          fi
+                  
+          # Check if Trivy vulnerabilities file has data after the header
+          if [ $(tail -n +2 trivy_new_vulnerabilities.csv | wc -l) -gt 0 ]; then
+            echo "Trivy vulnerabilities detected."
+            cat trivy_new_vulnerabilities.csv
+            exit 1  # Fail the job if data exists
+          else
+            echo "No new Trivy vulnerabilities detected."
+          fi
\ No newline at end of file
diff --git a/CODEOWNERS b/CODEOWNERS
index f1ae93a1aae9..6f6f143cc2f3 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -190,7 +190,7 @@ app/client/src/ce/JSFunctionExecutionSaga.ts @ApekshaBhosale
 app/client/src/ee/JSFunctionExecutionSaga.ts @ApekshaBhosale
 
 # Enterprise Success
-app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/**/* @sharat87 @abhvsn
+app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/**/* @sharat87 @abhvsn @AnaghHegde
 
 # DevOps & Shri
 deploy/**/* @sharat87 @pratapaprasanna
diff --git a/Dockerfile b/Dockerfile
index a9d4b233719d..be72a28da060 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,18 +17,10 @@ RUN <<END
     exit 1
   fi
 
-  if ! [ -f server/mongo/server.jar && -f server/pg/server.jar ]; then
+  if ! [ -f server/mongo/server.jar -a -f server/pg/server.jar ]; then
     echo "Missing one or both server.jar files in the right place. Are you using the build script?" >&2
     exit 1
   fi
-
-  mkdir -p ./editor ./rts
-
-  # Ensure all *.sh scripts are executable.
-  find . -name node_modules -prune -or -type f -name '*.sh' -print -exec chmod +x '{}' ';'
-
-  # Ensure all custom command-scripts have executable permission
-  chmod +x /opt/bin/*
 END
 
 # Add client UI - Application Layer
@@ -39,13 +31,28 @@ COPY ./app/client/packages/rts/dist rts/
 
 ENV PATH /opt/bin:/opt/appsmith/utils/node_modules/.bin:/opt/java/bin:/opt/node/bin:$PATH
 
-RUN cd ./utils && npm install --only=prod && npm install --only=prod -g . && cd - \
-  && chmod +x /opt/bin/* *.sh /watchtower-hooks/*.sh \
+RUN <<END
+  set -o errexit
+
+  cd ./utils
+  npm install --only=prod
+  npm install --only=prod -g .
+  rm -rf utils/node_modules/resolve/test
+  cd -
+
+  # Make all `*.sh` files executable, excluding `node_modules`.
+  find . \( -name node_modules -prune \) -o \( -type f -name '*.sh' \) -exec chmod +x '{}' +
+
+  # Ensure all custom command-scripts have executable permission
+  chmod +x /opt/bin/* /watchtower-hooks/*.sh
+
   # Disable setuid/setgid bits for the files inside container.
-  && find / \( -path /proc -prune \) -o \( \( -perm -2000 -o -perm -4000 \) -print -exec chmod -s '{}' + \) || true \
-  && mkdir -p /.mongodb/mongosh /appsmith-stacks \
-  && chmod ugo+w /etc /appsmith-stacks \
-  && chmod -R ugo+w /var/run /.mongodb /etc/ssl /usr/local/share
+  find / \( -path /proc -prune \) -o \( \( -perm -2000 -o -perm -4000 \) -exec chmod -s '{}' + \) || true
+
+  mkdir -p /.mongodb/mongosh /appsmith-stacks
+  chmod ugo+w /etc /appsmith-stacks
+  chmod -R ugo+w /var/run /.mongodb /etc/ssl /usr/local/share
+END
 
 LABEL com.centurylinklabs.watchtower.lifecycle.pre-check=/watchtower-hooks/pre-check.sh
 LABEL com.centurylinklabs.watchtower.lifecycle.pre-update=/watchtower-hooks/pre-update.sh
diff --git a/app/client/.eslintrc.base.json b/app/client/.eslintrc.base.json
index 14f56a137537..8b4f5036e02e 100644
--- a/app/client/.eslintrc.base.json
+++ b/app/client/.eslintrc.base.json
@@ -11,6 +11,7 @@
   ],
   "plugins": [
     "react",
+    "eslint-plugin-react-compiler",
     "@typescript-eslint",
     "prettier",
     "sort-destructure-keys",
@@ -41,6 +42,7 @@
     "project": "./tsconfig.json"
   },
   "rules": {
+    "react-compiler/react-compiler": "warn",
     "padding-line-between-statements": [
       "error",
       { "blankLine": "always", "prev": "*", "next": "return" },
diff --git a/app/client/cypress/e2e/GSheet/AllAccess_Spec.ts b/app/client/cypress/e2e/GSheet/AllAccess_Spec.ts
index aca3a5ab40df..b40e773c0e61 100644
--- a/app/client/cypress/e2e/GSheet/AllAccess_Spec.ts
+++ b/app/client/cypress/e2e/GSheet/AllAccess_Spec.ts
@@ -17,7 +17,9 @@ let appName = "gsheet-app";
 let spreadSheetName = "test-sheet";
 describe.skip(
   "GSheet-Functional Tests With All Access",
-  { tags: ["@tag.Datasource", "@tag.GSheet"] },
+  {
+    tags: ["@tag.Datasource", "@tag.GSheet", "@tag.Git", "@tag.AccessControl"],
+  },
   function () {
     before("Setup app and spreadsheet", function () {
       //Add a new app and an add new spreadsheet query
diff --git a/app/client/cypress/e2e/GSheet/GsheetMisc_Spec.ts b/app/client/cypress/e2e/GSheet/GsheetMisc_Spec.ts
index b54a27b257c2..e217201be66a 100644
--- a/app/client/cypress/e2e/GSheet/GsheetMisc_Spec.ts
+++ b/app/client/cypress/e2e/GSheet/GsheetMisc_Spec.ts
@@ -23,7 +23,9 @@ let appName = "gsheet-app";
 let spreadSheetName = "test-sheet";
 describe.skip(
   "GSheet Miscellaneous Tests",
-  { tags: ["@tag.Datasource", "@tag.GSheet"] },
+  {
+    tags: ["@tag.Datasource", "@tag.GSheet", "@tag.Git", "@tag.AccessControl"],
+  },
   function () {
     const columnHeaders = [
       "uniq_id",
diff --git a/app/client/cypress/e2e/GSheet/ReadNWrite_Access_Spec.ts b/app/client/cypress/e2e/GSheet/ReadNWrite_Access_Spec.ts
index 8d5a72c78b33..a9d8d6818247 100644
--- a/app/client/cypress/e2e/GSheet/ReadNWrite_Access_Spec.ts
+++ b/app/client/cypress/e2e/GSheet/ReadNWrite_Access_Spec.ts
@@ -13,7 +13,9 @@ import {
 
 describe.skip(
   "GSheet-Functional Tests With Read/Write Access",
-  { tags: ["@tag.Datasource", "@tag.GSheet"] },
+  {
+    tags: ["@tag.Datasource", "@tag.GSheet", "@tag.Git", "@tag.AccessControl"],
+  },
   function () {
     const workspaceName = "gsheet apps";
     const dataSourceName = {
diff --git a/app/client/cypress/e2e/GSheet/ReadOnly_Access_Spec.ts b/app/client/cypress/e2e/GSheet/ReadOnly_Access_Spec.ts
index e90840f7d3ca..ed651b75fccc 100644
--- a/app/client/cypress/e2e/GSheet/ReadOnly_Access_Spec.ts
+++ b/app/client/cypress/e2e/GSheet/ReadOnly_Access_Spec.ts
@@ -13,7 +13,9 @@ import {
 
 describe.skip(
   "GSheet-Functional Tests With Read Access",
-  { tags: ["@tag.Datasource", "@tag.GSheet"] },
+  {
+    tags: ["@tag.Datasource", "@tag.GSheet", "@tag.Git", "@tag.AccessControl"],
+  },
   function () {
     const workspaceName = "gsheet apps";
     const dataSourceName = {
diff --git a/app/client/cypress/e2e/GSheet/SelectedSheet_Access_Spec.ts b/app/client/cypress/e2e/GSheet/SelectedSheet_Access_Spec.ts
index 5e058b803dab..62f0423f2d2a 100644
--- a/app/client/cypress/e2e/GSheet/SelectedSheet_Access_Spec.ts
+++ b/app/client/cypress/e2e/GSheet/SelectedSheet_Access_Spec.ts
@@ -17,7 +17,9 @@ let appName = "gsheet-app";
 let spreadSheetName = "test-sheet-automation-selected";
 describe(
   "GSheet-Functional Tests With Selected Access",
-  { tags: ["@tag.Datasource", "@tag.GSheet"] },
+  {
+    tags: ["@tag.Datasource", "@tag.GSheet", "@tag.Git", "@tag.AccessControl"],
+  },
   function () {
     before("Setup app", function () {
       //Setting up app name
diff --git a/app/client/cypress/e2e/GSheet/WidgetBinding_AllAccess_Spec.ts b/app/client/cypress/e2e/GSheet/WidgetBinding_AllAccess_Spec.ts
index a3afbd77610c..43576a8b15ee 100644
--- a/app/client/cypress/e2e/GSheet/WidgetBinding_AllAccess_Spec.ts
+++ b/app/client/cypress/e2e/GSheet/WidgetBinding_AllAccess_Spec.ts
@@ -23,7 +23,9 @@ let appName = "gsheet-app";
 let spreadSheetName = "test-sheet";
 describe.skip(
   "GSheet-widget binding",
-  { tags: ["@tag.Datasource", "@tag.GSheet"] },
+  {
+    tags: ["@tag.Datasource", "@tag.GSheet", "@tag.Git", "@tag.AccessControl"],
+  },
   function () {
     before("Setup app and spreadsheet", function () {
       //Setting up the app name
diff --git a/app/client/cypress/e2e/GSheet/WidgetBinding_SelectedAccess_Spec.ts b/app/client/cypress/e2e/GSheet/WidgetBinding_SelectedAccess_Spec.ts
index a039279a49eb..7a768d834a5c 100644
--- a/app/client/cypress/e2e/GSheet/WidgetBinding_SelectedAccess_Spec.ts
+++ b/app/client/cypress/e2e/GSheet/WidgetBinding_SelectedAccess_Spec.ts
@@ -23,7 +23,9 @@ let appName = "gsheet-app";
 let spreadSheetName = "test-sheet-automation-selected";
 describe(
   "GSheet-widget binding for selected sheet access",
-  { tags: ["@tag.Datasource", "@tag.GSheet"] },
+  {
+    tags: ["@tag.Datasource", "@tag.GSheet", "@tag.Git", "@tag.AccessControl"],
+  },
   function () {
     before("Setup app and spreadsheet", function () {
       //Setting up the app name
diff --git a/app/client/cypress/e2e/Regression/Apps/CommunityIssues_Spec.ts b/app/client/cypress/e2e/Regression/Apps/CommunityIssues_Spec.ts
index 97f2d07f675d..4f16bf6fc3bc 100644
--- a/app/client/cypress/e2e/Regression/Apps/CommunityIssues_Spec.ts
+++ b/app/client/cypress/e2e/Regression/Apps/CommunityIssues_Spec.ts
@@ -16,7 +16,7 @@ import EditorNavigation, {
 
 describe(
   "AForce - Community Issues page validations",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(function () {
       agHelper.ClearLocalStorageCache();
@@ -74,8 +74,10 @@ describe(
 
     it("2. Validate table navigation with Server Side pagination enabled with Default selected row", () => {
       EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
+      propPane.ExpandIfCollapsedSection("pagination");
       agHelper.AssertExistingToggleState("Server side pagination", "true");
 
+      propPane.ExpandIfCollapsedSection("rowselection");
       propPane
         .ValidatePropertyFieldValue("Default selected row", "0")
         .then(($selectedRow: any) => {
@@ -114,6 +116,7 @@ describe(
       deployMode.NavigateBacktoEditor();
       table.WaitUntilTableLoad(0, 0, "v2");
       EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
+      propPane.ExpandIfCollapsedSection("pagination");
       propPane.TogglePropertyState("Server side pagination", "Off");
       deployMode.DeployApp();
       table.WaitUntilTableLoad(0, 0, "v2");
@@ -122,10 +125,12 @@ describe(
       deployMode.NavigateBacktoEditor();
       table.WaitUntilTableLoad(0, 0, "v2");
       EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
+      propPane.ExpandIfCollapsedSection("pagination");
       propPane.TogglePropertyState("Server side pagination", "On");
     });
 
     it("4. Change Default selected row in table and verify", () => {
+      propPane.ExpandIfCollapsedSection("rowselection");
       propPane.UpdatePropertyFieldValue("Default selected row", "1");
       deployMode.DeployApp();
       table.WaitUntilTableLoad(0, 0, "v2");
@@ -140,6 +145,7 @@ describe(
 
     it("5. Verify Default search text in table as per 'Default search text' property set + Bug 12228", () => {
       EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
+      propPane.ExpandIfCollapsedSection("search\\&filters");
       propPane.TypeTextIntoField("Default search text", "Bug");
       deployMode.DeployApp();
       table.AssertSearchText("Bug");
@@ -148,6 +154,7 @@ describe(
       deployMode.NavigateBacktoEditor();
 
       EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
+      propPane.ExpandIfCollapsedSection("search\\&filters");
       propPane.TypeTextIntoField("Default search text", "Quest", true, false);
 
       deployMode.DeployApp();
@@ -157,6 +164,7 @@ describe(
       table.WaitUntilTableLoad(0, 0, "v2");
 
       EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
+      propPane.ExpandIfCollapsedSection("search\\&filters");
       propPane.TypeTextIntoField("Default search text", "Epic"); //Bug 12228 - Searching based on hidden column value should not be allowed
       deployMode.DeployApp();
       table.AssertSearchText("Epic");
@@ -164,6 +172,7 @@ describe(
       deployMode.NavigateBacktoEditor();
 
       EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
+      propPane.ExpandIfCollapsedSection("search\\&filters");
       propPane.RemoveText("defaultsearchtext");
       agHelper.GetNClick(dataSources._refreshIcon, 0, true);
       table.WaitUntilTableLoad(0, 0, "v2");
@@ -171,6 +180,7 @@ describe(
 
     it("6. Validate Search table with Client Side Search enabled & disabled & onSearchTextChanged is set", () => {
       EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
+      propPane.ExpandIfCollapsedSection("search\\&filters");
       agHelper.AssertExistingToggleState("Client side search", "true");
 
       deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.TABLE));
@@ -188,6 +198,7 @@ describe(
       table.WaitUntilTableLoad(0, 1, "v2");
 
       EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
+      propPane.ExpandIfCollapsedSection("search\\&filters");
       propPane.TogglePropertyState("Client side search", "Off");
 
       deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.TABLE));
@@ -205,6 +216,7 @@ describe(
       deployMode.NavigateBacktoEditor();
       table.WaitUntilTableLoad(0, 1, "v2");
       EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
+      propPane.ExpandIfCollapsedSection("search\\&filters");
       propPane.TogglePropertyState("Client side search", "On");
       propPane.EnterJSContext("onSearchTextChanged", "");
       propPane.ToggleJSMode("onSearchTextChanged", false);
@@ -224,6 +236,7 @@ describe(
       deployMode.NavigateBacktoEditor();
       table.WaitUntilTableLoad(0, 1, "v2");
       EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
+      propPane.ExpandIfCollapsedSection("search\\&filters");
       propPane.TogglePropertyState("Client side search", "Off");
 
       deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.TABLE));
diff --git a/app/client/cypress/e2e/Regression/Apps/CurrencyInputIssue_Spec.js b/app/client/cypress/e2e/Regression/Apps/CurrencyInputIssue_Spec.js
index 516cdccbdc43..beb99404b172 100644
--- a/app/client/cypress/e2e/Regression/Apps/CurrencyInputIssue_Spec.js
+++ b/app/client/cypress/e2e/Regression/Apps/CurrencyInputIssue_Spec.js
@@ -9,7 +9,7 @@ const widgetInput = `${wiggetClass} input`;
 describe("Currency Input Issue", function () {
   it(
     "1. Import application json &should check that the widget input is not showing any error",
-    { tags: ["@tag.Widget", "@tag.CurrencyInput"] },
+    { tags: ["@tag.Widget", "@tag.CurrencyInput", "@tag.Binding"] },
     function () {
       agHelper.VisitNAssert("/applications", "getAllWorkspaces");
       homePage.ImportApp("CurrencyInputIssueExport.json");
diff --git a/app/client/cypress/e2e/Regression/Apps/EchoApiCMS_spec.js b/app/client/cypress/e2e/Regression/Apps/EchoApiCMS_spec.js
index 197d01bc3c8f..1034df29379c 100644
--- a/app/client/cypress/e2e/Regression/Apps/EchoApiCMS_spec.js
+++ b/app/client/cypress/e2e/Regression/Apps/EchoApiCMS_spec.js
@@ -16,7 +16,7 @@ import EditorNavigation, {
 
 describe(
   "Content Management System App",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   function () {
     before(() => {
       homePage.RenameApplication("EchoApiCMSApp");
diff --git a/app/client/cypress/e2e/Regression/Apps/ImportExportForkApplication_spec.js b/app/client/cypress/e2e/Regression/Apps/ImportExportForkApplication_spec.js
index 8ae788c61da1..9a28386d1b59 100644
--- a/app/client/cypress/e2e/Regression/Apps/ImportExportForkApplication_spec.js
+++ b/app/client/cypress/e2e/Regression/Apps/ImportExportForkApplication_spec.js
@@ -9,7 +9,7 @@ import {
 
 describe(
   "Import, Export and Fork application and validate data binding",
-  { tags: ["@tag.ImportExport", "@tag.Sanity"] },
+  { tags: ["@tag.ImportExport", "@tag.Sanity", "@tag.Git"] },
   function () {
     let workspaceId;
     let newWorkspaceName;
diff --git a/app/client/cypress/e2e/Regression/Apps/MongoDBShoppingCart_spec.ts b/app/client/cypress/e2e/Regression/Apps/MongoDBShoppingCart_spec.ts
index 1e9ad7dbd2ab..213c40d0754d 100644
--- a/app/client/cypress/e2e/Regression/Apps/MongoDBShoppingCart_spec.ts
+++ b/app/client/cypress/e2e/Regression/Apps/MongoDBShoppingCart_spec.ts
@@ -12,7 +12,9 @@ import {
 
 describe(
   "Shopping cart App",
-  { tags: ["@tag.Datasource", "@tag.Sanity"] },
+  {
+    tags: ["@tag.Datasource", "@tag.Sanity", "@tag.Git", "@tag.AccessControl"],
+  },
   function () {
     let datasourceName: string, repoName: any;
 
diff --git a/app/client/cypress/e2e/Regression/Apps/PgAdmin_spec.js b/app/client/cypress/e2e/Regression/Apps/PgAdmin_spec.js
index 65cc8b4ba293..fd1cded24be6 100644
--- a/app/client/cypress/e2e/Regression/Apps/PgAdmin_spec.js
+++ b/app/client/cypress/e2e/Regression/Apps/PgAdmin_spec.js
@@ -9,92 +9,99 @@ import {
 const widgetsPage = require("../../../locators/Widgets.json");
 const appPage = require("../../../locators/PgAdminlocators.json");
 
-describe("PgAdmin Clone App", { tags: ["@tag.Datasource"] }, function () {
-  let datasourceName, tableName;
+describe(
+  "PgAdmin Clone App",
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
+  function () {
+    let datasourceName, tableName;
 
-  before("Add dsl and create datasource", () => {
-    agHelper.AddDsl("PgAdmindsl");
-    dataSources.CreateDataSource("Postgres");
-    cy.get("@dsName").then(($dsName) => {
-      datasourceName = $dsName;
+    before("Add dsl and create datasource", () => {
+      agHelper.AddDsl("PgAdmindsl");
+      dataSources.CreateDataSource("Postgres");
+      cy.get("@dsName").then(($dsName) => {
+        datasourceName = $dsName;
+      });
     });
-  });
 
-  it("1. Create queries", function () {
-    // writing query to get all schema
-    dataSources.CreateQueryAfterDSSaved(
-      "SELECT schema_name FROM information_schema.schemata;",
-      "get_schema",
-    );
-    // switching off Use Prepared Statement toggle
-    dataSources.ToggleUsePreparedStatement(false);
-    dataSources.RunQuery();
+    it("1. Create queries", function () {
+      // writing query to get all schema
+      dataSources.CreateQueryAfterDSSaved(
+        "SELECT schema_name FROM information_schema.schemata;",
+        "get_schema",
+      );
+      // switching off Use Prepared Statement toggle
+      dataSources.ToggleUsePreparedStatement(false);
+      dataSources.RunQuery();
 
-    // writing query to get all the tables
-    dataSources.CreateQueryFromOverlay(
-      datasourceName,
-      `select * from pg_catalog.pg_tables where schemaname = {{schema_select.selectedOptionValue || "public"}};`,
-      "get_tables",
-      2000,
-    );
-    dataSources.RunQuery();
+      // writing query to get all the tables
+      dataSources.CreateQueryFromOverlay(
+        datasourceName,
+        `select * from pg_catalog.pg_tables where schemaname = {{schema_select.selectedOptionValue || "public"}};`,
+        "get_tables",
+        2000,
+      );
+      dataSources.RunQuery();
 
-    // writing query to get all the columns
-    dataSources.CreateQueryFromOverlay(
-      datasourceName,
-      `SELECT column_name, data_type, table_name, ordinal_position, is_nullable FROM information_schema.COLUMNS`,
-      "get_columns",
-    );
-    dataSources.RunQuery();
+      // writing query to get all the columns
+      dataSources.CreateQueryFromOverlay(
+        datasourceName,
+        `SELECT column_name, data_type, table_name, ordinal_position, is_nullable FROM information_schema.COLUMNS`,
+        "get_columns",
+      );
+      dataSources.RunQuery();
 
-    // writing query to get create table
-    dataSources.CreateQueryFromOverlay(
-      datasourceName,
-      `CREATE TABLE {{schema_select.selectedOptionValue}}.{{nt_name.text.replaceAll(" ","_")}}({{appsmith.store.nt_col.map((c)=> c.name.replaceAll(" ","_") + " " + c.dtype + (c.nnull ? " NOT NULL " : "") + (c.pkey ? " PRIMARY KEY " : "")).join(" , ")}})`,
-      "create_table",
-    );
-    dataSources.ToggleUsePreparedStatement(false);
+      // writing query to get create table
+      dataSources.CreateQueryFromOverlay(
+        datasourceName,
+        `CREATE TABLE {{schema_select.selectedOptionValue}}.{{nt_name.text.replaceAll(" ","_")}}({{appsmith.store.nt_col.map((c)=> c.name.replaceAll(" ","_") + " " + c.dtype + (c.nnull ? " NOT NULL " : "") + (c.pkey ? " PRIMARY KEY " : "")).join(" , ")}})`,
+        "create_table",
+      );
+      dataSources.ToggleUsePreparedStatement(false);
 
-    // writing query to get drop table
-    dataSources.CreateQueryFromOverlay(
-      datasourceName,
-      `DROP TABLE {{schema_select.selectedOptionValue}}.{{nt_name.text.replaceAll(" ","_")}}({{appsmith.store.nt_col.map((c)=>c.name.replaceAll(" ","_") + " " + c.dtype + (c.nnull ? " NOT NULL " :  "") + (c.pkey ? " PRIMARY KEY " : "")).join(" , ")}});`,
-      "drop_table",
-    );
-  });
+      // writing query to get drop table
+      dataSources.CreateQueryFromOverlay(
+        datasourceName,
+        `DROP TABLE {{schema_select.selectedOptionValue}}.{{nt_name.text.replaceAll(" ","_")}}({{appsmith.store.nt_col.map((c)=>c.name.replaceAll(" ","_") + " " + c.dtype + (c.nnull ? " NOT NULL " :  "") + (c.pkey ? " PRIMARY KEY " : "")).join(" , ")}});`,
+        "drop_table",
+      );
+    });
 
-  it("2. Add new table from app page, View and Delete table", function () {
-    deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.BUTTON));
-    // adding new table
-    agHelper.GetNClick(appPage.addNewtable, 0, true);
-    agHelper.AssertElementAbsence(appPage.loadButton, 40000); //for CI
-    agHelper.WaitUntilEleAppear(appPage.addTablename);
-    cy.generateUUID().then((UUID) => {
-      cy.xpath(appPage.addTablename).clear().type(`table${UUID}`);
-      tableName = `table${UUID}`;
+    it("2. Add new table from app page, View and Delete table", function () {
+      deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.BUTTON));
+      // adding new table
+      agHelper.GetNClick(appPage.addNewtable, 0, true);
+      agHelper.AssertElementAbsence(appPage.loadButton, 40000); //for CI
+      agHelper.WaitUntilEleAppear(appPage.addTablename);
+      cy.generateUUID().then((UUID) => {
+        cy.xpath(appPage.addTablename).clear().type(`table${UUID}`);
+        tableName = `table${UUID}`;
+      });
+      // adding column to the table
+      cy.xpath(appPage.addColumn).click({ force: true });
+      cy.xpath(appPage.columnNamefield).should("be.visible");
+      cy.xpath(appPage.datatypefield).should("be.visible");
+      agHelper.GetNClick(appPage.addColumnName);
+      agHelper.TypeText(
+        appPage.addColumnName + " " + locators._inputField,
+        "ID",
+      );
+      agHelper.SelectFromDropDown("Varchar", "", 1);
+      // switching on the Primary Key toggle
+      cy.get(widgetsPage.switchWidgetInactive).first().click();
+      // switching on the Not Null toggle
+      cy.get(widgetsPage.switchWidgetInactive).last().click();
+      cy.xpath(appPage.submitButton).click({ force: true });
+      agHelper.AssertElementVisibility(appPage.addColumn);
+      cy.xpath(appPage.submitButton).first().click({ force: true });
+      assertHelper.AssertNetworkStatus("@postExecute");
+      cy.xpath(appPage.closeButton).click({ force: true });
+      cy.xpath(appPage.addNewtable).should("be.visible");
+      // viewing the table's columns by clicking on view button
+      cy.xpath(appPage.viewButton).first().click({ force: true });
+      // deleting the table through modal
+      cy.xpath(appPage.deleteButton).last().click({ force: true });
+      cy.xpath(appPage.confirmButton).click({ force: true });
+      cy.xpath(appPage.closeButton).click({ force: true });
     });
-    // adding column to the table
-    cy.xpath(appPage.addColumn).click({ force: true });
-    cy.xpath(appPage.columnNamefield).should("be.visible");
-    cy.xpath(appPage.datatypefield).should("be.visible");
-    agHelper.GetNClick(appPage.addColumnName);
-    agHelper.TypeText(appPage.addColumnName + " " + locators._inputField, "ID");
-    agHelper.SelectFromDropDown("Varchar", "", 1);
-    // switching on the Primary Key toggle
-    cy.get(widgetsPage.switchWidgetInactive).first().click();
-    // switching on the Not Null toggle
-    cy.get(widgetsPage.switchWidgetInactive).last().click();
-    cy.xpath(appPage.submitButton).click({ force: true });
-    agHelper.AssertElementVisibility(appPage.addColumn);
-    cy.xpath(appPage.submitButton).first().click({ force: true });
-    assertHelper.AssertNetworkStatus("@postExecute");
-    cy.xpath(appPage.closeButton).click({ force: true });
-    cy.xpath(appPage.addNewtable).should("be.visible");
-    // viewing the table's columns by clicking on view button
-    cy.xpath(appPage.viewButton).first().click({ force: true });
-    // deleting the table through modal
-    cy.xpath(appPage.deleteButton).last().click({ force: true });
-    cy.xpath(appPage.confirmButton).click({ force: true });
-    cy.xpath(appPage.closeButton).click({ force: true });
-  });
-});
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/Apps/PromisesApp_spec.js b/app/client/cypress/e2e/Regression/Apps/PromisesApp_spec.js
index 2a348e14a2c1..2d26ab8949f7 100644
--- a/app/client/cypress/e2e/Regression/Apps/PromisesApp_spec.js
+++ b/app/client/cypress/e2e/Regression/Apps/PromisesApp_spec.js
@@ -14,7 +14,7 @@ const commonlocators = require("../../../locators/commonlocators.json");
 
 describe(
   "Promises App tests",
-  { tags: ["@tag.Widget", "@tag.JS"] },
+  { tags: ["@tag.Widget", "@tag.JS", "@tag.Binding"] },
   function () {
     before(() => {
       agHelper.AddDsl("promisesStoreValueDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ActionSelectorCreateShouldBind_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ActionSelectorCreateShouldBind_spec.ts
index 4e4b96e3e11e..fcd07b535a11 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ActionSelectorCreateShouldBind_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ActionSelectorCreateShouldBind_spec.ts
@@ -10,7 +10,7 @@ import EditorNavigation, {
 
 describe(
   "Creations via action selector should bind to the property",
-  { tags: ["@tag.JS", "@tag.PropertyPane"] },
+  { tags: ["@tag.JS", "@tag.PropertyPane", "@tag.Binding"] },
   () => {
     it.skip("binds newly created query / api to the button onClick", () => {
       entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ActionSelector_JsToNonJSMode_1_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ActionSelector_JsToNonJSMode_1_spec.ts
index 8b739f964cc3..ca77452c0d49 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ActionSelector_JsToNonJSMode_1_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ActionSelector_JsToNonJSMode_1_spec.ts
@@ -9,150 +9,153 @@ import EditorNavigation, {
   EntityType,
 } from "../../../../support/Pages/EditorNavigation";
 
-describe("JS to non-JS mode in Action Selector", { tags: ["@tag.JS"] }, () => {
-  it("1. should not show any fields with a blank JS field", () => {
-    agHelper.AddDsl("promisesBtnDsl", locators._buttonByText("Submit"));
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    propPane.EnterJSContext("onClick", `{{}}`, true, false);
-    propPane.ToggleJSMode("onClick", false);
-    agHelper.AssertElementAbsence(".action");
-  });
-
-  it("2. should show Api fields when Api1.run is entered", () => {
-    apiPage.CreateApi("Api1");
-    EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    propPane.EnterJSContext("onClick", `{{Api1.run()}}`, true, false);
-    propPane.ToggleJSMode("onClick", false);
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "GETExecute a queryApi1.run",
-    );
-    propPane.SelectActionByTitleAndValue("Execute a query", "Api1.run");
-    propPane.AssertSelectValue("Api1.run");
-  });
-
-  it("3. should show Api fields when an Api with then/catch is entered", () => {
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    propPane.EnterJSContext(
-      "onClick",
-      `{{Api1.run().then(() => {}).catch(() => {});}}`,
-      true,
-      false,
-    );
-    propPane.ToggleJSMode("onClick", false);
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "GETExecute a queryApi1.run",
-    );
-  });
-
-  it("4. should show Api fields when an Api with then/catch is entered", () => {
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    propPane.EnterJSContext(
-      "onClick",
-      `{{Api1.run().then(() => { showAlert(); }).catch(() => { showModal(); });}}`,
-      true,
-      false,
-    );
-    propPane.ToggleJSMode("onClick", false);
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "GETExecute a queryApi1.run+2",
-    );
-    agHelper.GetNClick(propPane._actionCard);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCallbackTitle,
-      "On success",
-      "have.text",
-      0,
-    );
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Show alertAdd message",
-      "have.text",
-      1,
-    );
-    agHelper.GetNAssertElementText(
-      propPane._actionCallbackTitle,
-      "On failure",
-      "have.text",
-      1,
-    );
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Show modalnone",
-      "have.text",
-      2,
-    );
-  });
-
-  it("5. should show Api fields when an Api with then/catch is entered", () => {
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    propPane.EnterJSContext(
-      "onClick",
-      `{{Api1.run().then(() => { showAlert('Hello world!', 'info'); storeValue('a', 18); }).catch(() => { showModal(Modal1.name); });}}`,
-      true,
-      false,
-    );
-    propPane.ToggleJSMode("onClick", false);
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "GETExecute a queryApi1.run+3",
-    );
-    agHelper.GetNClick(propPane._actionCard);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCallbackTitle,
-      "On success",
-      "have.text",
-      0,
-    );
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Show alertHello world!",
-      "have.text",
-      1,
-    );
-    agHelper.GetNAssertElementText(
-      propPane._actionCallbackTitle,
-      "On failure",
-      "have.text",
-      1,
-    );
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Store valuea",
-      "have.text",
-      2,
-    );
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Show modalModal1",
-      "have.text",
-      3,
-    );
-
-    agHelper.GetNClick(propPane._actionCard, 1);
-    agHelper.ValidateCodeEditorContent(propPane._textView, "Hello world!");
-    agHelper.GetNAssertElementText(propPane._selectorViewButton, "Info");
-
-    agHelper.GetNClick(propPane._actionCard, 2);
-    agHelper.ValidateCodeEditorContent(propPane._textView, "a{{18}}");
-
-    agHelper.GetNClick(propPane._actionCard, 3);
-    agHelper.GetNAssertElementText(
-      propPane._selectorViewButton,
-      "Select modal",
-    );
-  });
-
-  it("6. should show Api related fields appropriately with platform functions with callbacks", () => {
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    propPane.EnterJSContext(
-      "onClick",
-      `{{Api1.run().then(() => {
+describe(
+  "JS to non-JS mode in Action Selector",
+  { tags: ["@tag.JS", "@tag.Binding"] },
+  () => {
+    it("1. should not show any fields with a blank JS field", () => {
+      agHelper.AddDsl("promisesBtnDsl", locators._buttonByText("Submit"));
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      propPane.EnterJSContext("onClick", `{{}}`, true, false);
+      propPane.ToggleJSMode("onClick", false);
+      agHelper.AssertElementAbsence(".action");
+    });
+
+    it("2. should show Api fields when Api1.run is entered", () => {
+      apiPage.CreateApi("Api1");
+      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      propPane.EnterJSContext("onClick", `{{Api1.run()}}`, true, false);
+      propPane.ToggleJSMode("onClick", false);
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "GETExecute a queryApi1.run",
+      );
+      propPane.SelectActionByTitleAndValue("Execute a query", "Api1.run");
+      propPane.AssertSelectValue("Api1.run");
+    });
+
+    it("3. should show Api fields when an Api with then/catch is entered", () => {
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      propPane.EnterJSContext(
+        "onClick",
+        `{{Api1.run().then(() => {}).catch(() => {});}}`,
+        true,
+        false,
+      );
+      propPane.ToggleJSMode("onClick", false);
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "GETExecute a queryApi1.run",
+      );
+    });
+
+    it("4. should show Api fields when an Api with then/catch is entered", () => {
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      propPane.EnterJSContext(
+        "onClick",
+        `{{Api1.run().then(() => { showAlert(); }).catch(() => { showModal(); });}}`,
+        true,
+        false,
+      );
+      propPane.ToggleJSMode("onClick", false);
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "GETExecute a queryApi1.run+2",
+      );
+      agHelper.GetNClick(propPane._actionCard);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCallbackTitle,
+        "On success",
+        "have.text",
+        0,
+      );
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Show alertAdd message",
+        "have.text",
+        1,
+      );
+      agHelper.GetNAssertElementText(
+        propPane._actionCallbackTitle,
+        "On failure",
+        "have.text",
+        1,
+      );
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Show modalnone",
+        "have.text",
+        2,
+      );
+    });
+
+    it("5. should show Api fields when an Api with then/catch is entered", () => {
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      propPane.EnterJSContext(
+        "onClick",
+        `{{Api1.run().then(() => { showAlert('Hello world!', 'info'); storeValue('a', 18); }).catch(() => { showModal(Modal1.name); });}}`,
+        true,
+        false,
+      );
+      propPane.ToggleJSMode("onClick", false);
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "GETExecute a queryApi1.run+3",
+      );
+      agHelper.GetNClick(propPane._actionCard);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCallbackTitle,
+        "On success",
+        "have.text",
+        0,
+      );
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Show alertHello world!",
+        "have.text",
+        1,
+      );
+      agHelper.GetNAssertElementText(
+        propPane._actionCallbackTitle,
+        "On failure",
+        "have.text",
+        1,
+      );
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Store valuea",
+        "have.text",
+        2,
+      );
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Show modalModal1",
+        "have.text",
+        3,
+      );
+
+      agHelper.GetNClick(propPane._actionCard, 1);
+      agHelper.ValidateCodeEditorContent(propPane._textView, "Hello world!");
+      agHelper.GetNAssertElementText(propPane._selectorViewButton, "Info");
+
+      agHelper.GetNClick(propPane._actionCard, 2);
+      agHelper.ValidateCodeEditorContent(propPane._textView, "a{{18}}");
+
+      agHelper.GetNClick(propPane._actionCard, 3);
+      agHelper.GetNAssertElementText(
+        propPane._selectorViewButton,
+        "Select modal",
+      );
+    });
+
+    it("6. should show Api related fields appropriately with platform functions with callbacks", () => {
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      propPane.EnterJSContext(
+        "onClick",
+        `{{Api1.run().then(() => {
     appsmith.geolocation.getCurrentPosition(location => {
     showAlert(location);
     });
@@ -161,109 +164,109 @@ describe("JS to non-JS mode in Action Selector", { tags: ["@tag.JS"] }, () => {
       showAlert('hi');
     }, 5000, '1');
   });}}`,
-      true,
-      true,
-    );
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "GETExecute a queryApi1.run+2",
-    );
-
-    agHelper.GetNClick(propPane._actionCard);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCallbackTitle,
-      "On success",
-      "have.text",
-      0,
-    );
-    agHelper.GetNAssertElementText(
-      propPane._actionCallbackTitle,
-      "On failure",
-      "have.text",
-      1,
-    );
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Set interval5000ms",
-      "have.text",
-      2,
-    );
-  });
-
-  it("7. should show Api related fields appropriately with platform functions with catch callback", () => {
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    propPane.EnterJSContext(
-      "onClick",
-      "{{Api1.run().catch(() => copyToClipboard('hi'))}}",
-      true,
-      false,
-    );
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "GETExecute a queryApi1.run+1",
-      "have.text",
-      0,
-    );
-
-    agHelper.GetNClick(propPane._actionCard);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCallbackTitle,
-      "On failure",
-      "have.text",
-      1,
-    );
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Copy to clipboardhi",
-      "have.text",
-      1,
-    );
-
-    agHelper.GetNClick(propPane._actionCard, 1);
-    agHelper.ValidateCodeEditorContent(propPane._textView, "hi");
-  });
-
-  it("8. should show Api related fields appropriately with platform functions with catch callback", () => {
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    propPane.EnterJSContext(
-      "onClick",
-      "{{Api1.run().then(() => clearStore())}}",
-      true,
-      false,
-    );
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "GETExecute a queryApi1.run+1",
-      "have.text",
-      0,
-    );
-
-    agHelper.GetNClick(propPane._actionCard);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCallbackTitle,
-      "On success",
-      "have.text",
-      0,
-    );
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Clear store",
-      "have.text",
-      1,
-    );
-  });
-
-  it("9. shows fields appropriately for JS Object functions with/without arguments", () => {
-    const JS_OBJECT_BODY = `export default {
+        true,
+        true,
+      );
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "GETExecute a queryApi1.run+2",
+      );
+
+      agHelper.GetNClick(propPane._actionCard);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCallbackTitle,
+        "On success",
+        "have.text",
+        0,
+      );
+      agHelper.GetNAssertElementText(
+        propPane._actionCallbackTitle,
+        "On failure",
+        "have.text",
+        1,
+      );
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Set interval5000ms",
+        "have.text",
+        2,
+      );
+    });
+
+    it("7. should show Api related fields appropriately with platform functions with catch callback", () => {
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      propPane.EnterJSContext(
+        "onClick",
+        "{{Api1.run().catch(() => copyToClipboard('hi'))}}",
+        true,
+        false,
+      );
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "GETExecute a queryApi1.run+1",
+        "have.text",
+        0,
+      );
+
+      agHelper.GetNClick(propPane._actionCard);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCallbackTitle,
+        "On failure",
+        "have.text",
+        1,
+      );
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Copy to clipboardhi",
+        "have.text",
+        1,
+      );
+
+      agHelper.GetNClick(propPane._actionCard, 1);
+      agHelper.ValidateCodeEditorContent(propPane._textView, "hi");
+    });
+
+    it("8. should show Api related fields appropriately with platform functions with catch callback", () => {
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      propPane.EnterJSContext(
+        "onClick",
+        "{{Api1.run().then(() => clearStore())}}",
+        true,
+        false,
+      );
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "GETExecute a queryApi1.run+1",
+        "have.text",
+        0,
+      );
+
+      agHelper.GetNClick(propPane._actionCard);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCallbackTitle,
+        "On success",
+        "have.text",
+        0,
+      );
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Clear store",
+        "have.text",
+        1,
+      );
+    });
+
+    it("9. shows fields appropriately for JS Object functions with/without arguments", () => {
+      const JS_OBJECT_BODY = `export default {
       funcWithoutArgsSync: () => {
         console.log("hi");
       },
@@ -278,113 +281,113 @@ describe("JS to non-JS mode in Action Selector", { tags: ["@tag.JS"] }, () => {
       }
     }`;
 
-    jsEditor.CreateJSObject(JS_OBJECT_BODY, {
-      paste: true,
-      completeReplace: true,
-      toRun: false,
-      shouldCreateNewJSObj: true,
+      jsEditor.CreateJSObject(JS_OBJECT_BODY, {
+        paste: true,
+        completeReplace: true,
+        toRun: false,
+        shouldCreateNewJSObj: true,
+      });
+      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+
+      propPane.EnterJSContext(
+        "onClick",
+        "{{JSObject1.funcWithoutArgsSync()}}",
+        true,
+        false,
+      );
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Execute a JS functionJSObject1.funcWithoutArgsSync()",
+        "have.text",
+        0,
+      );
+
+      agHelper.GetNClick(propPane._actionCard);
+      agHelper.AssertElementAbsence(propPane._actionPopupTextLabel, 0);
+
+      propPane.EnterJSContext(
+        "onClick",
+        "{{JSObject1.funcWithArgsSync(18,26)}}",
+        true,
+        false,
+      );
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Execute a JS functionJSObject1.funcWithArgsSync(18, 26)",
+        "have.text",
+        0,
+      );
+
+      agHelper.GetNClick(propPane._actionCard);
+      agHelper.ValidateCodeEditorContent(propPane._textView, "{{18}}{{26}}");
+      agHelper.GetNAssertElementText(
+        propPane._actionPopupTextLabel,
+        "a",
+        "have.text",
+        0,
+      );
+      agHelper.GetNAssertElementText(
+        propPane._actionPopupTextLabel,
+        "b",
+        "have.text",
+        1,
+      );
+
+      propPane.EnterJSContext(
+        "onClick",
+        "{{JSObject1.funcWithoutArgsAsync()}}",
+        true,
+        false,
+      );
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Execute a JS functionJSObject1.funcWithoutArgsAsync()",
+        "have.text",
+        0,
+      );
+
+      agHelper.GetNClick(propPane._actionCard, 0);
+      agHelper.AssertElementAbsence(propPane._actionPopupTextLabel, 0);
+
+      propPane.EnterJSContext(
+        "onClick",
+        "{{JSObject1.funcWithArgsAsync()}}",
+        true,
+        false,
+      );
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Execute a JS functionJSObject1.funcWithArgsAsync()",
+        "have.text",
+        0,
+      );
+
+      agHelper.GetNClick(propPane._actionCard, 0);
+      agHelper.GetNAssertElementText(
+        propPane._actionPopupTextLabel,
+        "a",
+        "have.text",
+        0,
+      );
+      agHelper.GetNAssertElementText(
+        propPane._actionPopupTextLabel,
+        "b",
+        "have.text",
+        1,
+      );
     });
-    EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-
-    propPane.EnterJSContext(
-      "onClick",
-      "{{JSObject1.funcWithoutArgsSync()}}",
-      true,
-      false,
-    );
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Execute a JS functionJSObject1.funcWithoutArgsSync()",
-      "have.text",
-      0,
-    );
-
-    agHelper.GetNClick(propPane._actionCard);
-    agHelper.AssertElementAbsence(propPane._actionPopupTextLabel, 0);
-
-    propPane.EnterJSContext(
-      "onClick",
-      "{{JSObject1.funcWithArgsSync(18,26)}}",
-      true,
-      false,
-    );
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Execute a JS functionJSObject1.funcWithArgsSync(18, 26)",
-      "have.text",
-      0,
-    );
-
-    agHelper.GetNClick(propPane._actionCard);
-    agHelper.ValidateCodeEditorContent(propPane._textView, "{{18}}{{26}}");
-    agHelper.GetNAssertElementText(
-      propPane._actionPopupTextLabel,
-      "a",
-      "have.text",
-      0,
-    );
-    agHelper.GetNAssertElementText(
-      propPane._actionPopupTextLabel,
-      "b",
-      "have.text",
-      1,
-    );
-
-    propPane.EnterJSContext(
-      "onClick",
-      "{{JSObject1.funcWithoutArgsAsync()}}",
-      true,
-      false,
-    );
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Execute a JS functionJSObject1.funcWithoutArgsAsync()",
-      "have.text",
-      0,
-    );
-
-    agHelper.GetNClick(propPane._actionCard, 0);
-    agHelper.AssertElementAbsence(propPane._actionPopupTextLabel, 0);
-
-    propPane.EnterJSContext(
-      "onClick",
-      "{{JSObject1.funcWithArgsAsync()}}",
-      true,
-      false,
-    );
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Execute a JS functionJSObject1.funcWithArgsAsync()",
-      "have.text",
-      0,
-    );
-
-    agHelper.GetNClick(propPane._actionCard, 0);
-    agHelper.GetNAssertElementText(
-      propPane._actionPopupTextLabel,
-      "a",
-      "have.text",
-      0,
-    );
-    agHelper.GetNAssertElementText(
-      propPane._actionPopupTextLabel,
-      "b",
-      "have.text",
-      1,
-    );
-  });
-
-  it("10. shows fields appropriately for JS Object functions with/without arguments and then/catch blocks", () => {
-    const JS_OBJECT_BODY = `export default {
+
+    it("10. shows fields appropriately for JS Object functions with/without arguments and then/catch blocks", () => {
+      const JS_OBJECT_BODY = `export default {
       promiseFuncNoArgs: () => {
         return new Promise((resolve) => {
             resolve("hi");
@@ -401,155 +404,156 @@ describe("JS to non-JS mode in Action Selector", { tags: ["@tag.JS"] }, () => {
       },
     }`;
 
-    jsEditor.CreateJSObject(JS_OBJECT_BODY, {
-      paste: true,
-      completeReplace: true,
-      toRun: false,
-      shouldCreateNewJSObj: true,
+      jsEditor.CreateJSObject(JS_OBJECT_BODY, {
+        paste: true,
+        completeReplace: true,
+        toRun: false,
+        shouldCreateNewJSObj: true,
+      });
+      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+
+      propPane.EnterJSContext(
+        "onClick",
+        '{{JSObject2.promiseFuncNoArgs().then(() => showAlert("then"))}}',
+        true,
+        false,
+      );
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Execute a JS functionJSObject2.promiseFuncNoArgs()",
+        "have.text",
+        0,
+      );
+
+      agHelper.GetNClick(propPane._actionCard, 0);
+      agHelper.AssertElementAbsence(propPane._actionPopupTextLabel, 0);
+
+      propPane.EnterJSContext(
+        "onClick",
+        '{{JSObject2.promiseFuncNoArgs().catch(() => showAlert("catch"))}}',
+        true,
+        false,
+      );
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Execute a JS functionJSObject2.promiseFuncNoArgs()",
+        "have.text",
+        0,
+      );
+
+      agHelper.GetNClick(propPane._actionCard, 0);
+      agHelper.AssertElementAbsence(propPane._actionPopupTextLabel, 0);
+
+      propPane.EnterJSContext(
+        "onClick",
+        '{{JSObject2.promiseFuncNoArgs().then(() => showAlert("then")).catch(() => showAlert("catch"));}}',
+        true,
+        false,
+      );
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Execute a JS functionJSObject2.promiseFuncNoArgs()",
+        "have.text",
+        0,
+      );
+
+      agHelper.GetNClick(propPane._actionCard, 0);
+      agHelper.AssertElementAbsence(propPane._actionPopupTextLabel, 0);
+
+      propPane.EnterJSContext(
+        "onClick",
+        '{{JSObject2.promiseFuncNoArgs().catch(() => showAlert("catch")).then(() => showAlert("then"));}}',
+        true,
+        false,
+      );
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Execute a JS functionJSObject2.promiseFuncNoArgs()",
+        "have.text",
+        0,
+      );
+
+      agHelper.GetNClick(propPane._actionCard, 0);
+      agHelper.AssertElementAbsence(propPane._actionPopupTextLabel, 0);
+
+      propPane.EnterJSContext(
+        "onClick",
+        '{{JSObject2.promiseFuncWithArgs("hi").then(() => showAlert("hi")).catch(() => showAlert("bye"));}}',
+        true,
+        false,
+      );
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        'Execute a JS functionJSObject2.promiseFuncWithArgs("hi")',
+        "have.text",
+        0,
+      );
+
+      agHelper.GetNClick(propPane._actionCard, 0);
+      agHelper.GetNAssertElementText(
+        propPane._actionPopupTextLabel,
+        "a",
+        "have.text",
+        0,
+      );
+      agHelper.ValidateCodeEditorContent(propPane._textView, "hi");
+
+      propPane.EnterJSContext(
+        "onClick",
+        '{{JSObject2.promiseFuncWithArgs().catch(() => showAlert("catch"));}}',
+        true,
+        false,
+      );
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Execute a JS functionJSObject2.promiseFuncWithArgs()",
+        "have.text",
+        0,
+      );
+
+      agHelper.GetNClick(propPane._actionCard, 0);
+      agHelper.GetNAssertElementText(
+        propPane._actionPopupTextLabel,
+        "a",
+        "have.text",
+        0,
+      );
+
+      propPane.EnterJSContext(
+        "onClick",
+        '{{JSObject2.promiseFuncWithArgs().then(() => showAlert("hi")).catch(() => showAlert("bye"));}}',
+        true,
+        false,
+      );
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Execute a JS functionJSObject2.promiseFuncWithArgs()",
+        "have.text",
+        0,
+      );
+
+      agHelper.GetNClick(propPane._actionCard, 0);
+      agHelper.GetNAssertElementText(
+        propPane._actionPopupTextLabel,
+        "a",
+        "have.text",
+        0,
+      );
     });
-    EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-
-    propPane.EnterJSContext(
-      "onClick",
-      '{{JSObject2.promiseFuncNoArgs().then(() => showAlert("then"))}}',
-      true,
-      false,
-    );
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Execute a JS functionJSObject2.promiseFuncNoArgs()",
-      "have.text",
-      0,
-    );
-
-    agHelper.GetNClick(propPane._actionCard, 0);
-    agHelper.AssertElementAbsence(propPane._actionPopupTextLabel, 0);
-
-    propPane.EnterJSContext(
-      "onClick",
-      '{{JSObject2.promiseFuncNoArgs().catch(() => showAlert("catch"))}}',
-      true,
-      false,
-    );
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Execute a JS functionJSObject2.promiseFuncNoArgs()",
-      "have.text",
-      0,
-    );
-
-    agHelper.GetNClick(propPane._actionCard, 0);
-    agHelper.AssertElementAbsence(propPane._actionPopupTextLabel, 0);
-
-    propPane.EnterJSContext(
-      "onClick",
-      '{{JSObject2.promiseFuncNoArgs().then(() => showAlert("then")).catch(() => showAlert("catch"));}}',
-      true,
-      false,
-    );
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Execute a JS functionJSObject2.promiseFuncNoArgs()",
-      "have.text",
-      0,
-    );
-
-    agHelper.GetNClick(propPane._actionCard, 0);
-    agHelper.AssertElementAbsence(propPane._actionPopupTextLabel, 0);
-
-    propPane.EnterJSContext(
-      "onClick",
-      '{{JSObject2.promiseFuncNoArgs().catch(() => showAlert("catch")).then(() => showAlert("then"));}}',
-      true,
-      false,
-    );
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Execute a JS functionJSObject2.promiseFuncNoArgs()",
-      "have.text",
-      0,
-    );
-
-    agHelper.GetNClick(propPane._actionCard, 0);
-    agHelper.AssertElementAbsence(propPane._actionPopupTextLabel, 0);
-
-    propPane.EnterJSContext(
-      "onClick",
-      '{{JSObject2.promiseFuncWithArgs("hi").then(() => showAlert("hi")).catch(() => showAlert("bye"));}}',
-      true,
-      false,
-    );
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      'Execute a JS functionJSObject2.promiseFuncWithArgs("hi")',
-      "have.text",
-      0,
-    );
-
-    agHelper.GetNClick(propPane._actionCard, 0);
-    agHelper.GetNAssertElementText(
-      propPane._actionPopupTextLabel,
-      "a",
-      "have.text",
-      0,
-    );
-    agHelper.ValidateCodeEditorContent(propPane._textView, "hi");
-
-    propPane.EnterJSContext(
-      "onClick",
-      '{{JSObject2.promiseFuncWithArgs().catch(() => showAlert("catch"));}}',
-      true,
-      false,
-    );
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Execute a JS functionJSObject2.promiseFuncWithArgs()",
-      "have.text",
-      0,
-    );
-
-    agHelper.GetNClick(propPane._actionCard, 0);
-    agHelper.GetNAssertElementText(
-      propPane._actionPopupTextLabel,
-      "a",
-      "have.text",
-      0,
-    );
-
-    propPane.EnterJSContext(
-      "onClick",
-      '{{JSObject2.promiseFuncWithArgs().then(() => showAlert("hi")).catch(() => showAlert("bye"));}}',
-      true,
-      false,
-    );
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Execute a JS functionJSObject2.promiseFuncWithArgs()",
-      "have.text",
-      0,
-    );
-
-    agHelper.GetNClick(propPane._actionCard, 0);
-    agHelper.GetNAssertElementText(
-      propPane._actionPopupTextLabel,
-      "a",
-      "have.text",
-      0,
-    );
-  });
-});
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ActionSelector_JsToNonJSMode_2_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ActionSelector_JsToNonJSMode_2_spec.ts
index f51ad098c736..96e76a479f6f 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ActionSelector_JsToNonJSMode_2_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ActionSelector_JsToNonJSMode_2_spec.ts
@@ -8,651 +8,665 @@ import EditorNavigation, {
   EntityType,
 } from "../../../../support/Pages/EditorNavigation";
 
-describe("JS to non-JS mode in Action Selector", { tags: ["@tag.JS"] }, () => {
-  before(() => {
-    entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON);
-  });
-
-  it("1. shows fields for navigate to from js to non-js mode", () => {
-    propPane.EnterJSContext("onClick", "{{navigateTo()}}", true, false);
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Navigate toSelect page",
-      "have.text",
-      0,
-    );
-    agHelper.GetNClick(propPane._actionCard, 0);
-
-    agHelper.AssertElementVisibility(propPane._navigateToType("Page name"));
-
-    agHelper.GetNAssertElementText(
-      propPane._actionOpenDropdownSelectPage,
-      "Select page",
-      "have.text",
-      0,
-    );
-
-    agHelper.GetNAssertElementText(
-      propPane._actionPopupTextLabel,
-      "Query params",
-      "have.text",
-      0,
-    );
-
-    agHelper.GetNAssertElementText(
-      propPane._sameWindowDropdownOption,
-      "Same window",
-      "have.text",
-      0,
-    );
-
-    propPane.EnterJSContext(
-      "onClick",
-      "{{navigateTo('Page1', {a:1}, 'NEW_WINDOW')}}",
-      true,
-      true,
-    );
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Navigate toPage1",
-      "have.text",
-      0,
-    );
-    agHelper.GetNClick(propPane._actionCard, 0);
-
-    agHelper.AssertElementVisibility(propPane._navigateToType("Page name"));
-
-    agHelper.GetNAssertElementText(
-      propPane._actionOpenDropdownSelectPage,
-      "Page1",
-      "have.text",
-      0,
-    );
-
-    agHelper.GetNAssertElementText(
-      propPane._actionPopupTextLabel,
-      "Query params",
-      "have.text",
-      0,
-    );
-
-    agHelper.GetNAssertElementText(
-      propPane._sameWindowDropdownOption,
-      "New window",
-      "have.text",
-      0,
-    );
-
-    propPane.EnterJSContext(
-      "onClick",
-      "{{navigateTo('google.com', {a:1}, 'SAME_WINDOW')}}",
-      true,
-      true,
-    );
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Navigate togoogle.com",
-      "have.text",
-      0,
-    );
-    agHelper.GetNClick(propPane._actionCard, 0);
-
-    agHelper.AssertElementVisibility(propPane._navigateToType("URL"));
-
-    agHelper.GetNAssertElementText(
-      propPane._actionPopupTextLabel,
-      "Enter URL",
-      "have.text",
-      0,
-    );
-
-    agHelper.GetNAssertElementText(
-      propPane._actionPopupTextLabel,
-      "Query params",
-      "have.text",
-      1,
-    );
-
-    agHelper.GetNAssertElementText(
-      propPane._sameWindowDropdownOption,
-      "Same window",
-      "have.text",
-      0,
-    );
-  });
-
-  it("2. shows fields for show alert from js to non-js mode", () => {
-    EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-
-    propPane.EnterJSContext("onClick", "{{showAlert()}}", true, false);
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Show alertAdd message",
-      "have.text",
-      0,
-    );
-    agHelper.GetNClick(propPane._actionCard, 0);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionPopupTextLabel,
-      "Message",
-      "have.text",
-      0,
-    );
-
-    agHelper.GetNAssertElementText(
-      propPane._dropdownSelectType,
-      "Select type",
-      "have.text",
-      0,
-    );
-
-    propPane.EnterJSContext(
-      "onClick",
-      "{{showAlert('hello', 'info')}}",
-      true,
-      false,
-    );
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Show alerthello",
-      "have.text",
-      0,
-    );
-    agHelper.GetNClick(propPane._actionCard, 0);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionPopupTextLabel,
-      "Message",
-      "have.text",
-      0,
-    );
-    agHelper.ValidateCodeEditorContent(propPane._textView, "hello");
-
-    agHelper.GetNAssertElementText(
-      propPane._dropdownSelectType,
-      "Info",
-      "have.text",
-      0,
-    );
-  });
-
-  it("3. shows fields for show modal from js to non-js mode", () => {
-    EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
-
-    entityExplorer.DragDropWidgetNVerify("modalwidget", 300, 400);
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-
-    propPane.EnterJSContext("onClick", "{{showModal()}}", true, false);
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Show modalnone",
-      "have.text",
-      0,
-    );
-    agHelper.GetNClick(propPane._actionCard, 0);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionOpenDropdownSelectModal,
-      "Select modal",
-      "have.text",
-      0,
-    );
-
-    propPane.EnterJSContext(
-      "onClick",
-      "{{showModal(Modal1.name)}}",
-      true,
-      false,
-    );
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Show modalModal1",
-      "have.text",
-      0,
-    );
-    agHelper.GetNClick(propPane._actionCard, 0);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionOpenDropdownSelectModal,
-      "Modal1",
-      "have.text",
-      0,
-    );
-  });
-
-  it("4. shows fields for remove modal from js to non-js mode", () => {
-    EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-
-    propPane.EnterJSContext("onClick", "{{closeModal()}}", true, false);
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Close modalnone",
-      "have.text",
-      0,
-    );
-    agHelper.GetNClick(propPane._actionCard, 0);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionOpenDropdownSelectModal,
-      "Select modal",
-      "have.text",
-      0,
-    );
-
-    propPane.EnterJSContext(
-      "onClick",
-      "{{closeModal(Modal1.name)}}",
-      true,
-      false,
-    );
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Close modalModal1",
-      "have.text",
-      0,
-    );
-    agHelper.GetNClick(propPane._actionCard, 0);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionOpenDropdownSelectModal,
-      "Modal1",
-      "have.text",
-      0,
-    );
-  });
-
-  it("5. should shows appropriate fields for store value", () => {
-    EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-
-    propPane.EnterJSContext("onClick", "{{storeValue()}}", true, false);
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Store valueAdd key",
-      "have.text",
-      0,
-    );
-    agHelper.GetNClick(propPane._actionCard, 0);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionPopupTextLabel,
-      "Key",
-      "have.text",
-      0,
-    );
-    agHelper.GetNAssertElementText(
-      propPane._actionPopupTextLabel,
-      "Value",
-      "have.text",
-      1,
-    );
-
-    propPane.EnterJSContext("onClick", "{{storeValue('a', '')}}", true, false);
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Store valuea",
-      "have.text",
-      0,
-    );
-    agHelper.GetNClick(propPane._actionCard, 0);
-
-    propPane.EnterJSContext("onClick", "{{storeValue('a', 1)}}", true, false);
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Store valuea",
-      "have.text",
-      0,
-    );
-    agHelper.GetNClick(propPane._actionCard, 0);
-
-    agHelper.ValidateCodeEditorContent(propPane._textView, "a{{1}}");
-
-    propPane.EnterJSContext("onClick", "{{storeValue('', 1)}}", true, false);
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Store valueAdd key",
-      "have.text",
-      0,
-    );
-    agHelper.GetNClick(propPane._actionCard, 0);
-  });
-
-  it("6. shows fields for remove value appropriately", () => {
-    EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-
-    propPane.EnterJSContext("onClick", "{{removeValue()}}", true, false);
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Remove valueAdd key",
-      "have.text",
-      0,
-    );
-    agHelper.GetNClick(propPane._actionCard, 0);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionPopupTextLabel,
-      "Key",
-      "have.text",
-      0,
-    );
-
-    propPane.EnterJSContext("onClick", "{{removeValue('a')}}", true, false);
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Remove valuea",
-      "have.text",
-      0,
-    );
-    agHelper.GetNClick(propPane._actionCard, 0);
-
-    agHelper.ValidateCodeEditorContent(propPane._textView, "a");
-  });
-
-  it("7. shows fields appropriately for the download function", () => {
-    EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-
-    propPane.EnterJSContext("onClick", "{{download()}}", true, false);
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "DownloadAdd data to download",
-      "have.text",
-      0,
-    );
-    agHelper.GetNClick(propPane._actionCard, 0);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionPopupTextLabel,
-      "Data to download",
-      "have.text",
-      0,
-    );
-    agHelper.GetNAssertElementText(
-      propPane._actionPopupTextLabel,
-      "File name with extension",
-      "have.text",
-      1,
-    );
-    agHelper.GetNAssertElementText(
-      propPane._selectorViewLabel,
-      "Type",
-      "have.text",
-      0,
-    );
-
-    agHelper.GetNAssertElementText(
-      propPane._selectorViewButton,
-      "Select file type (optional)",
-    );
-
-    propPane.EnterJSContext(
-      "onClick",
-      "{{download('a', '', '')}}",
-      true,
-      false,
-    );
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "DownloadAdd data to download",
-      "have.text",
-      0,
-    );
-
-    propPane.EnterJSContext(
-      "onClick",
-      "{{download('a', 'b', '')}}",
-      true,
-      false,
-    );
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Downloadb",
-      "have.text",
-      0,
-    );
-
-    propPane.EnterJSContext(
-      "onClick",
-      "{{download('a', 'b', 'image/png')}}",
-      true,
-      false,
-    );
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Downloadb",
-      "have.text",
-      0,
-    );
-    agHelper.GetNClick(propPane._actionCard, 0);
-    agHelper.ValidateCodeEditorContent(propPane._textView, "ab");
-
-    agHelper.GetNAssertElementText(
-      propPane._selectorViewButton,
-      "PNG",
-      "have.text",
-      0,
-    );
-  });
-
-  it("8. shows fields for copyToClipboard appropriately", () => {
-    EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-
-    propPane.EnterJSContext("onClick", "{{copyToClipboard()}}", true, false);
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Copy to clipboardAdd text",
-      "have.text",
-      0,
-    );
-    agHelper.GetNClick(propPane._actionCard, 0);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionPopupTextLabel,
-      "Text to be copied to clipboard",
-      "have.text",
-      0,
-    );
-
-    propPane.EnterJSContext("onClick", "{{copyToClipboard('a')}}", true, false);
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Copy to clipboarda",
-      "have.text",
-      0,
-    );
-    agHelper.GetNClick(propPane._actionCard, 0);
-
-    agHelper.ValidateCodeEditorContent(propPane._textView, "a");
-    agHelper.TypeText(
-      propPane._actionSelectorFieldByLabel("Text to be copied to clipboard"),
-      "line1{enter}line2{enter}line3",
-      { parseSpecialCharSeq: true },
-    );
-    propPane.ToggleJSMode("onClick");
-    propPane.ValidatePropertyFieldValue(
-      "onClick",
-      `{{copyToClipboard('aline1\\nline2\\nline3');}}`,
-    );
-  });
-
-  it("9. shows fields for reset widget appropriately", () => {
-    EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-
-    propPane.EnterJSContext("onClick", "{{resetWidget()}}", true, false);
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Reset widgetSelect widget",
-      "have.text",
-      0,
-    );
-    agHelper.GetNClick(propPane._actionCard, 0);
-
-    agHelper.GetNAssertElementText(
-      propPane._selectorViewLabel,
-      "Widget",
-      "have.text",
-      0,
-    );
-
-    agHelper.GetNAssertElementText(
-      propPane._selectorViewLabel,
-      "Reset Children",
-      "have.text",
-      1,
-    );
-
-    agHelper.GetNAssertElementText(
-      propPane._selectorViewButton,
-      "Select widget",
-      "have.text",
-      0,
-    );
-
-    agHelper.GetNAssertElementText(
-      propPane._selectorViewButton,
-      "true",
-      "have.text",
-      1,
-    );
-
-    propPane.EnterJSContext(
-      "onClick",
-      '{{resetWidget("Modal1", false)}}',
-      true,
-      false,
-    );
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Reset widgetModal1",
-      "have.text",
-      0,
-    );
-    agHelper.GetNClick(propPane._actionCard, 0);
-
-    agHelper.GetNAssertElementText(
-      propPane._selectorViewButton,
-      "Modal1",
-      "have.text",
-      0,
-    );
-
-    agHelper.GetNAssertElementText(
-      propPane._selectorViewButton,
-      "false",
-      "have.text",
-      1,
-    );
-
-    propPane.EnterJSContext(
-      "onClick",
-      '{{resetWidget("Modal1")}}',
-      true,
-      false,
-    );
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Reset widgetModal1",
-      "have.text",
-      0,
-    );
-    agHelper.GetNClick(propPane._actionCard, 0);
-
-    agHelper.GetNAssertElementText(
-      propPane._selectorViewButton,
-      "Modal1",
-      "have.text",
-      0,
-    );
-
-    agHelper.GetNAssertElementText(
-      propPane._selectorViewButton,
-      "true",
-      "have.text",
-      1,
-    );
-
-    propPane.EnterJSContext(
-      "onClick",
-      "{{resetWidget('', false)}}",
-      true,
-      false,
-    );
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Reset widgetSelect widget",
-      "have.text",
-      0,
-    );
-    agHelper.GetNClick(propPane._actionCard, 0);
-
-    agHelper.GetNAssertElementText(
-      propPane._selectorViewButton,
-      "Select widget",
-      "have.text",
-      0,
-    );
-
-    agHelper.GetNAssertElementText(
-      propPane._selectorViewButton,
-      "false",
-      "have.text",
-      1,
-    );
-  });
-});
+describe(
+  "JS to non-JS mode in Action Selector",
+  { tags: ["@tag.JS", "@tag.Binding"] },
+  () => {
+    before(() => {
+      entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON);
+    });
+
+    it("1. shows fields for navigate to from js to non-js mode", () => {
+      propPane.EnterJSContext("onClick", "{{navigateTo()}}", true, false);
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Navigate toSelect page",
+        "have.text",
+        0,
+      );
+      agHelper.GetNClick(propPane._actionCard, 0);
+
+      agHelper.AssertElementVisibility(propPane._navigateToType("Page name"));
+
+      agHelper.GetNAssertElementText(
+        propPane._actionOpenDropdownSelectPage,
+        "Select page",
+        "have.text",
+        0,
+      );
+
+      agHelper.GetNAssertElementText(
+        propPane._actionPopupTextLabel,
+        "Query params",
+        "have.text",
+        0,
+      );
+
+      agHelper.GetNAssertElementText(
+        propPane._sameWindowDropdownOption,
+        "Same window",
+        "have.text",
+        0,
+      );
+
+      propPane.EnterJSContext(
+        "onClick",
+        "{{navigateTo('Page1', {a:1}, 'NEW_WINDOW')}}",
+        true,
+        true,
+      );
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Navigate toPage1",
+        "have.text",
+        0,
+      );
+      agHelper.GetNClick(propPane._actionCard, 0);
+
+      agHelper.AssertElementVisibility(propPane._navigateToType("Page name"));
+
+      agHelper.GetNAssertElementText(
+        propPane._actionOpenDropdownSelectPage,
+        "Page1",
+        "have.text",
+        0,
+      );
+
+      agHelper.GetNAssertElementText(
+        propPane._actionPopupTextLabel,
+        "Query params",
+        "have.text",
+        0,
+      );
+
+      agHelper.GetNAssertElementText(
+        propPane._sameWindowDropdownOption,
+        "New window",
+        "have.text",
+        0,
+      );
+
+      propPane.EnterJSContext(
+        "onClick",
+        "{{navigateTo('google.com', {a:1}, 'SAME_WINDOW')}}",
+        true,
+        true,
+      );
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Navigate togoogle.com",
+        "have.text",
+        0,
+      );
+      agHelper.GetNClick(propPane._actionCard, 0);
+
+      agHelper.AssertElementVisibility(propPane._navigateToType("URL"));
+
+      agHelper.GetNAssertElementText(
+        propPane._actionPopupTextLabel,
+        "Enter URL",
+        "have.text",
+        0,
+      );
+
+      agHelper.GetNAssertElementText(
+        propPane._actionPopupTextLabel,
+        "Query params",
+        "have.text",
+        1,
+      );
+
+      agHelper.GetNAssertElementText(
+        propPane._sameWindowDropdownOption,
+        "Same window",
+        "have.text",
+        0,
+      );
+    });
+
+    it("2. shows fields for show alert from js to non-js mode", () => {
+      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+
+      propPane.EnterJSContext("onClick", "{{showAlert()}}", true, false);
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Show alertAdd message",
+        "have.text",
+        0,
+      );
+      agHelper.GetNClick(propPane._actionCard, 0);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionPopupTextLabel,
+        "Message",
+        "have.text",
+        0,
+      );
+
+      agHelper.GetNAssertElementText(
+        propPane._dropdownSelectType,
+        "Select type",
+        "have.text",
+        0,
+      );
+
+      propPane.EnterJSContext(
+        "onClick",
+        "{{showAlert('hello', 'info')}}",
+        true,
+        false,
+      );
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Show alerthello",
+        "have.text",
+        0,
+      );
+      agHelper.GetNClick(propPane._actionCard, 0);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionPopupTextLabel,
+        "Message",
+        "have.text",
+        0,
+      );
+      agHelper.ValidateCodeEditorContent(propPane._textView, "hello");
+
+      agHelper.GetNAssertElementText(
+        propPane._dropdownSelectType,
+        "Info",
+        "have.text",
+        0,
+      );
+    });
+
+    it("3. shows fields for show modal from js to non-js mode", () => {
+      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+
+      entityExplorer.DragDropWidgetNVerify("modalwidget", 300, 400);
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+
+      propPane.EnterJSContext("onClick", "{{showModal()}}", true, false);
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Show modalnone",
+        "have.text",
+        0,
+      );
+      agHelper.GetNClick(propPane._actionCard, 0);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionOpenDropdownSelectModal,
+        "Select modal",
+        "have.text",
+        0,
+      );
+
+      propPane.EnterJSContext(
+        "onClick",
+        "{{showModal(Modal1.name)}}",
+        true,
+        false,
+      );
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Show modalModal1",
+        "have.text",
+        0,
+      );
+      agHelper.GetNClick(propPane._actionCard, 0);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionOpenDropdownSelectModal,
+        "Modal1",
+        "have.text",
+        0,
+      );
+    });
+
+    it("4. shows fields for remove modal from js to non-js mode", () => {
+      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+
+      propPane.EnterJSContext("onClick", "{{closeModal()}}", true, false);
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Close modalnone",
+        "have.text",
+        0,
+      );
+      agHelper.GetNClick(propPane._actionCard, 0);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionOpenDropdownSelectModal,
+        "Select modal",
+        "have.text",
+        0,
+      );
+
+      propPane.EnterJSContext(
+        "onClick",
+        "{{closeModal(Modal1.name)}}",
+        true,
+        false,
+      );
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Close modalModal1",
+        "have.text",
+        0,
+      );
+      agHelper.GetNClick(propPane._actionCard, 0);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionOpenDropdownSelectModal,
+        "Modal1",
+        "have.text",
+        0,
+      );
+    });
+
+    it("5. should shows appropriate fields for store value", () => {
+      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+
+      propPane.EnterJSContext("onClick", "{{storeValue()}}", true, false);
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Store valueAdd key",
+        "have.text",
+        0,
+      );
+      agHelper.GetNClick(propPane._actionCard, 0);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionPopupTextLabel,
+        "Key",
+        "have.text",
+        0,
+      );
+      agHelper.GetNAssertElementText(
+        propPane._actionPopupTextLabel,
+        "Value",
+        "have.text",
+        1,
+      );
+
+      propPane.EnterJSContext(
+        "onClick",
+        "{{storeValue('a', '')}}",
+        true,
+        false,
+      );
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Store valuea",
+        "have.text",
+        0,
+      );
+      agHelper.GetNClick(propPane._actionCard, 0);
+
+      propPane.EnterJSContext("onClick", "{{storeValue('a', 1)}}", true, false);
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Store valuea",
+        "have.text",
+        0,
+      );
+      agHelper.GetNClick(propPane._actionCard, 0);
+
+      agHelper.ValidateCodeEditorContent(propPane._textView, "a{{1}}");
+
+      propPane.EnterJSContext("onClick", "{{storeValue('', 1)}}", true, false);
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Store valueAdd key",
+        "have.text",
+        0,
+      );
+      agHelper.GetNClick(propPane._actionCard, 0);
+    });
+
+    it("6. shows fields for remove value appropriately", () => {
+      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+
+      propPane.EnterJSContext("onClick", "{{removeValue()}}", true, false);
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Remove valueAdd key",
+        "have.text",
+        0,
+      );
+      agHelper.GetNClick(propPane._actionCard, 0);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionPopupTextLabel,
+        "Key",
+        "have.text",
+        0,
+      );
+
+      propPane.EnterJSContext("onClick", "{{removeValue('a')}}", true, false);
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Remove valuea",
+        "have.text",
+        0,
+      );
+      agHelper.GetNClick(propPane._actionCard, 0);
+
+      agHelper.ValidateCodeEditorContent(propPane._textView, "a");
+    });
+
+    it("7. shows fields appropriately for the download function", () => {
+      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+
+      propPane.EnterJSContext("onClick", "{{download()}}", true, false);
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "DownloadAdd data to download",
+        "have.text",
+        0,
+      );
+      agHelper.GetNClick(propPane._actionCard, 0);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionPopupTextLabel,
+        "Data to download",
+        "have.text",
+        0,
+      );
+      agHelper.GetNAssertElementText(
+        propPane._actionPopupTextLabel,
+        "File name with extension",
+        "have.text",
+        1,
+      );
+      agHelper.GetNAssertElementText(
+        propPane._selectorViewLabel,
+        "Type",
+        "have.text",
+        0,
+      );
+
+      agHelper.GetNAssertElementText(
+        propPane._selectorViewButton,
+        "Select file type (optional)",
+      );
+
+      propPane.EnterJSContext(
+        "onClick",
+        "{{download('a', '', '')}}",
+        true,
+        false,
+      );
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "DownloadAdd data to download",
+        "have.text",
+        0,
+      );
+
+      propPane.EnterJSContext(
+        "onClick",
+        "{{download('a', 'b', '')}}",
+        true,
+        false,
+      );
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Downloadb",
+        "have.text",
+        0,
+      );
+
+      propPane.EnterJSContext(
+        "onClick",
+        "{{download('a', 'b', 'image/png')}}",
+        true,
+        false,
+      );
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Downloadb",
+        "have.text",
+        0,
+      );
+      agHelper.GetNClick(propPane._actionCard, 0);
+      agHelper.ValidateCodeEditorContent(propPane._textView, "ab");
+
+      agHelper.GetNAssertElementText(
+        propPane._selectorViewButton,
+        "PNG",
+        "have.text",
+        0,
+      );
+    });
+
+    it("8. shows fields for copyToClipboard appropriately", () => {
+      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+
+      propPane.EnterJSContext("onClick", "{{copyToClipboard()}}", true, false);
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Copy to clipboardAdd text",
+        "have.text",
+        0,
+      );
+      agHelper.GetNClick(propPane._actionCard, 0);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionPopupTextLabel,
+        "Text to be copied to clipboard",
+        "have.text",
+        0,
+      );
+
+      propPane.EnterJSContext(
+        "onClick",
+        "{{copyToClipboard('a')}}",
+        true,
+        false,
+      );
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Copy to clipboarda",
+        "have.text",
+        0,
+      );
+      agHelper.GetNClick(propPane._actionCard, 0);
+
+      agHelper.ValidateCodeEditorContent(propPane._textView, "a");
+      agHelper.TypeText(
+        propPane._actionSelectorFieldByLabel("Text to be copied to clipboard"),
+        "line1{enter}line2{enter}line3",
+        { parseSpecialCharSeq: true },
+      );
+      propPane.ToggleJSMode("onClick");
+      propPane.ValidatePropertyFieldValue(
+        "onClick",
+        `{{copyToClipboard('aline1\\nline2\\nline3');}}`,
+      );
+    });
+
+    it("9. shows fields for reset widget appropriately", () => {
+      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+
+      propPane.EnterJSContext("onClick", "{{resetWidget()}}", true, false);
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Reset widgetSelect widget",
+        "have.text",
+        0,
+      );
+      agHelper.GetNClick(propPane._actionCard, 0);
+
+      agHelper.GetNAssertElementText(
+        propPane._selectorViewLabel,
+        "Widget",
+        "have.text",
+        0,
+      );
+
+      agHelper.GetNAssertElementText(
+        propPane._selectorViewLabel,
+        "Reset Children",
+        "have.text",
+        1,
+      );
+
+      agHelper.GetNAssertElementText(
+        propPane._selectorViewButton,
+        "Select widget",
+        "have.text",
+        0,
+      );
+
+      agHelper.GetNAssertElementText(
+        propPane._selectorViewButton,
+        "true",
+        "have.text",
+        1,
+      );
+
+      propPane.EnterJSContext(
+        "onClick",
+        '{{resetWidget("Modal1", false)}}',
+        true,
+        false,
+      );
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Reset widgetModal1",
+        "have.text",
+        0,
+      );
+      agHelper.GetNClick(propPane._actionCard, 0);
+
+      agHelper.GetNAssertElementText(
+        propPane._selectorViewButton,
+        "Modal1",
+        "have.text",
+        0,
+      );
+
+      agHelper.GetNAssertElementText(
+        propPane._selectorViewButton,
+        "false",
+        "have.text",
+        1,
+      );
+
+      propPane.EnterJSContext(
+        "onClick",
+        '{{resetWidget("Modal1")}}',
+        true,
+        false,
+      );
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Reset widgetModal1",
+        "have.text",
+        0,
+      );
+      agHelper.GetNClick(propPane._actionCard, 0);
+
+      agHelper.GetNAssertElementText(
+        propPane._selectorViewButton,
+        "Modal1",
+        "have.text",
+        0,
+      );
+
+      agHelper.GetNAssertElementText(
+        propPane._selectorViewButton,
+        "true",
+        "have.text",
+        1,
+      );
+
+      propPane.EnterJSContext(
+        "onClick",
+        "{{resetWidget('', false)}}",
+        true,
+        false,
+      );
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Reset widgetSelect widget",
+        "have.text",
+        0,
+      );
+      agHelper.GetNClick(propPane._actionCard, 0);
+
+      agHelper.GetNAssertElementText(
+        propPane._selectorViewButton,
+        "Select widget",
+        "have.text",
+        0,
+      );
+
+      agHelper.GetNAssertElementText(
+        propPane._selectorViewButton,
+        "false",
+        "have.text",
+        1,
+      );
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ActionSelector_JsToNonJSMode_3_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ActionSelector_JsToNonJSMode_3_spec.ts
index fc866652ea6d..1acb2ec201ca 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ActionSelector_JsToNonJSMode_3_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ActionSelector_JsToNonJSMode_3_spec.ts
@@ -7,280 +7,294 @@ import EditorNavigation, {
   EntityType,
 } from "../../../../support/Pages/EditorNavigation";
 
-describe("JS to non-JS mode in Action Selector", { tags: ["@tag.JS"] }, () => {
-  before(() => {
-    agHelper.AddDsl("promisesBtnDsl", locators._buttonByText("Submit"));
-  });
-
-  it("1. should show fields appropriately for setinterval", () => {
-    EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-
-    propPane.EnterJSContext("onClick", "{{setInterval()}}", true, false);
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Set intervalms",
-      "have.text",
-      0,
-    );
-    agHelper.GetNClick(propPane._actionCard, 0);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionPopupTextLabel,
-      "Callback function",
-      "have.text",
-      0,
-    );
-
-    agHelper.GetNAssertElementText(
-      propPane._actionPopupTextLabel,
-      "Delay (ms)",
-      "have.text",
-      1,
-    );
-
-    agHelper.GetNAssertElementText(
-      propPane._actionPopupTextLabel,
-      "Id",
-      "have.text",
-      2,
-    );
-
-    propPane.EnterJSContext(
-      "onClick",
-      "{{setInterval(() => {}, 200, '')}}",
-      true,
-      false,
-    );
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Set interval200ms",
-      "have.text",
-      0,
-    );
-    agHelper.GetNClick(propPane._actionCard, 0);
-
-    propPane.EnterJSContext(
-      "onClick",
-      "{{setInterval(() => {showAlert('hi')}, 200, 'id1')}}",
-      true,
-      false,
-    );
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Set interval200ms",
-      "have.text",
-      0,
-    );
-    agHelper.GetNClick(propPane._actionCard, 0);
-  });
-
-  it("2. should show fields appropriately for clearInterval", () => {
-    EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-
-    propPane.EnterJSContext("onClick", "{{clearInterval()}}", true, false);
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Clear intervalAdd Id",
-      "have.text",
-      0,
-    );
-    agHelper.GetNClick(propPane._actionCard, 0);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionPopupTextLabel,
-      "Id",
-      "have.text",
-      0,
-    );
-
-    propPane.EnterJSContext("onClick", "{{clearInterval('Id1')}}", true, true);
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Clear intervalId1",
-      "have.text",
-      0,
-    );
-    agHelper.GetNClick(propPane._actionCard, 0);
-
-    agHelper.ValidateCodeEditorContent(propPane._textView, "Id1");
-  });
-
-  it("3. should show no fields for clear store", () => {
-    EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-
-    propPane.EnterJSContext("onClick", "{{clearStore()}}", true, false);
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Clear store",
-      "have.text",
-      0,
-    );
-    agHelper.GetNClick(propPane._actionCard, 0);
-
-    agHelper.AssertElementAbsence(propPane._textView);
-    agHelper.AssertElementAbsence(propPane._selectorView);
-  });
-
-  it("4. should show no fields for watch geolocation position", () => {
-    EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-
-    propPane.EnterJSContext(
-      "onClick",
-      "{{appsmith.geolocation.watchPosition()}}",
-      true,
-      false,
-    );
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Watch geolocation",
-      "have.text",
-      0,
-    );
-    agHelper.GetNClick(propPane._actionCard, 0);
-
-    agHelper.AssertElementAbsence(propPane._textView);
-    agHelper.AssertElementAbsence(propPane._selectorView);
-  });
-
-  it("5. should show no fields for stop watching geolocation position", () => {
-    EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-
-    propPane.EnterJSContext(
-      "onClick",
-      "{{appsmith.geolocation.clearWatch()}}",
-      true,
-      false,
-    );
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Stop watching geolocation",
-      "have.text",
-      0,
-    );
-    agHelper.GetNClick(propPane._actionCard, 0);
-
-    agHelper.AssertElementAbsence(propPane._textView);
-    agHelper.AssertElementAbsence(propPane._selectorView);
-  });
-
-  it("6. should show appropriate fields for get geolocation", () => {
-    EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-
-    propPane.EnterJSContext(
-      "onClick",
-      "{{appsmith.geolocation.getCurrentPosition()}}",
-      true,
-      false,
-    );
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Get geolocationAdd callback",
-      "have.text",
-      0,
-    );
-    agHelper.GetNClick(propPane._actionCard, 0);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionPopupTextLabel,
-      "Callback function",
-      "have.text",
-      0,
-    );
-
-    propPane.EnterJSContext(
-      "onClick",
-      `{{appsmith.geolocation.getCurrentPosition((location) => {
+describe(
+  "JS to non-JS mode in Action Selector",
+  { tags: ["@tag.JS", "@tag.Binding"] },
+  () => {
+    before(() => {
+      agHelper.AddDsl("promisesBtnDsl", locators._buttonByText("Submit"));
+    });
+
+    it("1. should show fields appropriately for setinterval", () => {
+      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+
+      propPane.EnterJSContext("onClick", "{{setInterval()}}", true, false);
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Set intervalms",
+        "have.text",
+        0,
+      );
+      agHelper.GetNClick(propPane._actionCard, 0);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionPopupTextLabel,
+        "Callback function",
+        "have.text",
+        0,
+      );
+
+      agHelper.GetNAssertElementText(
+        propPane._actionPopupTextLabel,
+        "Delay (ms)",
+        "have.text",
+        1,
+      );
+
+      agHelper.GetNAssertElementText(
+        propPane._actionPopupTextLabel,
+        "Id",
+        "have.text",
+        2,
+      );
+
+      propPane.EnterJSContext(
+        "onClick",
+        "{{setInterval(() => {}, 200, '')}}",
+        true,
+        false,
+      );
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Set interval200ms",
+        "have.text",
+        0,
+      );
+      agHelper.GetNClick(propPane._actionCard, 0);
+
+      propPane.EnterJSContext(
+        "onClick",
+        "{{setInterval(() => {showAlert('hi')}, 200, 'id1')}}",
+        true,
+        false,
+      );
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Set interval200ms",
+        "have.text",
+        0,
+      );
+      agHelper.GetNClick(propPane._actionCard, 0);
+    });
+
+    it("2. should show fields appropriately for clearInterval", () => {
+      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+
+      propPane.EnterJSContext("onClick", "{{clearInterval()}}", true, false);
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Clear intervalAdd Id",
+        "have.text",
+        0,
+      );
+      agHelper.GetNClick(propPane._actionCard, 0);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionPopupTextLabel,
+        "Id",
+        "have.text",
+        0,
+      );
+
+      propPane.EnterJSContext(
+        "onClick",
+        "{{clearInterval('Id1')}}",
+        true,
+        true,
+      );
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Clear intervalId1",
+        "have.text",
+        0,
+      );
+      agHelper.GetNClick(propPane._actionCard, 0);
+
+      agHelper.ValidateCodeEditorContent(propPane._textView, "Id1");
+    });
+
+    it("3. should show no fields for clear store", () => {
+      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+
+      propPane.EnterJSContext("onClick", "{{clearStore()}}", true, false);
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Clear store",
+        "have.text",
+        0,
+      );
+      agHelper.GetNClick(propPane._actionCard, 0);
+
+      agHelper.AssertElementAbsence(propPane._textView);
+      agHelper.AssertElementAbsence(propPane._selectorView);
+    });
+
+    it("4. should show no fields for watch geolocation position", () => {
+      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+
+      propPane.EnterJSContext(
+        "onClick",
+        "{{appsmith.geolocation.watchPosition()}}",
+        true,
+        false,
+      );
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Watch geolocation",
+        "have.text",
+        0,
+      );
+      agHelper.GetNClick(propPane._actionCard, 0);
+
+      agHelper.AssertElementAbsence(propPane._textView);
+      agHelper.AssertElementAbsence(propPane._selectorView);
+    });
+
+    it("5. should show no fields for stop watching geolocation position", () => {
+      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+
+      propPane.EnterJSContext(
+        "onClick",
+        "{{appsmith.geolocation.clearWatch()}}",
+        true,
+        false,
+      );
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Stop watching geolocation",
+        "have.text",
+        0,
+      );
+      agHelper.GetNClick(propPane._actionCard, 0);
+
+      agHelper.AssertElementAbsence(propPane._textView);
+      agHelper.AssertElementAbsence(propPane._selectorView);
+    });
+
+    it("6. should show appropriate fields for get geolocation", () => {
+      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+
+      propPane.EnterJSContext(
+        "onClick",
+        "{{appsmith.geolocation.getCurrentPosition()}}",
+        true,
+        false,
+      );
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Get geolocationAdd callback",
+        "have.text",
+        0,
+      );
+      agHelper.GetNClick(propPane._actionCard, 0);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionPopupTextLabel,
+        "Callback function",
+        "have.text",
+        0,
+      );
+
+      propPane.EnterJSContext(
+        "onClick",
+        `{{appsmith.geolocation.getCurrentPosition((location) => {
       // add code here
     });}}`,
-      true,
-      true,
-    );
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNClick(propPane._actionCard, 0);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionPopupTextLabel,
-      "Callback function",
-      "have.text",
-      0,
-    );
-  });
-
-  it("7. should show post message fields appropriately", () => {
-    EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-
-    propPane.EnterJSContext("onClick", "{{postWindowMessage()}}", true, false);
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Post messageAdd message",
-      "have.text",
-      0,
-    );
-    agHelper.GetNClick(propPane._actionCard, 0);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionPopupTextLabel,
-      "Message",
-      "have.text",
-      0,
-    );
-    agHelper.GetNAssertElementText(
-      propPane._windowTargetDropdown,
-      "Window",
-      "have.text",
-      0,
-    );
-    agHelper.GetNAssertElementText(
-      propPane._actionPopupTextLabel,
-      "Allowed origins",
-      "have.text",
-      1,
-    );
-
-    propPane.EnterJSContext(
-      "onClick",
-      "{{postWindowMessage('hello', 'window', '*')}}",
-      true,
-      false,
-    );
-    propPane.ToggleJSMode("onClick", false);
-
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Post messagehello",
-      "have.text",
-      0,
-    );
-    agHelper.GetNClick(propPane._actionCard, 0);
-
-    agHelper.ValidateCodeEditorContent(propPane._textView, "hellowindow*");
-  });
-});
+        true,
+        true,
+      );
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNClick(propPane._actionCard, 0);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionPopupTextLabel,
+        "Callback function",
+        "have.text",
+        0,
+      );
+    });
+
+    it("7. should show post message fields appropriately", () => {
+      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+
+      propPane.EnterJSContext(
+        "onClick",
+        "{{postWindowMessage()}}",
+        true,
+        false,
+      );
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Post messageAdd message",
+        "have.text",
+        0,
+      );
+      agHelper.GetNClick(propPane._actionCard, 0);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionPopupTextLabel,
+        "Message",
+        "have.text",
+        0,
+      );
+      agHelper.GetNAssertElementText(
+        propPane._windowTargetDropdown,
+        "Window",
+        "have.text",
+        0,
+      );
+      agHelper.GetNAssertElementText(
+        propPane._actionPopupTextLabel,
+        "Allowed origins",
+        "have.text",
+        1,
+      );
+
+      propPane.EnterJSContext(
+        "onClick",
+        "{{postWindowMessage('hello', 'window', '*')}}",
+        true,
+        false,
+      );
+      propPane.ToggleJSMode("onClick", false);
+
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Post messagehello",
+        "have.text",
+        0,
+      );
+      agHelper.GetNClick(propPane._actionCard, 0);
+
+      agHelper.ValidateCodeEditorContent(propPane._textView, "hellowindow*");
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ActionSelector_JsToNonJSMode_4_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ActionSelector_JsToNonJSMode_4_spec.ts
index d55f39bb83e4..b4af0af94357 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ActionSelector_JsToNonJSMode_4_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ActionSelector_JsToNonJSMode_4_spec.ts
@@ -7,47 +7,51 @@ import EditorNavigation, {
   EntityType,
 } from "../../../../support/Pages/EditorNavigation";
 
-describe("JS to non-JS mode in Action Selector", { tags: ["@tag.JS"] }, () => {
-  before(() => {
-    agHelper.AddDsl("promisesBtnDsl", locators._buttonByText("Submit"));
-  });
+describe(
+  "JS to non-JS mode in Action Selector",
+  { tags: ["@tag.JS", "@tag.Binding"] },
+  () => {
+    before(() => {
+      agHelper.AddDsl("promisesBtnDsl", locators._buttonByText("Submit"));
+    });
 
-  it("10. Bug 23167 - Message field in PostMessage should accept all type of values", () => {
-    EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+    it("10. Bug 23167 - Message field in PostMessage should accept all type of values", () => {
+      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
 
-    propPane.EnterJSContext(
-      "onClick",
-      "{{postWindowMessage(Input1.text, 'window', '*')}}",
-      true,
-      false,
-    );
-    propPane.ToggleJSMode("onClick", false);
+      propPane.EnterJSContext(
+        "onClick",
+        "{{postWindowMessage(Input1.text, 'window', '*')}}",
+        true,
+        false,
+      );
+      propPane.ToggleJSMode("onClick", false);
 
-    agHelper.GetNAssertElementText(
-      propPane._actionCard,
-      "Post message{{Input1.text}}",
-      "have.text",
-      0,
-    );
-    agHelper.GetNClick(propPane._actionCard, 0);
+      agHelper.GetNAssertElementText(
+        propPane._actionCard,
+        "Post message{{Input1.text}}",
+        "have.text",
+        0,
+      );
+      agHelper.GetNClick(propPane._actionCard, 0);
 
-    agHelper.ValidateCodeEditorContent(
-      propPane._textView,
-      "{{Input1.text}}window*",
-    );
+      agHelper.ValidateCodeEditorContent(
+        propPane._textView,
+        "{{Input1.text}}window*",
+      );
 
-    propPane.EnterJSContext(
-      "onClick",
-      "{{postWindowMessage({ x: Input1.text }, 'window', '*')}}",
-      true,
-      false,
-    );
-    propPane.ToggleJSMode("onClick", false);
-    agHelper.GetNClick(propPane._actionCard, 0);
-    agHelper.ValidateCodeEditorContent(
-      propPane._textView,
-      "{{{\n x: Input1.text \n}}}window*",
-    );
-  });
-});
+      propPane.EnterJSContext(
+        "onClick",
+        "{{postWindowMessage({ x: Input1.text }, 'window', '*')}}",
+        true,
+        false,
+      );
+      propPane.ToggleJSMode("onClick", false);
+      agHelper.GetNClick(propPane._actionCard, 0);
+      agHelper.ValidateCodeEditorContent(
+        propPane._textView,
+        "{{{\n x: Input1.text \n}}}window*",
+      );
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/Bug23345_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/Bug23345_spec.ts
index 1a2e4c9205b6..8b082f38963c 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/Bug23345_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/Bug23345_spec.ts
@@ -7,7 +7,7 @@ import {
 
 describe(
   "Delete No Action card without any error",
-  { tags: ["@tag.JS"] },
+  { tags: ["@tag.JS", "@tag.Binding"] },
   () => {
     it("1. Bug 23345", () => {
       entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON, 200, 200);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ClearStore_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ClearStore_spec.ts
index b8f7c7b38729..988a497ac1f4 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ClearStore_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ClearStore_spec.ts
@@ -9,13 +9,16 @@ import EditorNavigation, {
   EntityType,
 } from "../../../../support/Pages/EditorNavigation";
 
-describe("clearStore Action test", { tags: ["@tag.JS"] }, () => {
-  before(() => {
-    entityExplorer.DragDropWidgetNVerify("buttonwidget", 100, 100);
-  });
+describe(
+  "clearStore Action test",
+  { tags: ["@tag.JS", "@tag.Binding"] },
+  () => {
+    before(() => {
+      entityExplorer.DragDropWidgetNVerify("buttonwidget", 100, 100);
+    });
 
-  it("1. Feature 11639 : Clear all store value", function () {
-    const JS_OBJECT_BODY = `export default {
+    it("1. Feature 11639 : Clear all store value", function () {
+      const JS_OBJECT_BODY = `export default {
         storeValue: async () => {
             let values =
               [
@@ -32,49 +35,50 @@ describe("clearStore Action test", { tags: ["@tag.JS"] }, () => {
         }
     }`;
 
-    // Create js object
-    jsEditor.CreateJSObject(JS_OBJECT_BODY, {
-      paste: true,
-      completeReplace: true,
-      toRun: false,
-      prettify: false,
-      shouldCreateNewJSObj: true,
-    });
+      // Create js object
+      jsEditor.CreateJSObject(JS_OBJECT_BODY, {
+        paste: true,
+        completeReplace: true,
+        toRun: false,
+        prettify: false,
+        shouldCreateNewJSObj: true,
+      });
 
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    propPane.UpdatePropertyFieldValue("Label", "");
-    propPane.TypeTextIntoField("Label", "StoreValue");
-    cy.get("@jsObjName").then((jsObj: any) => {
-      propPane.SelectJSFunctionToExecute(
-        "onClick",
-        jsObj as string,
-        "storeValue",
-      );
-    });
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      propPane.UpdatePropertyFieldValue("Label", "");
+      propPane.TypeTextIntoField("Label", "StoreValue");
+      cy.get("@jsObjName").then((jsObj: any) => {
+        propPane.SelectJSFunctionToExecute(
+          "onClick",
+          jsObj as string,
+          "storeValue",
+        );
+      });
+
+      entityExplorer.DragDropWidgetNVerify("buttonwidget", 100, 200);
+      EditorNavigation.SelectEntityByName("Button2", EntityType.Widget);
+      propPane.UpdatePropertyFieldValue("Label", "");
+      propPane.TypeTextIntoField("Label", "ClearStore");
+      cy.get("@jsObjName").then((jsObj: any) => {
+        propPane.SelectJSFunctionToExecute(
+          "onClick",
+          jsObj as string,
+          "clearStore",
+        );
+      });
 
-    entityExplorer.DragDropWidgetNVerify("buttonwidget", 100, 200);
-    EditorNavigation.SelectEntityByName("Button2", EntityType.Widget);
-    propPane.UpdatePropertyFieldValue("Label", "");
-    propPane.TypeTextIntoField("Label", "ClearStore");
-    cy.get("@jsObjName").then((jsObj: any) => {
-      propPane.SelectJSFunctionToExecute(
-        "onClick",
-        jsObj as string,
-        "clearStore",
+      deployMode.DeployApp();
+      agHelper.ClickButton("StoreValue");
+      agHelper.AssertContains(
+        JSON.stringify({
+          val1: "value 1",
+          val2: "value 2",
+          val3: "value 3",
+        }),
       );
+      agHelper.ClickButton("ClearStore");
+      agHelper.AssertContains(JSON.stringify({}));
+      deployMode.NavigateBacktoEditor();
     });
-
-    deployMode.DeployApp();
-    agHelper.ClickButton("StoreValue");
-    agHelper.AssertContains(
-      JSON.stringify({
-        val1: "value 1",
-        val2: "value 2",
-        val3: "value 3",
-      }),
-    );
-    agHelper.ClickButton("ClearStore");
-    agHelper.AssertContains(JSON.stringify({}));
-    deployMode.NavigateBacktoEditor();
-  });
-});
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/Error_handling_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/Error_handling_spec.ts
index eef35878edc1..68671cd03f0f 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/Error_handling_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/Error_handling_spec.ts
@@ -14,7 +14,7 @@ import EditorNavigation, {
 
 describe(
   "Test Create Api and Bind to Button widget",
-  { tags: ["@tag.JS"] },
+  { tags: ["@tag.JS", "@tag.Binding"] },
   function () {
     before("Test_Add users api and execute api", () => {
       entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FieldEvaluation_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FieldEvaluation_spec.ts
index 1d1ad43a581f..afc733e00bc0 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FieldEvaluation_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FieldEvaluation_spec.ts
@@ -8,15 +8,19 @@ import EditorNavigation, {
   EntityType,
 } from "../../../../support/Pages/EditorNavigation";
 
-describe("Field value evaluation", { tags: ["@tag.JS"] }, () => {
-  before(() => {
-    entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON);
-  });
+describe(
+  "Field value evaluation",
+  { tags: ["@tag.JS", "@tag.Binding"] },
+  () => {
+    before(() => {
+      entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON);
+    });
 
-  it("1. Evaluation works for fields", () => {
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    propPane.SelectPlatformFunction("onClick", "Show alert");
-    agHelper.EnterActionValue("Message", "{{Button1.text}}");
-    agHelper.VerifyEvaluatedValue("Submit");
-  });
-});
+    it("1. Evaluation works for fields", () => {
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      propPane.SelectPlatformFunction("onClick", "Show alert");
+      agHelper.EnterActionValue("Message", "{{Button1.text}}");
+      agHelper.VerifyEvaluatedValue("Submit");
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/NavigateTo_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/NavigateTo_spec.ts
index 827cb3f96149..4f75807dd355 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/NavigateTo_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/NavigateTo_spec.ts
@@ -13,74 +13,82 @@ import EditorNavigation, {
 } from "../../../../support/Pages/EditorNavigation";
 import PageList from "../../../../support/Pages/PageList";
 
-describe("Navigate To feature", { tags: ["@tag.JS", "@tag.Sanity"] }, () => {
-  it("1. Navigates to page name clicked from the page name tab of navigate to", () => {
-    EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
-    entityExplorer.DragDropWidgetNVerify(draggableWidgets.TEXT, 500, 600);
-    EditorNavigation.SelectEntityByName("Text1", EntityType.Widget);
-    propPane.TypeTextIntoField("Text", "{{appsmith.URL.queryParams.test}}");
-    entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON, 300, 300);
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    propPane.SelectPlatformFunction("onClick", "Navigate to");
-    dataSources.ValidateNSelectDropdown("Choose page", "Select page", "Page1");
-    agHelper.GetNClick(propPane._actionCollapsibleHeader("Query params"));
-    propPane.UpdatePropertyFieldValue(
-      "Query params",
-      `{{
+describe(
+  "Navigate To feature",
+  { tags: ["@tag.JS", "@tag.Sanity", "@tag.Binding"] },
+  () => {
+    it("1. Navigates to page name clicked from the page name tab of navigate to", () => {
+      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+      entityExplorer.DragDropWidgetNVerify(draggableWidgets.TEXT, 500, 600);
+      EditorNavigation.SelectEntityByName("Text1", EntityType.Widget);
+      propPane.TypeTextIntoField("Text", "{{appsmith.URL.queryParams.test}}");
+      entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON, 300, 300);
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      propPane.SelectPlatformFunction("onClick", "Navigate to");
+      dataSources.ValidateNSelectDropdown(
+        "Choose page",
+        "Select page",
+        "Page1",
+      );
+      agHelper.GetNClick(propPane._actionCollapsibleHeader("Query params"));
+      propPane.UpdatePropertyFieldValue(
+        "Query params",
+        `{{
       {
        test: '123'
       }
       }}`,
-    );
-    agHelper.GetNClick(propPane._actionSelectorPopupClose);
-    agHelper.ClickButton("Submit");
+      );
+      agHelper.GetNClick(propPane._actionSelectorPopupClose);
+      agHelper.ClickButton("Submit");
 
-    agHelper.GetNAssertElementText(
-      WIDGETSKIT.textWidgetContainer,
-      "123",
-      "have.text",
-      0,
-    );
+      agHelper.GetNAssertElementText(
+        WIDGETSKIT.textWidgetContainer,
+        "123",
+        "have.text",
+        0,
+      );
 
-    cy.url().should("include", "a=b").and("include", "test=123");
-    deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.BUTTON));
-    agHelper.WaitUntilEleAppear(
-      locators._widgetInDeployed(draggableWidgets.BUTTON),
-    );
-    agHelper.ClickButton("Submit");
-    cy.url().then(($url) => {
-      cy.log("deploy url is" + $url);
-      expect($url).to.contain("test=123");
+      cy.url().should("include", "a=b").and("include", "test=123");
+      deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.BUTTON));
+      agHelper.WaitUntilEleAppear(
+        locators._widgetInDeployed(draggableWidgets.BUTTON),
+      );
+      agHelper.ClickButton("Submit");
+      cy.url().then(($url) => {
+        cy.log("deploy url is" + $url);
+        expect($url).to.contain("test=123");
+      });
+      deployMode.NavigateBacktoEditor();
+      propPane.DeleteWidgetFromPropertyPane("Button1");
     });
-    deployMode.NavigateBacktoEditor();
-    propPane.DeleteWidgetFromPropertyPane("Button1");
-  });
 
-  it("2. Gives error message when invalid word is entered in the url tab of navigate to", () => {
-    entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON, 300, 300);
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    propPane.SelectPlatformFunction("onClick", "Navigate to");
-    agHelper.GetNClick(propPane._navigateToType("URL"));
-    agHelper.TypeText(
-      propPane._actionSelectorFieldByLabel("Enter URL"),
-      "wrongPage",
-    );
-    agHelper.ClickButton("Submit");
-    agHelper.ValidateToastMessage("Enter a valid URL or page name");
-    propPane.DeleteWidgetFromPropertyPane("Button1");
-  });
+    it("2. Gives error message when invalid word is entered in the url tab of navigate to", () => {
+      entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON, 300, 300);
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      propPane.SelectPlatformFunction("onClick", "Navigate to");
+      agHelper.GetNClick(propPane._navigateToType("URL"));
+      agHelper.TypeText(
+        propPane._actionSelectorFieldByLabel("Enter URL"),
+        "wrongPage",
+      );
+      agHelper.ClickButton("Submit");
+      agHelper.ValidateToastMessage("Enter a valid URL or page name");
+      propPane.DeleteWidgetFromPropertyPane("Button1");
+    });
 
-  it("3. Navigates to url entered from the url tab of navigate to", () => {
-    entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON, 300, 300);
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    propPane.SelectPlatformFunction("onClick", "Navigate to");
-    agHelper.GetNClick(propPane._navigateToType("URL"));
-    agHelper.TypeText(
-      propPane._actionSelectorFieldByLabel("Enter URL"),
-      "www.google.com",
-    );
-    deployMode.DeployApp();
-    agHelper.ClickButton("Submit");
-    cy.url().should("include", "google.com");
-  });
-});
+    it("3. Navigates to url entered from the url tab of navigate to", () => {
+      entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON, 300, 300);
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      propPane.SelectPlatformFunction("onClick", "Navigate to");
+      agHelper.GetNClick(propPane._navigateToType("URL"));
+      agHelper.TypeText(
+        propPane._actionSelectorFieldByLabel("Enter URL"),
+        "www.google.com",
+      );
+      deployMode.DeployApp();
+      agHelper.ClickButton("Submit");
+      cy.url().should("include", "google.com");
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/PostWindowMessage_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/PostWindowMessage_spec.ts
index 87ee86ff3157..21827b0f56e5 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/PostWindowMessage_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/PostWindowMessage_spec.ts
@@ -10,21 +10,24 @@ import EditorNavigation, {
   EntityType,
 } from "../../../../support/Pages/EditorNavigation";
 
-describe("Post window message", { tags: ["@tag.JS", "@tag.Sanity"] }, () => {
-  it("1. Posts message to an iframe within Appsmith", () => {
-    entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON, 200, 200);
-    entityExplorer.DragDropWidgetNVerify(draggableWidgets.IFRAME, 200, 300);
+describe(
+  "Post window message",
+  { tags: ["@tag.JS", "@tag.Sanity", "@tag.Binding"] },
+  () => {
+    it("1. Posts message to an iframe within Appsmith", () => {
+      entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON, 200, 200);
+      entityExplorer.DragDropWidgetNVerify(draggableWidgets.IFRAME, 200, 300);
 
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    propPane.SelectPlatformFunction("onClick", "Post message");
-    agHelper.EnterActionValue("Message", "After postMessage");
-    agHelper.GetNClick(propPane._windowTargetDropdown);
-    agHelper.GetNClick(locators._dropDownValue("Iframe1"), 0, true);
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      propPane.SelectPlatformFunction("onClick", "Post message");
+      agHelper.EnterActionValue("Message", "After postMessage");
+      agHelper.GetNClick(propPane._windowTargetDropdown);
+      agHelper.GetNClick(locators._dropDownValue("Iframe1"), 0, true);
 
-    EditorNavigation.SelectEntityByName("Iframe1", EntityType.Widget);
-    propPane.UpdatePropertyFieldValue(
-      "srcDoc",
-      `<!doctype html>
+      EditorNavigation.SelectEntityByName("Iframe1", EntityType.Widget);
+      propPane.UpdatePropertyFieldValue(
+        "srcDoc",
+        `<!doctype html>
       <html lang="en">
       <head>
       <meta charset="UTF-8"><title>post msg</title>
@@ -42,28 +45,31 @@ describe("Post window message", { tags: ["@tag.JS", "@tag.Sanity"] }, () => {
       </script>
       </body>
       </html>`,
-    );
-    propPane.SelectPlatformFunction("onMessageReceived", "Show alert");
-    agHelper.EnterActionValue("Message", "I got a message from iframe");
-    deployMode.DeployApp(locators._buttonByText("Submit"));
-    agHelper.WaitUntilEleAppear(locators._buttonByText("Submit"));
-    agHelper.WaitUntilEleAppear("#iframe-Iframe1");
-    agHelper.AssertElementVisibility("#iframe-Iframe1");
-    cy.get("#iframe-Iframe1").then((element) => {
-      element.contents().find("body").find("#iframe-button").click();
-    });
-    agHelper.ValidateToastMessage("I got a message from iframe");
+      );
+      propPane.SelectPlatformFunction("onMessageReceived", "Show alert");
+      agHelper.EnterActionValue("Message", "I got a message from iframe");
+      deployMode.DeployApp(locators._buttonByText("Submit"));
+      agHelper.WaitUntilEleAppear(locators._buttonByText("Submit"));
+      agHelper.WaitUntilEleAppear("#iframe-Iframe1");
+      agHelper.AssertElementVisibility("#iframe-Iframe1");
+      cy.get("#iframe-Iframe1").then((element) => {
+        element.contents().find("body").find("#iframe-button").click();
+      });
+      agHelper.ValidateToastMessage("I got a message from iframe");
 
-    cy.get("#iframe-Iframe1").then(($element) => {
-      const $body = $element.contents().find("body");
-      cy.wrap($body).find("#txtMsg").should("have.text", "Before postMessage");
-    });
+      cy.get("#iframe-Iframe1").then(($element) => {
+        const $body = $element.contents().find("body");
+        cy.wrap($body)
+          .find("#txtMsg")
+          .should("have.text", "Before postMessage");
+      });
 
-    agHelper.ClickButton("Submit");
-    cy.get("#iframe-Iframe1").then(($element) => {
-      const $body = $element.contents().find("body");
-      cy.wrap($body).find("#txtMsg").should("have.text", "After postMessage");
+      agHelper.ClickButton("Submit");
+      cy.get("#iframe-Iframe1").then(($element) => {
+        const $body = $element.contents().find("body");
+        cy.wrap($body).find("#txtMsg").should("have.text", "After postMessage");
+      });
+      deployMode.NavigateBacktoEditor();
     });
-    deployMode.NavigateBacktoEditor();
-  });
-});
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/RemoveValue_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/RemoveValue_spec.ts
index b2f03e558fa1..f570db0e3272 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/RemoveValue_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/RemoveValue_spec.ts
@@ -11,14 +11,17 @@ import EditorNavigation, {
   PagePaneSegment,
 } from "../../../../support/Pages/EditorNavigation";
 
-describe("removeValue Action test", { tags: ["@tag.JS"] }, () => {
-  before(() => {
-    entityExplorer.DragDropWidgetNVerify("buttonwidget", 100, 100);
-    PageLeftPane.switchSegment(PagePaneSegment.JS);
-  });
+describe(
+  "removeValue Action test",
+  { tags: ["@tag.JS", "@tag.Binding"] },
+  () => {
+    before(() => {
+      entityExplorer.DragDropWidgetNVerify("buttonwidget", 100, 100);
+      PageLeftPane.switchSegment(PagePaneSegment.JS);
+    });
 
-  it("1. Feature 11639 : Remove store value", function () {
-    const JS_OBJECT_BODY = `export default {
+    it("1. Feature 11639 : Remove store value", function () {
+      const JS_OBJECT_BODY = `export default {
         storeValue: async () => {
             await storeValue('val1', 'value 1');
             await storeValue('val2', 'value 2');
@@ -30,52 +33,53 @@ describe("removeValue Action test", { tags: ["@tag.JS"] }, () => {
         }
     }`;
 
-    // Create js object
-    jsEditor.CreateJSObject(JS_OBJECT_BODY, {
-      paste: true,
-      completeReplace: true,
-      toRun: false,
-      prettify: false,
-      shouldCreateNewJSObj: true,
-    });
+      // Create js object
+      jsEditor.CreateJSObject(JS_OBJECT_BODY, {
+        paste: true,
+        completeReplace: true,
+        toRun: false,
+        prettify: false,
+        shouldCreateNewJSObj: true,
+      });
 
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    propPane.UpdatePropertyFieldValue("Label", "");
-    propPane.TypeTextIntoField("Label", "StoreValue");
-    cy.get("@jsObjName").then((jsObj: any) => {
-      propPane.SelectJSFunctionToExecute(
-        "onClick",
-        jsObj as string,
-        "storeValue",
-      );
-    });
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      propPane.UpdatePropertyFieldValue("Label", "");
+      propPane.TypeTextIntoField("Label", "StoreValue");
+      cy.get("@jsObjName").then((jsObj: any) => {
+        propPane.SelectJSFunctionToExecute(
+          "onClick",
+          jsObj as string,
+          "storeValue",
+        );
+      });
 
-    entityExplorer.DragDropWidgetNVerify("buttonwidget", 100, 200);
-    EditorNavigation.SelectEntityByName("Button2", EntityType.Widget);
-    propPane.UpdatePropertyFieldValue("Label", "");
-    propPane.TypeTextIntoField("Label", "RemoveValue");
-    cy.get("@jsObjName").then((jsObj: any) => {
-      propPane.SelectJSFunctionToExecute(
-        "onClick",
-        jsObj as string,
-        "removeValue",
+      entityExplorer.DragDropWidgetNVerify("buttonwidget", 100, 200);
+      EditorNavigation.SelectEntityByName("Button2", EntityType.Widget);
+      propPane.UpdatePropertyFieldValue("Label", "");
+      propPane.TypeTextIntoField("Label", "RemoveValue");
+      cy.get("@jsObjName").then((jsObj: any) => {
+        propPane.SelectJSFunctionToExecute(
+          "onClick",
+          jsObj as string,
+          "removeValue",
+        );
+      });
+
+      deployMode.DeployApp();
+      agHelper.ClickButton("StoreValue");
+      agHelper.AssertContains(
+        JSON.stringify({
+          val1: "value 1",
+          val2: "value 2",
+        }),
+      );
+      agHelper.ClickButton("RemoveValue");
+      agHelper.AssertContains(
+        JSON.stringify({
+          val2: "value 2",
+        }),
       );
+      deployMode.NavigateBacktoEditor();
     });
-
-    deployMode.DeployApp();
-    agHelper.ClickButton("StoreValue");
-    agHelper.AssertContains(
-      JSON.stringify({
-        val1: "value 1",
-        val2: "value 2",
-      }),
-    );
-    agHelper.ClickButton("RemoveValue");
-    agHelper.AssertContains(
-      JSON.stringify({
-        val2: "value 2",
-      }),
-    );
-    deployMode.NavigateBacktoEditor();
-  });
-});
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/StoreValue_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/StoreValue_spec.ts
index 683fcc7bd66d..fcc4d49b2b4e 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/StoreValue_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/StoreValue_spec.ts
@@ -14,14 +14,17 @@ import EditorNavigation, {
   PagePaneSegment,
 } from "../../../../support/Pages/EditorNavigation";
 
-describe("storeValue Action test", { tags: ["@tag.JS", "@tag.Sanity"] }, () => {
-  before(() => {
-    entityExplorer.DragDropWidgetNVerify("buttonwidget", 100, 100);
-    PageLeftPane.switchSegment(PagePaneSegment.JS);
-  });
-
-  it("1. Bug 14653: Running consecutive storeValue actions and await", function () {
-    const jsObjectBody = `export default {
+describe(
+  "storeValue Action test",
+  { tags: ["@tag.JS", "@tag.Sanity", "@tag.Binding"] },
+  () => {
+    before(() => {
+      entityExplorer.DragDropWidgetNVerify("buttonwidget", 100, 100);
+      PageLeftPane.switchSegment(PagePaneSegment.JS);
+    });
+
+    it("1. Bug 14653: Running consecutive storeValue actions and await", function () {
+      const jsObjectBody = `export default {
       storeTest: () => {
         let values =
           [
@@ -40,48 +43,48 @@ describe("storeValue Action test", { tags: ["@tag.JS", "@tag.Sanity"] }, () => {
       }
     }`;
 
-    jsEditor.CreateJSObject(jsObjectBody, {
-      paste: true,
-      completeReplace: true,
-      toRun: false,
-      shouldCreateNewJSObj: true,
-    });
+      jsEditor.CreateJSObject(jsObjectBody, {
+        paste: true,
+        completeReplace: true,
+        toRun: false,
+        shouldCreateNewJSObj: true,
+      });
 
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    propPane.UpdatePropertyFieldValue("Label", "");
-    propPane.TypeTextIntoField("Label", "StoreTest");
-    cy.get("@jsObjName").then((jsObj: any) => {
-      propPane.SelectJSFunctionToExecute(
-        "onClick",
-        jsObj as string,
-        "storeTest",
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      propPane.UpdatePropertyFieldValue("Label", "");
+      propPane.TypeTextIntoField("Label", "StoreTest");
+      cy.get("@jsObjName").then((jsObj: any) => {
+        propPane.SelectJSFunctionToExecute(
+          "onClick",
+          jsObj as string,
+          "storeTest",
+        );
+      });
+
+      deployMode.DeployApp();
+      agHelper.AssertElementVisibility(
+        locators._widgetInDeployed(draggableWidgets.BUTTON),
+      );
+      agHelper.ClickButton("StoreTest");
+      agHelper.AssertContains(
+        JSON.stringify({
+          val1: "number 1",
+          val2: "number 2",
+          val3: "number 3",
+          val4: "number 4",
+        }),
       );
+      deployMode.NavigateBacktoEditor();
     });
 
-    deployMode.DeployApp();
-    agHelper.AssertElementVisibility(
-      locators._widgetInDeployed(draggableWidgets.BUTTON),
-    );
-    agHelper.ClickButton("StoreTest");
-    agHelper.AssertContains(
-      JSON.stringify({
-        val1: "number 1",
-        val2: "number 2",
-        val3: "number 3",
-        val4: "number 4",
-      }),
-    );
-    deployMode.NavigateBacktoEditor();
-  });
-
-  it("2. Bug 14827 : Accepts paths as keys and doesn't update paths in store but creates a new field with path as key", function () {
-    const DEFAULT_STUDENT_OBJECT = {
-      details: { isTopper: true, name: "Abhah", grade: 1 },
-    };
-    const MODIFIED_STUDENT_OBJECT = {
-      details: { isTopper: false, name: "Alia", grade: 3 },
-    };
-    const JS_OBJECT_BODY = `export default {
+    it("2. Bug 14827 : Accepts paths as keys and doesn't update paths in store but creates a new field with path as key", function () {
+      const DEFAULT_STUDENT_OBJECT = {
+        details: { isTopper: true, name: "Abhah", grade: 1 },
+      };
+      const MODIFIED_STUDENT_OBJECT = {
+        details: { isTopper: false, name: "Alia", grade: 3 },
+      };
+      const JS_OBJECT_BODY = `export default {
         storePathTest: async ()=> {
         await storeValue("student", ${JSON.stringify(
           DEFAULT_STUDENT_OBJECT,
@@ -103,63 +106,67 @@ describe("storeValue Action test", { tags: ["@tag.JS", "@tag.Sanity"] }, () => {
        }
    `;
 
-    // Create js object
-    jsEditor.CreateJSObject(JS_OBJECT_BODY, {
-      paste: true,
-      completeReplace: true,
-      toRun: false,
-      shouldCreateNewJSObj: true,
-    });
+      // Create js object
+      jsEditor.CreateJSObject(JS_OBJECT_BODY, {
+        paste: true,
+        completeReplace: true,
+        toRun: false,
+        shouldCreateNewJSObj: true,
+      });
+
+      // Button1
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      propPane.UpdatePropertyFieldValue("Label", "StorePathTest");
+      cy.get(".action-block-tree").click({ force: true });
+      cy.get("@jsObjName").then((jsObj: any) => {
+        propPane.SelectJSFunctionToExecuteInExistingActionBlock(
+          jsObj,
+          "storePathTest",
+        );
+      });
+
+      // Button 2
+      entityExplorer.DragDropWidgetNVerify("buttonwidget", 100, 200);
+      EditorNavigation.SelectEntityByName("Button2", EntityType.Widget);
+      propPane.UpdatePropertyFieldValue("Label", "modifyStorePath");
+      cy.get("@jsObjName").then((jsObj: any) => {
+        propPane.SelectJSFunctionToExecute(
+          "onClick",
+          jsObj as string,
+          "modifyStorePath",
+        );
+      });
 
-    // Button1
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    propPane.UpdatePropertyFieldValue("Label", "StorePathTest");
-    cy.get(".action-block-tree").click({ force: true });
-    cy.get("@jsObjName").then((jsObj: any) => {
-      propPane.SelectJSFunctionToExecuteInExistingActionBlock(
-        jsObj,
-        "storePathTest",
+      deployMode.DeployApp();
+      agHelper.ClickButton("StorePathTest");
+      agHelper.ValidateToastMessage(
+        JSON.stringify(DEFAULT_STUDENT_OBJECT),
+        0,
+        1,
       );
-    });
+      agHelper.ValidateToastMessage(DEFAULT_STUDENT_OBJECT.details.name, 1, 2);
+      agHelper.ValidateToastMessage("Annah", 2, 3);
 
-    // Button 2
-    entityExplorer.DragDropWidgetNVerify("buttonwidget", 100, 200);
-    EditorNavigation.SelectEntityByName("Button2", EntityType.Widget);
-    propPane.UpdatePropertyFieldValue("Label", "modifyStorePath");
-    cy.get("@jsObjName").then((jsObj: any) => {
-      propPane.SelectJSFunctionToExecute(
-        "onClick",
-        jsObj as string,
-        "modifyStorePath",
+      agHelper.WaitUntilAllToastsDisappear();
+      agHelper.ClickButton("modifyStorePath");
+      agHelper.ValidateToastMessage(
+        JSON.stringify(MODIFIED_STUDENT_OBJECT.details),
+        0,
+        1,
+      );
+      agHelper.ValidateToastMessage(
+        `${MODIFIED_STUDENT_OBJECT.details.isTopper}`,
+        1,
+        2,
       );
+      agHelper.ValidateToastMessage(`true`, 2, 3);
+      deployMode.NavigateBacktoEditor();
     });
 
-    deployMode.DeployApp();
-    agHelper.ClickButton("StorePathTest");
-    agHelper.ValidateToastMessage(JSON.stringify(DEFAULT_STUDENT_OBJECT), 0, 1);
-    agHelper.ValidateToastMessage(DEFAULT_STUDENT_OBJECT.details.name, 1, 2);
-    agHelper.ValidateToastMessage("Annah", 2, 3);
-
-    agHelper.WaitUntilAllToastsDisappear();
-    agHelper.ClickButton("modifyStorePath");
-    agHelper.ValidateToastMessage(
-      JSON.stringify(MODIFIED_STUDENT_OBJECT.details),
-      0,
-      1,
-    );
-    agHelper.ValidateToastMessage(
-      `${MODIFIED_STUDENT_OBJECT.details.isTopper}`,
-      1,
-      2,
-    );
-    agHelper.ValidateToastMessage(`true`, 2, 3);
-    deployMode.NavigateBacktoEditor();
-  });
-
-  it("3. Bug 14827 : Accepts paths as keys and doesn't update paths in store but creates a new field with path as key - object keys", function () {
-    const TEST_OBJECT = { a: 1, two: {} };
-
-    const JS_OBJECT_BODY = `export default {
+    it("3. Bug 14827 : Accepts paths as keys and doesn't update paths in store but creates a new field with path as key - object keys", function () {
+      const TEST_OBJECT = { a: 1, two: {} };
+
+      const JS_OBJECT_BODY = `export default {
       setStore: async () => {
         await storeValue("test", ${JSON.stringify(TEST_OBJECT)}, false);
         await showAlert(JSON.stringify(appsmith.store.test));
@@ -171,47 +178,47 @@ describe("storeValue Action test", { tags: ["@tag.JS", "@tag.Sanity"] }, () => {
         showAlert(JSON.stringify(appsmith.store.test));}
     }`;
 
-    // create js object
-    jsEditor.CreateJSObject(JS_OBJECT_BODY, {
-      paste: true,
-      completeReplace: true,
-      toRun: false,
-      shouldCreateNewJSObj: true,
-    });
+      // create js object
+      jsEditor.CreateJSObject(JS_OBJECT_BODY, {
+        paste: true,
+        completeReplace: true,
+        toRun: false,
+        shouldCreateNewJSObj: true,
+      });
 
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    propPane.UpdatePropertyFieldValue("Label", "SetStore");
-    cy.get(".action-block-tree").click({ force: true });
-    cy.get("@jsObjName").then((jsObj: any) => {
-      propPane.SelectJSFunctionToExecuteInExistingActionBlock(
-        jsObj,
-        "setStore",
-      );
-    });
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      propPane.UpdatePropertyFieldValue("Label", "SetStore");
+      cy.get(".action-block-tree").click({ force: true });
+      cy.get("@jsObjName").then((jsObj: any) => {
+        propPane.SelectJSFunctionToExecuteInExistingActionBlock(
+          jsObj,
+          "setStore",
+        );
+      });
 
-    EditorNavigation.SelectEntityByName("Button2", EntityType.Widget);
-    propPane.UpdatePropertyFieldValue("Label", "ShowStore");
-    cy.get(".action-block-tree").click({ force: true });
-    cy.get("@jsObjName").then((jsObj: any) => {
-      propPane.SelectJSFunctionToExecuteInExistingActionBlock(
-        jsObj,
-        "showStore",
-      );
-    });
+      EditorNavigation.SelectEntityByName("Button2", EntityType.Widget);
+      propPane.UpdatePropertyFieldValue("Label", "ShowStore");
+      cy.get(".action-block-tree").click({ force: true });
+      cy.get("@jsObjName").then((jsObj: any) => {
+        propPane.SelectJSFunctionToExecuteInExistingActionBlock(
+          jsObj,
+          "showStore",
+        );
+      });
 
-    deployMode.DeployApp();
-    agHelper.ClickButton("SetStore");
-    agHelper.ValidateToastMessage(JSON.stringify(TEST_OBJECT), 0, 1);
-    agHelper.ValidateToastMessage(JSON.stringify(TEST_OBJECT.two), 1, 2);
-    agHelper.ValidateToastMessage(`{"b":2}`, 2, 3);
+      deployMode.DeployApp();
+      agHelper.ClickButton("SetStore");
+      agHelper.ValidateToastMessage(JSON.stringify(TEST_OBJECT), 0, 1);
+      agHelper.ValidateToastMessage(JSON.stringify(TEST_OBJECT.two), 1, 2);
+      agHelper.ValidateToastMessage(`{"b":2}`, 2, 3);
 
-    agHelper.ClickButton("ShowStore");
-    agHelper.ValidateToastMessage(JSON.stringify(TEST_OBJECT), 0);
-    deployMode.NavigateBacktoEditor();
-  });
+      agHelper.ClickButton("ShowStore");
+      agHelper.ValidateToastMessage(JSON.stringify(TEST_OBJECT), 0);
+      deployMode.NavigateBacktoEditor();
+    });
 
-  it("4. Bug 24882. StoreValue, removeValue and clearStore should emit platform generated logs", function () {
-    const jsObjectBody = `export default {
+    it("4. Bug 24882. StoreValue, removeValue and clearStore should emit platform generated logs", function () {
+      const jsObjectBody = `export default {
       storeFns: () => {
         storeValue("xyz", 123);
         removeValue("xyz");
@@ -219,30 +226,31 @@ describe("storeValue Action test", { tags: ["@tag.JS", "@tag.Sanity"] }, () => {
       }
     }`;
 
-    jsEditor.CreateJSObject(jsObjectBody, {
-      paste: true,
-      completeReplace: true,
-      toRun: true,
-      shouldCreateNewJSObj: true,
-    });
+      jsEditor.CreateJSObject(jsObjectBody, {
+        paste: true,
+        completeReplace: true,
+        toRun: true,
+        shouldCreateNewJSObj: true,
+      });
 
-    entityExplorer.DragDropWidgetNVerify("buttonwidget", 400, 400);
-    EditorNavigation.SelectEntityByName("Button3", EntityType.Widget);
-    propPane.UpdatePropertyFieldValue("Label", "Test store logs");
-    cy.get("@jsObjName").then((jsObj: any) => {
-      propPane.SelectJSFunctionToExecute(
-        "onClick",
-        jsObj as string,
-        "storeFns",
-      );
+      entityExplorer.DragDropWidgetNVerify("buttonwidget", 400, 400);
+      EditorNavigation.SelectEntityByName("Button3", EntityType.Widget);
+      propPane.UpdatePropertyFieldValue("Label", "Test store logs");
+      cy.get("@jsObjName").then((jsObj: any) => {
+        propPane.SelectJSFunctionToExecute(
+          "onClick",
+          jsObj as string,
+          "storeFns",
+        );
+      });
+      agHelper.ClickButton("Test store logs");
+
+      debuggerHelper.OpenDebugger();
+      debuggerHelper.ClickLogsTab();
+      debuggerHelper.changeLogsGroup("System logs");
+      debuggerHelper.DoesConsoleLogExist("storeValue('xyz', '123', true)");
+      debuggerHelper.DoesConsoleLogExist("removeValue('xyz')");
+      debuggerHelper.DoesConsoleLogExist("clearStore()");
     });
-    agHelper.ClickButton("Test store logs");
-
-    debuggerHelper.OpenDebugger();
-    debuggerHelper.ClickLogsTab();
-    debuggerHelper.changeLogsGroup("System logs");
-    debuggerHelper.DoesConsoleLogExist("storeValue('xyz', '123', true)");
-    debuggerHelper.DoesConsoleLogExist("removeValue('xyz')");
-    debuggerHelper.DoesConsoleLogExist("clearStore()");
-  });
-});
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/disableJSToggle_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/disableJSToggle_spec.ts
index 85c141bc79a7..6c9d1d7ca8d1 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/disableJSToggle_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/disableJSToggle_spec.ts
@@ -11,7 +11,7 @@ import EditorNavigation, {
 
 describe(
   "Disable JS toggle when Action selector code is not parsable",
-  { tags: ["@tag.JS"] },
+  { tags: ["@tag.JS", "@tag.Binding"] },
   () => {
     before(() => {
       entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON, 200, 200);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/setInterval_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/setInterval_spec.js
index debf75e8d1ad..de27e31520e2 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/setInterval_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/setInterval_spec.js
@@ -12,7 +12,7 @@ import EditorNavigation, {
 
 describe(
   "Test Create Api and Bind to Button widget",
-  { tags: ["@tag.JS"] },
+  { tags: ["@tag.JS", "@tag.Binding"] },
   function () {
     before("Test_Add users api and execute api", () => {
       agHelper.AddDsl("buttonApiDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/uiToCode_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/uiToCode_spec.ts
index 375553cbb9a5..07381359fcb5 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/uiToCode_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/uiToCode_spec.ts
@@ -11,7 +11,7 @@ import EditorNavigation, {
   EntityType,
 } from "../../../../support/Pages/EditorNavigation";
 
-describe("UI to Code", { tags: ["@tag.JS"] }, () => {
+describe("UI to Code", { tags: ["@tag.JS", "@tag.Binding"] }, () => {
   before(() => {
     entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON);
     apiPage.CreateApi();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Anvil/AnvilAppNavigation_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Anvil/AnvilAppNavigation_spec.ts
index 01942fda6081..0919d36625d8 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Anvil/AnvilAppNavigation_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Anvil/AnvilAppNavigation_spec.ts
@@ -12,7 +12,7 @@ import { anvilLocators } from "../../../../support/Pages/Anvil/Locators";
 
 describe(
   `${ANVIL_EDITOR_TEST}: Validating multiple widgets in anvil layout mode with App navigation settings`,
-  { tags: ["@tag.Anvil", "@tag.IDE"] },
+  { tags: ["@tag.Anvil", "@tag.IDE", "@tag.PropertyPane"] },
   function () {
     beforeEach(() => {
       // intercept features call for Anvil + WDS tests
diff --git a/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/AppNavigationWithAutoLayout_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/AppNavigationWithAutoLayout_spec.ts
index 88e5caf99d35..7c4f6e6fa5a8 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/AppNavigationWithAutoLayout_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/AppNavigationWithAutoLayout_spec.ts
@@ -15,7 +15,7 @@ import EditorNavigation, {
 
 describe(
   "Validating multiple widgets in auto layout mode with App navigation settings",
-  { tags: ["@tag.IDE"] },
+  { tags: ["@tag.IDE", "@tag.PropertyPane"] },
   function () {
     it("1. Drag and Drop multiple widgets in auto layout mode", function () {
       autoLayout.ConvertToAutoLayoutAndVerify(false);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/AppNavigationWithGit_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/AppNavigationWithGit_spec.ts
index 477cc3c87dd9..f5ced5a0c99a 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/AppNavigationWithGit_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/AppNavigationWithGit_spec.ts
@@ -12,7 +12,21 @@ import PageList from "../../../../support/Pages/PageList";
 
 describe(
   "General checks for app navigation with Git",
-  { tags: ["@tag.IDE", "@tag.Git", "@tag.Sanity"] },
+  {
+    tags: [
+      "@tag.IDE",
+      "@tag.Git",
+      "@tag.Sanity",
+      "@tag.AccessControl",
+      "@tag.Workflows",
+      "@tag.Module",
+      "@tag.Theme",
+      "@tag.JS",
+      "@tag.Container",
+      "@tag.ImportExport",
+      "@tag.PropertyPane",
+    ],
+  },
   function () {
     it("Issue #32050 - Branch parameter should not be removed when navigating from the inline nav more dropdown", () => {
       gitSync.CreateNConnectToGit();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/AppNavigationWithMultiplePages_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/AppNavigationWithMultiplePages_spec.ts
index d3e11d7f5d7d..26761b4f4a51 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/AppNavigationWithMultiplePages_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/AppNavigationWithMultiplePages_spec.ts
@@ -18,7 +18,7 @@ let currentUrl: string;
 
 describe(
   "Page orientation and navigation related usecases ",
-  { tags: ["@tag.IDE", "@tag.Sanity"] },
+  { tags: ["@tag.IDE", "@tag.Sanity", "@tag.PropertyPane"] },
   function () {
     it("1. Change 'Orientation' to 'Side', sidebar should appear", () => {
       AppSidebar.navigate(AppSidebarButton.Settings);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/AppNavigation_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/AppNavigation_spec.ts
index 6d45b8df590a..de59164a3391 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/AppNavigation_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/AppNavigation_spec.ts
@@ -10,7 +10,7 @@ import PageList from "../../../../support/Pages/PageList";
 
 describe(
   "General checks for app navigation",
-  { tags: ["@tag.IDE", "@tag.ImportExport"] },
+  { tags: ["@tag.IDE", "@tag.ImportExport", "@tag.PropertyPane", "@tag.Git"] },
   function () {
     it("1. App header should appear when there is a single page in the application, and navigation should appear alongside app header when there are two pages", () => {
       // App header should appear when there is a single page in the application
diff --git a/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/NavigationSettings_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/NavigationSettings_spec.ts
index b1abc8d29f12..ef140d3a0737 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/NavigationSettings_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/NavigationSettings_spec.ts
@@ -12,7 +12,7 @@ import PageList from "../../../../support/Pages/PageList";
 
 describe(
   "Test app's navigation settings",
-  { tags: ["@tag.IDE", "@tag.Sanity"] },
+  { tags: ["@tag.IDE", "@tag.Sanity", "@tag.PropertyPane"] },
   function () {
     it("1. Open app settings and navigation tab should be there and when the navigation tab is selected, navigation preview should be visible", () => {
       AppSidebar.navigate(AppSidebarButton.Settings);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/SidebarCollapse_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/SidebarCollapse_spec.ts
index 1d30a1219b4d..191da0755950 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/SidebarCollapse_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/SidebarCollapse_spec.ts
@@ -8,30 +8,34 @@ import {
   AppSidebarButton,
 } from "../../../../support/Pages/EditorNavigation";
 
-describe("Test Sidebar Collapse", { tags: ["@tag.IDE"] }, function () {
-  it("1. Sidebar collapse button should be there", () => {
-    // First make sure that nav orientation is set to side
-    AppSidebar.navigate(AppSidebarButton.Settings);
-    agHelper.GetNClick(appSettings.locators._navigationSettingsTab);
-    agHelper.GetNClick(
-      appSettings.locators._navigationSettings._orientationOptions._side,
-      0,
-      true,
-    );
-    deployMode.DeployApp();
-    agHelper.AssertElementVisibility(
-      appSettings.locators._sidebarCollapseButton,
-    );
-    //Sidebar should collapse and open on click of collapse button again
-    // Collapse
-    agHelper.GetNClick(appSettings.locators._sidebarCollapseButton, 0, true);
-    agHelper
-      .GetElement(appSettings.locators._sideNavbar)
-      .should("not.have.class", "is-open");
-    // Open
-    agHelper.GetNClick(appSettings.locators._sidebarCollapseButton);
-    agHelper
-      .GetElement(appSettings.locators._sideNavbar)
-      .should("have.class", "is-open");
-  });
-});
+describe(
+  "Test Sidebar Collapse",
+  { tags: ["@tag.IDE", "@tag.PropertyPane"] },
+  function () {
+    it("1. Sidebar collapse button should be there", () => {
+      // First make sure that nav orientation is set to side
+      AppSidebar.navigate(AppSidebarButton.Settings);
+      agHelper.GetNClick(appSettings.locators._navigationSettingsTab);
+      agHelper.GetNClick(
+        appSettings.locators._navigationSettings._orientationOptions._side,
+        0,
+        true,
+      );
+      deployMode.DeployApp();
+      agHelper.AssertElementVisibility(
+        appSettings.locators._sidebarCollapseButton,
+      );
+      //Sidebar should collapse and open on click of collapse button again
+      // Collapse
+      agHelper.GetNClick(appSettings.locators._sidebarCollapseButton, 0, true);
+      agHelper
+        .GetElement(appSettings.locators._sideNavbar)
+        .should("not.have.class", "is-open");
+      // Open
+      agHelper.GetNClick(appSettings.locators._sidebarCollapseButton);
+      agHelper
+        .GetElement(appSettings.locators._sideNavbar)
+        .should("have.class", "is-open");
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/Sidebar_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/Sidebar_spec.ts
index 47f5ece90134..41f24a205514 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/Sidebar_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/Sidebar_spec.ts
@@ -13,7 +13,7 @@ import {
 
 describe(
   "Test Sidebar navigation style",
-  { tags: ["@tag.IDE", "@tag.ImportExport"] },
+  { tags: ["@tag.IDE", "@tag.ImportExport", "@tag.PropertyPane", "@tag.Git"] },
   function () {
     before(() => {
       // Import an application
diff --git a/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/TopInline_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/TopInline_spec.ts
index c3fe5429ea14..887639ff7339 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/TopInline_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/TopInline_spec.ts
@@ -13,7 +13,7 @@ import {
 
 describe(
   "Test Top + Inline navigation style",
-  { tags: ["@tag.IDE", "@tag.ImportExport"] },
+  { tags: ["@tag.IDE", "@tag.ImportExport", "@tag.PropertyPane", "@tag.Git"] },
   function () {
     before(() => {
       // Import an application
diff --git a/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/TopStacked_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/TopStacked_spec.ts
index 42f80ccb5846..b1dc6ba298cc 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/TopStacked_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/TopStacked_spec.ts
@@ -13,7 +13,7 @@ import {
 
 describe(
   "Test Top + Stacked navigation style",
-  { tags: ["@tag.IDE", "@tag.ImportExport"] },
+  { tags: ["@tag.IDE", "@tag.ImportExport", "@tag.PropertyPane", "@tag.Git"] },
   function () {
     before(() => {
       // Import an application
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/Autocomplete_setters_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/Autocomplete_setters_spec.ts
index 3a0261578512..9685a068612b 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/Autocomplete_setters_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/Autocomplete_setters_spec.ts
@@ -21,90 +21,98 @@ const jsObjectBody = `export default {
 	}
 }`;
 
-describe("Autocomplete tests for setters", { tags: ["@tag.JS"] }, () => {
-  before(() => {
-    entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON, 100, 100);
-    entityExplorer.DragDropWidgetNVerify(draggableWidgets.INPUT_V2, 200, 200);
-    entityExplorer.DragDropWidgetNVerify(draggableWidgets.CHECKBOX, 300, 300);
-    entityExplorer.DragDropWidgetNVerify(draggableWidgets.SWITCH, 400, 400);
-  });
-
-  it("1. Check if setters are present in autocomplete for widgets in JsObject", () => {
-    jsEditor.CreateJSObject(jsObjectBody, {
-      paste: true,
-      completeReplace: true,
-      toRun: false,
-      shouldCreateNewJSObj: true,
-      prettify: false,
+describe(
+  "Autocomplete tests for setters",
+  { tags: ["@tag.JS", "@tag.Binding"] },
+  () => {
+    before(() => {
+      entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON, 100, 100);
+      entityExplorer.DragDropWidgetNVerify(draggableWidgets.INPUT_V2, 200, 200);
+      entityExplorer.DragDropWidgetNVerify(draggableWidgets.CHECKBOX, 300, 300);
+      entityExplorer.DragDropWidgetNVerify(draggableWidgets.SWITCH, 400, 400);
     });
 
-    agHelper.GetNClick(jsEditor._lineinJsEditor(5));
-    agHelper.TypeText(locators._codeMirrorTextArea, "Button1");
+    it("1. Check if setters are present in autocomplete for widgets in JsObject", () => {
+      jsEditor.CreateJSObject(jsObjectBody, {
+        paste: true,
+        completeReplace: true,
+        toRun: false,
+        shouldCreateNewJSObj: true,
+        prettify: false,
+      });
+
+      agHelper.GetNClick(jsEditor._lineinJsEditor(5));
+      agHelper.TypeText(locators._codeMirrorTextArea, "Button1");
 
-    agHelper.GetElementsNAssertTextPresence(
-      locators._hints,
-      "Button1.setColor",
-    );
-    agHelper.GetElementsNAssertTextPresence(
-      locators._hints,
-      "Button1.setDisabled",
-    );
-    agHelper.GetElementsNAssertTextPresence(
-      locators._hints,
-      "Button1.setVisibility",
-    );
+      agHelper.GetElementsNAssertTextPresence(
+        locators._hints,
+        "Button1.setColor",
+      );
+      agHelper.GetElementsNAssertTextPresence(
+        locators._hints,
+        "Button1.setDisabled",
+      );
+      agHelper.GetElementsNAssertTextPresence(
+        locators._hints,
+        "Button1.setVisibility",
+      );
 
-    agHelper.RemoveCharsNType(locators._codeMirrorTextArea, 7, "Input1.set");
+      agHelper.RemoveCharsNType(locators._codeMirrorTextArea, 7, "Input1.set");
 
-    agHelper.GetElementsNAssertTextPresence(locators._hints, "setValue");
-    agHelper.GetElementsNAssertTextPresence(locators._hints, "setDisabled");
-    agHelper.GetElementsNAssertTextPresence(locators._hints, "setVisibility");
+      agHelper.GetElementsNAssertTextPresence(locators._hints, "setValue");
+      agHelper.GetElementsNAssertTextPresence(locators._hints, "setDisabled");
+      agHelper.GetElementsNAssertTextPresence(locators._hints, "setVisibility");
 
-    agHelper.RemoveCharsNType(
-      locators._codeMirrorTextArea,
-      10,
-      "Checkbox1.set",
-    );
+      agHelper.RemoveCharsNType(
+        locators._codeMirrorTextArea,
+        10,
+        "Checkbox1.set",
+      );
 
-    agHelper.GetElementsNAssertTextPresence(locators._hints, "setValue");
-    agHelper.GetElementsNAssertTextPresence(locators._hints, "setDisabled");
-    agHelper.GetElementsNAssertTextPresence(locators._hints, "setVisibility");
+      agHelper.GetElementsNAssertTextPresence(locators._hints, "setValue");
+      agHelper.GetElementsNAssertTextPresence(locators._hints, "setDisabled");
+      agHelper.GetElementsNAssertTextPresence(locators._hints, "setVisibility");
 
-    agHelper.RemoveCharsNType(locators._codeMirrorTextArea, 13, "Switch1.set");
+      agHelper.RemoveCharsNType(
+        locators._codeMirrorTextArea,
+        13,
+        "Switch1.set",
+      );
 
-    agHelper.GetElementsNAssertTextPresence(locators._hints, "setDisabled");
-    agHelper.GetElementsNAssertTextPresence(locators._hints, "setRequired");
-  });
+      agHelper.GetElementsNAssertTextPresence(locators._hints, "setDisabled");
+      agHelper.GetElementsNAssertTextPresence(locators._hints, "setRequired");
+    });
 
-  it("2. Check if setters are present in autocomplete for widgets in property Pane", () => {
-    entityExplorer.DragDropWidgetNVerify(draggableWidgets.INPUT_V2, 500, 500);
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    propPane.EnterJSContext("onClick", "{{Input1.set", true, false);
-    agHelper.GetElementsNAssertTextPresence(locators._hints, "setDisabled");
-  });
+    it("2. Check if setters are present in autocomplete for widgets in property Pane", () => {
+      entityExplorer.DragDropWidgetNVerify(draggableWidgets.INPUT_V2, 500, 500);
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      propPane.EnterJSContext("onClick", "{{Input1.set", true, false);
+      agHelper.GetElementsNAssertTextPresence(locators._hints, "setDisabled");
+    });
 
-  it("3. function arguments hint shows up", () => {
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    propPane.EnterJSContext("onClick", "{{", true, false);
-    agHelper.GetNClickByContains(locators._hints, "appsmith", 0, false);
-    agHelper.AssertElementVisibility(locators._evalValuePopover);
-    propPane.EnterJSContext("onClick", "{{showAlert", true, false);
-    agHelper.GetElementsNAssertTextPresence(locators._hints, "showAlert");
-    agHelper.AssertElementAbsence(locators._evalValuePopover);
-    agHelper.GetNClickByContains(locators._hints, "showAlert", 0, false);
-    agHelper.GetNAssertElementText(
-      locators._argHintFnName,
-      "showAlert",
-      "contain.text",
-    );
-    agHelper.AssertElementAbsence(locators._evalValuePopover);
-  });
+    it("3. function arguments hint shows up", () => {
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      propPane.EnterJSContext("onClick", "{{", true, false);
+      agHelper.GetNClickByContains(locators._hints, "appsmith", 0, false);
+      agHelper.AssertElementVisibility(locators._evalValuePopover);
+      propPane.EnterJSContext("onClick", "{{showAlert", true, false);
+      agHelper.GetElementsNAssertTextPresence(locators._hints, "showAlert");
+      agHelper.AssertElementAbsence(locators._evalValuePopover);
+      agHelper.GetNClickByContains(locators._hints, "showAlert", 0, false);
+      agHelper.GetNAssertElementText(
+        locators._argHintFnName,
+        "showAlert",
+        "contain.text",
+      );
+      agHelper.AssertElementAbsence(locators._evalValuePopover);
+    });
 
-  it("4. function description tooltip shows up", () => {
-    entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON, 100, 100);
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    propPane.EnterJSContext("onClick", "{{showAlert", true, false);
-    agHelper.GetElementsNAssertTextPresence(locators._hints, "showAlert");
-    agHelper.AssertElementExist(locators._tern_doc);
-  });
-});
+    it("4. function description tooltip shows up", () => {
+      entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON, 100, 100);
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      propPane.EnterJSContext("onClick", "{{showAlert", true, false);
+      agHelper.GetElementsNAssertTextPresence(locators._hints, "showAlert");
+      agHelper.AssertElementExist(locators._tern_doc);
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/BracketNotation_AC_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/BracketNotation_AC_spec.ts
index bfbc91ef3d1f..d7979bbf777c 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/BracketNotation_AC_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/BracketNotation_AC_spec.ts
@@ -6,7 +6,7 @@ import {
 
 describe(
   "Test cases around bracket notation",
-  { tags: ["@tag.JS"] },
+  { tags: ["@tag.JS", "@tag.Binding"] },
   function () {
     const jsObjectBody = `export default {
         "my variable 1": [],
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/Bug23641_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/Bug23641_Spec.ts
index 3275e4c483c2..103f3cca08fb 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/Bug23641_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/Bug23641_Spec.ts
@@ -9,22 +9,38 @@ import EditorNavigation, {
   EntityType,
 } from "../../../../support/Pages/EditorNavigation";
 
-describe("Autocomplete bug fixes", { tags: ["@tag.JS"] }, function () {
-  it("1. Bug #23641 Verifies if 'children' shows up in autocomplete list", function () {
-    entityExplorer.DragDropWidgetNVerify(
-      draggableWidgets.MULTITREESELECT,
-      200,
-      200,
-    );
-    entityExplorer.DragDropWidgetNVerify(draggableWidgets.TREESELECT, 200, 400);
-    entityExplorer.DragDropWidgetNVerify(draggableWidgets.TEXT, 200, 600);
-    EditorNavigation.SelectEntityByName("Text1", EntityType.Widget);
-    propPane.TypeTextIntoField("Text", "{{TreeSelect1.options[0].c");
-    agHelper.AssertElementExist(locators._hints);
-    agHelper.GetNAssertElementText(locators._hints, "children", "contain.text");
+describe(
+  "Autocomplete bug fixes",
+  { tags: ["@tag.JS", "@tag.Binding"] },
+  function () {
+    it("1. Bug #23641 Verifies if 'children' shows up in autocomplete list", function () {
+      entityExplorer.DragDropWidgetNVerify(
+        draggableWidgets.MULTITREESELECT,
+        200,
+        200,
+      );
+      entityExplorer.DragDropWidgetNVerify(
+        draggableWidgets.TREESELECT,
+        200,
+        400,
+      );
+      entityExplorer.DragDropWidgetNVerify(draggableWidgets.TEXT, 200, 600);
+      EditorNavigation.SelectEntityByName("Text1", EntityType.Widget);
+      propPane.TypeTextIntoField("Text", "{{TreeSelect1.options[0].c");
+      agHelper.AssertElementExist(locators._hints);
+      agHelper.GetNAssertElementText(
+        locators._hints,
+        "children",
+        "contain.text",
+      );
 
-    propPane.TypeTextIntoField("Text", "{{MultiTreeSelect1.options[0].c");
-    agHelper.AssertElementExist(locators._hints);
-    agHelper.GetNAssertElementText(locators._hints, "children", "contain.text");
-  });
-});
+      propPane.TypeTextIntoField("Text", "{{MultiTreeSelect1.options[0].c");
+      agHelper.AssertElementExist(locators._hints);
+      agHelper.GetNAssertElementText(
+        locators._hints,
+        "children",
+        "contain.text",
+      );
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/Bugs_AC_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/Bugs_AC_Spec.ts
index 3a31df30341b..6f149a7b49ee 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/Bugs_AC_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/Bugs_AC_Spec.ts
@@ -14,163 +14,167 @@ import EditorNavigation, {
   AppSidebar,
 } from "../../../../support/Pages/EditorNavigation";
 
-describe("Autocomplete bug fixes", { tags: ["@tag.JS"] }, function () {
-  it("1. Bug #12790 Verifies if selectedRow is in best match", function () {
-    entityExplorer.DragDropWidgetNVerify(draggableWidgets.TABLE, 200, 200);
-    table.AddSampleTableData();
-    entityExplorer.DragDropWidgetNVerify(draggableWidgets.TEXT, 200, 600);
-    EditorNavigation.SelectEntityByName("Text1", EntityType.Widget);
-    propPane.TypeTextIntoField("Text", "{{Table1.");
-    agHelper.AssertElementExist(locators._hints);
-    agHelper.GetNAssertElementText(locators._hints, "Best match");
-    agHelper.GetNAssertElementText(
-      locators._hints,
-      "selectedRow",
-      "have.text",
-      1,
-    );
-  });
-
-  it("2. Bug #13983 Verifies if object properties are in autocomplete list", function () {
-    EditorNavigation.SelectEntityByName("Text1", EntityType.Widget);
-    propPane.TypeTextIntoField("Text", '{{Table1.selectedRow["');
-    agHelper.AssertElementExist(locators._hints);
-    agHelper.GetNAssertElementText(locators._hints, "status", "contain.text");
-
-    propPane.TypeTextIntoField("Text", "{{Table1.selectedRow['");
-    agHelper.AssertElementExist(locators._hints);
-    agHelper.GetNAssertElementText(locators._hints, "status", "contain.text");
-  });
-
-  it("3. Bug #13983 Verifies if object properties are in autocomplete list", function () {
-    EditorNavigation.SelectEntityByName("Text1", EntityType.Widget);
-    propPane.TypeTextIntoField("Text", '{{Table1.selectedRo"');
-    agHelper.AssertElementAbsence(locators._hints);
-
-    propPane.TypeTextIntoField("Text", '{{"');
-    agHelper.AssertElementAbsence(locators._hints);
-  });
-
-  it("4. Bug #14990 Checks if copied widget show up on autocomplete suggestions", function () {
-    entityExplorer.CopyPasteWidget("Text1");
-    EditorNavigation.SelectEntityByName("Text1", EntityType.Widget);
-    propPane.UpdatePropertyFieldValue("Text", "");
-    propPane.TypeTextIntoField("Text", "{{Te");
-    agHelper.AssertElementExist(locators._hints);
-    agHelper.GetNAssertElementText(locators._hints, "Best match");
-    agHelper.GetNAssertElementText(
-      locators._hints,
-      "Text1Copy.text",
-      "have.text",
-      1,
-    );
-  });
-
-  it("5. Bug #14100 Custom columns name label change should reflect in autocomplete", function () {
-    // select table widget
-    EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
-    // add new column
-    cy.get(".t--add-column-btn").click();
-    // edit column name
-    cy.get(
-      "[data-rbd-draggable-id='customColumn1'] .t--edit-column-btn",
-    ).click();
-
-    propPane.UpdatePropertyFieldValue("Property Name", "columnAlias");
-    // select text widget
-    EditorNavigation.SelectEntityByName("Text1", EntityType.Widget);
-
-    // type {{Table1.selectedRow. and check for autocompletion suggestion having edited column name
-    propPane.TypeTextIntoField("Text", "{{Table1.selectedRow.");
-    agHelper.GetNAssertElementText(
-      locators._hints,
-      "columnAlias",
-      "have.text",
-      0,
-    );
-  });
-
-  it(
-    "7. Installed library should show up in autocomplete",
-    { tags: ["@tag.excludeForAirgap"] },
-    function () {
-      AppSidebar.navigate(AppSidebarButton.Libraries);
-      installer.OpenInstaller();
-      installer.InstallLibrary("uuidjs", "UUID");
-      installer.CloseInstaller();
-      AppSidebar.navigate(AppSidebarButton.Editor);
+describe(
+  "Autocomplete bug fixes",
+  { tags: ["@tag.JS", "@tag.Binding"] },
+  function () {
+    it("1. Bug #12790 Verifies if selectedRow is in best match", function () {
+      entityExplorer.DragDropWidgetNVerify(draggableWidgets.TABLE, 200, 200);
+      table.AddSampleTableData();
+      entityExplorer.DragDropWidgetNVerify(draggableWidgets.TEXT, 200, 600);
       EditorNavigation.SelectEntityByName("Text1", EntityType.Widget);
-      propPane.TypeTextIntoField("Text", "{{UUI");
-      agHelper.GetNAssertElementText(locators._hints, "UUID");
-    },
-  );
-
-  it(
-    "8. No autocomplete for Removed libraries",
-    { tags: ["@tag.excludeForAirgap"] },
-    function () {
-      entityExplorer.RenameEntityFromExplorer("Text1Copy", "UUIDTEXT");
-      AppSidebar.navigate(AppSidebarButton.Libraries);
-      installer.uninstallLibrary("uuidjs");
-      AppSidebar.navigate(AppSidebarButton.Editor);
-      propPane.TypeTextIntoField("Text", "{{UUID.");
+      propPane.TypeTextIntoField("Text", "{{Table1.");
+      agHelper.AssertElementExist(locators._hints);
+      agHelper.GetNAssertElementText(locators._hints, "Best match");
+      agHelper.GetNAssertElementText(
+        locators._hints,
+        "selectedRow",
+        "have.text",
+        1,
+      );
+    });
+
+    it("2. Bug #13983 Verifies if object properties are in autocomplete list", function () {
+      EditorNavigation.SelectEntityByName("Text1", EntityType.Widget);
+      propPane.TypeTextIntoField("Text", '{{Table1.selectedRow["');
+      agHelper.AssertElementExist(locators._hints);
+      agHelper.GetNAssertElementText(locators._hints, "status", "contain.text");
+
+      propPane.TypeTextIntoField("Text", "{{Table1.selectedRow['");
+      agHelper.AssertElementExist(locators._hints);
+      agHelper.GetNAssertElementText(locators._hints, "status", "contain.text");
+    });
+
+    it("3. Bug #13983 Verifies if object properties are in autocomplete list", function () {
+      EditorNavigation.SelectEntityByName("Text1", EntityType.Widget);
+      propPane.TypeTextIntoField("Text", '{{Table1.selectedRo"');
       agHelper.AssertElementAbsence(locators._hints);
-    },
-  );
 
-  it("9. Bug #20449 Cursor should be between parenthesis when function is autocompleted (Property Pane)", function () {
-    EditorNavigation.SelectEntityByName("Text1", EntityType.Widget);
-    propPane.TypeTextIntoField("Text", "{{console.l");
+      propPane.TypeTextIntoField("Text", '{{"');
+      agHelper.AssertElementAbsence(locators._hints);
+    });
 
-    agHelper.GetNClickByContains(locators._hints, "log");
+    it("4. Bug #14990 Checks if copied widget show up on autocomplete suggestions", function () {
+      entityExplorer.CopyPasteWidget("Text1");
+      EditorNavigation.SelectEntityByName("Text1", EntityType.Widget);
+      propPane.UpdatePropertyFieldValue("Text", "");
+      propPane.TypeTextIntoField("Text", "{{Te");
+      agHelper.AssertElementExist(locators._hints);
+      agHelper.GetNAssertElementText(locators._hints, "Best match");
+      agHelper.GetNAssertElementText(
+        locators._hints,
+        "Text1Copy.text",
+        "have.text",
+        1,
+      );
+    });
+
+    it("5. Bug #14100 Custom columns name label change should reflect in autocomplete", function () {
+      // select table widget
+      EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
+      // add new column
+      cy.get(".t--add-column-btn").click();
+      // edit column name
+      cy.get(
+        "[data-rbd-draggable-id='customColumn1'] .t--edit-column-btn",
+      ).click();
+
+      propPane.UpdatePropertyFieldValue("Property Name", "columnAlias");
+      // select text widget
+      EditorNavigation.SelectEntityByName("Text1", EntityType.Widget);
 
-    propPane.TypeTextIntoField("Text", '"hello"', false);
+      // type {{Table1.selectedRow. and check for autocompletion suggestion having edited column name
+      propPane.TypeTextIntoField("Text", "{{Table1.selectedRow.");
+      agHelper.GetNAssertElementText(
+        locators._hints,
+        "columnAlias",
+        "have.text",
+        0,
+      );
+    });
+
+    it(
+      "7. Installed library should show up in autocomplete",
+      { tags: ["@tag.excludeForAirgap"] },
+      function () {
+        AppSidebar.navigate(AppSidebarButton.Libraries);
+        installer.OpenInstaller();
+        installer.InstallLibrary("uuidjs", "UUID");
+        installer.CloseInstaller();
+        AppSidebar.navigate(AppSidebarButton.Editor);
+        EditorNavigation.SelectEntityByName("Text1", EntityType.Widget);
+        propPane.TypeTextIntoField("Text", "{{UUI");
+        agHelper.GetNAssertElementText(locators._hints, "UUID");
+      },
+    );
 
-    // If the cursor was not between parenthesis, the following command will fail
-    propPane.ValidatePropertyFieldValue("Text", '{{console.log("hello")}}');
-  });
+    it(
+      "8. No autocomplete for Removed libraries",
+      { tags: ["@tag.excludeForAirgap"] },
+      function () {
+        entityExplorer.RenameEntityFromExplorer("Text1Copy", "UUIDTEXT");
+        AppSidebar.navigate(AppSidebarButton.Libraries);
+        installer.uninstallLibrary("uuidjs");
+        AppSidebar.navigate(AppSidebarButton.Editor);
+        propPane.TypeTextIntoField("Text", "{{UUID.");
+        agHelper.AssertElementAbsence(locators._hints);
+      },
+    );
+
+    it("9. Bug #20449 Cursor should be between parenthesis when function is autocompleted (Property Pane)", function () {
+      EditorNavigation.SelectEntityByName("Text1", EntityType.Widget);
+      propPane.TypeTextIntoField("Text", "{{console.l");
+
+      agHelper.GetNClickByContains(locators._hints, "log");
+
+      propPane.TypeTextIntoField("Text", '"hello"', false);
+
+      // If the cursor was not between parenthesis, the following command will fail
+      propPane.ValidatePropertyFieldValue("Text", '{{console.log("hello")}}');
+    });
 
-  it("10. Bug #20449 Cursor should be between parenthesis when function is autocompleted (JS Object)", function () {
-    jsEditor.CreateJSObject(
-      `export default {
+    it("10. Bug #20449 Cursor should be between parenthesis when function is autocompleted (JS Object)", function () {
+      jsEditor.CreateJSObject(
+        `export default {
     myFun1: () => {
 
     },
   }`,
-      {
-        paste: true,
-        completeReplace: true,
-        toRun: false,
-        shouldCreateNewJSObj: true,
-        prettify: false,
-      },
-    );
+        {
+          paste: true,
+          completeReplace: true,
+          toRun: false,
+          shouldCreateNewJSObj: true,
+          prettify: false,
+        },
+      );
 
-    agHelper.GetNClick(jsEditor._lineinJsEditor(3));
+      agHelper.GetNClick(jsEditor._lineinJsEditor(3));
 
-    agHelper.TypeText(locators._codeMirrorTextArea, "console.l");
+      agHelper.TypeText(locators._codeMirrorTextArea, "console.l");
 
-    agHelper.GetNClickByContains(locators._hints, "log");
+      agHelper.GetNClickByContains(locators._hints, "log");
 
-    agHelper.TypeText(locators._codeMirrorTextArea, "'hello'");
+      agHelper.TypeText(locators._codeMirrorTextArea, "'hello'");
 
-    // If the cursor was not between parenthesis, the following command will fail
-    agHelper.GetNAssertContains(
-      jsEditor._lineinJsEditor(3),
-      "console.log('hello')",
-    );
-  });
-
-  it("11. Bug #31114 Verify Object Properties in Autocomplete List for isVisible Field in JSONForm Widget", function () {
-    entityExplorer.DragDropWidgetNVerify(draggableWidgets.JSONFORM, 400, 800);
-    EditorNavigation.SelectEntityByName("Text1", EntityType.Widget);
-    propPane.EnterJSContext("Visible", "");
-    propPane.TypeTextIntoField("Visible", "{{JSONForm1.isVis");
-    agHelper.AssertElementExist(locators._hints);
-    agHelper.GetNAssertElementText(
-      locators._hints,
-      "isVisible",
-      "contain.text",
-    );
-  });
-});
+      // If the cursor was not between parenthesis, the following command will fail
+      agHelper.GetNAssertContains(
+        jsEditor._lineinJsEditor(3),
+        "console.log('hello')",
+      );
+    });
+
+    it("11. Bug #31114 Verify Object Properties in Autocomplete List for isVisible Field in JSONForm Widget", function () {
+      entityExplorer.DragDropWidgetNVerify(draggableWidgets.JSONFORM, 400, 800);
+      EditorNavigation.SelectEntityByName("Text1", EntityType.Widget);
+      propPane.EnterJSContext("Visible", "");
+      propPane.TypeTextIntoField("Visible", "{{JSONForm1.isVis");
+      agHelper.AssertElementExist(locators._hints);
+      agHelper.GetNAssertElementText(
+        locators._hints,
+        "isVisible",
+        "contain.text",
+      );
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/JS_AC1_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/JS_AC1_spec.ts
index 37fd2bbaf4fb..f8190d48f01a 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/JS_AC1_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/JS_AC1_spec.ts
@@ -29,7 +29,7 @@ const jsObjectBody = `export default {
 	}
 }`;
 
-describe("Autocomplete tests", { tags: ["@tag.JS"] }, () => {
+describe("Autocomplete tests", { tags: ["@tag.JS", "@tag.Binding"] }, () => {
   it("1. Bug #13613 Verify widgets autocomplete: ButtonGroup & Document viewer widget", () => {
     entityExplorer.DragDropWidgetNVerify(
       draggableWidgets.BUTTON_GROUP,
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/JS_AC2_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/JS_AC2_spec.ts
index ee83327369a2..603edff0c980 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/JS_AC2_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/JS_AC2_spec.ts
@@ -22,7 +22,7 @@ const jsObjectBody = `export default {
 	}
 }`;
 
-describe("Autocomplete tests", { tags: ["@tag.JS"] }, () => {
+describe("Autocomplete tests", { tags: ["@tag.JS", "@tag.Binding"] }, () => {
   it("1. Bug #17059 Autocomplete does not suggest same function name that belongs to a different object", () => {
     // create js object - JSObject1
     jsEditor.CreateJSObject(jsObjectBody, {
@@ -111,7 +111,7 @@ describe("Autocomplete tests", { tags: ["@tag.JS"] }, () => {
     });
   });
 
-  it.skip("3. Bug #15429 Random keystrokes trigger autocomplete to show up", () => {
+  it("3. Bug #15429 Random keystrokes trigger autocomplete to show up", () => {
     // create js object & assert no hints just show up
     jsEditor.CreateJSObject(
       `export default
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/PropertyPaneSlashCommand_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/PropertyPaneSlashCommand_spec.ts
index 31f4b1c7feb1..919b1c39aab2 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/PropertyPaneSlashCommand_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/PropertyPaneSlashCommand_spec.ts
@@ -1,12 +1,7 @@
-import { featureFlagIntercept } from "../../../../support/Objects/FeatureFlags";
 import {
   agHelper,
   locators,
-  entityExplorer,
   propPane,
-  draggableWidgets,
-  apiPage,
-  entityItems,
   homePage,
   assertHelper,
 } from "../../../../support/Objects/ObjectsCore";
@@ -14,63 +9,61 @@ import EditorNavigation, {
   EntityType,
 } from "../../../../support/Pages/EditorNavigation";
 
-describe("Property Pane Suggestions", { tags: ["@tag.JS"] }, () => {
-  before(() => {
-    featureFlagIntercept({
-      ab_learnability_ease_of_initial_use_enabled: true,
+describe(
+  "Property Pane Suggestions",
+  { tags: ["@tag.JS", "@tag.Binding"] },
+  () => {
+    before(function () {
+      agHelper.ClearLocalStorageCache();
     });
-  });
 
-  before(function () {
-    agHelper.ClearLocalStorageCache();
-  });
-
-  beforeEach(() => {
-    agHelper.RestoreLocalStorageCache();
-  });
+    beforeEach(() => {
+      agHelper.RestoreLocalStorageCache();
+    });
 
-  afterEach(() => {
-    agHelper.SaveLocalStorageCache();
-  });
+    afterEach(() => {
+      agHelper.SaveLocalStorageCache();
+    });
 
-  it("1. Should show Property Pane Suggestions on / command & when typing {{}}", () => {
-    homePage.NavigateToHome();
-    homePage.ImportApp("PropertyPaneSlashMenuBindings.json");
-    assertHelper.WaitForNetworkCall("importNewApplication");
+    it("1. Should show Property Pane Suggestions on / command & when typing {{}}", () => {
+      homePage.NavigateToHome();
+      homePage.ImportApp("PropertyPaneSlashMenuBindings.json");
+      assertHelper.WaitForNetworkCall("importNewApplication");
 
-    // Select table and check for slash menu command popup
-    EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
-    propPane.ToggleJSMode("Table data", true);
-    propPane.FocusIntoTextField("Table data");
-    agHelper.GetElementsNAssertTextPresence(locators._hints, "Add a binding");
-    agHelper.GetNClickByContains(locators._hints, "Add a binding");
-    propPane.ValidatePropertyFieldValue("Table data", "{{}}");
+      // Select table and check for slash menu command popup
+      EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
+      propPane.ToggleJSMode("Table data", true);
+      propPane.FocusIntoTextField("Table data");
+      agHelper.GetElementsNAssertTextPresence(locators._hints, "Add a binding");
+      agHelper.GetNClickByContains(locators._hints, "Add a binding");
+      propPane.ValidatePropertyFieldValue("Table data", "{{}}");
 
-    // Select json form widget and check for slash menu command popup
-    EditorNavigation.SelectEntityByName("JSONForm1", EntityType.Widget);
-    propPane.ToggleJSMode("Source data", true);
-    propPane.FocusIntoTextField("Source data");
-    agHelper.GetElementsNAssertTextPresence(locators._hints, "Add a binding");
-    agHelper.GetNClickByContains(locators._hints, "Add a binding");
-    propPane.ValidatePropertyFieldValue("Source data", "{{}}");
-  });
+      // Select json form widget and check for slash menu command popup
+      EditorNavigation.SelectEntityByName("JSONForm1", EntityType.Widget);
+      propPane.ToggleJSMode("Source data", true);
+      propPane.FocusIntoTextField("Source data");
+      agHelper.GetElementsNAssertTextPresence(locators._hints, "Add a binding");
+      agHelper.GetNClickByContains(locators._hints, "Add a binding");
+      propPane.ValidatePropertyFieldValue("Source data", "{{}}");
+    });
 
-  it("2. Should show `load more` option in case number of queries are more than 5", () => {
-    // Navigate to table and open slash menu command
-    EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
-    propPane.ToggleJSMode("Table data", true);
-    propPane.UpdatePropertyFieldValue("Table data", "");
-    propPane.FocusIntoTextField("Table data");
-    agHelper.GetElementsNAssertTextPresence(locators._hints, "Add a binding");
+    it("2. Should show `load more` option in case number of queries are more than 5", () => {
+      // Navigate to table and open slash menu command
+      EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
+      propPane.ToggleJSMode("Table data", true);
+      propPane.UpdatePropertyFieldValue("Table data", "");
+      propPane.FocusIntoTextField("Table data");
+      agHelper.GetElementsNAssertTextPresence(locators._hints, "Add a binding");
 
-    // Assert that count of Codemirror-hints is 10, as the whole list is not expanded yet
-    agHelper.AssertElementLength(locators._hints_apis, 5);
-    agHelper.GetElementsNAssertTextPresence(locators._hints, "Load 3 more");
+      // Assert that count of Codemirror-hints is 10, as the whole list is not expanded yet
+      agHelper.AssertElementLength(locators._hints_apis, 5);
+      agHelper.GetElementsNAssertTextPresence(locators._hints, "Load 3 more");
 
-    // Click on load more to expand all options
-    agHelper.GetNClickByContains(locators._hints, "Load 3 more");
+      // Click on load more to expand all options
+      agHelper.GetNClickByContains(locators._hints, "Load 3 more");
 
-    // Assert that all elements are visible now
-    agHelper.AssertElementLength(locators._hints_apis, 8);
-  });
-});
+      // Assert that all elements are visible now
+      agHelper.AssertElementLength(locators._hints_apis, 8);
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/PropertyPaneSuggestion_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/PropertyPaneSuggestion_spec.ts
index f93026f9ee59..60407e48079e 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/PropertyPaneSuggestion_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/PropertyPaneSuggestion_spec.ts
@@ -10,44 +10,48 @@ import EditorNavigation, {
   EntityType,
 } from "../../../../support/Pages/EditorNavigation";
 
-describe("Property Pane Suggestions", { tags: ["@tag.JS"] }, () => {
-  before(() => {
-    entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON);
-  });
+describe(
+  "Property Pane Suggestions",
+  { tags: ["@tag.JS", "@tag.Binding"] },
+  () => {
+    before(() => {
+      entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON);
+    });
 
-  it("1. Should show Property Pane Suggestions on / command & when typing {{}}", () => {
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    propPane.TypeTextIntoField("Label", "/");
-    agHelper.GetElementsNAssertTextPresence(locators._hints, "Add a binding");
-    agHelper.GetNClickByContains(locators._hints, "Add a binding");
-    propPane.ValidatePropertyFieldValue("Label", "{{}}");
+    it("1. Should show Property Pane Suggestions on / command & when typing {{}}", () => {
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      propPane.TypeTextIntoField("Label", "/");
+      agHelper.GetElementsNAssertTextPresence(locators._hints, "Add a binding");
+      agHelper.GetNClickByContains(locators._hints, "Add a binding");
+      propPane.ValidatePropertyFieldValue("Label", "{{}}");
 
-    //typing {{}}
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    propPane.TypeTextIntoField("Label", "{{");
-    agHelper.GetElementsNAssertTextPresence(locators._hints, "appsmith");
-    agHelper.GetNClickByContains(locators._hints, "appsmith");
-    propPane.ValidatePropertyFieldValue("Label", "{{appsmith}}");
-  });
+      //typing {{}}
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      propPane.TypeTextIntoField("Label", "{{");
+      agHelper.GetElementsNAssertTextPresence(locators._hints, "appsmith");
+      agHelper.GetNClickByContains(locators._hints, "appsmith");
+      propPane.ValidatePropertyFieldValue("Label", "{{appsmith}}");
+    });
 
-  it("2. [Bug]-[2040]: undefined binding on / command dropdown", () => {
-    // Create js object
-    jsEditor.CreateJSObject("");
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    propPane.TypeTextIntoField("Label", "/");
-    agHelper.GetElementsNAssertTextPresence(
-      locators._slashCommandHintText,
-      "JSObject1",
-    );
-  });
+    it("2. [Bug]-[2040]: undefined binding on / command dropdown", () => {
+      // Create js object
+      jsEditor.CreateJSObject("");
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      propPane.TypeTextIntoField("Label", "/");
+      agHelper.GetElementsNAssertTextPresence(
+        locators._slashCommandHintText,
+        "JSObject1",
+      );
+    });
 
-  it("3. Should add Autocomplete Suggestions on Tab press", () => {
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    propPane.TypeTextIntoField("Label", "{{");
-    agHelper.GetElementsNAssertTextPresence(locators._hints, "appsmith");
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    cy.get("body").tab();
-    propPane.ValidatePropertyFieldValue("Label", "{{JSObject1}}");
-  });
-});
+    it("3. Should add Autocomplete Suggestions on Tab press", () => {
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      propPane.TypeTextIntoField("Label", "{{");
+      agHelper.GetElementsNAssertTextPresence(locators._hints, "appsmith");
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      cy.get("body").tab();
+      propPane.ValidatePropertyFieldValue("Label", "{{JSObject1}}");
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/Sql_AC_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/Sql_AC_Spec.ts
index bc0f17e737ba..bc4d9917497e 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/Sql_AC_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/Sql_AC_Spec.ts
@@ -6,7 +6,7 @@ import {
 
 let dsName: any;
 
-describe("SQL Autocompletion", { tags: ["@tag.JS"] }, () => {
+describe("SQL Autocompletion", { tags: ["@tag.JS", "@tag.Binding"] }, () => {
   it("1. Create DS for SQL autocompletion testing", () => {
     dataSources.CreateDataSource("Postgres");
     cy.get("@dsName").then(($dsName) => {
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/autocomplete_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/autocomplete_spec.ts
index d5525d2dc546..017172ca76ce 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/autocomplete_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/autocomplete_spec.ts
@@ -7,7 +7,7 @@ const dynamicInputLocators = require("../../../../locators/DynamicInput.json");
 
 describe(
   "Dynamic input autocomplete",
-  { tags: ["@tag.JS", "@tag.Sanity"] },
+  { tags: ["@tag.JS", "@tag.Sanity", "@tag.Binding"] },
   () => {
     before(() => {
       agHelper.AddDsl("autocomp");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Binding/DatePicker_Text_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Binding/DatePicker_Text_spec.js
index 037e637f8cd7..52c699902baf 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Binding/DatePicker_Text_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Binding/DatePicker_Text_spec.js
@@ -14,7 +14,7 @@ describe(
       _.agHelper.AddDsl("uiBindDsl");
     });
     // Skipping tests due to issue - https://www.notion.so/appsmith/f353d8c6bd664f79ad858a42010cdfc8?v=f04cde23f6424aeb9d5a6e389cd172bd&p=0717892d43684c40bae4e2c87b8308cb&pm=s
-    it.skip("1. DatePicker-Text, Validate selectedDate functionality", function () {
+    it("1. DatePicker-Text, Validate selectedDate functionality", function () {
       /**
        * Bind DatePicker1 to Text for "selectedDate"
        */
@@ -25,9 +25,8 @@ describe(
        * Set the Calender for today's date in DatePicker1
        */
       cy.openPropertyPane("datepickerwidget");
-      cy.get(formWidgetsPage.defaultDate).click();
-      cy.ClearDateFooter();
-      cy.SetDateToToday();
+      cy.get(formWidgetsPage.datepickerWidget).first().click();
+      cy.get(formWidgetsPage.datepickerFooter).contains("Today").click();
 
       cy.getDate(1, "YYYY-MM-DD").then((date) => {
         cy.log("retured date" + date);
@@ -43,15 +42,15 @@ describe(
         cy.get(publishPage.datepickerWidget + commonlocators.inputField)
           .eq(0)
           .click();
-        cy.ClearDateFooter();
-        cy.setDate(1, "ddd MMM DD YYYY");
+        cy.SetDateToToday();
+        cy.setDate(1, "ddd MMM DD YYYY", "v1");
         cy.get(commonlocators.labelTextStyle).should("contain", nextDay);
       });
 
       cy.get(commonlocators.backToEditor).click();
     });
 
-    it.skip("2. DatePicker1-text: Change the date in DatePicker1 and Validate the same in text widget", function () {
+    it("2. DatePicker1-text: Change the date in DatePicker1 and Validate the same in text widget", function () {
       cy.openPropertyPane("textwidget");
 
       /**
@@ -75,9 +74,9 @@ describe(
        */
       cy.openPropertyPane("datepickerwidget");
       cy.get(formWidgetsPage.defaultDate).click();
-      cy.ClearDateFooter();
-      cy.setDate(1, "ddd MMM DD YYYY");
-      // cy.get(commonlocators.onDateSelectedField).click();
+      cy.get(formWidgetsPage.dayPickerToday).click();
+      cy.get(formWidgetsPage.defaultDate).click();
+      cy.setDate(1);
 
       /**
        *Validate the date in text widget
@@ -89,7 +88,7 @@ describe(
       });
     });
 
-    it.skip("3. Validate the Date is not changed in DatePicker2", function () {
+    it("3. Validate the Date is not changed in DatePicker2", function () {
       cy.log("dateDp2:" + dateDp2);
       cy.get(formWidgetsPage.datepickerWidget + commonlocators.inputField)
         .eq(1)
@@ -124,7 +123,7 @@ describe(
       _.deployMode.NavigateBacktoEditor();
     });
 
-    it.skip("5. Checks if on deselection of date triggers the onDateSelected action or not.", function () {
+    it("5. Checks if on deselection of date triggers the onDateSelected action or not.", function () {
       /**
        * bind datepicker to show a message "Hello" on date selected
        */
@@ -135,7 +134,6 @@ describe(
        * checking if on selecting the date triggers the message
        */
       cy.get(formWidgetsPage.datepickerWidget).first().click();
-      cy.ClearDateFooter();
       cy.SetDateToToday();
       cy.get(commonlocators.toastmsg).contains("hello");
 
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Binding/InputWidget_TableV2_Sorting_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Binding/InputWidget_TableV2_Sorting_spec.js
index ba5b040609b1..7fad7eb5d0f8 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Binding/InputWidget_TableV2_Sorting_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Binding/InputWidget_TableV2_Sorting_spec.js
@@ -4,10 +4,7 @@ import EditorNavigation, {
 
 const publish = require("../../../../locators/publishWidgetspage.json");
 const testdata = require("../../../../fixtures/testdata.json");
-import {
-  agHelper,
-  entityExplorer,
-} from "../../../../support/Objects/ObjectsCore";
+import { agHelper, propPane } from "../../../../support/Objects/ObjectsCore";
 
 describe(
   "Binding the Table and input Widget",
@@ -32,7 +29,7 @@ describe(
 
     it("2. validation of data displayed in input widgets based on sorting", function () {
       EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
-
+      propPane.ExpandIfCollapsedSection("rowselection");
       cy.testJsontext("defaultselectedrow", "0");
       cy.get(".draggable-header").contains("id").click({ force: true });
       cy.wait(1000);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Binding/Promises_1_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Binding/Promises_1_Spec.ts
index 7e97e10dc94e..e988d2ba54d8 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Binding/Promises_1_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Binding/Promises_1_Spec.ts
@@ -172,7 +172,7 @@ return WhatTrumpThinks.run().then((res) => { showAlert("Today's Trump quote for
     );
     agHelper.ValidateToastMessage(
       "will be executed automatically on page load",
-    ); //Validating 'Run API on Page Load' is set once api response is mapped
+    ); //Validating 'Run the API on Page Load' is set once api response is mapped
     EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
     propPane.EnterJSContext(
       "onClick",
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Binding/TableV2TextPagination_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Binding/TableV2TextPagination_spec.js
index d8d0a262ff30..490e40de6f97 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Binding/TableV2TextPagination_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Binding/TableV2TextPagination_spec.js
@@ -6,7 +6,6 @@ const commonlocators = require("../../../../locators/commonlocators.json");
 const testdata = require("../../../../fixtures/testdata.json");
 import apiPageLocators from "../../../../locators/ApiEditor";
 import {
-  entityExplorer,
   apiPage,
   deployMode,
   propPane,
@@ -91,6 +90,7 @@ describe(
     it("3. Table-Text, Validate Server Side Pagination of Paginate with Total v2 Records Count", function () {
       deployMode.NavigateBacktoEditor();
       EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
+      propPane.ExpandIfCollapsedSection("pagination");
       propPane.UpdatePropertyFieldValue("Total Records", "20");
       deployMode.DeployApp();
       cy.wait("@postExecute");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Binding/TableV2Widget_selectedRow_Input_widget_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Binding/TableV2Widget_selectedRow_Input_widget_spec.js
index 5bec54443d47..6ba248fe1a63 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Binding/TableV2Widget_selectedRow_Input_widget_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Binding/TableV2Widget_selectedRow_Input_widget_spec.js
@@ -30,6 +30,7 @@ describe(
 
     it("2. validation of data displayed in input widgets based on selected row", function () {
       EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
+      _.propPane.ExpandIfCollapsedSection("rowselection");
       cy.testJsontext("defaultselectedrow", "2");
       cy.readTableV2dataPublish("2", "0").then((tabData) => {
         const tabValue = tabData;
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Binding/TableV2_ClientSide_Search_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Binding/TableV2_ClientSide_Search_spec.js
index e3b110fbc9d6..322323850394 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Binding/TableV2_ClientSide_Search_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Binding/TableV2_ClientSide_Search_spec.js
@@ -20,6 +20,7 @@ describe(
       cy.readTableV2dataPublish("0", "0").then((tabData) => {
         expect(tabData).to.eq("#2");
       });
+      _.propPane.ExpandIfCollapsedSection("search\\&filters");
       // Input onsearchtextchanged control
       cy.get(".t--property-control-onsearchtextchanged .t--js-toggle")
         .first()
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Binding/TableV2_DefaultSearch_Input_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Binding/TableV2_DefaultSearch_Input_spec.js
index 457593fec0f3..c21342e793f0 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Binding/TableV2_DefaultSearch_Input_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Binding/TableV2_DefaultSearch_Input_spec.js
@@ -27,6 +27,7 @@ describe(
       );
       // validation of data displayed in input widgets based on search value set
       EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
+      _.propPane.ExpandIfCollapsedSection("search\\&filters");
       cy.get(".t--property-control-allowsearching input").click({
         force: true,
       });
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Binding/TableV2_Widget_API_Pagination_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Binding/TableV2_Widget_API_Pagination_spec.js
index 03a7d1e93afe..ef31811f782f 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Binding/TableV2_Widget_API_Pagination_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Binding/TableV2_Widget_API_Pagination_spec.js
@@ -30,6 +30,7 @@ describe(
       //Validate Table V2 with API data and then add a column
       EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
       propPane.UpdatePropertyFieldValue("Table data", "{{Api1.data}}");
+      propPane.ExpandIfCollapsedSection("pagination");
       cy.CheckWidgetProperties(commonlocators.serverSidePaginationCheckbox);
       cy.get(`.t--widget-tablewidgetv2 .page-item`)
         .first()
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Binding/TextTableV2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Binding/TextTableV2_spec.js
index e30b11a03156..b42f2840c89e 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Binding/TextTableV2_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Binding/TextTableV2_spec.js
@@ -5,7 +5,6 @@ import EditorNavigation, {
 const commonlocators = require("../../../../locators/commonlocators.json");
 const publish = require("../../../../locators/publishWidgetspage.json");
 import {
-  entityExplorer,
   agHelper,
   deployMode,
   propPane,
@@ -113,6 +112,7 @@ describe(
       EditorNavigation.SelectEntityByName("Table1", EntityType.Widget, {}, [
         "Container3",
       ]);
+      propPane.ExpandIfCollapsedSection("rowselection");
       cy.testJsontext("defaultselectedrow", "2");
       cy.wait("@updateLayout");
       cy.get(commonlocators.TableV2Row)
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/AbortAction_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/AbortAction_Spec.ts
index 3030cd8521f6..244efea2281e 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/AbortAction_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/AbortAction_Spec.ts
@@ -7,47 +7,51 @@ import {
   entityItems,
 } from "../../../../support/Objects/ObjectsCore";
 
-describe("Abort Action Execution", { tags: ["@tag.Datasource"] }, function () {
-  it("1. Bug #14006, #16093 - Cancel request button should abort API action execution", function () {
-    apiPage.CreateAndFillApi(
-      dataManager.dsValues[dataManager.defaultEnviorment].mockApiUrl + "00",
-      "AbortApi",
-      0,
-    );
-    apiPage.RunAPI(false, 0);
-    agHelper.GetNClick(locators._cancelActionExecution, 0, true);
-    agHelper.AssertContains(
-      Cypress.env("MESSAGES").ACTION_EXECUTION_CANCELLED("AbortApi"),
-    );
-    agHelper.AssertElementAbsence(locators._specificToast("{}")); //Assert that empty toast does not appear - Bug #16093
-    agHelper.ActionContextMenuWithInPane({
-      action: "Delete",
-      entityType: entityItems.Api,
-    });
-  });
-
-  // Queries were resolving quicker than we could cancel them
-  // Commenting this out till we can find a query that resolves slow enough for us to cancel its execution.
-
-  it("2. Bug #14006, #16093 Cancel request button should abort Query action execution", function () {
-    dataSources.CreateDataSource("MySql");
-    cy.get("@dsName").then(($dsName) => {
-      dataSources.CreateQueryAfterDSSaved(
-        "SELECT * FROM worldCountryInfo wc join countryFlags cf on wc.Name = cf.Country CROSS JOIN customers cc",
-        "AbortQuery",
+describe(
+  "Abort Action Execution",
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
+  function () {
+    it("1. Bug #14006, #16093 - Cancel request button should abort API action execution", function () {
+      apiPage.CreateAndFillApi(
+        dataManager.dsValues[dataManager.defaultEnviorment].mockApiUrl + "00",
+        "AbortApi",
+        0,
       );
-      dataSources.SetQueryTimeout(0);
-      agHelper.GetNClick(dataSources._runQueryBtn, 0, true, 0);
+      apiPage.RunAPI(false, 0);
       agHelper.GetNClick(locators._cancelActionExecution, 0, true);
       agHelper.AssertContains(
-        Cypress.env("MESSAGES").ACTION_EXECUTION_CANCELLED("AbortQuery"),
+        Cypress.env("MESSAGES").ACTION_EXECUTION_CANCELLED("AbortApi"),
       );
       agHelper.AssertElementAbsence(locators._specificToast("{}")); //Assert that empty toast does not appear - Bug #16093
       agHelper.ActionContextMenuWithInPane({
         action: "Delete",
-        entityType: entityItems.Query,
+        entityType: entityItems.Api,
+      });
+    });
+
+    // Queries were resolving quicker than we could cancel them
+    // Commenting this out till we can find a query that resolves slow enough for us to cancel its execution.
+
+    it("2. Bug #14006, #16093 Cancel request button should abort Query action execution", function () {
+      dataSources.CreateDataSource("MySql");
+      cy.get("@dsName").then(($dsName) => {
+        dataSources.CreateQueryAfterDSSaved(
+          "SELECT * FROM worldCountryInfo wc join countryFlags cf on wc.Name = cf.Country CROSS JOIN customers cc",
+          "AbortQuery",
+        );
+        dataSources.SetQueryTimeout(0);
+        agHelper.GetNClick(dataSources._runQueryBtn, 0, true, 0);
+        agHelper.GetNClick(locators._cancelActionExecution, 0, true);
+        agHelper.AssertContains(
+          Cypress.env("MESSAGES").ACTION_EXECUTION_CANCELLED("AbortQuery"),
+        );
+        agHelper.AssertElementAbsence(locators._specificToast("{}")); //Assert that empty toast does not appear - Bug #16093
+        agHelper.ActionContextMenuWithInPane({
+          action: "Delete",
+          entityType: entityItems.Query,
+        });
+        dataSources.DeleteDatasourceFromWithinDS($dsName as unknown as string);
       });
-      dataSources.DeleteDatasourceFromWithinDS($dsName as unknown as string);
     });
-  });
-});
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/AllWidgets_Reset_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/AllWidgets_Reset_Spec.ts
index 523dd65efee5..88e09e31a43f 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/AllWidgets_Reset_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/AllWidgets_Reset_Spec.ts
@@ -414,7 +414,7 @@ function filePickerWidgetAndReset() {
 Object.entries(widgetsToTest).forEach(([widgetSelector, testConfig]) => {
   describe(
     `${testConfig.widgetName} widget test for validating reset assertWidgetReset`,
-    { tags: ["@tag.Widget", "@tag.Sanity"] },
+    { tags: ["@tag.Widget", "@tag.Sanity", "@tag.Binding"] },
     () => {
       beforeEach(() => {
         _.agHelper.RestoreLocalStorageCache();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/ApiBug6732_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/ApiBug6732_Spec.ts
index 3df84846bcad..a859be45aafb 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/ApiBug6732_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/ApiBug6732_Spec.ts
@@ -4,7 +4,7 @@ const { apiPage } = _;
 
 describe(
   "Bug 6732 - this.params in IIFE function in API editor",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   () => {
     it("1. this.params should be available in IIFE function in API editor", () => {
       apiPage.CreateApi("Api1", "GET");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/ApiBugs_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/ApiBugs_Spec.ts
index a31c13ac81ec..2402bbe3ab72 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/ApiBugs_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/ApiBugs_Spec.ts
@@ -17,111 +17,117 @@ import {
   AppSidebarButton,
 } from "../../../../support/Pages/EditorNavigation";
 
-describe("API Bugs", { tags: ["@tag.Datasource"] }, function () {
-  it("1. Bug 14037, 25432: User gets an error even when table widget is added from the API page successfully", function () {
-    // Case where api returns array response
-    apiPage.CreateAndFillApi(
-      dataManager.dsValues[dataManager.defaultEnviorment].mockApiUrl,
-    );
-    apiPage.RunAPI();
-    dataSources.AddSuggestedWidget(Widgets.Table);
-    debuggerHelper.AssertErrorCount(0);
-    table.WaitUntilTableLoad(0, 0, "v2");
-    propPane.AssertPropertiesDropDownCurrentValue("Table data", "Api1");
+describe(
+  "API Bugs",
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
+  function () {
+    it("1. Bug 14037, 25432: User gets an error even when table widget is added from the API page successfully", function () {
+      // Case where api returns array response
+      apiPage.CreateAndFillApi(
+        dataManager.dsValues[dataManager.defaultEnviorment].mockApiUrl,
+      );
+      apiPage.RunAPI();
+      dataSources.AddSuggestedWidget(Widgets.Table);
+      debuggerHelper.AssertErrorCount(0);
+      table.WaitUntilTableLoad(0, 0, "v2");
+      propPane.AssertPropertiesDropDownCurrentValue("Table data", "Api1");
 
-    // Create another API so that it returns object response
-    apiPage.CreateAndFillApi(
-      dataManager.dsValues[dataManager.defaultEnviorment].mockApiObjectUrl,
-    );
-    apiPage.RunAPI();
-    dataSources.AddSuggestedWidget(Widgets.Table);
-    table.WaitUntilTableLoad(0, 0, "v2");
-    propPane.ValidatePropertyFieldValue("Table data", "{{Api2.data.users}}");
-  });
+      // Create another API so that it returns object response
+      apiPage.CreateAndFillApi(
+        dataManager.dsValues[dataManager.defaultEnviorment].mockApiObjectUrl,
+      );
+      apiPage.RunAPI();
+      dataSources.AddSuggestedWidget(Widgets.Table);
+      table.WaitUntilTableLoad(0, 0, "v2");
+      propPane.ValidatePropertyFieldValue("Table data", "{{Api2.data.users}}");
+    });
 
-  it("2. Bug 16377, When Api url has dynamic binding expressions, ensure the url and path derived is not corrupting Api execution", function () {
-    //Since the specified expression always returns true - it will never run mock-apis - which actually doesn't exist
-    const apiUrl = `http://host.docker.internal:5001/v1/{{true ? 'mock-api' : 'mock-apis'}}?records=10`;
+    it("2. Bug 16377, When Api url has dynamic binding expressions, ensure the url and path derived is not corrupting Api execution", function () {
+      //Since the specified expression always returns true - it will never run mock-apis - which actually doesn't exist
+      const apiUrl = `http://host.docker.internal:5001/v1/{{true ? 'mock-api' : 'mock-apis'}}?records=10`;
 
-    apiPage.CreateAndFillApi(apiUrl, "BindingExpressions");
-    agHelper.VerifyEvaluatedValue(
-      dataManager.dsValues[dataManager.defaultEnviorment].mockApiUrl,
-    );
-    apiPage.RunAPI();
-    agHelper.AssertElementAbsence(
-      locators._specificToast(
-        Cypress.env("MESSAGES").ERROR_ACTION_EXECUTE_FAIL("BindingExpressions"),
-      ),
-    ); //Assert that an error is not returned.
-    apiPage.ResponseStatusCheck("200 OK");
-    agHelper.ActionContextMenuWithInPane({
-      action: "Delete",
-      entityType: entityItems.Api,
+      apiPage.CreateAndFillApi(apiUrl, "BindingExpressions");
+      agHelper.VerifyEvaluatedValue(
+        dataManager.dsValues[dataManager.defaultEnviorment].mockApiUrl,
+      );
+      apiPage.RunAPI();
+      agHelper.AssertElementAbsence(
+        locators._specificToast(
+          Cypress.env("MESSAGES").ERROR_ACTION_EXECUTE_FAIL(
+            "BindingExpressions",
+          ),
+        ),
+      ); //Assert that an error is not returned.
+      apiPage.ResponseStatusCheck("200 OK");
+      agHelper.ActionContextMenuWithInPane({
+        action: "Delete",
+        entityType: entityItems.Api,
+      });
+      AppSidebar.navigate(AppSidebarButton.Editor);
     });
-    AppSidebar.navigate(AppSidebarButton.Editor);
-  });
 
-  it("3. Bug 18876 Ensures application does not crash when saving datasource", () => {
-    apiPage.CreateAndFillApi(
-      dataManager.dsValues[dataManager.defaultEnviorment].mockApiUrl,
-      "FirstAPI",
-      10000,
-      "POST",
-    );
-    apiPage.SelectPaneTab("Authentication");
-    cy.get(apiPage._saveAsDS).last().click({ force: true });
-    cy.go("back");
-    cy.get(dataSources._datasourceModalSave).click();
-    // ensures app does not crash and datasource is saved.
-    cy.contains("Edit datasource to access authentication settings").should(
-      "exist",
-    );
-  });
+    it("3. Bug 18876 Ensures application does not crash when saving datasource", () => {
+      apiPage.CreateAndFillApi(
+        dataManager.dsValues[dataManager.defaultEnviorment].mockApiUrl,
+        "FirstAPI",
+        10000,
+        "POST",
+      );
+      apiPage.SelectPaneTab("Authentication");
+      cy.get(apiPage._saveAsDS).last().click({ force: true });
+      cy.go("back");
+      cy.get(dataSources._datasourceModalSave).click();
+      // ensures app does not crash and datasource is saved.
+      cy.contains("Edit datasource to access authentication settings").should(
+        "exist",
+      );
+    });
 
-  it("4. Bug 16683, When Api url has dynamic binding expressions, ensures the query params is not truncated", function () {
-    const apiUrl = `http://host.docker.internal:5001/v1/mock-api?records=4{{Math.random() > 0.5 ? '&param1=5' : '&param2=6'}}`;
+    it("4. Bug 16683, When Api url has dynamic binding expressions, ensures the query params is not truncated", function () {
+      const apiUrl = `http://host.docker.internal:5001/v1/mock-api?records=4{{Math.random() > 0.5 ? '&param1=5' : '&param2=6'}}`;
 
-    apiPage.CreateAndFillApi(apiUrl, "BindingExpressions");
-    apiPage.ValidateQueryParams({
-      key: "records",
-      value: "4{{Math.random() > 0.5 ? '&param1=5' : '&param2=6'}}",
+      apiPage.CreateAndFillApi(apiUrl, "BindingExpressions");
+      apiPage.ValidateQueryParams({
+        key: "records",
+        value: "4{{Math.random() > 0.5 ? '&param1=5' : '&param2=6'}}",
+      });
     });
-  });
 
-  it("5. Bug 26897, Invalid binding of table data when used existing suggested widgets for an action returning object & array", function () {
-    entityExplorer.DragDropWidgetNVerify(draggableWidgets.TABLE);
+    it("5. Bug 26897, Invalid binding of table data when used existing suggested widgets for an action returning object & array", function () {
+      entityExplorer.DragDropWidgetNVerify(draggableWidgets.TABLE);
 
-    // Case where api returns array response
-    apiPage.CreateAndFillApi(
-      dataManager.dsValues[dataManager.defaultEnviorment].mockApiUrl,
-      "ARRAY_RESPONSE",
-    );
-    apiPage.RunAPI();
-    dataSources.AddSuggestedWidget(
-      Widgets.Table,
-      dataSources._addSuggestedExisting,
-    );
-    debuggerHelper.AssertErrorCount(0);
-    table.WaitUntilTableLoad(0, 0, "v2");
-    propPane.AssertPropertiesDropDownCurrentValue(
-      "Table data",
-      "ARRAY_RESPONSE",
-    );
+      // Case where api returns array response
+      apiPage.CreateAndFillApi(
+        dataManager.dsValues[dataManager.defaultEnviorment].mockApiUrl,
+        "ARRAY_RESPONSE",
+      );
+      apiPage.RunAPI();
+      dataSources.AddSuggestedWidget(
+        Widgets.Table,
+        dataSources._addSuggestedExisting,
+      );
+      debuggerHelper.AssertErrorCount(0);
+      table.WaitUntilTableLoad(0, 0, "v2");
+      propPane.AssertPropertiesDropDownCurrentValue(
+        "Table data",
+        "ARRAY_RESPONSE",
+      );
 
-    // Create API so that it returns object response
-    apiPage.CreateAndFillApi(
-      dataManager.dsValues[dataManager.defaultEnviorment].mockApiObjectUrl,
-      "OBJECT_RESPONSE",
-    );
-    apiPage.RunAPI();
-    dataSources.AddSuggestedWidget(
-      Widgets.Table,
-      dataSources._addSuggestedExisting,
-    );
-    table.WaitUntilTableLoad(0, 0, "v2");
-    propPane.ValidatePropertyFieldValue(
-      "Table data",
-      "{{OBJECT_RESPONSE.data.users}}",
-    );
-  });
-});
+      // Create API so that it returns object response
+      apiPage.CreateAndFillApi(
+        dataManager.dsValues[dataManager.defaultEnviorment].mockApiObjectUrl,
+        "OBJECT_RESPONSE",
+      );
+      apiPage.RunAPI();
+      dataSources.AddSuggestedWidget(
+        Widgets.Table,
+        dataSources._addSuggestedExisting,
+      );
+      table.WaitUntilTableLoad(0, 0, "v2");
+      propPane.ValidatePropertyFieldValue(
+        "Table data",
+        "{{OBJECT_RESPONSE.data.users}}",
+      );
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Binding_Bug28731_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Binding_Bug28731_Spec.ts
index ed61181c8f5d..824cb29695fe 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Binding_Bug28731_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Binding_Bug28731_Spec.ts
@@ -10,7 +10,7 @@ import {
 
 describe(
   "transformed one-click binding",
-  { tags: ["@tag.JS", "@tag.Binding"] },
+  { tags: ["@tag.JS", "@tag.Binding", "@tag.Binding"] },
   function () {
     it("Transforms API data to match widget exppected type ", function () {
       // Create anAPI that mreturns object response
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug14987_spec.js b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug14987_spec.js
index 4d73e1c3f2c0..ace0a7d92fed 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug14987_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug14987_spec.js
@@ -7,7 +7,14 @@ import {
 
 describe(
   "Verify setting tab form controls not to have tooltip and tooltip (underline) styles",
-  { tags: ["@tag.Datasource", "@tag.Settings"] },
+  {
+    tags: [
+      "@tag.Datasource",
+      "@tag.Settings",
+      "@tag.Git",
+      "@tag.AccessControl",
+    ],
+  },
   function () {
     let guid, datasourceName;
 
@@ -24,7 +31,7 @@ describe(
       cy.xpath(queryLocators.querySettingsTab).click();
 
       cy.get(".label-icon-wrapper")
-        .contains("Run query on page load")
+        .contains("Run the query on page load")
         .parent()
         .then(($el) => {
           cy.window().then((win) => {
@@ -38,7 +45,7 @@ describe(
         });
 
       cy.get(".label-icon-wrapper")
-        .contains("Request confirmation before running query")
+        .contains("Request confirmation before running this query")
         .parent()
         .then(($el) => {
           cy.window().then((win) => {
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/CatchBlock_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/CatchBlock_Spec.ts
index 2b912acca439..14e12af8c708 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/CatchBlock_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/CatchBlock_Spec.ts
@@ -12,7 +12,7 @@ import EditorNavigation, {
 
 describe(
   "Bug #15372 Catch block was not triggering in Safari/firefox",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   () => {
     it("1. Triggers the catch block when the API hits a 404", () => {
       apiPage.CreateAndFillApi(
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DSDiscardBugs_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DSDiscardBugs_spec.ts
index c8142f9bf7ad..fa47f87c3aa1 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DSDiscardBugs_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DSDiscardBugs_spec.ts
@@ -9,7 +9,7 @@ const testString = "test";
 
 describe(
   "datasource unsaved changes popup shows even without changes",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   function () {
     // In case of postgres and other plugins, host address and port key values are initialized by default making form dirty
     it("1. Bug 18664: Create postgres datasource, save it and edit it and go back, now unsaved changes popup should not be shown", () => {
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug18035_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug18035_Spec.ts
index 70ee2c897897..b1f8170cfb72 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug18035_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug18035_Spec.ts
@@ -9,7 +9,14 @@ const dataSources = ObjectsRegistry.DataSources,
 
 describe(
   "Bug 18035: Updates save button text on datasource discard popup",
-  { tags: ["@tag.Datasource", "@tag.excludeForAirgap"] },
+  {
+    tags: [
+      "@tag.Datasource",
+      "@tag.excludeForAirgap",
+      "@tag.Git",
+      "@tag.AccessControl",
+    ],
+  },
   function () {
     it("1. Create gsheet datasource, click on back button, discard popup should contain save and authorize", function () {
       dataSources.NavigateToDSCreateNew();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug19893_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug19893_spec.ts
index e309a25afc01..a82491e9c6c3 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug19893_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug19893_spec.ts
@@ -4,7 +4,7 @@ let dsName: any;
 
 describe(
   "Bug 19893: Authenticated API DS in case of OAuth2, should have save and authorise button enabled all the times",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   function () {
     it("1. Create Auth API DS, save i, now edit again and check the save and authorise button state", function () {
       _.dataSources.NavigateToDSCreateNew();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug21734_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug21734_Spec.ts
index 3ec5cd9906c8..d798a36bc318 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug21734_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug21734_Spec.ts
@@ -11,7 +11,7 @@ const dataSources = ObjectsRegistry.DataSources,
 
 describe(
   "Bug 21734: On exiting from the Datasources page without saving changes, an error is thrown and the app becomes unresponsive.",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   function () {
     it("1. Navigating from intermediary datasource to new page", function () {
       dataSources.NavigateToDSCreateNew();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug25148_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug25148_Spec.ts
index 96c6aaf84c61..6002c827a39d 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug25148_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug25148_Spec.ts
@@ -5,7 +5,7 @@ let dsName: any;
 
 describe(
   "Bug 25148 - Edit Datasource button was disabled on Authentication tab of Api action",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   () => {
     it("1. Checking if the Edit datasource button is enabled or not", () => {
       dataSources.NavigateToDSCreateNew();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug25982_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug25982_Spec.ts
index a2607fb6a0dc..07e2107300b1 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug25982_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug25982_Spec.ts
@@ -3,28 +3,32 @@ import EditorNavigation, {
   EntityType,
 } from "../../../../support/Pages/EditorNavigation";
 
-describe("Fix UQI query switching", { tags: ["@tag.Datasource"] }, function () {
-  it("1. The command of the query must be preserved and should not default to initial value after changed.", function () {
-    dataSources.NavigateToDSCreateNew();
-    dataSources.CreateDataSource("Mongo", false, false);
-    dataSources.CreateQueryAfterDSSaved("", "MongoQuery");
-    dataSources.ValidateNSelectDropdown(
-      "Command",
-      "Find document(s)",
-      "Insert document(s)",
-    );
-    dataSources.NavigateToDSCreateNew();
-    dataSources.CreateDataSource("S3", false, false);
-    dataSources.CreateQueryAfterDSSaved("", "S3Query");
-    dataSources.ValidateNSelectDropdown(
-      "Command",
-      "List files in bucket",
-      "Create a new file",
-    );
-    EditorNavigation.SelectEntityByName("MongoQuery", EntityType.Query);
-    dataSources.ValidateNSelectDropdown("Command", "Insert document(s)");
+describe(
+  "Fix UQI query switching",
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
+  function () {
+    it("1. The command of the query must be preserved and should not default to initial value after changed.", function () {
+      dataSources.NavigateToDSCreateNew();
+      dataSources.CreateDataSource("Mongo", false, false);
+      dataSources.CreateQueryAfterDSSaved("", "MongoQuery");
+      dataSources.ValidateNSelectDropdown(
+        "Command",
+        "Find document(s)",
+        "Insert document(s)",
+      );
+      dataSources.NavigateToDSCreateNew();
+      dataSources.CreateDataSource("S3", false, false);
+      dataSources.CreateQueryAfterDSSaved("", "S3Query");
+      dataSources.ValidateNSelectDropdown(
+        "Command",
+        "List files in bucket",
+        "Create a new file",
+      );
+      EditorNavigation.SelectEntityByName("MongoQuery", EntityType.Query);
+      dataSources.ValidateNSelectDropdown("Command", "Insert document(s)");
 
-    EditorNavigation.SelectEntityByName("S3Query", EntityType.Query);
-    dataSources.ValidateNSelectDropdown("Command", "Create a new file");
-  });
-});
+      EditorNavigation.SelectEntityByName("S3Query", EntityType.Query);
+      dataSources.ValidateNSelectDropdown("Command", "Create a new file");
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug26126_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug26126_spec.ts
index 0d87bb6561a0..6945c429b86f 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug26126_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug26126_spec.ts
@@ -5,7 +5,7 @@ import {
 
 describe(
   "Bug 26126: Fix DS button disability",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   function () {
     it("ensures save button is correctly updated when DS required fields change", function () {
       dataSources.NavigateToDSCreateNew();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug26716_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug26716_Spec.ts
index daefc982b73c..0c4e9bea2992 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug26716_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug26716_Spec.ts
@@ -10,7 +10,14 @@ let dsName: any, userMock: string, movieMock: string;
 
 describe(
   "Bug 26716: Datasource selected from entity explorer should be correctly highlighted",
-  { tags: ["@tag.Datasource", "@tag.excludeForAirgap"] },
+  {
+    tags: [
+      "@tag.Datasource",
+      "@tag.excludeForAirgap",
+      "@tag.Git",
+      "@tag.AccessControl",
+    ],
+  },
   function () {
     it("1. Create users and movies mock datasources and switch between them through entity explorer, check the active state", function () {
       dataSources.CreateMockDB("Users").then((mockDBName) => {
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug26941_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug26941_Spec.ts
index 1293b4c16f02..3dcc34f07880 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug26941_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug26941_Spec.ts
@@ -7,7 +7,7 @@ import {
 
 describe(
   "Inconsistent Api error after the invalid chars are removed from header key",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   function () {
     it("1. Checking whether the appropriate error is displayed even after the removal of invalid chars in header key.", function () {
       const randomApi = `${
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug27817_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug27817_Spec.ts
index 9ea04dc143ab..a72076e663af 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug27817_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug27817_Spec.ts
@@ -7,7 +7,7 @@ import { featureFlagIntercept } from "../../../../support/Objects/FeatureFlags";
 
 describe(
   "Datasource structure schema preview data",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   () => {
     before(() => {
       dataSources.CreateDataSource("Postgres");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug28750_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug28750_Spec.ts
index 18b2f9b146c6..faccd0776546 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug28750_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug28750_Spec.ts
@@ -3,7 +3,14 @@ import { featureFlagIntercept } from "../../../../support/Objects/FeatureFlags";
 
 describe(
   "Datasource structure schema preview data",
-  { tags: ["@tag.Datasource", "@tag.excludeForAirgap"] },
+  {
+    tags: [
+      "@tag.Datasource",
+      "@tag.excludeForAirgap",
+      "@tag.Git",
+      "@tag.AccessControl",
+    ],
+  },
   () => {
     before(() => {
       dataSources.CreateMockDB("Users");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug28985_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug28985_spec.ts
index e5f2c97cacf0..e5f126865a33 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug28985_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug28985_spec.ts
@@ -7,7 +7,7 @@ import EditorNavigation, {
 
 describe(
   "Api execution results test cases",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   () => {
     it("1. Check to see if API execution results are preserved after it is renamed", () => {
       const {
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bugs26410_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bugs26410_spec.ts
index a9bea83f71d6..32dc87074a7e 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bugs26410_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bugs26410_spec.ts
@@ -5,7 +5,14 @@ import EditorNavigation, {
 
 describe(
   "Fix UQI query switching",
-  { tags: ["@tag.Datasource", "@tag.excludeForAirgap"] },
+  {
+    tags: [
+      "@tag.Datasource",
+      "@tag.excludeForAirgap",
+      "@tag.Git",
+      "@tag.AccessControl",
+    ],
+  },
   function () {
     it("1. The command of the Mongo query must be preserved and should not default to initial value after changed.", function () {
       dataSources.NavigateToDSCreateNew();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DatasourceSchema_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DatasourceSchema_spec.ts
index d0a02c28e0bb..9608ee564cbd 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DatasourceSchema_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DatasourceSchema_spec.ts
@@ -15,7 +15,7 @@ let guid;
 let dataSourceName: string;
 describe(
   "Datasource form related tests",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   function () {
     before(() => {
       homePage.CreateNewWorkspace("FetchSchemaOnce", true);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/GitBugs_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/GitBugs_Spec.ts
index f7bc432e1cf3..722cbe524d38 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/GitBugs_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/GitBugs_Spec.ts
@@ -13,158 +13,173 @@ let tempBranch1: any;
 let tempBranch2: any;
 let tempBranch3: any;
 
-describe("Git Bugs", { tags: ["@tag.Git"] }, function () {
-  before(() => {
-    _.agHelper.GenerateUUID();
-    cy.get("@guid").then((uid) => {
-      _.homePage.CreateNewWorkspace("GitBugs" + uid, true);
-      _.homePage.CreateAppInWorkspace("GitBugs" + uid);
+describe(
+  "Git Bugs",
+  {
+    tags: [
+      "@tag.Git",
+      "@tag.AccessControl",
+      "@tag.Workflows",
+      "@tag.Module",
+      "@tag.Theme",
+      "@tag.JS",
+      "@tag.Container",
+      "@tag.ImportExport",
+    ],
+  },
+  function () {
+    before(() => {
+      _.agHelper.GenerateUUID();
+      cy.get("@guid").then((uid) => {
+        _.homePage.CreateNewWorkspace("GitBugs" + uid, true);
+        _.homePage.CreateAppInWorkspace("GitBugs" + uid);
+      });
     });
-  });
 
-  it("1. Bug 16248, When GitSync modal is open, block shortcut action execution", function () {
-    const modifierKey = Cypress.platform === "darwin" ? "meta" : "ctrl";
-    _.apiPage.CreateAndFillApi(
-      _.dataManager.dsValues[_.dataManager.defaultEnviorment].mockApiUrl,
-      "GitSyncTest",
-    );
-    _.gitSync.OpenGitSyncModal();
-    cy.get("body").type(`{${modifierKey}}{enter}`);
-    cy.get("@postExecute").should("not.exist");
-    _.gitSync.CloseGitSyncModal();
-    cy.get("body").type(`{${modifierKey}}{enter}`);
-    _.assertHelper.AssertNetworkStatus("@postExecute");
-  });
+    it("1. Bug 16248, When GitSync modal is open, block shortcut action execution", function () {
+      const modifierKey = Cypress.platform === "darwin" ? "meta" : "ctrl";
+      _.apiPage.CreateAndFillApi(
+        _.dataManager.dsValues[_.dataManager.defaultEnviorment].mockApiUrl,
+        "GitSyncTest",
+      );
+      _.gitSync.OpenGitSyncModal();
+      cy.get("body").type(`{${modifierKey}}{enter}`);
+      cy.get("@postExecute").should("not.exist");
+      _.gitSync.CloseGitSyncModal();
+      cy.get("body").type(`{${modifierKey}}{enter}`);
+      _.assertHelper.AssertNetworkStatus("@postExecute");
+    });
 
-  it("2. Bug 18665 : Creates a new Git branch, Create datasource, discard it and check current branch", function () {
-    _.gitSync.CreateNConnectToGit();
-    _.gitSync.CreateGitBranch(tempBranch, false);
+    it("2. Bug 18665 : Creates a new Git branch, Create datasource, discard it and check current branch", function () {
+      _.gitSync.CreateNConnectToGit();
+      _.gitSync.CreateGitBranch(tempBranch, false);
 
-    cy.get("@gitbranchName").then((branchName) => {
-      tempBranch = branchName;
-      _.dataSources.NavigateToDSCreateNew();
-      _.dataSources.CreatePlugIn("PostgreSQL");
-      _.dataSources.FillPostgresDSForm();
-      _.dataSources.SaveDSFromDialog(false);
-      _.agHelper.AssertElementVisibility(_.gitSync._branchButton);
-      cy.get("@gitRepoName").then((repName) => {
-        repoName = repName;
+      cy.get("@gitbranchName").then((branchName) => {
+        tempBranch = branchName;
+        _.dataSources.NavigateToDSCreateNew();
+        _.dataSources.CreatePlugIn("PostgreSQL");
+        _.dataSources.FillPostgresDSForm();
+        _.dataSources.SaveDSFromDialog(false);
+        _.agHelper.AssertElementVisibility(_.gitSync._branchButton);
+        cy.get("@gitRepoName").then((repName) => {
+          repoName = repName;
+        });
       });
     });
-  });
-
-  it("3. Bug 18376:  navigateTo fails to set queryParams if the app is connected to Git", () => {
-    PageList.AddNewPage();
-    _.entityExplorer.DragDropWidgetNVerify(_.draggableWidgets.TEXT);
-    EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
-    _.entityExplorer.DragDropWidgetNVerify(_.draggableWidgets.BUTTON);
-    _.propPane.EnterJSContext(
-      "onClick",
-      "{{navigateTo('Page2', {testQP: 'Yes'}, 'SAME_WINDOW')}}",
-      true,
-      true,
-    );
-    _.propPane.ToggleJSMode("onClick", false);
-    _.agHelper.Sleep(500);
-    EditorNavigation.SelectEntityByName("Page2", EntityType.Page);
-    EditorNavigation.SelectEntityByName("Text1", EntityType.Widget);
-    _.propPane.UpdatePropertyFieldValue(
-      "Text",
-      "{{appsmith.URL.queryParams.testQP}}",
-    );
-    EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
-    _.agHelper.ClickButton("Submit");
-    _.agHelper.Sleep(500);
-    _.agHelper
-      .GetText(_.locators._textWidget)
-      .then(($qp) => expect($qp).to.eq("Yes"));
-    _.agHelper.AssertURL("branch=" + tempBranch); //Validate we are still in Git branch
-    _.agHelper.AssertURL("testQP=Yes"); //Validate we also ve the Query Params from Page1
-  });
 
-  it("4. Bug 24946 : Discard message is missing when only navigation settings are changed", function () {
-    _.gitSync.SwitchGitBranch("master");
-    _.gitSync.CreateGitBranch(`b24946`, true);
-    cy.get("@gitbranchName").then((branchName) => {
-      statusBranch = branchName;
-      AppSidebar.navigate(AppSidebarButton.Settings);
-      _.agHelper.GetNClick(_.locators._appNavigationSettings);
-      _.agHelper.GetNClick(_.locators._appNavigationSettingsShowTitle);
-      AppSidebar.navigate(AppSidebarButton.Editor);
-      _.agHelper.GetNClick(_.locators._publishButton);
-      _.agHelper.WaitUntilEleAppear(_.gitSync._gitStatusChanges);
-      _.agHelper.GetNClick(_.gitSync._discardChanges);
-      _.agHelper.WaitUntilEleAppear(_.gitSync._discardCallout);
-      _.agHelper.AssertContains(
-        Cypress.env("MESSAGES").DISCARD_CHANGES_WARNING(),
-        "exist",
-        _.gitSync._discardCallout,
+    it("3. Bug 18376:  navigateTo fails to set queryParams if the app is connected to Git", () => {
+      PageList.AddNewPage();
+      _.entityExplorer.DragDropWidgetNVerify(_.draggableWidgets.TEXT);
+      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+      _.entityExplorer.DragDropWidgetNVerify(_.draggableWidgets.BUTTON);
+      _.propPane.EnterJSContext(
+        "onClick",
+        "{{navigateTo('Page2', {testQP: 'Yes'}, 'SAME_WINDOW')}}",
+        true,
+        true,
       );
-      _.agHelper.AssertContains(
-        Cypress.env("MESSAGES").DISCARD_MESSAGE(),
-        "exist",
-        _.gitSync._discardCallout,
+      _.propPane.ToggleJSMode("onClick", false);
+      _.agHelper.Sleep(500);
+      EditorNavigation.SelectEntityByName("Page2", EntityType.Page);
+      EditorNavigation.SelectEntityByName("Text1", EntityType.Widget);
+      _.propPane.UpdatePropertyFieldValue(
+        "Text",
+        "{{appsmith.URL.queryParams.testQP}}",
       );
-      _.agHelper.GetNClick(_.locators._dialogCloseButton);
+      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+      _.agHelper.ClickButton("Submit");
+      _.agHelper.Sleep(500);
+      _.agHelper
+        .GetText(_.locators._textWidget)
+        .then(($qp) => expect($qp).to.eq("Yes"));
+      _.agHelper.AssertURL("branch=" + tempBranch); //Validate we are still in Git branch
+      _.agHelper.AssertURL("testQP=Yes"); //Validate we also ve the Query Params from Page1
+    });
+
+    it("4. Bug 24946 : Discard message is missing when only navigation settings are changed", function () {
+      _.gitSync.SwitchGitBranch("master");
+      _.gitSync.CreateGitBranch(`b24946`, true);
+      cy.get("@gitbranchName").then((branchName) => {
+        statusBranch = branchName;
+        AppSidebar.navigate(AppSidebarButton.Settings);
+        _.agHelper.GetNClick(_.locators._appNavigationSettings);
+        _.agHelper.GetNClick(_.locators._appNavigationSettingsShowTitle);
+        AppSidebar.navigate(AppSidebarButton.Editor);
+        _.agHelper.GetNClick(_.locators._publishButton);
+        _.agHelper.WaitUntilEleAppear(_.gitSync._gitStatusChanges);
+        _.agHelper.GetNClick(_.gitSync._discardChanges);
+        _.agHelper.WaitUntilEleAppear(_.gitSync._discardCallout);
+        _.agHelper.AssertContains(
+          Cypress.env("MESSAGES").DISCARD_CHANGES_WARNING(),
+          "exist",
+          _.gitSync._discardCallout,
+        );
+        _.agHelper.AssertContains(
+          Cypress.env("MESSAGES").DISCARD_MESSAGE(),
+          "exist",
+          _.gitSync._discardCallout,
+        );
+        _.agHelper.GetNClick(_.locators._dialogCloseButton);
+      });
     });
-  });
 
-  it("5. Bug 24486 : Loading state for remote branches", function () {
-    _.gitSync.CreateRemoteBranch(repoName, "test-24486");
-    _.gitSync.SwitchGitBranch("origin/test-24486", false, true);
-  });
+    it("5. Bug 24486 : Loading state for remote branches", function () {
+      _.gitSync.CreateRemoteBranch(repoName, "test-24486");
+      _.gitSync.SwitchGitBranch("origin/test-24486", false, true);
+    });
 
-  it("6. Bug 24920: Not able to discard app settings changes for the first time in git connected app ", function () {
-    _.gitSync.SwitchGitBranch("master", false, true);
-    // add navigation settings changes
-    AppSidebar.navigate(AppSidebarButton.Settings);
-    _.agHelper.GetNClick(_.appSettings.locators._navigationSettingsTab);
-    _.agHelper.GetNClick(
-      _.appSettings.locators._navigationSettings._orientationOptions._side,
-    );
-    _.agHelper.AssertElementExist(_.appSettings.locators._sideNavbar);
-    // discard changes and verify
-    _.gitSync.DiscardChanges();
-    _.gitSync.VerifyChangeLog(false);
-  });
+    it("6. Bug 24920: Not able to discard app settings changes for the first time in git connected app ", function () {
+      _.gitSync.SwitchGitBranch("master", false, true);
+      // add navigation settings changes
+      AppSidebar.navigate(AppSidebarButton.Settings);
+      _.agHelper.GetNClick(_.appSettings.locators._navigationSettingsTab);
+      _.agHelper.GetNClick(
+        _.appSettings.locators._navigationSettings._orientationOptions._side,
+      );
+      _.agHelper.AssertElementExist(_.appSettings.locators._sideNavbar);
+      // discard changes and verify
+      _.gitSync.DiscardChanges();
+      _.gitSync.VerifyChangeLog(false);
+    });
 
-  it("7. Bug 23858 : Branch list in git sync modal is not scrollable", function () {
-    // create git branches
-    _.gitSync.CreateGitBranch(tempBranch1, true);
-    _.gitSync.CreateGitBranch(tempBranch2, true);
-    _.gitSync.CreateGitBranch(tempBranch3, true);
-    _.agHelper.AssertElementExist(_.gitSync._bottomBarPull);
-    _.agHelper.GetNClick(_.gitSync._bottomBarMergeButton);
-    _.agHelper.AssertElementEnabledDisabled(
-      _.gitSync._mergeBranchDropdownDestination,
-      0,
-      false,
-    );
-    _.agHelper.Sleep(6000); // adding wait for branch list to load
-    _.agHelper.GetNClick(_.gitSync._mergeBranchDropdownDestination);
-    // to verify scroll works and clicks on last branch in list
-    _.agHelper.GetNClick(_.gitSync._dropdownmenu, 5);
-    _.gitSync.CloseGitSyncModal();
-  });
+    it("7. Bug 23858 : Branch list in git sync modal is not scrollable", function () {
+      // create git branches
+      _.gitSync.CreateGitBranch(tempBranch1, true);
+      _.gitSync.CreateGitBranch(tempBranch2, true);
+      _.gitSync.CreateGitBranch(tempBranch3, true);
+      _.agHelper.AssertElementExist(_.gitSync._bottomBarPull);
+      _.agHelper.GetNClick(_.gitSync._bottomBarMergeButton);
+      _.agHelper.AssertElementEnabledDisabled(
+        _.gitSync._mergeBranchDropdownDestination,
+        0,
+        false,
+      );
+      _.agHelper.Sleep(6000); // adding wait for branch list to load
+      _.agHelper.GetNClick(_.gitSync._mergeBranchDropdownDestination);
+      // to verify scroll works and clicks on last branch in list
+      _.agHelper.GetNClick(_.gitSync._dropdownmenu, 5);
+      _.gitSync.CloseGitSyncModal();
+    });
 
-  it("8. Bug 24206 : Open repository button is not functional in git sync modal", function () {
-    _.gitSync.SwitchGitBranch("master");
-    _.appSettings.OpenPaneAndChangeTheme("Moon");
-    _.gitSync.CommitAndPush();
-    _.gitSync.SwitchGitBranch(tempBranch);
-    _.appSettings.OpenPaneAndChangeTheme("Pampas");
-    _.gitSync.CommitAndPush();
-    _.gitSync.CheckMergeConflicts("master");
-    cy.window().then((win) => {
-      cy.stub(win, "open", (url) => {
-        win.location.href = "http://host.docker.internal/";
-      }).as("repoURL");
+    it("8. Bug 24206 : Open repository button is not functional in git sync modal", function () {
+      _.gitSync.SwitchGitBranch("master");
+      _.appSettings.OpenPaneAndChangeTheme("Moon");
+      _.gitSync.CommitAndPush();
+      _.gitSync.SwitchGitBranch(tempBranch);
+      _.appSettings.OpenPaneAndChangeTheme("Pampas");
+      _.gitSync.CommitAndPush();
+      _.gitSync.CheckMergeConflicts("master");
+      cy.window().then((win) => {
+        cy.stub(win, "open", (url) => {
+          win.location.href = "http://host.docker.internal/";
+        }).as("repoURL");
+      });
+      _.gitSync.OpenRepositoryAndVerify();
+      cy.get("@repoURL").should("be.called");
     });
-    _.gitSync.OpenRepositoryAndVerify();
-    cy.get("@repoURL").should("be.called");
-  });
 
-  after(() => {
-    _.gitSync.DeleteTestGithubRepo(repoName);
-  });
-});
+    after(() => {
+      _.gitSync.DeleteTestGithubRepo(repoName);
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/GraphQL_Binding_Bug16702_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/GraphQL_Binding_Bug16702_Spec.ts
index 4fc0e617f10e..60b440114b7a 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/GraphQL_Binding_Bug16702_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/GraphQL_Binding_Bug16702_Spec.ts
@@ -18,7 +18,9 @@ const GRAPHQL_RESPONSE = {
 
 describe(
   "Binding Expressions should not be truncated in Url and path extraction",
-  { tags: ["@tag.Datasource", "@tag.Binding"] },
+  {
+    tags: ["@tag.Datasource", "@tag.Binding", "@tag.Git", "@tag.AccessControl"],
+  },
   function () {
     it("Bug 16702, Moustache+Quotes formatting goes wrong in graphql body resulting in autocomplete failure", function () {
       const jsObjectBody = `export default {
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/InvalidURL_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/InvalidURL_Spec.ts
index eb68c3904507..61f94ea3b776 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/InvalidURL_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/InvalidURL_Spec.ts
@@ -3,7 +3,7 @@ import { ObjectsRegistry } from "../../../../support/Objects/Registry";
 const jsEditor = ObjectsRegistry.JSEditor,
   agHelper = ObjectsRegistry.AggregateHelper;
 
-describe("Invalid page routing", { tags: ["@tag.JS"] }, () => {
+describe("Invalid page routing", { tags: ["@tag.JS", "@tag.Binding"] }, () => {
   it("1. Bug #16047 - Shows Invalid URL UI for invalid JS Object page url", () => {
     const JS_OBJECT_BODY = `export default {
         myVar1: [],
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/JSParse_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JSParse_Spec.ts
index 674e9b33457e..728d4410e3d9 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/JSParse_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JSParse_Spec.ts
@@ -29,7 +29,7 @@ const assertLintErrorAndOutput = (
 
 describe(
   "Bug #15283 - Correctly parses JS Function",
-  { tags: ["@tag.JS"] },
+  { tags: ["@tag.JS", "@tag.Binding"] },
   () => {
     before(() => {
       ee.DragDropWidgetNVerify("singleselecttreewidget", 300, 500);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug14002_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug14002_Spec.ts
index 58fb3672aa90..13b84feab23a 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug14002_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug14002_Spec.ts
@@ -2,7 +2,7 @@ import * as _ from "../../../../support/Objects/ObjectsCore";
 
 describe(
   "Invalid JSObject export statement",
-  { tags: ["@tag.JS"] },
+  { tags: ["@tag.JS", "@tag.Binding"] },
   function () {
     it("1. Shows error toast for invalid js object export statement", function () {
       const JSObjectWithInvalidExport = `{
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug15056_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug15056_Spec.ts
index 8b2bd104cab2..85dfc41dff88 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug15056_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug15056_Spec.ts
@@ -9,18 +9,21 @@ import EditorNavigation, {
   EntityType,
 } from "../../../../support/Pages/EditorNavigation";
 
-describe("JS data update on button click", { tags: ["@tag.JS"] }, function () {
-  before(() => {
-    agHelper.AddDsl("jsFunctionTriggerDsl");
-  });
+describe(
+  "JS data update on button click",
+  { tags: ["@tag.JS", "@tag.Binding"] },
+  function () {
+    before(() => {
+      agHelper.AddDsl("jsFunctionTriggerDsl");
+    });
 
-  it("1. Populates js function data when triggered via button click", function () {
-    apiPage.CreateAndFillApi(
-      dataManager.dsValues[dataManager.defaultEnviorment].mockApiUrl,
-      "Api1",
-    );
+    it("1. Populates js function data when triggered via button click", function () {
+      apiPage.CreateAndFillApi(
+        dataManager.dsValues[dataManager.defaultEnviorment].mockApiUrl,
+        "Api1",
+      );
 
-    const jsObjectString = `export default {
+      const jsObjectString = `export default {
         myVar1: [],
         myVar2: {},
         myFun1: async () => {
@@ -35,15 +38,16 @@ describe("JS data update on button click", { tags: ["@tag.JS"] }, function () {
         }
     }`;
 
-    jsEditor.CreateJSObject(jsObjectString, {
-      paste: true,
-      completeReplace: true,
-      toRun: false,
-      shouldCreateNewJSObj: true,
+      jsEditor.CreateJSObject(jsObjectString, {
+        paste: true,
+        completeReplace: true,
+        toRun: false,
+        shouldCreateNewJSObj: true,
+      });
+      EditorNavigation.SelectEntityByName("Button2", EntityType.Widget);
+      agHelper.ClickButton("Submit");
+      agHelper.AssertContains("myFun1 Data", "exist");
+      agHelper.AssertContains("myFun2 Data", "exist");
     });
-    EditorNavigation.SelectEntityByName("Button2", EntityType.Widget);
-    agHelper.ClickButton("Submit");
-    agHelper.AssertContains("myFun1 Data", "exist");
-    agHelper.AssertContains("myFun2 Data", "exist");
-  });
-});
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug15909_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug15909_Spec.ts
index ba4be8142893..257586a5d037 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug15909_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug15909_Spec.ts
@@ -3,13 +3,20 @@ import EditorNavigation, {
   EntityType,
 } from "../../../../support/Pages/EditorNavigation";
 
-describe("JS Function Execution", { tags: ["@tag.JS"] }, function () {
-  before(() => {
-    _.entityExplorer.DragDropWidgetNVerify(_.draggableWidgets.BUTTON, 200, 200);
-  });
-  it("1. Shows js function data as part of autocompletion hints", function () {
-    _.jsEditor.CreateJSObject(
-      `export default {
+describe(
+  "JS Function Execution",
+  { tags: ["@tag.JS", "@tag.Binding"] },
+  function () {
+    before(() => {
+      _.entityExplorer.DragDropWidgetNVerify(
+        _.draggableWidgets.BUTTON,
+        200,
+        200,
+      );
+    });
+    it("1. Shows js function data as part of autocompletion hints", function () {
+      _.jsEditor.CreateJSObject(
+        `export default {
   	myFun1: ()=>{
   		return "yes"
   	},
@@ -17,17 +24,18 @@ describe("JS Function Execution", { tags: ["@tag.JS"] }, function () {
         return [{name: "test"}]
     }
   }`,
-      {
-        paste: true,
-        completeReplace: true,
-        toRun: false,
-        shouldCreateNewJSObj: true,
-        prettify: false,
-      },
-    );
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    _.propPane.EnterJSContext("onClick", `{{JSObject1.`, true, false);
-    _.agHelper.AssertContains("myFun1.data");
-    _.agHelper.AssertContains("myFun2.data");
-  });
-});
+        {
+          paste: true,
+          completeReplace: true,
+          toRun: false,
+          shouldCreateNewJSObj: true,
+          prettify: false,
+        },
+      );
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      _.propPane.EnterJSContext("onClick", `{{JSObject1.`, true, false);
+      _.agHelper.AssertContains("myFun1.data");
+      _.agHelper.AssertContains("myFun2.data");
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug18369_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug18369_Spec.ts
index f09e1c097a02..4ec8686dbc11 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug18369_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug18369_Spec.ts
@@ -6,14 +6,18 @@ import EditorNavigation, {
 const locator = ObjectsRegistry.CommonLocators,
   agHelper = ObjectsRegistry.AggregateHelper;
 
-describe("JS Function Execution", { tags: ["@tag.JS"] }, function () {
-  before(() => {
-    agHelper.AddDsl("formWithtabdsl");
-  });
+describe(
+  "JS Function Execution",
+  { tags: ["@tag.JS", "@tag.Binding"] },
+  function () {
+    before(() => {
+      agHelper.AddDsl("formWithtabdsl");
+    });
 
-  it("1. Doesn't show lint errors for 'form.hasChanges' for form in inactive tab", () => {
-    EditorNavigation.SelectEntityByName("Text2", EntityType.Widget);
-    agHelper.Sleep(4000);
-    agHelper.AssertElementAbsence(locator._lintErrorElement);
-  });
-});
+    it("1. Doesn't show lint errors for 'form.hasChanges' for form in inactive tab", () => {
+      EditorNavigation.SelectEntityByName("Text2", EntityType.Widget);
+      agHelper.Sleep(4000);
+      agHelper.AssertElementAbsence(locator._lintErrorElement);
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug19982_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug19982_Spec.ts
index a63330f66859..61e43c409208 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug19982_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug19982_Spec.ts
@@ -5,7 +5,7 @@ const jsEditor = ObjectsRegistry.JSEditor,
 
 describe(
   "JS Execution of Higher-order-functions",
-  { tags: ["@tag.JS"] },
+  { tags: ["@tag.JS", "@tag.Binding"] },
   function () {
     it("1. Completes execution properly", function () {
       const JSObjectWithHigherOrderFunction = `export default{
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug20841_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug20841_Spec.ts
index 105ea013df46..ee72668e4382 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug20841_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug20841_Spec.ts
@@ -6,7 +6,7 @@ import PageList from "../../../../support/Pages/PageList";
 
 describe(
   "Evaluations causing error when page is cloned",
-  { tags: ["@tag.JS"] },
+  { tags: ["@tag.JS", "@tag.Binding"] },
   function () {
     it("1. Bug: 20841: JSObjects | Sync methods | Not run consistently when Page is cloned", function () {
       const JS_OBJECT_BODY = `export default{
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug24194_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug24194_Spec.ts
index 5c9be26ffae6..d09b978db3d2 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug24194_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug24194_Spec.ts
@@ -9,12 +9,15 @@ import EditorNavigation, {
   EntityType,
 } from "../../../../support/Pages/EditorNavigation";
 
-describe("Responsiveness of linting", { tags: ["@tag.JS"] }, () => {
-  before(() => {
-    entityExplorer.DragDropWidgetNVerify("buttonwidget", 300, 300);
-  });
-  it("Should update linting when entity is added/renamed", () => {
-    const JS_OBJECT = `export default {
+describe(
+  "Responsiveness of linting",
+  { tags: ["@tag.JS", "@tag.Binding"] },
+  () => {
+    before(() => {
+      entityExplorer.DragDropWidgetNVerify("buttonwidget", 300, 300);
+    });
+    it("Should update linting when entity is added/renamed", () => {
+      const JS_OBJECT = `export default {
         myFun1: () => {
           return "";
         },
@@ -22,21 +25,22 @@ describe("Responsiveness of linting", { tags: ["@tag.JS"] }, () => {
          return ""
         }
       }`;
-    propPane.UpdatePropertyFieldValue("Tooltip", "{{JSObject1.myFun1}}");
-    agHelper.AssertElementExist(locators._lintErrorElement);
-    jsEditor.CreateJSObject(JS_OBJECT, {
-      paste: true,
-      completeReplace: true,
-      toRun: false,
-      shouldCreateNewJSObj: true,
-    });
+      propPane.UpdatePropertyFieldValue("Tooltip", "{{JSObject1.myFun1}}");
+      agHelper.AssertElementExist(locators._lintErrorElement);
+      jsEditor.CreateJSObject(JS_OBJECT, {
+        paste: true,
+        completeReplace: true,
+        toRun: false,
+        shouldCreateNewJSObj: true,
+      });
 
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    agHelper.AssertElementAbsence(locators._lintErrorElement);
-    agHelper.RefreshPage();
-    EditorNavigation.SelectEntityByName("JSObject1", EntityType.JSObject);
-    jsEditor.RenameJSObjFromPane("JSObject2");
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    agHelper.AssertElementAbsence(locators._lintErrorElement);
-  });
-});
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      agHelper.AssertElementAbsence(locators._lintErrorElement);
+      agHelper.RefreshPage();
+      EditorNavigation.SelectEntityByName("JSObject1", EntityType.JSObject);
+      jsEditor.RenameJSObjFromPane("JSObject2");
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      agHelper.AssertElementAbsence(locators._lintErrorElement);
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug25894_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug25894_spec.ts
index c45dd898b845..4eb8874dd867 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug25894_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug25894_spec.ts
@@ -10,7 +10,7 @@ import EditorNavigation, {
 
 describe(
   "Bug 25894 - Moustache brackets should be highlighted",
-  { tags: ["@tag.JS"] },
+  { tags: ["@tag.JS", "@tag.Binding"] },
   () => {
     it("1. should show {{ }} in bold", () => {
       entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug28764_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug28764_Spec.ts
index 3083962c588c..5885ba6da5a5 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug28764_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug28764_Spec.ts
@@ -7,11 +7,14 @@ import EditorNavigation, {
   EntityType,
 } from "../../../../support/Pages/EditorNavigation";
 
-describe("JS Function Execution", { tags: ["@tag.JS"] }, function () {
-  it("Retains lint errors after navigation", function () {
-    // JS Object 1
-    jsEditor.CreateJSObject(
-      `export default {
+describe(
+  "JS Function Execution",
+  { tags: ["@tag.JS", "@tag.Binding"] },
+  function () {
+    it("Retains lint errors after navigation", function () {
+      // JS Object 1
+      jsEditor.CreateJSObject(
+        `export default {
           myVar1: [],
           myVar2: {},
           myFun1 () {
@@ -24,17 +27,17 @@ describe("JS Function Execution", { tags: ["@tag.JS"] }, function () {
               fff
           }
       }`,
-      {
-        paste: true,
-        completeReplace: true,
-        toRun: false,
-        shouldCreateNewJSObj: true,
-        prettify: false,
-      },
-    );
-    // JS Object 2
-    jsEditor.CreateJSObject(
-      `export default {
+        {
+          paste: true,
+          completeReplace: true,
+          toRun: false,
+          shouldCreateNewJSObj: true,
+          prettify: false,
+        },
+      );
+      // JS Object 2
+      jsEditor.CreateJSObject(
+        `export default {
           myVar1: [],
           myVar2: {},
           myFun1 () {
@@ -45,28 +48,29 @@ describe("JS Function Execution", { tags: ["@tag.JS"] }, function () {
               //	use async-await or promises
           }
       }`,
-      {
-        paste: true,
-        completeReplace: true,
-        toRun: false,
-        shouldCreateNewJSObj: true,
-        prettify: false,
-      },
-    );
+        {
+          paste: true,
+          completeReplace: true,
+          toRun: false,
+          shouldCreateNewJSObj: true,
+          prettify: false,
+        },
+      );
 
-    EditorNavigation.SelectEntityByName("JSObject1", EntityType.JSObject);
-    // Assert lint error
-    agHelper.AssertElementLength(locators._lintErrorElement, 1);
-    agHelper.HoverElement(locators._lintErrorElement);
-    agHelper.AssertContains(`'fff' is not defined`);
+      EditorNavigation.SelectEntityByName("JSObject1", EntityType.JSObject);
+      // Assert lint error
+      agHelper.AssertElementLength(locators._lintErrorElement, 1);
+      agHelper.HoverElement(locators._lintErrorElement);
+      agHelper.AssertContains(`'fff' is not defined`);
 
-    EditorNavigation.SelectEntityByName("JSObject2", EntityType.JSObject);
-    agHelper.AssertElementAbsence(locators._lintErrorElement);
+      EditorNavigation.SelectEntityByName("JSObject2", EntityType.JSObject);
+      agHelper.AssertElementAbsence(locators._lintErrorElement);
 
-    EditorNavigation.SelectEntityByName("JSObject1", EntityType.JSObject);
-    // Assert lint error
-    agHelper.AssertElementLength(locators._lintErrorElement, 1);
-    agHelper.HoverElement(locators._lintErrorElement);
-    agHelper.AssertContains(`'fff' is not defined`);
-  });
-});
+      EditorNavigation.SelectEntityByName("JSObject1", EntityType.JSObject);
+      // Assert lint error
+      agHelper.AssertElementLength(locators._lintErrorElement, 1);
+      agHelper.HoverElement(locators._lintErrorElement);
+      agHelper.AssertContains(`'fff' is not defined`);
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug29131_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug29131_spec.ts
index 0f424f4845d5..a2743b4a4d2b 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug29131_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug29131_spec.ts
@@ -13,41 +13,45 @@ const jsObjectBody = `export default {
 	}
 }`;
 
-describe("Verifies JS object rename bug", { tags: ["@tag.JS"] }, () => {
-  it("Verify that a JS Object name is up for taking after it is deleted", () => {
-    jsEditor.CreateJSObject(jsObjectBody, {
-      paste: true,
-      completeReplace: true,
-      toRun: false,
-      shouldCreateNewJSObj: true,
-      prettify: false,
+describe(
+  "Verifies JS object rename bug",
+  { tags: ["@tag.JS", "@tag.Binding"] },
+  () => {
+    it("Verify that a JS Object name is up for taking after it is deleted", () => {
+      jsEditor.CreateJSObject(jsObjectBody, {
+        paste: true,
+        completeReplace: true,
+        toRun: false,
+        shouldCreateNewJSObj: true,
+        prettify: false,
+      });
+
+      jsEditor.CreateJSObject(jsObjectBody, {
+        paste: true,
+        completeReplace: true,
+        toRun: false,
+        shouldCreateNewJSObj: true,
+        prettify: false,
+      });
+
+      jsEditor.RenameJSObjFromPane("JSObj2");
+
+      agHelper.ActionContextMenuWithInPane({
+        action: "Delete",
+        entityType: EntityItems.JSObject,
+      });
+
+      jsEditor.CreateJSObject(jsObjectBody, {
+        paste: true,
+        completeReplace: true,
+        toRun: false,
+        shouldCreateNewJSObj: true,
+        prettify: false,
+      });
+
+      jsEditor.RenameJSObjFromPane("JSObj2");
+
+      PageLeftPane.assertPresence("JSObj2");
     });
-
-    jsEditor.CreateJSObject(jsObjectBody, {
-      paste: true,
-      completeReplace: true,
-      toRun: false,
-      shouldCreateNewJSObj: true,
-      prettify: false,
-    });
-
-    jsEditor.RenameJSObjFromPane("JSObj2");
-
-    agHelper.ActionContextMenuWithInPane({
-      action: "Delete",
-      entityType: EntityItems.JSObject,
-    });
-
-    jsEditor.CreateJSObject(jsObjectBody, {
-      paste: true,
-      completeReplace: true,
-      toRun: false,
-      shouldCreateNewJSObj: true,
-      prettify: false,
-    });
-
-    jsEditor.RenameJSObjFromPane("JSObj2");
-
-    PageLeftPane.assertPresence("JSObj2");
-  });
-});
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/ListWidgetOnPageLoad_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/ListWidgetOnPageLoad_Spec.ts
index 4826088ab6d7..f53f3a2e2c18 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/ListWidgetOnPageLoad_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/ListWidgetOnPageLoad_Spec.ts
@@ -15,7 +15,7 @@ import EditorNavigation, {
 
 describe(
   "JS Function execution data mutation",
-  { tags: ["@tag.Widget", "@tag.List"] },
+  { tags: ["@tag.Widget", "@tag.List", "@tag.Binding"] },
   function () {
     before(() => {
       agHelper.AddDsl("Listv2/simpleList");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Moment_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Moment_Spec.ts
index a17f26f09537..95b189ec2a55 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Moment_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Moment_Spec.ts
@@ -21,7 +21,9 @@ let dsName: any, query: string;
 
 describe(
   "Bug #14299 - The data from the query does not show up on the widget",
-  { tags: ["@tag.Widget", "@tag.Datasource"] },
+  {
+    tags: ["@tag.Widget", "@tag.Datasource", "@tag.Git", "@tag.AccessControl"],
+  },
   function () {
     before("Create Postgress DS & set theme", () => {
       agHelper.AddDsl("Bugs/14299dsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/SelectWidget_Bug9334_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/SelectWidget_Bug9334_Spec.ts
index 4ebc73776bc5..f1840e1bb546 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/SelectWidget_Bug9334_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/SelectWidget_Bug9334_Spec.ts
@@ -17,7 +17,7 @@ let dsName: any;
 
 describe(
   "Bug 9334: The Select widget value is sent as null when user switches between the pages",
-  { tags: ["@tag.Widget"] },
+  { tags: ["@tag.Widget", "@tag.Binding"] },
   function () {
     before("Change Theme & Create Postgress DS", () => {
       appSettings.OpenPaneAndChangeTheme("Pampas");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Widget_Bug27119_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Widget_Bug27119_Spec.ts
index e9aa3e6cb90d..f971ac85c024 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Widget_Bug27119_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Widget_Bug27119_Spec.ts
@@ -8,51 +8,54 @@ import {
   jsEditor,
 } from "../../../../support/Objects/ObjectsCore";
 
-describe("Reset widget action", { tags: ["@tag.Widget"] }, () => {
-  it("Reset widget to default after setValue has been applied", () => {
-    entityExplorer.DragDropWidgetNVerify(draggableWidgets.INPUT_V2);
-    propPane.UpdatePropertyFieldValue("Default value", "John");
+describe(
+  "Reset widget action",
+  { tags: ["@tag.Widget", "@tag.Binding"] },
+  () => {
+    it("Reset widget to default after setValue has been applied", () => {
+      entityExplorer.DragDropWidgetNVerify(draggableWidgets.INPUT_V2);
+      propPane.UpdatePropertyFieldValue("Default value", "John");
 
-    entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON, 300, 300);
-    propPane.EnterJSContext("onClick", `{{Input1.setValue('Hello!')}}`);
-    propPane.UpdatePropertyFieldValue("Label", "Set value");
+      entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON, 300, 300);
+      propPane.EnterJSContext("onClick", `{{Input1.setValue('Hello!')}}`);
+      propPane.UpdatePropertyFieldValue("Label", "Set value");
 
-    entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON, 500, 100);
-    propPane.EnterJSContext("onClick", `{{resetWidget("Input1")}}`);
-    propPane.UpdatePropertyFieldValue("Label", "Reset value");
+      entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON, 500, 100);
+      propPane.EnterJSContext("onClick", `{{resetWidget("Input1")}}`);
+      propPane.UpdatePropertyFieldValue("Label", "Reset value");
 
-    deployMode.DeployApp();
+      deployMode.DeployApp();
 
-    agHelper.ClickButton("Set value");
-    agHelper.AssertText(
-      locators._widgetInDeployed(draggableWidgets.INPUT_V2) + " input",
-      "val",
-      "Hello!",
-    );
+      agHelper.ClickButton("Set value");
+      agHelper.AssertText(
+        locators._widgetInDeployed(draggableWidgets.INPUT_V2) + " input",
+        "val",
+        "Hello!",
+      );
 
-    agHelper.ClickButton("Reset value");
-    agHelper.AssertText(
-      locators._widgetInDeployed(draggableWidgets.INPUT_V2) + " input",
-      "val",
-      "John",
-    );
+      agHelper.ClickButton("Reset value");
+      agHelper.AssertText(
+        locators._widgetInDeployed(draggableWidgets.INPUT_V2) + " input",
+        "val",
+        "John",
+      );
 
-    agHelper.ClearNType(
-      locators._widgetInDeployed(draggableWidgets.INPUT_V2) + " input",
-      "Testing",
-    );
-    agHelper.ClickButton("Reset value");
-    agHelper.AssertText(
-      locators._widgetInDeployed(draggableWidgets.INPUT_V2) + " input",
-      "val",
-      "John",
-    );
-  });
-  it("Reset value is accessible after 'awaiting'", () => {
-    deployMode.NavigateBacktoEditor();
-    agHelper.ClearNType(locators._input, "Meta Text");
+      agHelper.ClearNType(
+        locators._widgetInDeployed(draggableWidgets.INPUT_V2) + " input",
+        "Testing",
+      );
+      agHelper.ClickButton("Reset value");
+      agHelper.AssertText(
+        locators._widgetInDeployed(draggableWidgets.INPUT_V2) + " input",
+        "val",
+        "John",
+      );
+    });
+    it("Reset value is accessible after 'awaiting'", () => {
+      deployMode.NavigateBacktoEditor();
+      agHelper.ClearNType(locators._input, "Meta Text");
 
-    const JS_OBJECT_BODY = `export default {
+      const JS_OBJECT_BODY = `export default {
       async resetInputWithoutAwait () {
          resetWidget('Input1')
          showAlert(Input1.text)	
@@ -63,21 +66,22 @@ describe("Reset widget action", { tags: ["@tag.Widget"] }, () => {
       }
     }`;
 
-    // Create js object
-    jsEditor.CreateJSObject(JS_OBJECT_BODY, {
-      paste: true,
-      completeReplace: true,
-      toRun: false,
-      prettify: false,
-      shouldCreateNewJSObj: true,
-    });
-    agHelper.Sleep(4000);
-    jsEditor.SelectFunctionDropdown("resetInputWithoutAwait");
-    agHelper.ClickButton("Run");
-    agHelper.AssertContains("Meta Text");
+      // Create js object
+      jsEditor.CreateJSObject(JS_OBJECT_BODY, {
+        paste: true,
+        completeReplace: true,
+        toRun: false,
+        prettify: false,
+        shouldCreateNewJSObj: true,
+      });
+      agHelper.Sleep(4000);
+      jsEditor.SelectFunctionDropdown("resetInputWithoutAwait");
+      agHelper.ClickButton("Run");
+      agHelper.AssertContains("Meta Text");
 
-    jsEditor.SelectFunctionDropdown("resetInputWithAwait");
-    agHelper.ClickButton("Run");
-    agHelper.AssertContains("John");
-  });
-});
+      jsEditor.SelectFunctionDropdown("resetInputWithAwait");
+      agHelper.ClickButton("Run");
+      agHelper.AssertContains("John");
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/defaultFilterTextValue_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/defaultFilterTextValue_Spec.ts
index 0a6e6665b9ac..4f457f88602b 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/defaultFilterTextValue_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/defaultFilterTextValue_Spec.ts
@@ -2,12 +2,16 @@ import { ObjectsRegistry } from "../../../../support/Objects/Registry";
 
 const agHelper = ObjectsRegistry.AggregateHelper;
 
-describe("Select widget filterText", { tags: ["@tag.Widget"] }, () => {
-  before(() => {
-    agHelper.AddDsl("defaultFilterText");
-  });
+describe(
+  "Select widget filterText",
+  { tags: ["@tag.Widget", "@tag.Binding"] },
+  () => {
+    before(() => {
+      agHelper.AddDsl("defaultFilterText");
+    });
 
-  it("1. default value should be an empty string", () => {
-    agHelper.AssertContains("string");
-  });
-});
+    it("1. default value should be an empty string", () => {
+      agHelper.AssertContains("string");
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/formHasChanged_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/formHasChanged_Spec.ts
index 46dca4c26246..3949f0615452 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/formHasChanged_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/formHasChanged_Spec.ts
@@ -7,14 +7,18 @@ const ee = ObjectsRegistry.EntityExplorer,
   locator = ObjectsRegistry.CommonLocators,
   agHelper = ObjectsRegistry.AggregateHelper;
 
-describe("JS Function Execution", { tags: ["@tag.JS"] }, function () {
-  before(() => {
-    agHelper.AddDsl("formChangeDSL");
-  });
+describe(
+  "JS Function Execution",
+  { tags: ["@tag.JS", "@tag.Binding"] },
+  function () {
+    before(() => {
+      agHelper.AddDsl("formChangeDSL");
+    });
 
-  it("1. Doesn't show lint errors for 'form.hasChanges'", () => {
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    agHelper.Sleep(4000);
-    agHelper.AssertElementAbsence(locator._lintErrorElement);
-  });
-});
+    it("1. Doesn't show lint errors for 'form.hasChanges'", () => {
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      agHelper.Sleep(4000);
+      agHelper.AssertElementAbsence(locator._lintErrorElement);
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/invalidLintError_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/invalidLintError_Spec.ts
index 7ccf899196a9..7d6d52e3fa0f 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/invalidLintError_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/invalidLintError_Spec.ts
@@ -5,7 +5,7 @@ const jsEditor = ObjectsRegistry.JSEditor,
   ee = ObjectsRegistry.EntityExplorer,
   agHelper = ObjectsRegistry.AggregateHelper;
 
-describe("Linting", { tags: ["@tag.JS"] }, () => {
+describe("Linting", { tags: ["@tag.JS", "@tag.Binding"] }, () => {
   before(() => {
     ee.DragDropWidgetNVerify("buttonwidget", 300, 300);
   });
diff --git a/app/client/cypress/e2e/Regression/ClientSide/CodeComment/PropertyPaneCodeComment_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/CodeComment/PropertyPaneCodeComment_spec.ts
index cd3fd14d61d9..cdf97d94a7ef 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/CodeComment/PropertyPaneCodeComment_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/CodeComment/PropertyPaneCodeComment_spec.ts
@@ -3,22 +3,26 @@ import EditorNavigation, {
   EntityType,
 } from "../../../../support/Pages/EditorNavigation";
 
-describe("Property Pane Code Commenting", { tags: ["@tag.JS"] }, () => {
-  before(() => {
-    agHelper.AddDsl("buttondsl");
-  });
+describe(
+  "Property Pane Code Commenting",
+  { tags: ["@tag.JS", "@tag.Binding"] },
+  () => {
+    before(() => {
+      agHelper.AddDsl("buttondsl");
+    });
 
-  it("1. Should comment code in Property Pane", () => {
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    propPane.TypeTextIntoField("Label", "{{appsmith}}");
-    propPane.ToggleCommentInTextField("Label");
+    it("1. Should comment code in Property Pane", () => {
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      propPane.TypeTextIntoField("Label", "{{appsmith}}");
+      propPane.ToggleCommentInTextField("Label");
 
-    propPane.ValidatePropertyFieldValue("Label", "{{// appsmith}}");
+      propPane.ValidatePropertyFieldValue("Label", "{{// appsmith}}");
 
-    //Uncomment
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    propPane.TypeTextIntoField("Label", "{{// appsmith}}");
-    propPane.ToggleCommentInTextField("Label");
-    propPane.ValidatePropertyFieldValue("Label", "{{appsmith}}");
-  });
-});
+      //Uncomment
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      propPane.TypeTextIntoField("Label", "{{// appsmith}}");
+      propPane.ToggleCommentInTextField("Label");
+      propPane.ValidatePropertyFieldValue("Label", "{{appsmith}}");
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/CommunityTemplate/PublishCommunityTemplatesFlow_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/CommunityTemplate/PublishCommunityTemplatesFlow_spec.ts
index 97b3537d98d8..e0c464b3b8b5 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/CommunityTemplate/PublishCommunityTemplatesFlow_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/CommunityTemplate/PublishCommunityTemplatesFlow_spec.ts
@@ -8,7 +8,15 @@ import {
 const communityForm = communityTemplates.locators._communityForm;
 describe(
   "Publish app to Community flow",
-  { tags: ["@tag.Templates", " @tag.excludeForAirgap"] },
+  {
+    tags: [
+      "@tag.Templates",
+      " @tag.excludeForAirgap",
+      "@tag.Git",
+      "@tag.ImportExport",
+      "@tag.Fork",
+    ],
+  },
   () => {
     afterEach(() => {
       agHelper.RefreshPage();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Debugger/Api_pane_navigation_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Debugger/Api_pane_navigation_spec.ts
index 5bacf30fa3d1..094d5fd8f876 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Debugger/Api_pane_navigation_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Debugger/Api_pane_navigation_spec.ts
@@ -11,7 +11,14 @@ import EditorNavigation from "../../../../support/Pages/EditorNavigation";
 
 describe(
   "Api pane navigation",
-  { tags: ["@tag.Datasource", " @tag.excludeForAirgap"] },
+  {
+    tags: [
+      "@tag.Datasource",
+      " @tag.excludeForAirgap",
+      "@tag.Git",
+      "@tag.AccessControl",
+    ],
+  },
   () => {
     it("1. Navigation to Graphql pagination field", () => {
       apiPage.CreateGraphqlApi("Api1");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Debugger/Widget_property_navigation_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Debugger/Widget_property_navigation_spec.ts
index 30a27209444a..dd4821a3e662 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Debugger/Widget_property_navigation_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Debugger/Widget_property_navigation_spec.ts
@@ -6,7 +6,7 @@ import EditorNavigation, {
 
 describe(
   "Widget property navigation",
-  { tags: ["@tag.Widget", "@tag.excludeForAirgap"] },
+  { tags: ["@tag.Widget", "@tag.excludeForAirgap", "@tag.Binding"] },
   () => {
     it("1. Collapsed field navigation", () => {
       _.entityExplorer.DragDropWidgetNVerify(_.draggableWidgets.AUDIO);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/JsonForm_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/JsonForm_spec.ts
index 6ecade613423..c20df368d0e2 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/JsonForm_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/JsonForm_spec.ts
@@ -1,5 +1,4 @@
 import {
-  entityExplorer,
   locators,
   agHelper,
   propPane,
@@ -17,6 +16,7 @@ describe(
       agHelper.AddDsl("jsonFormDynamicHeightDsl");
 
       EditorNavigation.SelectEntityByName("JSONForm1", EntityType.Widget);
+      propPane.ExpandIfCollapsedSection("general");
       agHelper
         .GetWidgetCSSHeight(
           locators._widgetInDeployed(draggableWidgets.JSONFORM),
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/API_Pane_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/API_Pane_spec.js
index 23c509869ddf..11e9fd975b15 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/API_Pane_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/API_Pane_spec.js
@@ -17,7 +17,7 @@ let ee = ObjectsRegistry.EntityExplorer,
 
 describe(
   "Entity explorer API pane related testcases",
-  { tags: ["@tag.IDE"] },
+  { tags: ["@tag.IDE", "@tag.PropertyPane"] },
   function () {
     it("1. Empty Message validation for Widgets/API/Queries", function () {
       homePage.CreateNewWorkspace("EmptyMsgCheck", true);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Admin_settings_1_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Admin_settings_1_spec.js
index 95c62141598b..058193b1279d 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Admin_settings_1_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Admin_settings_1_spec.js
@@ -2,155 +2,161 @@
 import adminsSettings from "../../../../locators/AdminsSettings";
 import { adminSettings as adminSettingsHelper } from "../../../../support/Objects/ObjectsCore";
 
-describe("Admin settings page", { tags: ["@tag.IDE"] }, function () {
-  beforeEach(() => {
-    cy.intercept("GET", "/api/v1/admin/env", {
-      body: { responseMeta: { status: 200, success: true }, data: {} },
-    }).as("getEnvVariables");
-    cy.intercept("PUT", "/api/v1/admin/env", {
-      body: { responseMeta: { status: 200, success: true }, data: {} },
-    }).as("postEnvVariables");
-    cy.intercept("PUT", "/api/v1/tenants", {
-      body: { responseMeta: { status: 200, success: true }, data: {} },
-    }).as("postTenantConfig");
-  });
-
-  it("1. should test that settings page is accessible to super user", () => {
-    cy.LogOut();
-    cy.LoginFromAPI(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
-    cy.get(".admin-settings-menu-option").should("be.visible");
-    cy.get(".admin-settings-menu-option").click();
-    cy.url().should("contain", adminSettingsHelper.routes.GENERAL);
-    cy.wait("@getEnvVariables");
-  });
+describe(
+  "Admin settings page",
+  { tags: ["@tag.IDE", "@tag.PropertyPane"] },
+  function () {
+    beforeEach(() => {
+      cy.intercept("GET", "/api/v1/admin/env", {
+        body: { responseMeta: { status: 200, success: true }, data: {} },
+      }).as("getEnvVariables");
+      cy.intercept("PUT", "/api/v1/admin/env", {
+        body: { responseMeta: { status: 200, success: true }, data: {} },
+      }).as("postEnvVariables");
+      cy.intercept("PUT", "/api/v1/tenants", {
+        body: { responseMeta: { status: 200, success: true }, data: {} },
+      }).as("postTenantConfig");
+    });
 
-  it("2. should test that page header is visible", () => {
-    cy.get(adminsSettings.appsmithHeader).should("be.visible");
-    cy.visit(adminSettingsHelper.routes.DEVELOPER_SETTINGS, { timeout: 60000 });
-    cy.url().should("contain", "/developer-settings");
-    cy.wait(2000); //page to load properly
-    cy.get(adminsSettings.appsmithHeader).should("be.visible");
-    cy.visit(adminSettingsHelper.routes.GOOGLEAUTH, { timeout: 60000 });
-    cy.url().should("contain", "/google-auth");
-    cy.wait(2000); //page to load properly
-    cy.get(adminsSettings.appsmithHeader).should("be.visible");
-  });
+    it("1. should test that settings page is accessible to super user", () => {
+      cy.LogOut();
+      cy.LoginFromAPI(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
+      cy.get(".admin-settings-menu-option").should("be.visible");
+      cy.get(".admin-settings-menu-option").click();
+      cy.url().should("contain", adminSettingsHelper.routes.GENERAL);
+      cy.wait("@getEnvVariables");
+    });
 
-  it("3. should test that clicking on logo should redirect to applications page", () => {
-    cy.visit(adminSettingsHelper.routes.GENERAL, { timeout: 60000 });
-    cy.get(adminsSettings.appsmithHeader).should("be.visible");
-    cy.get(adminsSettings.appsmithLogo).should("be.visible");
-    cy.get(adminsSettings.appsmithLogo).click();
-    cy.url().should("contain", adminSettingsHelper.routes.APPLICATIONS);
-  });
+    it("2. should test that page header is visible", () => {
+      cy.get(adminsSettings.appsmithHeader).should("be.visible");
+      cy.visit(adminSettingsHelper.routes.DEVELOPER_SETTINGS, {
+        timeout: 60000,
+      });
+      cy.url().should("contain", "/developer-settings");
+      cy.wait(2000); //page to load properly
+      cy.get(adminsSettings.appsmithHeader).should("be.visible");
+      cy.visit(adminSettingsHelper.routes.GOOGLEAUTH, { timeout: 60000 });
+      cy.url().should("contain", "/google-auth");
+      cy.wait(2000); //page to load properly
+      cy.get(adminsSettings.appsmithHeader).should("be.visible");
+    });
 
-  it("4. should test that settings page is redirected to default tab", () => {
-    cy.LoginFromAPI(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
-    cy.visit(adminSettingsHelper.routes.SETTINGS, { timeout: 60000 });
-    cy.url().should("contain", adminSettingsHelper.routes.GENERAL);
-  });
+    it("3. should test that clicking on logo should redirect to applications page", () => {
+      cy.visit(adminSettingsHelper.routes.GENERAL, { timeout: 60000 });
+      cy.get(adminsSettings.appsmithHeader).should("be.visible");
+      cy.get(adminsSettings.appsmithLogo).should("be.visible");
+      cy.get(adminsSettings.appsmithLogo).click();
+      cy.url().should("contain", adminSettingsHelper.routes.APPLICATIONS);
+    });
 
-  it(
-    "airgap",
-    "5. should test that settings page tab redirects and google maps doesn't exist - airgap",
-    () => {
-      cy.visit(adminSettingsHelper.routes.APPLICATIONS, { timeout: 60000 });
-      cy.wait(3000);
-      cy.get(".admin-settings-menu-option").click();
-      cy.get(adminsSettings.generalTab).click();
+    it("4. should test that settings page is redirected to default tab", () => {
+      cy.LoginFromAPI(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
+      cy.visit(adminSettingsHelper.routes.SETTINGS, { timeout: 60000 });
       cy.url().should("contain", adminSettingsHelper.routes.GENERAL);
-      cy.get(adminsSettings.advancedTab).click();
-      cy.url().should("contain", adminSettingsHelper.routes.ADVANCED);
-      cy.get(adminsSettings.authenticationTab).click();
-      cy.url().should("contain", adminSettingsHelper.routes.AUTHENTICATION);
-      cy.get(adminsSettings.emailTab).click();
-      cy.get(adminsSettings.developerSettingsTab).should("not.exist");
-      cy.url().should("contain", adminSettingsHelper.routes.EMAIL);
-      cy.get(adminsSettings.versionTab).click();
-      cy.url().should("contain", adminSettingsHelper.routes.VERSION);
-    },
-  );
+    });
 
-  it("6. should test save and clear buttons disabled state", () => {
-    cy.visit(adminSettingsHelper.routes.GENERAL, { timeout: 60000 });
-    const assertVisibilityAndDisabledState = () => {
+    it(
+      "airgap",
+      "5. should test that settings page tab redirects and google maps doesn't exist - airgap",
+      () => {
+        cy.visit(adminSettingsHelper.routes.APPLICATIONS, { timeout: 60000 });
+        cy.wait(3000);
+        cy.get(".admin-settings-menu-option").click();
+        cy.get(adminsSettings.generalTab).click();
+        cy.url().should("contain", adminSettingsHelper.routes.GENERAL);
+        cy.get(adminsSettings.advancedTab).click();
+        cy.url().should("contain", adminSettingsHelper.routes.ADVANCED);
+        cy.get(adminsSettings.authenticationTab).click();
+        cy.url().should("contain", adminSettingsHelper.routes.AUTHENTICATION);
+        cy.get(adminsSettings.emailTab).click();
+        cy.get(adminsSettings.developerSettingsTab).should("not.exist");
+        cy.url().should("contain", adminSettingsHelper.routes.EMAIL);
+        cy.get(adminsSettings.versionTab).click();
+        cy.url().should("contain", adminSettingsHelper.routes.VERSION);
+      },
+    );
+
+    it("6. should test save and clear buttons disabled state", () => {
+      cy.visit(adminSettingsHelper.routes.GENERAL, { timeout: 60000 });
+      const assertVisibilityAndDisabledState = () => {
+        cy.get(adminsSettings.saveButton).should("be.visible");
+        cy.get(adminsSettings.saveButton).should("be.disabled");
+        cy.get(adminsSettings.resetButton).should("be.visible");
+        cy.get(adminsSettings.resetButton).should("be.disabled");
+      };
+      assertVisibilityAndDisabledState();
+      cy.get(adminsSettings.instanceName).should("be.visible");
+      cy.get(adminsSettings.instanceName).clear().type("AppsmithInstance");
       cy.get(adminsSettings.saveButton).should("be.visible");
-      cy.get(adminsSettings.saveButton).should("be.disabled");
+      cy.get(adminsSettings.saveButton).should("not.be.disabled");
       cy.get(adminsSettings.resetButton).should("be.visible");
-      cy.get(adminsSettings.resetButton).should("be.disabled");
-    };
-    assertVisibilityAndDisabledState();
-    cy.get(adminsSettings.instanceName).should("be.visible");
-    cy.get(adminsSettings.instanceName).clear().type("AppsmithInstance");
-    cy.get(adminsSettings.saveButton).should("be.visible");
-    cy.get(adminsSettings.saveButton).should("not.be.disabled");
-    cy.get(adminsSettings.resetButton).should("be.visible");
-    cy.get(adminsSettings.resetButton).should("not.be.disabled");
-    cy.get(adminsSettings.resetButton).click();
-    assertVisibilityAndDisabledState();
-  });
-
-  it("7. should test saving a setting value", () => {
-    cy.visit(adminSettingsHelper.routes.GENERAL, { timeout: 60000 });
-    cy.get(adminsSettings.restartNotice).should("not.exist");
-    cy.get(adminsSettings.instanceName).should("be.visible");
-    let instanceName;
-    cy.generateUUID().then((uuid) => {
-      instanceName = uuid;
-      cy.get(adminsSettings.instanceName).clear().type(uuid);
+      cy.get(adminsSettings.resetButton).should("not.be.disabled");
+      cy.get(adminsSettings.resetButton).click();
+      assertVisibilityAndDisabledState();
     });
-    cy.get(adminsSettings.saveButton).should("be.visible");
-    cy.get(adminsSettings.saveButton).should("not.be.disabled");
-    cy.get(adminsSettings.saveButton).click();
-    cy.wait("@postTenantConfig").then((interception) => {
-      expect(interception.request.body.instanceName).to.equal(instanceName);
-    });
-    cy.get(adminsSettings.restartNotice).should("not.exist");
-    cy.wait(3000);
-  });
 
-  it("8. should test saving settings value from different tabs", () => {
-    cy.visit(adminSettingsHelper.routes.GENERAL, { timeout: 60000 });
-    cy.get(adminsSettings.restartNotice).should("not.exist");
-    cy.get(adminsSettings.instanceName).should("be.visible");
-    let instanceName;
-    cy.generateUUID().then((uuid) => {
-      instanceName = uuid;
-      cy.get(adminsSettings.instanceName).clear().type(uuid);
-    });
-    cy.get(adminsSettings.saveButton).should("be.visible");
-    cy.get(adminsSettings.saveButton).should("not.be.disabled");
-    cy.get(adminsSettings.emailTab).click();
-    cy.get(adminsSettings.saveButton).should("be.visible");
-    cy.get(adminsSettings.saveButton).should("not.be.disabled");
-    cy.get(adminsSettings.fromAddress).should("be.visible");
-    let fromAddress;
-    cy.generateUUID().then((uuid) => {
-      fromAddress = uuid;
-      cy.get(adminsSettings.fromAddress).clear().type(`${uuid}@appsmith.com`);
-    });
-    cy.intercept("POST", "/api/v1/admin/restart", {
-      body: { responseMeta: { status: 200, success: true }, data: true },
-    });
-    cy.get(adminsSettings.saveButton).click();
-    cy.wait("@postTenantConfig").then((interception) => {
-      expect(interception.request.body.instanceName).to.equal(instanceName);
+    it("7. should test saving a setting value", () => {
+      cy.visit(adminSettingsHelper.routes.GENERAL, { timeout: 60000 });
+      cy.get(adminsSettings.restartNotice).should("not.exist");
+      cy.get(adminsSettings.instanceName).should("be.visible");
+      let instanceName;
+      cy.generateUUID().then((uuid) => {
+        instanceName = uuid;
+        cy.get(adminsSettings.instanceName).clear().type(uuid);
+      });
+      cy.get(adminsSettings.saveButton).should("be.visible");
+      cy.get(adminsSettings.saveButton).should("not.be.disabled");
+      cy.get(adminsSettings.saveButton).click();
+      cy.wait("@postTenantConfig").then((interception) => {
+        expect(interception.request.body.instanceName).to.equal(instanceName);
+      });
+      cy.get(adminsSettings.restartNotice).should("not.exist");
+      cy.wait(3000);
     });
-    cy.wait("@postEnvVariables").then((interception) => {
-      expect(interception.request.body.APPSMITH_MAIL_FROM).to.equal(
-        `${fromAddress}@appsmith.com`,
+
+    it("8. should test saving settings value from different tabs", () => {
+      cy.visit(adminSettingsHelper.routes.GENERAL, { timeout: 60000 });
+      cy.get(adminsSettings.restartNotice).should("not.exist");
+      cy.get(adminsSettings.instanceName).should("be.visible");
+      let instanceName;
+      cy.generateUUID().then((uuid) => {
+        instanceName = uuid;
+        cy.get(adminsSettings.instanceName).clear().type(uuid);
+      });
+      cy.get(adminsSettings.saveButton).should("be.visible");
+      cy.get(adminsSettings.saveButton).should("not.be.disabled");
+      cy.get(adminsSettings.emailTab).click();
+      cy.get(adminsSettings.saveButton).should("be.visible");
+      cy.get(adminsSettings.saveButton).should("not.be.disabled");
+      cy.get(adminsSettings.fromAddress).should("be.visible");
+      let fromAddress;
+      cy.generateUUID().then((uuid) => {
+        fromAddress = uuid;
+        cy.get(adminsSettings.fromAddress).clear().type(`${uuid}@appsmith.com`);
+      });
+      cy.intercept("POST", "/api/v1/admin/restart", {
+        body: { responseMeta: { status: 200, success: true }, data: true },
+      });
+      cy.get(adminsSettings.saveButton).click();
+      cy.wait("@postTenantConfig").then((interception) => {
+        expect(interception.request.body.instanceName).to.equal(instanceName);
+      });
+      cy.wait("@postEnvVariables").then((interception) => {
+        expect(interception.request.body.APPSMITH_MAIL_FROM).to.equal(
+          `${fromAddress}@appsmith.com`,
+        );
+      });
+      cy.waitUntil(() =>
+        cy.contains("General", { timeout: 180000 }).should("be.visible"),
       );
+      cy.get(adminsSettings.restartNotice).should("not.exist");
+      cy.wait(3000);
     });
-    cy.waitUntil(() =>
-      cy.contains("General", { timeout: 180000 }).should("be.visible"),
-    );
-    cy.get(adminsSettings.restartNotice).should("not.exist");
-    cy.wait(3000);
-  });
 
-  it("9. should test that instance name and admin emails exist on general tab", () => {
-    cy.visit(adminSettingsHelper.routes.GENERAL, { timeout: 60000 });
-    cy.get(adminsSettings.instanceName).should("be.visible");
-    cy.get(adminsSettings.adminEmails).should("be.visible");
-  });
-});
+    it("9. should test that instance name and admin emails exist on general tab", () => {
+      cy.visit(adminSettingsHelper.routes.GENERAL, { timeout: 60000 });
+      cy.get(adminsSettings.instanceName).should("be.visible");
+      cy.get(adminsSettings.adminEmails).should("be.visible");
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Admin_settings_2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Admin_settings_2_spec.js
index cc5790f476a2..fdc9e5bbfff0 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Admin_settings_2_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Admin_settings_2_spec.js
@@ -6,52 +6,61 @@ const {
   GOOGLE_MAPS_SETUP_DOC,
 } = require("../../../../../src/constants/ThirdPartyConstants");
 
-describe("Admin settings page", { tags: ["@tag.IDE"] }, function () {
-  it("1. should test that configure link redirects to google maps setup doc", () => {
-    cy.visit(adminSettingsHelper.routes.DEVELOPER_SETTINGS, { timeout: 60000 });
-    cy.get(adminsSettings.readMoreLink).within(() => {
-      cy.get("a")
-        .should("have.attr", "target", "_blank")
-        .invoke("removeAttr", "target")
-        .click()
-        .wait(3000); //for page to load fully;
-      cy.url().should("contain", GOOGLE_MAPS_SETUP_DOC);
+describe(
+  "Admin settings page",
+  { tags: ["@tag.IDE", "@tag.PropertyPane"] },
+  function () {
+    it("1. should test that configure link redirects to google maps setup doc", () => {
+      cy.visit(adminSettingsHelper.routes.DEVELOPER_SETTINGS, {
+        timeout: 60000,
+      });
+      cy.get(adminsSettings.readMoreLink).within(() => {
+        cy.get("a")
+          .should("have.attr", "target", "_blank")
+          .invoke("removeAttr", "target")
+          .click()
+          .wait(3000); //for page to load fully;
+        cy.url().should("contain", GOOGLE_MAPS_SETUP_DOC);
+      });
     });
-  });
 
-  it(
-    "airgap",
-    "2. should test that authentication page redirects and google and github auth doesn't exist - airgap",
-    () => {
-      cy.visit(adminSettingsHelper.routes.GENERAL, { timeout: 60000 });
-      cy.get(adminsSettings.authenticationTab).click();
-      cy.url().should("contain", adminSettingsHelper.routes.AUTHENTICATION);
-      cy.get(adminsSettings.googleButton).should("not.exist");
-      cy.get(adminsSettings.githubButton).should("not.exist");
-      cy.get(adminsSettings.formloginButton).click();
-      cy.url().should("contain", adminSettingsHelper.routes.FORMLOGIN);
-    },
-  );
+    it(
+      "airgap",
+      "2. should test that authentication page redirects and google and github auth doesn't exist - airgap",
+      () => {
+        cy.visit(adminSettingsHelper.routes.GENERAL, { timeout: 60000 });
+        cy.get(adminsSettings.authenticationTab).click();
+        cy.url().should("contain", adminSettingsHelper.routes.AUTHENTICATION);
+        cy.get(adminsSettings.googleButton).should("not.exist");
+        cy.get(adminsSettings.githubButton).should("not.exist");
+        cy.get(adminsSettings.formloginButton).click();
+        cy.url().should("contain", adminSettingsHelper.routes.FORMLOGIN);
+      },
+    );
 
-  it(
-    "airgap",
-    "5. should test that read more on version is hidden for airgap",
-    () => {
-      cy.visit(adminSettingsHelper.routes.GENERAL, { timeout: 60000 });
-      cy.get(adminsSettings.versionTab).click();
-      cy.url().should("contain", adminSettingsHelper.routes.VERSION);
-      cy.get(adminsSettings.readMoreLink).should("not.exist");
-    },
-  );
+    it(
+      "airgap",
+      "5. should test that read more on version is hidden for airgap",
+      () => {
+        cy.visit(adminSettingsHelper.routes.GENERAL, { timeout: 60000 });
+        cy.get(adminsSettings.versionTab).click();
+        cy.url().should("contain", adminSettingsHelper.routes.VERSION);
+        cy.get(adminsSettings.readMoreLink).should("not.exist");
+      },
+    );
 
-  it("6. should test that settings page is not accessible to normal users", () => {
-    cy.LogOut(false);
-    cy.wait(2000);
-    cy.LoginFromAPI(Cypress.env("TESTUSERNAME3"), Cypress.env("TESTPASSWORD3"));
-    cy.get(".admin-settings-menu-option").should("not.exist");
-    cy.visit(adminSettingsHelper.routes.GENERAL, { timeout: 60000 });
-    // non super users are redirected to home page
-    cy.url().should("contain", adminSettingsHelper.routes.APPLICATIONS);
-    cy.LogOut(false);
-  });
-});
+    it("6. should test that settings page is not accessible to normal users", () => {
+      cy.LogOut(false);
+      cy.wait(2000);
+      cy.LoginFromAPI(
+        Cypress.env("TESTUSERNAME3"),
+        Cypress.env("TESTPASSWORD3"),
+      );
+      cy.get(".admin-settings-menu-option").should("not.exist");
+      cy.visit(adminSettingsHelper.routes.GENERAL, { timeout: 60000 });
+      // non super users are redirected to home page
+      cy.url().should("contain", adminSettingsHelper.routes.APPLICATIONS);
+      cy.LogOut(false);
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Admin_settings_3_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Admin_settings_3_spec.ts
index b0f71965592a..54fb59551011 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Admin_settings_3_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Admin_settings_3_spec.ts
@@ -10,7 +10,7 @@ const {
 
 describe(
   "Admin settings page",
-  { tags: ["@tag.IDE", "@tag.excludeForAirgap"] },
+  { tags: ["@tag.IDE", "@tag.excludeForAirgap", "@tag.PropertyPane"] },
   function () {
     it("1. should test that authentication page redirects", () => {
       cy.visit(adminSettingsHelper.routes.GENERAL, { timeout: 60000 });
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Bindings_Widgets_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Bindings_Widgets_spec.ts
index 926bfaeee830..f9111b4486a3 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Bindings_Widgets_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Bindings_Widgets_spec.ts
@@ -11,7 +11,7 @@ import PageList from "../../../../support/Pages/PageList";
 
 describe(
   "Entity explorer tests related to widgets and validation",
-  { tags: ["@tag.IDE"] },
+  { tags: ["@tag.IDE", "@tag.PropertyPane"] },
   function () {
     beforeEach(() => {
       agHelper.RestoreLocalStorageCache();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/CopyQuery_RenameDatasource_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/CopyQuery_RenameDatasource_spec.js
index e38696d62478..535ec4df3c5c 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/CopyQuery_RenameDatasource_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/CopyQuery_RenameDatasource_spec.js
@@ -16,7 +16,7 @@ let datasourceName;
 
 describe(
   "Entity explorer tests related to copy query",
-  { tags: ["@tag.IDE"] },
+  { tags: ["@tag.IDE", "@tag.PropertyPane"] },
   function () {
     beforeEach(() => {
       dataSources.StartDataSourceRoutes();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/DragAndDropWidget_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/DragAndDropWidget_spec.js
index f8fc4b443857..a0ee177944ed 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/DragAndDropWidget_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/DragAndDropWidget_spec.js
@@ -11,7 +11,7 @@ import * as _ from "../../../../support/Objects/ObjectsCore";
 
 describe(
   "Entity explorer Drag and Drop widgets testcases",
-  { tags: ["@tag.IDE"] },
+  { tags: ["@tag.IDE", "@tag.PropertyPane"] },
   function () {
     it("1. Drag and drop form widget and validate", function () {
       cy.get(commonlocators.entityExplorersearch).should("be.visible");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Drag_Drop_Building_Blocks_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Drag_Drop_Building_Blocks_spec.ts
index db34cc51dae9..2bdeb3c0fb6d 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Drag_Drop_Building_Blocks_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Drag_Drop_Building_Blocks_spec.ts
@@ -19,6 +19,11 @@ describe(
       "@tag.Widget",
       "@tag.Templates",
       "@tag.excludeForAirgap",
+      "@tag.PropertyPane",
+      "@tag.Git",
+      "@tag.ImportExport",
+      "@tag.Fork",
+      "@tag.Binding",
     ],
   },
   () => {
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Entity_Naming_conflict_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Entity_Naming_conflict_spec.js
index 3c6c68c2306d..65705fcab66c 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Entity_Naming_conflict_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Entity_Naming_conflict_spec.js
@@ -7,25 +7,29 @@ const apiwidget = require("../../../../locators/apiWidgetslocator.json");
 
 import * as _ from "../../../../support/Objects/ObjectsCore";
 
-describe("Tab widget test", { tags: ["@tag.IDE"] }, function () {
-  const apiName = "Table1";
-  const tableName = "Table1";
-  before(() => {
-    _.agHelper.AddDsl("basicTabledsl");
-  });
+describe(
+  "Tab widget test",
+  { tags: ["@tag.IDE", "@tag.PropertyPane"] },
+  function () {
+    const apiName = "Table1";
+    const tableName = "Table1";
+    before(() => {
+      _.agHelper.AddDsl("basicTabledsl");
+    });
 
-  it("1. Rename API with table widget name validation test", function () {
-    cy.log("Login Successful");
-    cy.CreateApiAndValidateUniqueEntityName(apiName);
-    cy.get(apiwidget.apiTxt)
-      .clear()
-      .type(tableName, { force: true })
-      .should("have.value", tableName);
-    //Rename Table widget with api name validation test
-    PageLeftPane.switchSegment(PagePaneSegment.UI);
-    PageLeftPane.assertPresence("Table1");
-    PageLeftPane.switchSegment(PagePaneSegment.Queries);
-    cy.RenameEntity(apiName);
-    cy.validateMessage(apiName);
-  });
-});
+    it("1. Rename API with table widget name validation test", function () {
+      cy.log("Login Successful");
+      cy.CreateApiAndValidateUniqueEntityName(apiName);
+      cy.get(apiwidget.apiTxt)
+        .clear()
+        .type(tableName, { force: true })
+        .should("have.value", tableName);
+      //Rename Table widget with api name validation test
+      PageLeftPane.switchSegment(PagePaneSegment.UI);
+      PageLeftPane.assertPresence("Table1");
+      PageLeftPane.switchSegment(PagePaneSegment.Queries);
+      cy.RenameEntity(apiName);
+      cy.validateMessage(apiName);
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Hide_Page_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Hide_Page_spec.js
index 90f5ba7b7ace..985faa158dff 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Hide_Page_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Hide_Page_spec.js
@@ -9,7 +9,7 @@ import { EntityItems } from "../../../../support/Pages/AssertHelper";
 
 describe(
   "Hide / Show page test functionality",
-  { tags: ["@tag.IDE"] },
+  { tags: ["@tag.IDE", "@tag.PropertyPane"] },
   function () {
     it("1. Hide/Show page test ", function () {
       PageList.AddNewPage(); // Page2
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/JSEditorContextMenu_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/JSEditorContextMenu_Spec.ts
index c6f892cde2f0..c132f969099e 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/JSEditorContextMenu_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/JSEditorContextMenu_Spec.ts
@@ -13,7 +13,7 @@ import { EntityItems } from "../../../../support/Pages/AssertHelper";
 
 describe(
   "Validate basic operations on Entity explorer JSEditor structure",
-  { tags: ["@tag.IDE"] },
+  { tags: ["@tag.IDE", "@tag.PropertyPane"] },
   () => {
     const pageId = "Page1";
 
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Long_Name_Tooltip_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Long_Name_Tooltip_spec.js
index 1de4d9a46e4f..fa2e9654bea2 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Long_Name_Tooltip_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Long_Name_Tooltip_spec.js
@@ -12,7 +12,7 @@ const alternateName = "AlternateName";
 const tooltTipQuery = `.rc-tooltip.ads-v2-tooltip:not(.rc-tooltip-hidden) > .rc-tooltip-content > .rc-tooltip-inner > .ads-v2-text`;
 describe(
   "Entity Explorer showing tooltips on long names",
-  { tags: ["@tag.IDE"] },
+  { tags: ["@tag.IDE", "@tag.PropertyPane"] },
   function () {
     it("1. Expect tooltip on long names only", function () {
       // create an API with a short name
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Page_Load_Spec.js b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Page_Load_Spec.js
index fb68eabeb0cc..66286db42006 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Page_Load_Spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Page_Load_Spec.js
@@ -11,7 +11,7 @@ import {
 import PageList from "../../../../support/Pages/PageList";
 import { EntityItems } from "../../../../support/Pages/AssertHelper";
 
-describe("Page Load tests", { tags: ["@tag.IDE"] }, () => {
+describe("Page Load tests", { tags: ["@tag.IDE", "@tag.PropertyPane"] }, () => {
   afterEach(() => {
     agHelper.SaveLocalStorageCache();
   });
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Pages_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Pages_spec.js
index cf1d77b9dd19..b0189631403f 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Pages_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Pages_spec.js
@@ -4,7 +4,7 @@ import EditorNavigation, {
 } from "../../../../support/Pages/EditorNavigation";
 import PageList from "../../../../support/Pages/PageList";
 
-describe("Pages", { tags: ["@tag.IDE"] }, function () {
+describe("Pages", { tags: ["@tag.IDE", "@tag.PropertyPane"] }, function () {
   let veryLongPageName = `abcdefghijklmnopqrstuvwxyz1234`;
   let apiName = "someApi";
 
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Query_Datasource_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Query_Datasource_spec.js
index db02a87e71de..70e051f3101e 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Query_Datasource_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Query_Datasource_spec.js
@@ -17,7 +17,7 @@ let datasourceName;
 
 describe(
   "Entity explorer tests related to query and datasource",
-  { tags: ["@tag.IDE"] },
+  { tags: ["@tag.IDE", "@tag.PropertyPane"] },
   function () {
     before(() => {
       cy.generateUUID().then((uid) => {
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Renaming_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Renaming_spec.js
index 95bb8d422533..8df62d3156c0 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Renaming_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Renaming_spec.js
@@ -19,7 +19,7 @@ const secondApiName = "Second";
 
 describe(
   "Api Naming conflict on a page test",
-  { tags: ["@tag.IDE"] },
+  { tags: ["@tag.IDE", "@tag.PropertyPane"] },
   function () {
     it("1. Expects actions on the same page cannot have identical names", function () {
       // create an API
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Select_Widget_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Select_Widget_spec.js
index 193f72ce28ca..419b2b2c5acb 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Select_Widget_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Select_Widget_spec.js
@@ -6,94 +6,111 @@ import EditorNavigation, {
   EntityType,
 } from "../../../../support/Pages/EditorNavigation";
 
-describe("Explorer hidden widget Selection", { tags: ["@tag.IDE"] }, () => {
-  before(() => {
-    _.agHelper.AddDsl("explorerHiddenWidgets");
-  });
-  afterEach(() => {
-    cy.get(commonLocators.canvas).click({ force: true });
-  });
-  it("1. Opens modal when selecting a modal", () => {
-    EditorNavigation.SelectEntityByName("SimpleModal", EntityType.Widget);
+describe(
+  "Explorer hidden widget Selection",
+  { tags: ["@tag.IDE", "@tag.PropertyPane"] },
+  () => {
+    before(() => {
+      _.agHelper.AddDsl("explorerHiddenWidgets");
+    });
+    afterEach(() => {
+      cy.get(commonLocators.canvas).click({ force: true });
+    });
+    it("1. Opens modal when selecting a modal", () => {
+      EditorNavigation.SelectEntityByName("SimpleModal", EntityType.Widget);
 
-    cy.get(widgetLocators.modalWidget).should("have.length", 1);
-    cy.get(commonLocators.propertyPaneTitle).should("contain", "SimpleModal");
-    cy.get(widgets.modalCloseButton).click({ force: true });
-  });
+      cy.get(widgetLocators.modalWidget).should("have.length", 1);
+      cy.get(commonLocators.propertyPaneTitle).should("contain", "SimpleModal");
+      cy.get(widgets.modalCloseButton).click({ force: true });
+    });
 
-  it("2. Opens modal when selecting a widget inside a modal", () => {
-    EditorNavigation.SelectEntityByName("Simple_Modal_Text", EntityType.Widget);
+    it("2. Opens modal when selecting a widget inside a modal", () => {
+      EditorNavigation.SelectEntityByName(
+        "Simple_Modal_Text",
+        EntityType.Widget,
+      );
 
-    cy.get(widgetLocators.modalWidget).should("have.length", 1);
-    cy.get(commonLocators.propertyPaneTitle).should(
-      "contain",
-      "Simple_Modal_Text",
-    );
-    cy.get(widgets.modalCloseButton).click({ force: true });
-  });
+      cy.get(widgetLocators.modalWidget).should("have.length", 1);
+      cy.get(commonLocators.propertyPaneTitle).should(
+        "contain",
+        "Simple_Modal_Text",
+      );
+      cy.get(widgets.modalCloseButton).click({ force: true });
+    });
 
-  it("3. Switches tabs when selecting a tab", () => {
-    EditorNavigation.SelectEntityByName(
-      "UnselectedTab",
-      EntityType.Widget,
-      {},
-      ["Tabs1"],
-    );
+    it("3. Switches tabs when selecting a tab", () => {
+      EditorNavigation.SelectEntityByName(
+        "UnselectedTab",
+        EntityType.Widget,
+        {},
+        ["Tabs1"],
+      );
 
-    // Assert correct tab is open
-    cy.wait(1000);
-    cy.get(".t--page-switch-tab.is-active").contains("UnselectedTab");
-  });
+      // Assert correct tab is open
+      cy.wait(1000);
+      cy.get(".t--page-switch-tab.is-active").contains("UnselectedTab");
+    });
 
-  it("4. Switches tabs when selecting a widget inside other tab", () => {
-    EditorNavigation.SelectEntityByName("Button6", EntityType.Widget, {}, [
-      "UnselectedTab",
-    ]);
+    it("4. Switches tabs when selecting a widget inside other tab", () => {
+      EditorNavigation.SelectEntityByName("Button6", EntityType.Widget, {}, [
+        "UnselectedTab",
+      ]);
 
-    // Assert correct tab is open and button selected
-    cy.wait(1000);
-    cy.get(".t--page-switch-tab.is-active").contains("UnselectedTab");
-    cy.get(commonLocators.propertyPaneTitle).should("contain", "Button6");
-  });
-  it("5. Switches tabs with a button inside the tab", () => {
-    cy.get(".t--page-switch-tab")
-      .contains("UnselectedTab")
-      .click({ force: true });
-    cy.wait(1000);
-    cy.get(widgets.buttonWidget).contains("Unselected").click({ force: true });
-    // Assert tab is switched
-    cy.get(".t--page-switch-tab.is-active").should("contain", "InternalTab");
-    cy.get(commonLocators.propertyPaneTitle).should("contain", "Button6");
-  });
-  it("6. Switches tabs when selecting a widget inside hidden tab", () => {
-    EditorNavigation.SelectEntityByName("Button7", EntityType.Widget, {}, [
-      "Tab 3",
-    ]);
+      // Assert correct tab is open and button selected
+      cy.wait(1000);
+      cy.get(".t--page-switch-tab.is-active").contains("UnselectedTab");
+      cy.get(commonLocators.propertyPaneTitle).should("contain", "Button6");
+    });
+    it("5. Switches tabs with a button inside the tab", () => {
+      cy.get(".t--page-switch-tab")
+        .contains("UnselectedTab")
+        .click({ force: true });
+      cy.wait(1000);
+      cy.get(widgets.buttonWidget)
+        .contains("Unselected")
+        .click({ force: true });
+      // Assert tab is switched
+      cy.get(".t--page-switch-tab.is-active").should("contain", "InternalTab");
+      cy.get(commonLocators.propertyPaneTitle).should("contain", "Button6");
+    });
+    it("6. Switches tabs when selecting a widget inside hidden tab", () => {
+      EditorNavigation.SelectEntityByName("Button7", EntityType.Widget, {}, [
+        "Tab 3",
+      ]);
 
-    // Assert button is selected
-    cy.wait(1000);
-    cy.get(".t--page-switch-tab.is-active").should("not.exist");
-    cy.get(commonLocators.propertyPaneTitle).should("contain", "Button7");
-  });
+      // Assert button is selected
+      cy.wait(1000);
+      cy.get(".t--page-switch-tab.is-active").should("not.exist");
+      cy.get(commonLocators.propertyPaneTitle).should("contain", "Button7");
+    });
 
-  it("7. Assert the overkill", () => {
-    EditorNavigation.SelectEntityByName("OverKillText", EntityType.Widget, {}, [
-      "Overkill_Modal",
-      "Tabs2",
-      "Tab 2",
-      "Tabs3",
-      "Canvas9",
-      "Tabs4",
-      "Canvas11",
-      "Tabs5",
-      "Canvas13",
-    ]);
+    it("7. Assert the overkill", () => {
+      EditorNavigation.SelectEntityByName(
+        "OverKillText",
+        EntityType.Widget,
+        {},
+        [
+          "Overkill_Modal",
+          "Tabs2",
+          "Tab 2",
+          "Tabs3",
+          "Canvas9",
+          "Tabs4",
+          "Canvas11",
+          "Tabs5",
+          "Canvas13",
+        ],
+      );
 
-    // Assert that widget is seen
-    cy.get(commonLocators.propertyPaneTitle).should("contain", "OverKillText");
-    cy.get(`div[data-testid='t--selected']`)
-      .should("have.length", 1)
-      .should("have.class", "t--draggable-textwidget")
-      .contains("Overkill Widget");
-  });
-});
+      // Assert that widget is seen
+      cy.get(commonLocators.propertyPaneTitle).should(
+        "contain",
+        "OverKillText",
+      );
+      cy.get(`div[data-testid='t--selected']`)
+        .should("have.length", 1)
+        .should("have.class", "t--draggable-textwidget")
+        .contains("Overkill Widget");
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Tab_rename_Delete_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Tab_rename_Delete_spec.ts
index fe76b3118a28..df52ca57622b 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Tab_rename_Delete_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Tab_rename_Delete_spec.ts
@@ -9,36 +9,39 @@ import EditorNavigation, {
   PageLeftPane,
 } from "../../../../support/Pages/EditorNavigation";
 
-describe("Tab widget test", { tags: ["@tag.IDE"] }, function () {
-  const tabname = "UpdatedTab";
-  before(() => {
-    agHelper.AddDsl("tabdsl");
-  });
+describe(
+  "Tab widget test",
+  { tags: ["@tag.IDE", "@tag.PropertyPane"] },
+  function () {
+    const tabname = "UpdatedTab";
+    before(() => {
+      agHelper.AddDsl("tabdsl");
+    });
 
-  it("1. Tab Widget Functionality To rename Tabs from entity explorer", function () {
-    EditorNavigation.SelectEntityByName("Tabs1", EntityType.Widget);
-    PageLeftPane.expandCollapseItem("Tabs1");
-    entityExplorer.RenameEntityFromExplorer("Tab1", tabname, true);
-  });
+    it("1. Tab Widget Functionality To rename Tabs from entity explorer", function () {
+      EditorNavigation.SelectEntityByName("Tabs1", EntityType.Widget);
+      PageLeftPane.expandCollapseItem("Tabs1");
+      entityExplorer.RenameEntityFromExplorer("Tab1", tabname, true);
+    });
 
-  it("2. Tab Widget Functionality To delete Tabs from entity explorer", function () {
-    EditorNavigation.SelectEntityByName("Tabs1", EntityType.Widget);
-    PageLeftPane.expandCollapseItem("Tabs1");
-    entityExplorer.ActionContextMenuByEntityName({
-      entityNameinLeftSidebar: "Tab2",
-      action: "Rename",
+    it("2. Tab Widget Functionality To delete Tabs from entity explorer", function () {
+      EditorNavigation.SelectEntityByName("Tabs1", EntityType.Widget);
+      PageLeftPane.expandCollapseItem("Tabs1");
+      entityExplorer.ActionContextMenuByEntityName({
+        entityNameinLeftSidebar: "Tab2",
+        action: "Rename",
+      });
+      agHelper.TypeText(locators._entityNameEditing("Tab2"), tabname);
+      agHelper.Sleep(2000);
+      entityExplorer.ValidateDuplicateMessageToolTip(tabname);
+      cy.get(explorer.editEntity)
+        .last()
+        .click()
+        .type("Tab2" + "{enter}", { force: true });
+      entityExplorer.DeleteWidgetFromEntityExplorer(tabname + "Tab2");
     });
-    agHelper.TypeText(locators._entityNameEditing("Tab2"), tabname);
-    agHelper.Sleep(2000);
-    entityExplorer.ValidateDuplicateMessageToolTip(tabname);
-    cy.get(explorer.editEntity)
-      .last()
-      .click()
-      .type("Tab2" + "{enter}", { force: true });
-    entityExplorer.DeleteWidgetFromEntityExplorer(tabname + "Tab2");
-  });
 
-  /* To be enabled once the bug is fixed
+    /* To be enabled once the bug is fixed
     it("Publish app and check for the widget name", function() {
       deployMode.DeployApp();
       cy.get(publish.tabWidget)
@@ -61,7 +64,8 @@ deployMode.NavigateBacktoEditor();
         .should("not.be.visible");
     });
     */
-});
+  },
+);
 
 afterEach(() => {
   // put your clean up code if any
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Widgets_Copy_Delete_Undo_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Widgets_Copy_Delete_Undo_spec.js
index 9c8d981cda5e..ac48486220e0 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Widgets_Copy_Delete_Undo_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Widgets_Copy_Delete_Undo_spec.js
@@ -17,7 +17,7 @@ before(() => {
 
 describe(
   "Test Suite to validate copy/delete/undo functionalites",
-  { tags: ["@tag.IDE", "@tag.Sanity"] },
+  { tags: ["@tag.IDE", "@tag.Sanity", "@tag.PropertyPane"] },
   function () {
     const modifierKey = Cypress.platform === "darwin" ? "meta" : "ctrl";
 
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Widgets_Copy_Paste_Delete_Undo_Keyboard_Event_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Widgets_Copy_Paste_Delete_Undo_Keyboard_Event_spec.js
index dab2b9f5b084..350e4b008565 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Widgets_Copy_Paste_Delete_Undo_Keyboard_Event_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Widgets_Copy_Paste_Delete_Undo_Keyboard_Event_spec.js
@@ -16,7 +16,7 @@ before(() => {
 
 describe(
   "Test Suite to validate copy/delete/undo functionalites",
-  { tags: ["@tag.IDE"] },
+  { tags: ["@tag.IDE", "@tag.PropertyPane"] },
   function () {
     it("1. Drag and drop form widget and validate copy widget via toast message", function () {
       const modifierKey = Cypress.platform === "darwin" ? "meta" : "ctrl";
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Widgets_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Widgets_spec.js
index c08e88e2ca38..552b50ca0720 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Widgets_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Widgets_spec.js
@@ -7,7 +7,7 @@ import * as _ from "../../../../support/Objects/ObjectsCore";
 
 describe(
   "Entity explorer tests related to widgets and validation",
-  { tags: ["@tag.IDE"] },
+  { tags: ["@tag.IDE", "@tag.PropertyPane"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("displayWidgetDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Fork/ForkAppWithMultipleDS_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Fork/ForkAppWithMultipleDS_Spec.ts
index 1ff3847aa8dc..34d2bd4c1660 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Fork/ForkAppWithMultipleDS_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Fork/ForkAppWithMultipleDS_Spec.ts
@@ -9,7 +9,9 @@ let targetWorkspaceId: string;
 
 describe(
   "Fork application with multiple datasources",
-  { tags: ["@tag.Fork"] },
+  {
+    tags: ["@tag.Fork", "@tag.Datasource", "@tag.Git", "@tag.Table", "@tag.JS"],
+  },
   function () {
     it("1. Bug Id: 24708  - fork and test the forked application", function () {
       // Create a new workspace and fork application
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Fork/ForkApplicationInDeployedMode_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Fork/ForkApplicationInDeployedMode_spec.ts
index 9de8b3ef1688..637d705ec7ed 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Fork/ForkApplicationInDeployedMode_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Fork/ForkApplicationInDeployedMode_spec.ts
@@ -8,7 +8,9 @@ import applicationLocators from "../../../../locators/Applications.json";
 
 describe(
   "Fork application in deployed mode",
-  { tags: ["@tag.Fork"] },
+  {
+    tags: ["@tag.Fork", "@tag.Datasource", "@tag.Git", "@tag.Table", "@tag.JS"],
+  },
   function () {
     it("1. Fork modal should open and close", function () {
       appSettings.OpenAppSettings();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Fork/ForkApplicationReconnectModal_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Fork/ForkApplicationReconnectModal_spec.ts
index 3495f3942d8e..9b3d2056ac4b 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Fork/ForkApplicationReconnectModal_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Fork/ForkApplicationReconnectModal_spec.ts
@@ -8,7 +8,16 @@ let currentWorkspace: string, currentAppName: string, forkWorkspaceName: string;
 
 describe(
   "Fork application across workspaces",
-  { tags: ["@tag.Fork", "@tag.Sanity"] },
+  {
+    tags: [
+      "@tag.Fork",
+      "@tag.Sanity",
+      "@tag.Datasource",
+      "@tag.Git",
+      "@tag.Table",
+      "@tag.JS",
+    ],
+  },
   function () {
     it("Bug 24702: Signed user should be able to fork a public forkable app & Check if the forked application has the same dsl as the original", function () {
       // Create new workspace to create App in
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Fork/ForkApplicationWithinAppEditor_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Fork/ForkApplicationWithinAppEditor_spec.ts
index 0f45c14af7b3..bcef1ac1fa49 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Fork/ForkApplicationWithinAppEditor_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Fork/ForkApplicationWithinAppEditor_spec.ts
@@ -5,7 +5,9 @@ import EditorNavigation, {
 
 describe(
   "Fork application across workspaces",
-  { tags: ["@tag.Fork"] },
+  {
+    tags: ["@tag.Fork", "@tag.Datasource", "@tag.Git", "@tag.Table", "@tag.JS"],
+  },
   function () {
     before(() => {
       _.agHelper.AddDsl("basicDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Fork/ForkApplication_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Fork/ForkApplication_spec.ts
index 8a2bfbebb65b..a4612d360b92 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Fork/ForkApplication_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Fork/ForkApplication_spec.ts
@@ -25,7 +25,9 @@ let forkableAppUrl: any;
 
 describe(
   "Fork application across workspaces",
-  { tags: ["@tag.Fork"] },
+  {
+    tags: ["@tag.Fork", "@tag.Datasource", "@tag.Git", "@tag.Table", "@tag.JS"],
+  },
   function () {
     it("1. Mark application as forkable", () => {
       cy.LoginFromAPI(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts
index 85eb6edf6ec1..909105a76031 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts
@@ -4,24 +4,31 @@ import {
   dataSources,
   deployMode,
   draggableWidgets,
-  entityExplorer,
   gitSync,
   homePage,
-  jsEditor,
   locators,
-  propPane,
   table,
 } from "../../../../../../support/Objects/ObjectsCore";
-import EditorNavigation, {
-  EntityType,
-  PageLeftPane,
-} from "../../../../../../support/Pages/EditorNavigation";
+import PageList from "../../../../../../support/Pages/PageList";
 
 describe(
   "Import and validate older app (app created in older versions of Appsmith) from Gitea",
-  { tags: ["@tag.Git", "@tag.Sanity"] },
+  {
+    tags: [
+      "@tag.Git",
+      "@tag.Sanity",
+      "@tag.TedMigration",
+      "@tag.AccessControl",
+      "@tag.Workflows",
+      "@tag.Module",
+      "@tag.Theme",
+      "@tag.JS",
+      "@tag.Container",
+      "@tag.ImportExport",
+    ],
+  },
   function () {
-    let appRepoName = "TestMigration",
+    let appRepoName = "TED-migration-test-1",
       appName = "UpgradeAppToLatestVersion",
       keyId: any,
       workspaceName: any;
@@ -41,68 +48,21 @@ describe(
       dataSources.ReconnectDSbyType("MongoDB");
       dataSources.ReconnectDSbyType("MySQL");
       dataSources.ReconnectDSbyType("PostgreSQL");
-      agHelper.Sleep(3000); //for CI to reconnect successfully
       homePage.AssertNCloseImport();
-    });
-
-    it("1. Validate merge status + Bug23822", () => {
-      PageLeftPane.assertPresence("ListingAndReviews");
-      //Wait for the app to settle
-      agHelper.Sleep(3000);
       homePage.RenameApplication(appName);
+      PageList.assertPresence("ListingAndReviews");
+
+      // this logic will have to be removed after decimal issue with auto-commit is resolved
       assertHelper.AssertNetworkResponseData("gitStatus");
       agHelper.AssertElementExist(gitSync._bottomBarCommit, 0, 30000);
-      agHelper.AssertText(gitSync._gitPullCount, "text", "4");
       agHelper.GetNClick(gitSync._bottomBarCommit);
       agHelper.AssertElementVisibility(gitSync._gitSyncModal);
-
-      //This is expected due to Canvas Splitting PR changes in v1.9.24
-      agHelper.GetNAssertContains(
-        gitSync._gitStatusChanges,
-        /[0-9] page(|s) modified/,
-      );
-
-      // Commenting it as part of #28012 - to be added back later
-      // agHelper.GetNAssertElementText(
-      //   gitSync._gitStatusChanges,
-      //   "Application settings modified",
-      //   "not.contain.text",
-      // );
-      agHelper.GetNAssertElementText(
-        gitSync._gitStatusChanges,
-        "Theme modified",
-        "not.contain.text",
-      );
-      agHelper.AssertContains(/[0-9] quer(y|ies) modified/, "not.exist");
-
-      // Commented out due to #25739 - to be fixed by dev later
-      // agHelper.GetNAssertElementText(
-      //   gitSync._gitStatusChanges,
-      //   "datasource modified",
-      //   "not.contain.text",
-      // );
-
-      agHelper.AssertContains(/[0-9] JS Object(|s) modified/, "not.exist");
-
-      // Commenting it as part of #28012 - to be added back later
-      // agHelper.AssertContains(/[0-9] librar(y|ies) modified/, "not.exist");
-
-      // This assertions is commented out due to issue #https://github.com/appsmithorg/appsmith/issues/28563
-      // Since we don't want this specific message appearing when we are just migrating the metadata,
-      // this assertion is not required.
-      // Slack conversation: https://theappsmith.slack.com/archives/C04HERDNZPA/p1698851532418569
-
-      // agHelper.GetNAssertElementText(
-      //   gitSync._gitStatusChanges,
-      //   "Some of the changes above are due to an improved file structure designed to reduce merge conflicts. You can safely commit them to your repository.",
-      //   "contain.text",
-      // );
       agHelper.GetNClick(gitSync._commitButton);
       assertHelper.AssertNetworkStatus("@commit", 201);
       gitSync.CloseGitSyncModal();
     });
 
-    it("2. Deploy the app & Validate CRUD pages - Mongo , MySql, Postgres pages", () => {
+    it("1. Deploy the app & Validate CRUD pages - Mongo , MySql, Postgres pages", () => {
       //Mongo CRUD page validation
       //Assert table data
       cy.latestDeployPreview();
@@ -112,7 +72,7 @@ describe(
         "listingAndReviews Data",
       );
       agHelper.AssertElementVisibility(locators._widgetByName("data_table"));
-      table.WaitUntilTableLoad(0, 0, "v2");
+      table.WaitUntilTableLoad(0, 0);
 
       //Filter & validate table data
       table.OpenNFilterTable("_id", "is exactly", "15665837");
@@ -131,7 +91,7 @@ describe(
         "countryFlags Data",
       );
       agHelper.AssertElementVisibility(locators._widgetByName("data_table"));
-      table.WaitUntilTableLoad(0, 0, "v2");
+      table.WaitUntilTableLoad(0, 0);
 
       //Filter & validate table data
       table.OpenNFilterTable("Country", "starts with", "Ba");
@@ -152,7 +112,7 @@ describe(
         "public_astronauts Data",
       );
       agHelper.AssertElementVisibility(locators._widgetByName("data_table"));
-      table.WaitUntilTableLoad(0, 0, "v2");
+      table.WaitUntilTableLoad(0, 0);
 
       //Filter & validate table data
       table.OpenNFilterTable("id", "is exactly", "196");
@@ -164,10 +124,8 @@ describe(
       //Update table data
       deployMode.EnterJSONInputValue("Statusid", "5", 0, true);
       deployMode.EnterJSONInputValue("Statusname", "Active", 0, true);
-      agHelper.Sleep(500);
       agHelper.ClickButton("Update");
-      agHelper.Sleep(2000); //for CI update to be successful
-      table.WaitUntilTableLoad(0, 0, "v1");
+      table.WaitUntilTableLoad(0, 0);
 
       //Validate updated values in table
       table.ReadTableRowColumnData(0, 3).then(($cellData) => {
@@ -176,10 +134,9 @@ describe(
       table.ReadTableRowColumnData(0, 4).then(($cellData) => {
         expect($cellData).to.eq("Active");
       });
-      agHelper.Sleep(500);
     });
 
-    it("3. Validate widgets & bindings", () => {
+    it("2. Validate widgets & bindings", () => {
       agHelper.GetNClickByContains(locators._deployedPage, "Widgets");
       agHelper.AssertElementVisibility(
         locators._widgetInDeployed(draggableWidgets.AUDIO),
@@ -194,22 +151,35 @@ describe(
         locators._widgetInDeployed(draggableWidgets.CHART),
       );
 
-      //Button
-      agHelper.ClickButton("Alert button");
-      agHelper.Sleep(500);
-      agHelper.WaitUntilToastDisappear(
-        "404 hit : invalidApi failed to execute",
-      );
-
       //Checkbox group
       agHelper.AssertElementVisibility(
         locators._widgetInDeployed(draggableWidgets.CHECKBOXGROUP),
       );
-      agHelper.GetNAssertElementText(
+      agHelper.GetNAssertContains(
+        locators._widgetInDeployed(draggableWidgets.CHECKBOXGROUP),
+        "Select Astronaut",
+      );
+      agHelper.GetNAssertContains(
+        locators._widgetInDeployed(draggableWidgets.CHECKBOXGROUP),
+        "Ulf Merbold",
+      );
+      agHelper.GetNAssertContains(
+        locators._widgetInDeployed(draggableWidgets.CHECKBOXGROUP),
+        "Andreas Mogensen",
+      );
+      agHelper.GetNAssertContains(
+        locators._widgetInDeployed(draggableWidgets.CHECKBOXGROUP),
+        "Wubbo Ockels",
+      );
+      agHelper.GetNAssertContains(
+        locators._widgetInDeployed(draggableWidgets.CHECKBOXGROUP),
+        "Thomas Reiter",
+      );
+      agHelper.GetNAssertContains(
         locators._widgetInDeployed(draggableWidgets.CHECKBOXGROUP),
-        "Select AstronautUlf MerboldAndreas MogensenWubbo OckelsThomas ReiterAnil Menon",
-        "have.text",
+        "Anil Menon",
       );
+
       agHelper
         .GetElement(locators._checkboxTypeByOption("Ulf Merbold"))
         .should("be.checked");
@@ -219,10 +189,8 @@ describe(
       agHelper
         .ScrollIntoView(locators._sliderThumb)
         .focus()
-        .type("{rightArrow}")
-        .wait(500);
+        .type("{rightArrow}");
 
-      agHelper.Sleep(500);
       agHelper.WaitUntilToastDisappear("Category Value Changed!");
 
       //Currency input
@@ -261,51 +229,6 @@ describe(
       agHelper.WaitUntilToastDisappear("Delete customer successful!");
       agHelper.ClickButton("Close");
       agHelper.AssertElementAbsence(locators._modal);
-      agHelper.Sleep(2000);
-    });
-
-    it.skip("4. Edit JSObject & Check Updated Data ", () => {
-      deployMode.NavigateBacktoEditor();
-      //Edit existing JS object
-      EditorNavigation.SelectEntityByName("users", EntityType.JSObject);
-      jsEditor.EditJSObj(`export default {
-      fun: async () => {
-        return await invalidApi.run().catch((e) => showAlert("404 hit : " + e.message));
-      },
-      myFun1: async () => {
-        //write code here
-        const data = JSON.stringify(await usersApi.run())
-        return data
-      },
-      myFun2: async () => {
-        //use async-await or promises
-        await this.myFun1()
-        return showAlert("myFun2 Data")
-      }
-    }`);
-
-      //Update property field for button
-      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-      propPane.EnterJSContext("onClick", `{{users.myFun2()}}`, true, false);
-
-      //Drag n drop text widget & bind it to myFun1
-      entityExplorer.DragDropWidgetNVerify(draggableWidgets.TEXT);
-      propPane.TypeTextIntoField("Text", `{{users.myFun1.data}}`);
-      agHelper.ValidateToastMessage(
-        "[users.myFun1] will be executed automatically on page load",
-      );
-
-      //Commit & push new changes
-      gitSync.CommitAndPush();
-      cy.latestDeployPreview();
-
-      //Validate new response for button & text widget
-      agHelper.GetNClickByContains(locators._deployedPage, "Widgets");
-      agHelper.ClickButton("Submit");
-      agHelper.ValidateToastMessage("myFun2 Data");
-      agHelper
-        .GetText(locators._widgetInDeployed(draggableWidgets.TEXT), "text")
-        .should("not.be.empty");
     });
 
     after(() => {
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitAutocommit_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Git/GitAutocommit_spec.ts
index c55b51711cea..fc6e6ff070bb 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitAutocommit_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitAutocommit_spec.ts
@@ -16,6 +16,13 @@ describe(
       "@tag.GitAutocommit",
       "@tag.Sanity",
       "@tag.TedMigration",
+      "@tag.AccessControl",
+      "@tag.Workflows",
+      "@tag.Module",
+      "@tag.Theme",
+      "@tag.JS",
+      "@tag.Container",
+      "@tag.ImportExport",
     ],
   },
   function () {
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitDiscardChange/DiscardChanges_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitDiscardChange/DiscardChanges_spec.js
index fd1877ce5c20..2a2a4818b929 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitDiscardChange/DiscardChanges_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitDiscardChange/DiscardChanges_spec.js
@@ -19,7 +19,19 @@ import PageList from "../../../../../support/Pages/PageList";
 
 describe(
   "Git discard changes:",
-  { tags: ["@tag.Git", "@tag.Sanity"] },
+  {
+    tags: [
+      "@tag.Git",
+      "@tag.Sanity",
+      "@tag.AccessControl",
+      "@tag.Workflows",
+      "@tag.Module",
+      "@tag.Theme",
+      "@tag.JS",
+      "@tag.Container",
+      "@tag.ImportExport",
+    ],
+  },
   function () {
     let datasourceName;
     let repoName;
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitImport/GitImport_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitImport/GitImport_spec.js
index 0c64032af71b..118bcb335e36 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitImport/GitImport_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitImport/GitImport_spec.js
@@ -23,7 +23,19 @@ import PageList from "../../../../../support/Pages/PageList";
 
 describe(
   "Git import flow ",
-  { tags: ["@tag.Git", "@tag.Sanity"] },
+  {
+    tags: [
+      "@tag.Git",
+      "@tag.Sanity",
+      "@tag.AccessControl",
+      "@tag.Workflows",
+      "@tag.Module",
+      "@tag.Theme",
+      "@tag.JS",
+      "@tag.Container",
+      "@tag.ImportExport",
+    ],
+  },
   function () {
     it("1. Import an app from JSON with Postgres, MySQL, Mongo db & then connect it to Git", () => {
       homePage.NavigateToHome();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitImport/ImportEmptyRepo_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitImport/ImportEmptyRepo_spec.js
index 50ba0fb3a345..04b1d6c65551 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitImport/ImportEmptyRepo_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitImport/ImportEmptyRepo_spec.js
@@ -2,39 +2,54 @@ import homePage from "../../../../../locators/HomePage";
 import gitSyncLocators from "../../../../../locators/gitSyncLocators";
 import * as _ from "../../../../../support/Objects/ObjectsCore";
 
-describe("Git import empty repository", { tags: ["@tag.Git"] }, function () {
-  let repoName;
-  const assertConnectFailure = true;
-  const failureMessage =
-    "git import failed. \nDetails: Cannot import app from an empty repo";
-  before(() => {
-    _.homePage.NavigateToHome();
-    cy.createWorkspace();
-    cy.wait("@createWorkspace").then((interception) => {
-      const newWorkspaceName = interception.response.body.data.name;
-      cy.CreateAppForWorkspace(newWorkspaceName, newWorkspaceName);
-    });
-    cy.generateUUID().then((uid) => {
-      repoName = uid;
-      _.gitSync.CreateTestGiteaRepo(repoName);
+describe(
+  "Git import empty repository",
+  {
+    tags: [
+      "@tag.Git",
+      "@tag.AccessControl",
+      "@tag.Workflows",
+      "@tag.Module",
+      "@tag.Theme",
+      "@tag.JS",
+      "@tag.Container",
+      "@tag.ImportExport",
+    ],
+  },
+  function () {
+    let repoName;
+    const assertConnectFailure = true;
+    const failureMessage =
+      "git import failed. \nDetails: Cannot import app from an empty repo";
+    before(() => {
+      _.homePage.NavigateToHome();
+      cy.createWorkspace();
+      cy.wait("@createWorkspace").then((interception) => {
+        const newWorkspaceName = interception.response.body.data.name;
+        cy.CreateAppForWorkspace(newWorkspaceName, newWorkspaceName);
+      });
+      cy.generateUUID().then((uid) => {
+        repoName = uid;
+        _.gitSync.CreateTestGiteaRepo(repoName);
+      });
     });
-  });
 
-  it("1. Bug #12749 Git Import - Empty Repo NullPointerException", () => {
-    cy.generateUUID().then((uid) => {
-      repoName = uid;
-      _.gitSync.CreateTestGiteaRepo(repoName);
-      _.gitSync.ImportAppFromGit(undefined, repoName, false);
-      cy.wait("@importFromGit").then((interception) => {
-        const status = interception.response.body.responseMeta.status;
-        const message = interception.response.body.responseMeta.error.message;
-        expect(status).to.be.gte(400);
-        expect(message).to.contain(failureMessage);
-        cy.get(gitSyncLocators.closeGitSyncModal).click();
+    it("1. Bug #12749 Git Import - Empty Repo NullPointerException", () => {
+      cy.generateUUID().then((uid) => {
+        repoName = uid;
+        _.gitSync.CreateTestGiteaRepo(repoName);
+        _.gitSync.ImportAppFromGit(undefined, repoName, false);
+        cy.wait("@importFromGit").then((interception) => {
+          const status = interception.response.body.responseMeta.status;
+          const message = interception.response.body.responseMeta.error.message;
+          expect(status).to.be.gte(400);
+          expect(message).to.contain(failureMessage);
+          cy.get(gitSyncLocators.closeGitSyncModal).click();
+        });
       });
     });
-  });
-  after(() => {
-    _.gitSync.DeleteTestGithubRepo(repoName);
-  });
-});
+    after(() => {
+      _.gitSync.DeleteTestGithubRepo(repoName);
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitPersistBranch_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Git/GitPersistBranch_spec.ts
new file mode 100644
index 000000000000..a0bbf7d0817a
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitPersistBranch_spec.ts
@@ -0,0 +1,45 @@
+import { featureFlagIntercept } from "../../../../support/Objects/FeatureFlags";
+import {
+  agHelper,
+  gitSync,
+  homePage,
+} from "../../../../support/Objects/ObjectsCore";
+
+let wsName: string;
+let appName: string;
+let repoName: string;
+
+describe(
+  "Git Persist Branch",
+  {
+    tags: ["@tag.Git", "@tag.GitPersistBranch"],
+  },
+  function () {
+    before(() => {
+      agHelper.GenerateUUID();
+      cy.get("@guid").then((uid) => {
+        wsName = "GitPB-" + uid;
+        appName = "GitPB1-" + uid;
+        homePage.CreateNewWorkspace(wsName, true);
+        homePage.CreateAppInWorkspace(wsName, appName);
+        gitSync.CreateNConnectToGit("test-git-perssit-branch", true, true);
+        cy.get("@gitRepoName").then((resRepoName) => {
+          repoName = resRepoName.toString();
+          homePage.NavigateToHome();
+        });
+      });
+    });
+    it("Check if branch persist after changing branch and exiting the app", function () {
+      featureFlagIntercept({ release_git_persist_branch_enabled: true }, true);
+      homePage.EditAppFromAppHover(appName);
+      gitSync.CreateGitBranch("b1", false);
+      cy.get("@gitbranchName").then((resBranchName) => {
+        const branchName = resBranchName.toString();
+        homePage.NavigateToHome();
+        homePage.EditAppFromAppHover(appName);
+        gitSync.AssertBranchName(branchName);
+        gitSync.AssertBranchNameInUrl(branchName);
+      });
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/DeleteBranch_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/DeleteBranch_spec.js
index f1259df417de..69ebc80ffda2 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/DeleteBranch_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/DeleteBranch_spec.js
@@ -7,112 +7,128 @@ import {
 } from "../../../../../support/Pages/EditorNavigation";
 
 let repoName, branchName;
-describe("Delete branch flow", { tags: ["@tag.Git", "@tag.Sanity"] }, () => {
-  it("1. Connect app to git, create new branch and delete it", () => {
-    // create git repo and connect app to git
-    gitSync.CreateNConnectToGit();
-    cy.get("@gitRepoName").then((repName) => {
-      repoName = repName;
+describe(
+  "Delete branch flow",
+  {
+    tags: [
+      "@tag.Git",
+      "@tag.Sanity",
+      "@tag.AccessControl",
+      "@tag.Workflows",
+      "@tag.Module",
+      "@tag.Theme",
+      "@tag.JS",
+      "@tag.Container",
+      "@tag.ImportExport",
+    ],
+  },
+  () => {
+    it("1. Connect app to git, create new branch and delete it", () => {
+      // create git repo and connect app to git
+      gitSync.CreateNConnectToGit();
+      cy.get("@gitRepoName").then((repName) => {
+        repoName = repName;
+      });
+      gitSync.CreateGitBranch();
+      //cy.createGitBranch(branchName);
+      cy.wait(1000);
+      // verify can not delete the checked out branch
+      DeleteBranchFromUI(1);
+      cy.get("@gitbranchName").then((branName) => {
+        branchName = branName;
+        agHelper.ValidateToastMessage(
+          `Cannot delete checked out branch. Please check out other branch before deleting ${branchName}.`,
+        );
+        cy.get(gitSyncLocators.closeBranchList).click({ force: true });
+        // switch to master and delete new branch created
+        cy.switchGitBranch("master");
+        cy.wait(2000);
+
+        DeleteBranchFromUI(1);
+        cy.wait("@deleteBranch").should(
+          "have.nested.property",
+          "response.body.responseMeta.status",
+          200,
+        );
+        cy.get(gitSyncLocators.closeBranchList).click({ force: true });
+        // verify remote branch is there for the deleted local branch
+        cy.wait(2000);
+        cy.switchGitBranch(`origin/${branchName}`);
+        cy.wait(2000);
+      });
     });
-    gitSync.CreateGitBranch();
-    //cy.createGitBranch(branchName);
-    cy.wait(1000);
-    // verify can not delete the checked out branch
-    DeleteBranchFromUI(1);
-    cy.get("@gitbranchName").then((branName) => {
-      branchName = branName;
-      agHelper.ValidateToastMessage(
-        `Cannot delete checked out branch. Please check out other branch before deleting ${branchName}.`,
-      );
-      cy.get(gitSyncLocators.closeBranchList).click({ force: true });
-      // switch to master and delete new branch created
+
+    it("2. Create child branch, merge data from child branch, delete child branch verify the data should reflect in master ", () => {
+      cy.switchGitBranch("master");
+      gitSync.CreateGitBranch("", true);
+      cy.wait(1000);
+      PageLeftPane.switchSegment(PagePaneSegment.UI);
+      cy.dragAndDropToCanvas("checkboxwidget", { x: 100, y: 200 });
+      cy.get(".t--draggable-checkboxwidget").should("exist");
+      cy.wait(2000);
+      cy.commitAndPush();
+      cy.merge("master");
+      gitSync.CloseGitSyncModal();
       cy.switchGitBranch("master");
       cy.wait(2000);
 
       DeleteBranchFromUI(1);
+
       cy.wait("@deleteBranch").should(
         "have.nested.property",
         "response.body.responseMeta.status",
         200,
       );
       cy.get(gitSyncLocators.closeBranchList).click({ force: true });
-      // verify remote branch is there for the deleted local branch
-      cy.wait(2000);
-      cy.switchGitBranch(`origin/${branchName}`);
-      cy.wait(2000);
+      cy.get(".t--draggable-checkboxwidget").should("be.visible");
     });
-  });
-
-  it("2. Create child branch, merge data from child branch, delete child branch verify the data should reflect in master ", () => {
-    cy.switchGitBranch("master");
-    gitSync.CreateGitBranch("", true);
-    cy.wait(1000);
-    PageLeftPane.switchSegment(PagePaneSegment.UI);
-    cy.dragAndDropToCanvas("checkboxwidget", { x: 100, y: 200 });
-    cy.get(".t--draggable-checkboxwidget").should("exist");
-    cy.wait(2000);
-    cy.commitAndPush();
-    cy.merge("master");
-    gitSync.CloseGitSyncModal();
-    cy.switchGitBranch("master");
-    cy.wait(2000);
-
-    DeleteBranchFromUI(1);
-
-    cy.wait("@deleteBranch").should(
-      "have.nested.property",
-      "response.body.responseMeta.status",
-      200,
-    );
-    cy.get(gitSyncLocators.closeBranchList).click({ force: true });
-    cy.get(".t--draggable-checkboxwidget").should("be.visible");
-  });
 
-  it("3. Create new branch, commit data in that branch , delete the branch, verify data should not reflect in master ", () => {
-    gitSync.CreateGitBranch("", true);
-    cy.wait(1000);
-    PageLeftPane.switchSegment(PagePaneSegment.UI);
-    cy.dragAndDropToCanvas("chartwidget", { x: 210, y: 300 });
-    cy.get(".t--widget-chartwidget").should("exist");
-    cy.wait(2000);
-    cy.commitAndPush();
-    cy.wait(1000);
-    cy.switchGitBranch("master");
-    cy.wait(3000);
+    it("3. Create new branch, commit data in that branch , delete the branch, verify data should not reflect in master ", () => {
+      gitSync.CreateGitBranch("", true);
+      cy.wait(1000);
+      PageLeftPane.switchSegment(PagePaneSegment.UI);
+      cy.dragAndDropToCanvas("chartwidget", { x: 210, y: 300 });
+      cy.get(".t--widget-chartwidget").should("exist");
+      cy.wait(2000);
+      cy.commitAndPush();
+      cy.wait(1000);
+      cy.switchGitBranch("master");
+      cy.wait(3000);
 
-    DeleteBranchFromUI(1);
+      DeleteBranchFromUI(1);
 
-    cy.wait("@deleteBranch").should(
-      "have.nested.property",
-      "response.body.responseMeta.status",
-      200,
-    );
-    cy.get(".--widget-chartwidget").should("not.exist");
-    cy.get(gitSyncLocators.closeBranchList).click({ force: true });
-  });
+      cy.wait("@deleteBranch").should(
+        "have.nested.property",
+        "response.body.responseMeta.status",
+        200,
+      );
+      cy.get(".--widget-chartwidget").should("not.exist");
+      cy.get(gitSyncLocators.closeBranchList).click({ force: true });
+    });
 
-  it("4. Verify Default branch deletion not allowed ", () => {
-    agHelper.Sleep(2000); //for toasts to appear then wait for disappear
-    agHelper.WaitUntilAllToastsDisappear();
-    DeleteBranchFromUI(0);
-    cy.get(gitSyncLocators.closeBranchList).click({ force: true });
-    agHelper.ValidateToastMessage("Cannot delete default branch: master");
-  });
+    it("4. Verify Default branch deletion not allowed ", () => {
+      agHelper.Sleep(2000); //for toasts to appear then wait for disappear
+      agHelper.WaitUntilAllToastsDisappear();
+      DeleteBranchFromUI(0);
+      cy.get(gitSyncLocators.closeBranchList).click({ force: true });
+      agHelper.ValidateToastMessage("Cannot delete default branch: master");
+    });
 
-  function DeleteBranchFromUI(index = 1) {
-    cy.get(gitSyncLocators.branchButton).click();
-    cy.get(gitSyncLocators.branchListItem)
-      .eq(index)
-      .trigger("mouseenter")
-      .wait(1000);
-    cy.get(gitSyncLocators.gitBranchContextMenu).click({ force: true });
-    cy.xpath("//div[@role='menu']//span[text()='Delete']")
-      .should("be.visible")
-      .click({ force: true });
-  }
+    function DeleteBranchFromUI(index = 1) {
+      cy.get(gitSyncLocators.branchButton).click();
+      cy.get(gitSyncLocators.branchListItem)
+        .eq(index)
+        .trigger("mouseenter")
+        .wait(1000);
+      cy.get(gitSyncLocators.gitBranchContextMenu).click({ force: true });
+      cy.xpath("//div[@role='menu']//span[text()='Delete']")
+        .should("be.visible")
+        .click({ force: true });
+    }
 
-  after(() => {
-    //clean up
-    gitSync.DeleteTestGithubRepo(repoName);
-  });
-});
+    after(() => {
+      //clean up
+      gitSync.DeleteTestGithubRepo(repoName);
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/Deploy_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/Deploy_spec.js
index e2d3411a371c..ed78013ecc09 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/Deploy_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/Deploy_spec.js
@@ -5,7 +5,19 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 let repoName;
 describe(
   "Git sync modal: deploy tab",
-  { tags: ["@tag.Git", "@tag.Sanity"] },
+  {
+    tags: [
+      "@tag.Git",
+      "@tag.Sanity",
+      "@tag.AccessControl",
+      "@tag.Workflows",
+      "@tag.Module",
+      "@tag.Theme",
+      "@tag.JS",
+      "@tag.Container",
+      "@tag.ImportExport",
+    ],
+  },
   function () {
     before(() => {
       _.homePage.NavigateToHome();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/DisconnectGit_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/DisconnectGit_spec.js
index 1b69edeef302..77855eef72c4 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/DisconnectGit_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/DisconnectGit_spec.js
@@ -3,113 +3,130 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 let repoName;
 let windowOpenSpy;
-describe("Git disconnect modal:", { tags: ["@tag.Git"] }, function () {
-  before(() => {
-    _.homePage.NavigateToHome();
-    cy.createWorkspace();
-    cy.wait("@createWorkspace").then((interception) => {
-      const newWorkspaceName = interception.response.body.data.name;
-      cy.CreateAppForWorkspace(newWorkspaceName, newWorkspaceName);
+describe(
+  "Git disconnect modal:",
+  {
+    tags: [
+      "@tag.Git",
+      "@tag.AccessControl",
+      "@tag.Workflows",
+      "@tag.Module",
+      "@tag.Theme",
+      "@tag.JS",
+      "@tag.Container",
+      "@tag.ImportExport",
+    ],
+  },
+  function () {
+    before(() => {
+      _.homePage.NavigateToHome();
+      cy.createWorkspace();
+      cy.wait("@createWorkspace").then((interception) => {
+        const newWorkspaceName = interception.response.body.data.name;
+        cy.CreateAppForWorkspace(newWorkspaceName, newWorkspaceName);
+      });
     });
-  });
 
-  it("1. should be opened with proper components", function () {
-    cy.generateUUID().then((uid) => {
-      _.gitSync.CreateNConnectToGit(uid);
-      cy.get("@gitRepoName").then((repName) => {
-        repoName = repName;
+    it("1. should be opened with proper components", function () {
+      cy.generateUUID().then((uid) => {
+        _.gitSync.CreateNConnectToGit(uid);
+        cy.get("@gitRepoName").then((repName) => {
+          repoName = repName;
+        });
       });
-    });
-    cy.get(_.gitSync._bottomSettingsBtn).click();
-    cy.get(_.gitSync._settingsTabGeneral).click();
-    // after clicked disconnect on connection modal,
-    // it should be closed and disconnect modal should be opened
-    cy.get(_.gitSync._disconnectGitBtn).click();
-    cy.get(gitSyncLocators.gitSyncModal).should("not.exist");
-    cy.get(gitSyncLocators.disconnectGitModal).should("exist");
+      cy.get(_.gitSync._bottomSettingsBtn).click();
+      cy.get(_.gitSync._settingsTabGeneral).click();
+      // after clicked disconnect on connection modal,
+      // it should be closed and disconnect modal should be opened
+      cy.get(_.gitSync._disconnectGitBtn).click();
+      cy.get(gitSyncLocators.gitSyncModal).should("not.exist");
+      cy.get(gitSyncLocators.disconnectGitModal).should("exist");
 
-    cy.get(gitSyncLocators.disconnectGitModal).contains(
-      Cypress.env("MESSAGES").NONE_REVERSIBLE_MESSAGE(),
-    );
+      cy.get(gitSyncLocators.disconnectGitModal).contains(
+        Cypress.env("MESSAGES").NONE_REVERSIBLE_MESSAGE(),
+      );
 
-    // Stubbing window.open
-    cy.window().then((window) => {
-      windowOpenSpy = cy.stub(window, "open").callsFake((url) => {
-        expect(url.startsWith("https://docs.appsmith.com/")).to.be.true;
-        windowOpenSpy.restore();
+      // Stubbing window.open
+      cy.window().then((window) => {
+        windowOpenSpy = cy.stub(window, "open").callsFake((url) => {
+          expect(url.startsWith("https://docs.appsmith.com/")).to.be.true;
+          windowOpenSpy.restore();
+        });
       });
-    });
-    cy.get(gitSyncLocators.disconnectLearnMoreLink).click();
+      cy.get(gitSyncLocators.disconnectLearnMoreLink).click();
 
-    cy.window()
-      .its("store")
-      .invoke("getState")
-      .then((state) => {
-        const { name } = state.ui.gitSync.disconnectingGitApp;
-        cy.get(gitSyncLocators.disconnectGitModal).contains(
-          Cypress.env("MESSAGES").GIT_REVOKE_ACCESS(name),
-        );
-        cy.get(gitSyncLocators.disconnectGitModal).contains(
-          Cypress.env("MESSAGES").GIT_TYPE_REPO_NAME_FOR_REVOKING_ACCESS(name),
-        );
-      });
+      cy.window()
+        .its("store")
+        .invoke("getState")
+        .then((state) => {
+          const { name } = state.ui.gitSync.disconnectingGitApp;
+          cy.get(gitSyncLocators.disconnectGitModal).contains(
+            Cypress.env("MESSAGES").GIT_REVOKE_ACCESS(name),
+          );
+          cy.get(gitSyncLocators.disconnectGitModal).contains(
+            Cypress.env("MESSAGES").GIT_TYPE_REPO_NAME_FOR_REVOKING_ACCESS(
+              name,
+            ),
+          );
+        });
 
-    // disconnect button should be disabled
-    cy.get(gitSyncLocators.disconnectButton).should("be.disabled");
-    cy.get(gitSyncLocators.closeDisconnectModal).click();
-    cy.wait(2000);
-  });
+      // disconnect button should be disabled
+      cy.get(gitSyncLocators.disconnectButton).should("be.disabled");
+      cy.get(gitSyncLocators.closeDisconnectModal).click();
+      cy.wait(2000);
+    });
 
-  it("2. should have disconnect repo button", function () {
-    cy.get(_.gitSync._bottomSettingsBtn).click();
-    cy.get(_.gitSync._settingsTabGeneral).click();
+    it("2. should have disconnect repo button", function () {
+      cy.get(_.gitSync._bottomSettingsBtn).click();
+      cy.get(_.gitSync._settingsTabGeneral).click();
 
-    // after clicked disconnect on connection modal,
-    // it should be closed and disconnect modal should be opened
-    cy.get(_.gitSync._disconnectGitBtn).click();
-    cy.get(gitSyncLocators.disconnectButton).should("be.disabled");
+      // after clicked disconnect on connection modal,
+      // it should be closed and disconnect modal should be opened
+      cy.get(_.gitSync._disconnectGitBtn).click();
+      cy.get(gitSyncLocators.disconnectButton).should("be.disabled");
 
-    cy.get(gitSyncLocators.disconnectAppNameInput).type(
-      `{selectAll}${repoName}`,
-    );
-    cy.get(gitSyncLocators.disconnectButton).should("be.disabled");
+      cy.get(gitSyncLocators.disconnectAppNameInput).type(
+        `{selectAll}${repoName}`,
+      );
+      cy.get(gitSyncLocators.disconnectButton).should("be.disabled");
 
-    cy.window()
-      .its("store")
-      .invoke("getState")
-      .then((state) => {
-        const { name } = state.ui.gitSync.disconnectingGitApp;
-        cy.get(gitSyncLocators.disconnectAppNameInput).type(
-          `{selectAll}${name}`,
-        );
-        cy.get(gitSyncLocators.disconnectButton).should("be.enabled");
-      });
+      cy.window()
+        .its("store")
+        .invoke("getState")
+        .then((state) => {
+          const { name } = state.ui.gitSync.disconnectingGitApp;
+          cy.get(gitSyncLocators.disconnectAppNameInput).type(
+            `{selectAll}${name}`,
+          );
+          cy.get(gitSyncLocators.disconnectButton).should("be.enabled");
+        });
 
-    // disconnecting validation
-    cy.intercept("POST", "api/v1/git/disconnect/app/*").as("disconnect");
-    cy.get(gitSyncLocators.disconnectButton).click();
-    cy.wait(3000);
-    //cy.get(gitSyncLocators.disconnectButton).should("be.disabled");
-    cy.wait("@disconnect").should(
-      "have.nested.property",
-      "response.body.responseMeta.status",
-      200,
-    );
+      // disconnecting validation
+      cy.intercept("POST", "api/v1/git/disconnect/app/*").as("disconnect");
+      cy.get(gitSyncLocators.disconnectButton).click();
+      cy.wait(3000);
+      //cy.get(gitSyncLocators.disconnectButton).should("be.disabled");
+      cy.wait("@disconnect").should(
+        "have.nested.property",
+        "response.body.responseMeta.status",
+        200,
+      );
 
-    // validation store after disconnected
-    cy.window()
-      .its("store")
-      .invoke("getState")
-      .then((state) => {
-        const { id, name } = state.ui.gitSync.disconnectingGitApp;
-        expect(name).to.eq("");
-        expect(id).to.eq("");
-      });
+      // validation store after disconnected
+      cy.window()
+        .its("store")
+        .invoke("getState")
+        .then((state) => {
+          const { id, name } = state.ui.gitSync.disconnectingGitApp;
+          expect(name).to.eq("");
+          expect(id).to.eq("");
+        });
 
-    cy.get(gitSyncLocators.disconnectGitModal).should("not.exist");
-  });
+      cy.get(gitSyncLocators.disconnectGitModal).should("not.exist");
+    });
 
-  after(() => {
-    _.gitSync.DeleteTestGithubRepo(repoName);
-  });
-});
+    after(() => {
+      _.gitSync.DeleteTestGithubRepo(repoName);
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitBranchProtect_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitBranchProtect_spec.ts
index 6a27f57bb7b1..5864a9215017 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitBranchProtect_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitBranchProtect_spec.ts
@@ -7,55 +7,70 @@ import {
 let guid: any;
 let repoName: any;
 
-describe("Git Branch Protection", { tags: ["@tag.Git"] }, function () {
-  it("Issue 28056 - 2 : Check if protection is enabled when feature flag is enabled", function () {
-    _.agHelper.GenerateUUID();
-    cy.get("@guid").then((uid) => {
-      guid = uid;
-      const wsName = "GitBranchProtect-2" + uid;
-      const appName = "GitBranchProtect-2" + uid;
-      _.homePage.CreateNewWorkspace(wsName, true);
-      _.homePage.CreateAppInWorkspace(wsName, appName);
-      _.gitSync.CreateNConnectToGit("repoprotect", true, true);
-      cy.wait(1000);
+describe(
+  "Git Branch Protection",
+  {
+    tags: [
+      "@tag.Git",
+      "@tag.AccessControl",
+      "@tag.Workflows",
+      "@tag.Module",
+      "@tag.Theme",
+      "@tag.JS",
+      "@tag.Container",
+      "@tag.ImportExport",
+    ],
+  },
+  function () {
+    it("Issue 28056 - 2 : Check if protection is enabled when feature flag is enabled", function () {
+      _.agHelper.GenerateUUID();
+      cy.get("@guid").then((uid) => {
+        guid = uid;
+        const wsName = "GitBranchProtect-2" + uid;
+        const appName = "GitBranchProtect-2" + uid;
+        _.homePage.CreateNewWorkspace(wsName, true);
+        _.homePage.CreateAppInWorkspace(wsName, appName);
+        _.gitSync.CreateNConnectToGit("repoprotect", true, true);
+        cy.wait(1000);
 
-      cy.intercept({
-        method: "POST",
-        url: /\/api\/v1\/git\/branch\/app\/.*\/protected/,
-      }).as("gitProtectApi");
-      cy.get("@gitRepoName").then((repName) => {
-        repoName = repName;
-        _.gitSync.OpenGitSettingsModal();
-        _.agHelper.GetNClick(_.gitSync._settingsTabBranch);
-        _.agHelper.GetNClick(_.gitSync._protectedBranchesSelect);
-        _.agHelper.GetNClick(
-          `${_.gitSync._protectedBranchesSelect} .rc-select-item`,
-          0,
-        );
-        _.agHelper.GetNClick(_.gitSync._branchProtectionUpdateBtn);
-        cy.wait("@gitProtectApi").then((res1) => {
-          _.agHelper.GetNClick(_.gitSync._closeGitSettingsModal);
-          expect(res1.response).to.have.property("statusCode", 200);
-          _.agHelper.AssertElementAbsence(AppSidebar.locators.sidebar);
-          _.agHelper.AssertElementVisibility(
-            PageLeftPane.locators.selector,
-            false,
-          );
-          _.agHelper.AssertElementVisibility(
-            _.propPane._propertyPaneSidebar,
-            false,
-          );
-          _.agHelper.AssertElementEnabledDisabled(
-            _.gitSync._bottomBarCommit,
+        cy.intercept({
+          method: "POST",
+          url: /\/api\/v1\/git\/branch\/app\/.*\/protected/,
+        }).as("gitProtectApi");
+        cy.get("@gitRepoName").then((repName) => {
+          repoName = repName;
+          _.gitSync.OpenGitSettingsModal();
+          _.agHelper.GetNClick(_.gitSync._settingsTabBranch);
+          _.agHelper.GetNClick(_.gitSync._protectedBranchesSelect);
+          _.agHelper.GetNClick(
+            `${_.gitSync._protectedBranchesSelect} .rc-select-item`,
             0,
-            true,
           );
+          _.agHelper.GetNClick(_.gitSync._branchProtectionUpdateBtn);
+          cy.wait("@gitProtectApi").then((res1) => {
+            _.agHelper.GetNClick(_.gitSync._closeGitSettingsModal);
+            expect(res1.response).to.have.property("statusCode", 200);
+            _.agHelper.AssertElementAbsence(AppSidebar.locators.sidebar);
+            _.agHelper.AssertElementVisibility(
+              PageLeftPane.locators.selector,
+              false,
+            );
+            _.agHelper.AssertElementVisibility(
+              _.propPane._propertyPaneSidebar,
+              false,
+            );
+            _.agHelper.AssertElementEnabledDisabled(
+              _.gitSync._bottomBarCommit,
+              0,
+              true,
+            );
+          });
         });
       });
     });
-  });
 
-  after(() => {
-    _.gitSync.DeleteTestGithubRepo(repoName);
-  });
-});
+    after(() => {
+      _.gitSync.DeleteTestGithubRepo(repoName);
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitConnectV2_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitConnectV2_spec.ts
index 26cbff86c2af..64da08fe67d3 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitConnectV2_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitConnectV2_spec.ts
@@ -1,4 +1,3 @@
-import { featureFlagIntercept } from "../../../../../support/Objects/FeatureFlags";
 import * as _ from "../../../../../support/Objects/ObjectsCore";
 import EditorNavigation, {
   EntityType,
@@ -10,45 +9,65 @@ let app1Name: string;
 let repoName: any;
 let branchName: any;
 
-describe("Git Connect V2", { tags: ["@tag.Git", "@tag.Sanity"] }, function () {
-  before(() => {
-    _.agHelper.GenerateUUID();
-    cy.get("@guid").then((uid) => {
-      ws1Name = "GCV2-1" + uid;
-      ws2Name = "GCV2-2" + uid;
-      app1Name = "GCV2" + uid;
-      _.homePage.CreateNewWorkspace(ws1Name, true);
-      _.homePage.CreateNewWorkspace(ws2Name, true);
-      _.homePage.SelectWorkspace(ws1Name);
-      _.homePage.CreateAppInWorkspace(ws1Name, app1Name);
+describe(
+  "Git Connect V2",
+  {
+    tags: [
+      "@tag.Git",
+      "@tag.Sanity",
+      "@tag.AccessControl",
+      "@tag.Workflows",
+      "@tag.Module",
+      "@tag.Theme",
+      "@tag.JS",
+      "@tag.Container",
+      "@tag.ImportExport",
+    ],
+  },
+  function () {
+    before(() => {
+      _.agHelper.GenerateUUID();
+      cy.get("@guid").then((uid) => {
+        ws1Name = "GCV2-1" + uid;
+        ws2Name = "GCV2-2" + uid;
+        app1Name = "GCV2" + uid;
+        _.homePage.CreateNewWorkspace(ws1Name, true);
+        _.homePage.CreateNewWorkspace(ws2Name, true);
+        _.homePage.SelectWorkspace(ws1Name);
+        _.homePage.CreateAppInWorkspace(ws1Name, app1Name);
+      });
     });
-  });
 
-  it("Testing connect to git flow - V2", function () {
-    _.gitSync.CreateNConnectToGit();
+    it("Testing connect to git flow - V2", function () {
+      _.gitSync.CreateNConnectToGit();
 
-    cy.get("@gitRepoName").then((repName) => {
-      repoName = repName;
+      cy.get("@gitRepoName").then((repName) => {
+        repoName = repName;
+      });
     });
-  });
 
-  it("Testing import via git flow - V2", function () {
-    _.gitSync.CreateGitBranch("test", true);
-    cy.get("@gitbranchName").then((bName) => {
-      branchName = bName;
-      _.entityExplorer.DragDropWidgetNVerify(_.draggableWidgets.TEXT, 300, 300);
-      _.propPane.RenameWidget("Text1", "MyText");
-      _.propPane.UpdatePropertyFieldValue("Text", "Hello World");
-      _.gitSync.CommitAndPush();
+    it("Testing import via git flow - V2", function () {
+      _.gitSync.CreateGitBranch("test", true);
+      cy.get("@gitbranchName").then((bName) => {
+        branchName = bName;
+        _.entityExplorer.DragDropWidgetNVerify(
+          _.draggableWidgets.TEXT,
+          300,
+          300,
+        );
+        _.propPane.RenameWidget("Text1", "MyText");
+        _.propPane.UpdatePropertyFieldValue("Text", "Hello World");
+        _.gitSync.CommitAndPush();
 
-      _.gitSync.ImportAppFromGit(ws2Name, repoName);
-      _.gitSync.SwitchGitBranch(branchName);
-      EditorNavigation.SelectEntityByName("MyText", EntityType.Widget);
-      _.propPane.ValidatePropertyFieldValue("Text", "Hello World");
+        _.gitSync.ImportAppFromGit(ws2Name, repoName);
+        _.gitSync.SwitchGitBranch(branchName);
+        EditorNavigation.SelectEntityByName("MyText", EntityType.Widget);
+        _.propPane.ValidatePropertyFieldValue("Text", "Hello World");
+      });
     });
-  });
 
-  after(() => {
-    _.gitSync.DeleteTestGithubRepo(repoName);
-  });
-});
+    after(() => {
+      _.gitSync.DeleteTestGithubRepo(repoName);
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitStatusLite_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitStatusLite_spec.ts
index ced7d8b756b0..480b0696f6ac 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitStatusLite_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitStatusLite_spec.ts
@@ -4,39 +4,54 @@ let wsName: string;
 let appName: string;
 let repoName: any;
 
-describe("Git Connect V2", { tags: ["@tag.Git"] }, function () {
-  before(() => {
-    _.agHelper.GenerateUUID();
-    cy.get("@guid").then((uid) => {
-      wsName = "GitStatusLite" + uid;
-      appName = "GitStatusLite" + uid;
-      _.homePage.CreateNewWorkspace(wsName, true);
-      _.homePage.CreateAppInWorkspace(wsName, appName);
-      _.gitSync.CreateNConnectToGit();
-      cy.get("@gitRepoName").then((repName) => {
-        repoName = repName;
+describe(
+  "Git Connect V2",
+  {
+    tags: [
+      "@tag.Git",
+      "@tag.AccessControl",
+      "@tag.Workflows",
+      "@tag.Module",
+      "@tag.Theme",
+      "@tag.JS",
+      "@tag.Container",
+      "@tag.ImportExport",
+    ],
+  },
+  function () {
+    before(() => {
+      _.agHelper.GenerateUUID();
+      cy.get("@guid").then((uid) => {
+        wsName = "GitStatusLite" + uid;
+        appName = "GitStatusLite" + uid;
+        _.homePage.CreateNewWorkspace(wsName, true);
+        _.homePage.CreateAppInWorkspace(wsName, appName);
+        _.gitSync.CreateNConnectToGit();
+        cy.get("@gitRepoName").then((repName) => {
+          repoName = repName;
+        });
       });
     });
-  });
 
-  it("Issue 26038 : No simultaneous git status and remote compare api calls on commit modal", function () {
-    cy.wait(1000);
+    it("Issue 26038 : No simultaneous git status and remote compare api calls on commit modal", function () {
+      cy.wait(1000);
 
-    cy.intercept({
-      method: "GET",
-      url: "/api/v1/git/status/app/**",
-      query: { compareRemote: "true" },
-    }).as("gitStatusApi");
+      cy.intercept({
+        method: "GET",
+        url: "/api/v1/git/status/app/**",
+        query: { compareRemote: "true" },
+      }).as("gitStatusApi");
 
-    _.agHelper.GetNClick(_.locators._publishButton);
+      _.agHelper.GetNClick(_.locators._publishButton);
 
-    cy.wait("@gitStatusApi").then((res1) => {
-      expect(res1.response).to.have.property("statusCode", 200);
-      _.agHelper.GetNClick(_.locators._dialogCloseButton);
+      cy.wait("@gitStatusApi").then((res1) => {
+        expect(res1.response).to.have.property("statusCode", 200);
+        _.agHelper.GetNClick(_.locators._dialogCloseButton);
+      });
     });
-  });
 
-  after(() => {
-    _.gitSync.DeleteTestGithubRepo(repoName);
-  });
-});
+    after(() => {
+      _.gitSync.DeleteTestGithubRepo(repoName);
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncGitBugs_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncGitBugs_spec.js
index e803036ac36f..03717e871899 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncGitBugs_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncGitBugs_spec.js
@@ -27,7 +27,19 @@ let repoName;
 
 describe(
   "Git sync Bug #10773",
-  { tags: ["@tag.Git", "@tag.Sanity"] },
+  {
+    tags: [
+      "@tag.Git",
+      "@tag.Sanity",
+      "@tag.AccessControl",
+      "@tag.Workflows",
+      "@tag.Module",
+      "@tag.Theme",
+      "@tag.JS",
+      "@tag.Container",
+      "@tag.ImportExport",
+    ],
+  },
   function () {
     beforeEach(() => {
       agHelper.RestoreLocalStorageCache();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncedApps_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncedApps_spec.js
index fbabcd599f09..e3d4b01a7ad4 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncedApps_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncedApps_spec.js
@@ -41,408 +41,427 @@ const mainBranch = "master";
 let datasourceName;
 let repoName;
 
-describe("Git sync apps", { tags: ["@tag.Git"] }, function () {
-  it("1. Generate postgreSQL crud page , connect to git, clone the page, rename page with special character in it", () => {
-    homePage.NavigateToHome();
-    homePage.CreateNewApplication();
+describe(
+  "Git sync apps",
+  {
+    tags: [
+      "@tag.Git",
+      "@tag.AccessControl",
+      "@tag.Workflows",
+      "@tag.Module",
+      "@tag.Theme",
+      "@tag.JS",
+      "@tag.Container",
+      "@tag.ImportExport",
+    ],
+  },
+  function () {
+    it("1. Generate postgreSQL crud page , connect to git, clone the page, rename page with special character in it", () => {
+      homePage.NavigateToHome();
+      homePage.CreateNewApplication();
+
+      // create New App and  generate Postgres CRUD page
+      PageList.AddNewPage("Generate page with data");
+      //cy.get(generatePage.generateCRUDPageActionCard).click();
+
+      cy.get(generatePage.selectDatasourceDropdown).click();
+
+      cy.contains("Connect new datasource").click({ force: true });
+
+      agHelper.GetNClick(datasource.PostgreSQL);
+
+      cy.fillPostgresDatasourceForm();
+
+      cy.generateUUID().then((UUID) => {
+        datasourceName = `${UUID}`;
+        cy.renameDatasource(datasourceName);
+      });
 
-    // create New App and  generate Postgres CRUD page
-    PageList.AddNewPage("Generate page with data");
-    //cy.get(generatePage.generateCRUDPageActionCard).click();
+      cy.get(".t--save-datasource").click();
+      cy.wait("@saveDatasource").should(
+        "have.nested.property",
+        "response.body.responseMeta.status",
+        201,
+      );
 
-    cy.get(generatePage.selectDatasourceDropdown).click();
+      cy.wait("@getDatasourceStructure").should(
+        "have.nested.property",
+        "response.body.responseMeta.status",
+        200,
+      );
 
-    cy.contains("Connect new datasource").click({ force: true });
+      cy.get(generatePage.selectTableDropdown).click();
 
-    agHelper.GetNClick(datasource.PostgreSQL);
+      cy.get(generatePage.dropdownOption).contains("public.configs").click();
 
-    cy.fillPostgresDatasourceForm();
+      //  skip optional search column selection.
+      cy.get(generatePage.generatePageFormSubmitBtn).click();
 
-    cy.generateUUID().then((UUID) => {
-      datasourceName = `${UUID}`;
-      cy.renameDatasource(datasourceName);
-    });
+      cy.wait("@replaceLayoutWithCRUDPage").should(
+        "have.nested.property",
+        "response.body.responseMeta.status",
+        201,
+      );
+      cy.wait("@getActions");
+      cy.wait("@postExecute").should(
+        "have.nested.property",
+        "response.body.responseMeta.status",
+        200,
+      );
 
-    cy.get(".t--save-datasource").click();
-    cy.wait("@saveDatasource").should(
-      "have.nested.property",
-      "response.body.responseMeta.status",
-      201,
-    );
-
-    cy.wait("@getDatasourceStructure").should(
-      "have.nested.property",
-      "response.body.responseMeta.status",
-      200,
-    );
-
-    cy.get(generatePage.selectTableDropdown).click();
-
-    cy.get(generatePage.dropdownOption).contains("public.configs").click();
-
-    //  skip optional search column selection.
-    cy.get(generatePage.generatePageFormSubmitBtn).click();
-
-    cy.wait("@replaceLayoutWithCRUDPage").should(
-      "have.nested.property",
-      "response.body.responseMeta.status",
-      201,
-    );
-    cy.wait("@getActions");
-    cy.wait("@postExecute").should(
-      "have.nested.property",
-      "response.body.responseMeta.status",
-      200,
-    );
-
-    cy.get("span:contains('Got it')").click();
-
-    // connect app to git
-    gitSync.CreateNConnectToGit(repoName);
-    cy.get("@gitRepoName").then((repName) => {
-      repoName = repName;
-    });
-    table.ReadTableRowColumnData(0, 1, "v2").then((cellData) => {
-      expect(cellData).to.be.equal("New Config");
+      cy.get("span:contains('Got it')").click();
+
+      // connect app to git
+      gitSync.CreateNConnectToGit(repoName);
+      cy.get("@gitRepoName").then((repName) => {
+        repoName = repName;
+      });
+      table.ReadTableRowColumnData(0, 1, "v2").then((cellData) => {
+        expect(cellData).to.be.equal("New Config");
+      });
+      // rename page to crud_page
+      entityExplorer.RenameEntityFromExplorer(
+        "Page1",
+        pageName,
+        false,
+        EntityItems.Page,
+      );
+      PageList.ClonePage(pageName);
+
+      PageList.ShowList();
+      PageLeftPane.assertPresence(`${pageName} Copy`);
+      table.ReadTableRowColumnData(0, 1, "v2").then((cellData) => {
+        expect(cellData).to.be.equal("New Config");
+      });
     });
-    // rename page to crud_page
-    entityExplorer.RenameEntityFromExplorer(
-      "Page1",
-      pageName,
-      false,
-      EntityItems.Page,
-    );
-    PageList.ClonePage(pageName);
-
-    PageList.ShowList();
-    PageLeftPane.assertPresence(`${pageName} Copy`);
-    table.ReadTableRowColumnData(0, 1, "v2").then((cellData) => {
-      expect(cellData).to.be.equal("New Config");
+
+    it("2. Create api queries from api pane and cURL import , bind it to widget and clone page from page settings", () => {
+      cy.fixture("datasources").then((datasourceFormData) => {
+        cy.Createpage(newPage);
+        EditorNavigation.SelectEntityByName(newPage, EntityType.Page);
+
+        // create a get api call
+        apiPage.CreateAndFillApi(datasourceFormData["echoApiUrl"], "get_data");
+        apiPage.EnterHeader("info", "This is a test");
+        apiPage.RunAPI();
+        apiPage.ResponseStatusCheck("200 OK");
+        // curl import
+        apiPage.FillCurlNImport(
+          `curl -d \'{"name":"morpheus","job":"leader"}\' -H Content-Type:application/json -X POST '` +
+            datasourceFormData["echoApiUrl"],
+        );
+        cy.RunAPI();
+        apiPage.ResponseStatusCheck("200 OK");
+        cy.get("@curlImport").then((response) => {
+          cy.expect(response.response.body.responseMeta.success).to.eq(true);
+          cy.get(apiwidget.ApiName)
+            .invoke("text")
+            .then((text) => {
+              const someText = text;
+              expect(someText).to.equal(response.response.body.data.name);
+            });
+        });
+        EditorNavigation.ShowCanvas();
+        // bind input widgets to the api calls responses
+        cy.dragAndDropToCanvas("inputwidgetv2", { x: 300, y: 300 });
+        cy.get(".t--widget-inputwidgetv2").should("exist");
+        cy.EnableAllCodeEditors();
+        cy.get(
+          `.t--property-control-defaultvalue ${dynamicInputLocators.input}`,
+        )
+          .last()
+          .click({ force: true })
+          .type("{{Api1.data.body.name}}", {
+            parseSpecialCharSequences: false,
+          });
+        cy.dragAndDropToCanvas("inputwidgetv2", { x: 300, y: 500 });
+        propPane.UpdatePropertyFieldValue(
+          "Default value",
+          "{{get_data.data.headers.Info}}",
+        );
+        agHelper.WaitUntilToastDisappear(
+          "will be executed automatically on page load",
+        );
+        // clone the page from page settings
+        PageList.ClonePage(newPage);
+        EditorNavigation.SelectEntityByName(newPage, EntityType.Page);
+      });
     });
-  });
 
-  it("2. Create api queries from api pane and cURL import , bind it to widget and clone page from page settings", () => {
-    cy.fixture("datasources").then((datasourceFormData) => {
-      cy.Createpage(newPage);
+    it("3. Commit and push changes, validate data binding on all pages in edit and deploy mode on master", () => {
+      // verfiy data binding on all pages in edit mode
+      cy.get(widgetsPage.inputWidget).should("be.visible");
+      cy.get(widgetsPage.inputWidget)
+        .first()
+        .find(widgetsPage.dataclass)
+        .invoke("val")
+        .should("be.oneOf", ["morpheus", "This is a test"]);
+      cy.get(widgetsPage.inputWidget)
+        .last()
+        .find(widgetsPage.dataclass)
+        .invoke("val")
+        .should("be.oneOf", ["morpheus", "This is a test"]);
+
+      PageList.ShowList();
       EditorNavigation.SelectEntityByName(newPage, EntityType.Page);
+      cy.get(widgetsPage.inputWidget)
+        .first()
+        .find(widgetsPage.dataclass)
+        .should("have.value", "morpheus");
+      cy.get(widgetsPage.inputWidget)
+        .last()
+        .find(widgetsPage.dataclass)
+        .should("have.value", "This is a test");
+
+      PageList.ShowList();
+      EditorNavigation.SelectEntityByName(pageName, EntityType.Page);
+      table.ReadTableRowColumnData(0, 1, "v2").then((cellData) => {
+        expect(cellData).to.be.equal("New Config");
+      });
+
+      PageList.ShowList();
+      EditorNavigation.SelectEntityByName(`${pageName} Copy`, EntityType.Page);
+      table.ReadTableRowColumnData(0, 1, "v2").then((cellData) => {
+        expect(cellData).to.be.equal("New Config");
+      });
+      // commit and push the changes
+      gitSync.CommitAndPush(true);
+      // verify data binding on all pages in deploy mode
+      cy.latestDeployPreview();
+      agHelper.GetNClickByContains(locators._deployedPage, pageName);
+      table.ReadTableRowColumnData(0, 1, "v2").then((cellData) => {
+        expect(cellData).to.be.equal("New Config");
+      });
+      agHelper.GetNClickByContains(locators._deployedPage, `${pageName} Copy`);
+      table.ReadTableRowColumnData(0, 1, "v2").then((cellData) => {
+        expect(cellData).to.be.equal("New Config");
+      });
+      agHelper.GetNClickByContains(locators._deployedPage, `${newPage}`);
+      agHelper.RefreshPage("getConsolidatedData");
+      cy.get(widgetsPage.dataclass)
+        .first()
+        .invoke("val")
+        .should("be.oneOf", ["morpheus", "This is a test"]);
+      cy.get(widgetsPage.dataclass)
+        .last()
+        .invoke("val")
+        .should("be.oneOf", ["morpheus", "This is a test"]);
+      cy.get(".t--page-switch-tab")
+        .contains(`${newPage} Copy`)
+        .click({ force: true });
+      cy.get(widgetsPage.dataclass)
+        .first()
+        .invoke("val")
+        .should("be.oneOf", ["morpheus", "This is a test"]);
+      cy.get(widgetsPage.dataclass)
+        .last()
+        .invoke("val")
+        .should("be.oneOf", ["morpheus", "This is a test"]);
+      agHelper.AssertElementLength(
+        locators._widgetInDeployed(draggableWidgets.INPUT_V2),
+        2,
+      );
+      deployMode.NavigateBacktoEditor();
+    });
 
-      // create a get api call
-      apiPage.CreateAndFillApi(datasourceFormData["echoApiUrl"], "get_data");
-      apiPage.EnterHeader("info", "This is a test");
-      apiPage.RunAPI();
-      apiPage.ResponseStatusCheck("200 OK");
-      // curl import
-      apiPage.FillCurlNImport(
-        `curl -d \'{"name":"morpheus","job":"leader"}\' -H Content-Type:application/json -X POST '` +
-          datasourceFormData["echoApiUrl"],
+    it("4. Create a new branch tempBranch, add jsObject and datasource query, move them to new page i.e. Child_Page and bind to widgets", () => {
+      gitSync.CreateGitBranch(tempBranch, true);
+      cy.get("@gitbranchName").then((branName) => {
+        tempBranch = branName;
+      });
+      // create jsObject and rename it
+      EditorNavigation.SelectEntityByName(`${newPage} Copy`, EntityType.Page);
+
+      jsEditor.CreateJSObject('return "Success";');
+      // create postgres select query
+      dataSources.CreateQueryForDS(
+        datasourceName,
+        "SELECT * FROM users ORDER BY id LIMIT 10;",
+        "get_users",
       );
-      cy.RunAPI();
-      apiPage.ResponseStatusCheck("200 OK");
-      cy.get("@curlImport").then((response) => {
-        cy.expect(response.response.body.responseMeta.success).to.eq(true);
-        cy.get(apiwidget.ApiName)
-          .invoke("text")
-          .then((text) => {
-            const someText = text;
-            expect(someText).to.equal(response.response.body.data.name);
-          });
+      dataSources.RunQuery();
+      // create a new page
+      cy.Createpage("Child_Page");
+      EditorNavigation.SelectEntityByName(`${newPage} Copy`, EntityType.Page);
+      EditorNavigation.SelectEntityByName("get_users", EntityType.Query);
+      agHelper.ActionContextMenuWithInPane({
+        action: "Move to page",
+        subAction: "Child_Page",
+        toastToValidate: "moved to page",
+      });
+      agHelper.WaitUntilAllToastsDisappear();
+      dataSources.RunQuery();
+      EditorNavigation.SelectEntityByName(`${newPage} Copy`, EntityType.Page);
+      EditorNavigation.SelectEntityByName("JSObject1", EntityType.JSObject);
+      entityExplorer.ActionContextMenuByEntityName({
+        entityNameinLeftSidebar: "JSObject1",
+        action: "Move to page",
+        subAction: "Child_Page",
+        toastToValidate: "moved to page",
       });
-      EditorNavigation.ShowCanvas();
-      // bind input widgets to the api calls responses
+      agHelper.WaitUntilAllToastsDisappear();
+      // bind input widgets to the jsObject and query response
       cy.dragAndDropToCanvas("inputwidgetv2", { x: 300, y: 300 });
       cy.get(".t--widget-inputwidgetv2").should("exist");
       cy.EnableAllCodeEditors();
       cy.get(`.t--property-control-defaultvalue ${dynamicInputLocators.input}`)
         .last()
         .click({ force: true })
-        .type("{{Api1.data.body.name}}", { parseSpecialCharSequences: false });
+        .type("{{JSObject1.myFun1()}}", { parseSpecialCharSequences: false });
       cy.dragAndDropToCanvas("inputwidgetv2", { x: 300, y: 500 });
+      cy.get(".t--widget-inputwidgetv2").should("exist");
       propPane.UpdatePropertyFieldValue(
         "Default value",
-        "{{get_data.data.headers.Info}}",
-      );
-      agHelper.WaitUntilToastDisappear(
-        "will be executed automatically on page load",
+        "{{get_users.data[0].name}}",
       );
-      // clone the page from page settings
-      PageList.ClonePage(newPage);
-      EditorNavigation.SelectEntityByName(newPage, EntityType.Page);
-    });
-  });
-
-  it("3. Commit and push changes, validate data binding on all pages in edit and deploy mode on master", () => {
-    // verfiy data binding on all pages in edit mode
-    cy.get(widgetsPage.inputWidget).should("be.visible");
-    cy.get(widgetsPage.inputWidget)
-      .first()
-      .find(widgetsPage.dataclass)
-      .invoke("val")
-      .should("be.oneOf", ["morpheus", "This is a test"]);
-    cy.get(widgetsPage.inputWidget)
-      .last()
-      .find(widgetsPage.dataclass)
-      .invoke("val")
-      .should("be.oneOf", ["morpheus", "This is a test"]);
-
-    PageList.ShowList();
-    EditorNavigation.SelectEntityByName(newPage, EntityType.Page);
-    cy.get(widgetsPage.inputWidget)
-      .first()
-      .find(widgetsPage.dataclass)
-      .should("have.value", "morpheus");
-    cy.get(widgetsPage.inputWidget)
-      .last()
-      .find(widgetsPage.dataclass)
-      .should("have.value", "This is a test");
-
-    PageList.ShowList();
-    EditorNavigation.SelectEntityByName(pageName, EntityType.Page);
-    table.ReadTableRowColumnData(0, 1, "v2").then((cellData) => {
-      expect(cellData).to.be.equal("New Config");
+      PageLeftPane.switchSegment(PagePaneSegment.Queries);
+      EditorNavigation.SelectEntityByName("get_users", EntityType.Query);
+      dataSources.RunQuery();
     });
 
-    PageList.ShowList();
-    EditorNavigation.SelectEntityByName(`${pageName} Copy`, EntityType.Page);
-    table.ReadTableRowColumnData(0, 1, "v2").then((cellData) => {
-      expect(cellData).to.be.equal("New Config");
-    });
-    // commit and push the changes
-    gitSync.CommitAndPush(true);
-    // verify data binding on all pages in deploy mode
-    cy.latestDeployPreview();
-    agHelper.GetNClickByContains(locators._deployedPage, pageName);
-    table.ReadTableRowColumnData(0, 1, "v2").then((cellData) => {
-      expect(cellData).to.be.equal("New Config");
+    it("5. Commit and push changes, validate data binding on all pages in edit and deploy mode on tempBranch", () => {
+      // commit and push changes
+      cy.get(homePageLocators.publishButton).click();
+      cy.get(gitSyncLocators.commitCommentInput).type("Initial Commit");
+      cy.get(gitSyncLocators.commitButton).click();
+      cy.get(gitSyncLocators.closeGitSyncModal).click();
+      // verfiy data binding on all pages in deploy mode
+      cy.latestDeployPreview();
+      cy.get(widgetsPage.dataclass).should("be.visible");
+      cy.get(widgetsPage.dataclass)
+        .first()
+        .invoke("val")
+        .should("be.oneOf", ["Success", "Test user 7"]);
+      cy.get(widgetsPage.dataclass)
+        .last()
+        .invoke("val")
+        .should("be.oneOf", ["Success", "Test user 7"]);
+      agHelper.GetNClickByContains(locators._deployedPage, `${pageName}`);
+      table.ReadTableRowColumnData(0, 1, "v2").then((cellData) => {
+        expect(cellData).to.be.equal("New Config");
+      });
+      agHelper.GetNClickByContains(locators._deployedPage, `${pageName} Copy`);
+      table.ReadTableRowColumnData(0, 1, "v2").then((cellData) => {
+        expect(cellData).to.be.equal("New Config");
+      });
+      agHelper.GetNClickByContains(locators._deployedPage, `${newPage}`);
+      cy.get(widgetsPage.dataclass)
+        .first()
+        .invoke("val")
+        .should("be.oneOf", ["morpheus", "This is a test"]);
+      cy.get(widgetsPage.dataclass)
+        .last()
+        .invoke("val")
+        .should("be.oneOf", ["morpheus", "This is a test"]);
+
+      agHelper.GetNClickByContains(locators._deployedPage, `${newPage} Copy`);
+      cy.get(widgetsPage.dataclass)
+        .first()
+        .invoke("val")
+        .should("be.oneOf", ["morpheus", "This is a test"]);
+      cy.get(widgetsPage.dataclass)
+        .last()
+        .invoke("val")
+        .should("be.oneOf", ["morpheus", "This is a test"]);
+      deployMode.NavigateBacktoEditor();
     });
-    agHelper.GetNClickByContains(locators._deployedPage, `${pageName} Copy`);
-    table.ReadTableRowColumnData(0, 1, "v2").then((cellData) => {
-      expect(cellData).to.be.equal("New Config");
+
+    it("6. Switch to master and verify no uncommitted changes should be shown on master", () => {
+      cy.switchGitBranch("master");
+      // verify commit input box is disabled
+      cy.get(homePageLocators.publishButton).click();
+      cy.get(gitSyncLocators.commitCommentInput)
+        .should("be.disabled")
+        .and("have.text", "No changes to commit");
+      cy.get(gitSyncLocators.closeGitSyncModal).click();
     });
-    agHelper.GetNClickByContains(locators._deployedPage, `${newPage}`);
-    agHelper.RefreshPage("getConsolidatedData");
-    cy.get(widgetsPage.dataclass)
-      .first()
-      .invoke("val")
-      .should("be.oneOf", ["morpheus", "This is a test"]);
-    cy.get(widgetsPage.dataclass)
-      .last()
-      .invoke("val")
-      .should("be.oneOf", ["morpheus", "This is a test"]);
-    cy.get(".t--page-switch-tab")
-      .contains(`${newPage} Copy`)
-      .click({ force: true });
-    cy.get(widgetsPage.dataclass)
-      .first()
-      .invoke("val")
-      .should("be.oneOf", ["morpheus", "This is a test"]);
-    cy.get(widgetsPage.dataclass)
-      .last()
-      .invoke("val")
-      .should("be.oneOf", ["morpheus", "This is a test"]);
-    agHelper.AssertElementLength(
-      locators._widgetInDeployed(draggableWidgets.INPUT_V2),
-      2,
-    );
-    deployMode.NavigateBacktoEditor();
-  });
-
-  it("4. Create a new branch tempBranch, add jsObject and datasource query, move them to new page i.e. Child_Page and bind to widgets", () => {
-    gitSync.CreateGitBranch(tempBranch, true);
-    cy.get("@gitbranchName").then((branName) => {
-      tempBranch = branName;
+
+    it("7. Switch to tempBranch , Clone the Child_Page, change it's visiblity to hidden and deploy, merge to master", () => {
+      cy.switchGitBranch(tempBranch);
+      //  clone the Child_Page
+      EditorNavigation.SelectEntityByName("Child_Page", EntityType.Page);
+      PageList.ClonePage("Child_Page");
+      // change cloned page visiblity to hidden
+      EditorNavigation.SelectEntityByName("Child_Page Copy", EntityType.Page);
+      PageList.HidePage("Child_Page");
+
+      EditorNavigation.SelectEntityByName("Child_Page", EntityType.Page);
+      cy.wait("@getConsolidatedData");
+      cy.get(homePageLocators.publishButton).click();
+      cy.get(gitSyncLocators.commitCommentInput).type("Initial Commit");
+      cy.get(gitSyncLocators.commitButton).click();
+      cy.get(gitSyncLocators.closeGitSyncModal).click();
+
+      gitSync.MergeToMaster();
+
+      cy.latestDeployPreview();
+      // verify page is hidden on deploy mode
+      agHelper.AssertContains("Child_Page Copy", "not.exist");
+      deployMode.NavigateBacktoEditor();
     });
-    // create jsObject and rename it
-    EditorNavigation.SelectEntityByName(`${newPage} Copy`, EntityType.Page);
-
-    jsEditor.CreateJSObject('return "Success";');
-    // create postgres select query
-    dataSources.CreateQueryForDS(
-      datasourceName,
-      "SELECT * FROM users ORDER BY id LIMIT 10;",
-      "get_users",
-    );
-    dataSources.RunQuery();
-    // create a new page
-    cy.Createpage("Child_Page");
-    EditorNavigation.SelectEntityByName(`${newPage} Copy`, EntityType.Page);
-    EditorNavigation.SelectEntityByName("get_users", EntityType.Query);
-    agHelper.ActionContextMenuWithInPane({
-      action: "Move to page",
-      subAction: "Child_Page",
-      toastToValidate: "moved to page",
+
+    it("8. Verify Page visiblity on master in edit and deploy mode", () => {
+      cy.switchGitBranch(mainBranch);
+      cy.latestDeployPreview();
+      agHelper.AssertContains("Child_Page Copy", "not.exist");
+      deployMode.NavigateBacktoEditor();
     });
-    agHelper.WaitUntilAllToastsDisappear();
-    dataSources.RunQuery();
-    EditorNavigation.SelectEntityByName(`${newPage} Copy`, EntityType.Page);
-    EditorNavigation.SelectEntityByName("JSObject1", EntityType.JSObject);
-    entityExplorer.ActionContextMenuByEntityName({
-      entityNameinLeftSidebar: "JSObject1",
-      action: "Move to page",
-      subAction: "Child_Page",
-      toastToValidate: "moved to page",
+
+    it("9. Create new branch, delete a page and merge back to master, verify page is deleted on master", () => {
+      //cy.createGitBranch(tempBranch1);
+      gitSync.CreateGitBranch(tempBranch1, true);
+      // delete page from page settings
+      EditorNavigation.SelectEntityByName("Child_Page Copy", EntityType.Page);
+      cy.wait("@getConsolidatedData");
+      PageList.DeletePage("Child_Page Copy");
+      cy.get(homePageLocators.publishButton).click();
+      cy.get(gitSyncLocators.commitCommentInput).type("Initial Commit");
+      cy.get(gitSyncLocators.commitButton).click();
+      cy.get(gitSyncLocators.closeGitSyncModal).click();
+      gitSync.MergeToMaster();
+      cy.latestDeployPreview();
+      // verify page is hidden on deploy mode
+      agHelper.AssertContains("Child_Page Copy", "not.exist");
+      deployMode.NavigateBacktoEditor();
     });
-    agHelper.WaitUntilAllToastsDisappear();
-    // bind input widgets to the jsObject and query response
-    cy.dragAndDropToCanvas("inputwidgetv2", { x: 300, y: 300 });
-    cy.get(".t--widget-inputwidgetv2").should("exist");
-    cy.EnableAllCodeEditors();
-    cy.get(`.t--property-control-defaultvalue ${dynamicInputLocators.input}`)
-      .last()
-      .click({ force: true })
-      .type("{{JSObject1.myFun1()}}", { parseSpecialCharSequences: false });
-    cy.dragAndDropToCanvas("inputwidgetv2", { x: 300, y: 500 });
-    cy.get(".t--widget-inputwidgetv2").should("exist");
-    propPane.UpdatePropertyFieldValue(
-      "Default value",
-      "{{get_users.data[0].name}}",
-    );
-    PageLeftPane.switchSegment(PagePaneSegment.Queries);
-    EditorNavigation.SelectEntityByName("get_users", EntityType.Query);
-    dataSources.RunQuery();
-  });
-
-  it("5. Commit and push changes, validate data binding on all pages in edit and deploy mode on tempBranch", () => {
-    // commit and push changes
-    cy.get(homePageLocators.publishButton).click();
-    cy.get(gitSyncLocators.commitCommentInput).type("Initial Commit");
-    cy.get(gitSyncLocators.commitButton).click();
-    cy.get(gitSyncLocators.closeGitSyncModal).click();
-    // verfiy data binding on all pages in deploy mode
-    cy.latestDeployPreview();
-    cy.get(widgetsPage.dataclass).should("be.visible");
-    cy.get(widgetsPage.dataclass)
-      .first()
-      .invoke("val")
-      .should("be.oneOf", ["Success", "Test user 7"]);
-    cy.get(widgetsPage.dataclass)
-      .last()
-      .invoke("val")
-      .should("be.oneOf", ["Success", "Test user 7"]);
-    agHelper.GetNClickByContains(locators._deployedPage, `${pageName}`);
-    table.ReadTableRowColumnData(0, 1, "v2").then((cellData) => {
-      expect(cellData).to.be.equal("New Config");
+
+    //Skipping these since these are causing chrome crash in CI, passes in electron.
+    it.skip("10. After merge back to master, verify page is deleted on master", () => {
+      // verify Child_Page is not on master
+      cy.switchGitBranch(mainBranch);
+      assertHelper.AssertDocumentReady();
+      table.WaitUntilTableLoad();
+      cy.readTabledataPublish("0", "1").then((cellData) => {
+        expect(cellData).to.be.equal("New Config");
+      });
+      agHelper.AssertAutoSave();
+      PageList.ShowList();
+      PageLeftPane.assertAbsence("Child_Page Copy");
+      // create another branch and verify deleted page doesn't exist on it
+      gitSync.CreateGitBranch(tempBranch0, true);
+      PageList.ShowList();
+      PageLeftPane.assertAbsence("Child_Page Copy");
     });
-    agHelper.GetNClickByContains(locators._deployedPage, `${pageName} Copy`);
-    table.ReadTableRowColumnData(0, 1, "v2").then((cellData) => {
-      expect(cellData).to.be.equal("New Config");
+
+    it.skip("11. Import app from git and verify page order should not change", () => {
+      cy.get(homePageLocators.homeIcon).click();
+      agHelper.GetNClick(homePageLocators.createNew, 0);
+      cy.get(homePageLocators.workspaceImportAppOption).click({ force: true });
+      cy.get(".t--import-json-card").next().click();
+      // import application from git
+      cy.importAppFromGit(repoName);
+      // verify page order remains same as in orignal app
+      PageList.ShowList();
+      cy.get(".t--entity-item").eq(1).contains("crudpage_1");
+      cy.get(".t--entity-item").eq(2).contains("crudpage_1 Copy");
+      cy.get(".t--entity-item").eq(3).contains("ApiCalls_1");
+      cy.get(".t--entity-item").eq(4).contains("ApiCalls_1 Copy");
+      cy.get(".t--entity-item").eq(5).contains("Child_Page");
     });
-    agHelper.GetNClickByContains(locators._deployedPage, `${newPage}`);
-    cy.get(widgetsPage.dataclass)
-      .first()
-      .invoke("val")
-      .should("be.oneOf", ["morpheus", "This is a test"]);
-    cy.get(widgetsPage.dataclass)
-      .last()
-      .invoke("val")
-      .should("be.oneOf", ["morpheus", "This is a test"]);
-
-    agHelper.GetNClickByContains(locators._deployedPage, `${newPage} Copy`);
-    cy.get(widgetsPage.dataclass)
-      .first()
-      .invoke("val")
-      .should("be.oneOf", ["morpheus", "This is a test"]);
-    cy.get(widgetsPage.dataclass)
-      .last()
-      .invoke("val")
-      .should("be.oneOf", ["morpheus", "This is a test"]);
-    deployMode.NavigateBacktoEditor();
-  });
-
-  it("6. Switch to master and verify no uncommitted changes should be shown on master", () => {
-    cy.switchGitBranch("master");
-    // verify commit input box is disabled
-    cy.get(homePageLocators.publishButton).click();
-    cy.get(gitSyncLocators.commitCommentInput)
-      .should("be.disabled")
-      .and("have.text", "No changes to commit");
-    cy.get(gitSyncLocators.closeGitSyncModal).click();
-  });
-
-  it("7. Switch to tempBranch , Clone the Child_Page, change it's visiblity to hidden and deploy, merge to master", () => {
-    cy.switchGitBranch(tempBranch);
-    //  clone the Child_Page
-    EditorNavigation.SelectEntityByName("Child_Page", EntityType.Page);
-    PageList.ClonePage("Child_Page");
-    // change cloned page visiblity to hidden
-    EditorNavigation.SelectEntityByName("Child_Page Copy", EntityType.Page);
-    PageList.HidePage("Child_Page");
-
-    EditorNavigation.SelectEntityByName("Child_Page", EntityType.Page);
-    cy.wait("@getConsolidatedData");
-    cy.get(homePageLocators.publishButton).click();
-    cy.get(gitSyncLocators.commitCommentInput).type("Initial Commit");
-    cy.get(gitSyncLocators.commitButton).click();
-    cy.get(gitSyncLocators.closeGitSyncModal).click();
-
-    gitSync.MergeToMaster();
-
-    cy.latestDeployPreview();
-    // verify page is hidden on deploy mode
-    agHelper.AssertContains("Child_Page Copy", "not.exist");
-    deployMode.NavigateBacktoEditor();
-  });
-
-  it("8. Verify Page visiblity on master in edit and deploy mode", () => {
-    cy.switchGitBranch(mainBranch);
-    cy.latestDeployPreview();
-    agHelper.AssertContains("Child_Page Copy", "not.exist");
-    deployMode.NavigateBacktoEditor();
-  });
-
-  it("9. Create new branch, delete a page and merge back to master, verify page is deleted on master", () => {
-    //cy.createGitBranch(tempBranch1);
-    gitSync.CreateGitBranch(tempBranch1, true);
-    // delete page from page settings
-    EditorNavigation.SelectEntityByName("Child_Page Copy", EntityType.Page);
-    cy.wait("@getConsolidatedData");
-    PageList.DeletePage("Child_Page Copy");
-    cy.get(homePageLocators.publishButton).click();
-    cy.get(gitSyncLocators.commitCommentInput).type("Initial Commit");
-    cy.get(gitSyncLocators.commitButton).click();
-    cy.get(gitSyncLocators.closeGitSyncModal).click();
-    gitSync.MergeToMaster();
-    cy.latestDeployPreview();
-    // verify page is hidden on deploy mode
-    agHelper.AssertContains("Child_Page Copy", "not.exist");
-    deployMode.NavigateBacktoEditor();
-  });
-
-  //Skipping these since these are causing chrome crash in CI, passes in electron.
-  it.skip("10. After merge back to master, verify page is deleted on master", () => {
-    // verify Child_Page is not on master
-    cy.switchGitBranch(mainBranch);
-    assertHelper.AssertDocumentReady();
-    table.WaitUntilTableLoad();
-    cy.readTabledataPublish("0", "1").then((cellData) => {
-      expect(cellData).to.be.equal("New Config");
+
+    after(() => {
+      //clean up
+      gitSync.DeleteTestGithubRepo(repoName);
     });
-    agHelper.AssertAutoSave();
-    PageList.ShowList();
-    PageLeftPane.assertAbsence("Child_Page Copy");
-    // create another branch and verify deleted page doesn't exist on it
-    gitSync.CreateGitBranch(tempBranch0, true);
-    PageList.ShowList();
-    PageLeftPane.assertAbsence("Child_Page Copy");
-  });
-
-  it.skip("11. Import app from git and verify page order should not change", () => {
-    cy.get(homePageLocators.homeIcon).click();
-    agHelper.GetNClick(homePageLocators.createNew, 0);
-    cy.get(homePageLocators.workspaceImportAppOption).click({ force: true });
-    cy.get(".t--import-json-card").next().click();
-    // import application from git
-    cy.importAppFromGit(repoName);
-    // verify page order remains same as in orignal app
-    PageList.ShowList();
-    cy.get(".t--entity-item").eq(1).contains("crudpage_1");
-    cy.get(".t--entity-item").eq(2).contains("crudpage_1 Copy");
-    cy.get(".t--entity-item").eq(3).contains("ApiCalls_1");
-    cy.get(".t--entity-item").eq(4).contains("ApiCalls_1 Copy");
-    cy.get(".t--entity-item").eq(5).contains("Child_Page");
-  });
-
-  after(() => {
-    //clean up
-    gitSync.DeleteTestGithubRepo(repoName);
-  });
-});
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/MergeViaRemote_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/MergeViaRemote_spec.ts
index 10cf74d2fd09..ec5a302d5a58 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/MergeViaRemote_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/MergeViaRemote_spec.ts
@@ -29,7 +29,18 @@ let repoName: any;
 
 describe(
   "Git sync: Merge changes via remote",
-  { tags: ["@tag.Git"] },
+  {
+    tags: [
+      "@tag.Git",
+      "@tag.AccessControl",
+      "@tag.Workflows",
+      "@tag.Module",
+      "@tag.Theme",
+      "@tag.JS",
+      "@tag.Container",
+      "@tag.ImportExport",
+    ],
+  },
   function () {
     before(() => {
       _.homePage.NavigateToHome();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/Merge_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/Merge_spec.js
index 59e708234980..82f17e6d1cb5 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/Merge_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/Merge_spec.js
@@ -7,7 +7,19 @@ let childBranchKey = "ChildBranch";
 let mainBranch = "master";
 describe(
   "Git sync modal: merge tab",
-  { tags: ["@tag.Git", "@tag.Git", "@tag.Sanity"] },
+  {
+    tags: [
+      "@tag.Git",
+      "@tag.Sanity",
+      "@tag.AccessControl",
+      "@tag.Workflows",
+      "@tag.Module",
+      "@tag.Theme",
+      "@tag.JS",
+      "@tag.Container",
+      "@tag.ImportExport",
+    ],
+  },
   function () {
     before(() => {
       _.homePage.NavigateToHome();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/PreConnect_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/PreConnect_spec.ts
index 633de9d4984f..139ca0d4da5d 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/PreConnect_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/PreConnect_spec.ts
@@ -2,39 +2,54 @@ import homePage from "../../../../../locators/HomePage";
 import * as _ from "../../../../../support/Objects/ObjectsCore";
 import gitSyncLocators from "../../../../../locators/gitSyncLocators";
 
-describe("Pre git connection spec:", { tags: ["@tag.Git"] }, function () {
-  it("1. Deploy menu at the application dropdown menu", () => {
-    // create new app
-    _.homePage.NavigateToHome();
-    cy.createWorkspace();
-    cy.wait("@createWorkspace").then((interception) => {
-      const newWorkspaceName = interception.response.body.data.name;
-      cy.CreateAppForWorkspace(newWorkspaceName, newWorkspaceName);
-    });
+describe(
+  "Pre git connection spec:",
+  {
+    tags: [
+      "@tag.Git",
+      "@tag.AccessControl",
+      "@tag.Workflows",
+      "@tag.Module",
+      "@tag.Theme",
+      "@tag.JS",
+      "@tag.Container",
+      "@tag.ImportExport",
+    ],
+  },
+  function () {
+    it("1. Deploy menu at the application dropdown menu", () => {
+      // create new app
+      _.homePage.NavigateToHome();
+      cy.createWorkspace();
+      cy.wait("@createWorkspace").then((interception) => {
+        const newWorkspaceName = interception.response.body.data.name;
+        cy.CreateAppForWorkspace(newWorkspaceName, newWorkspaceName);
+      });
 
-    cy.intercept("POST", "/api/v1/applications/publish/*").as("publishApp");
+      cy.intercept("POST", "/api/v1/applications/publish/*").as("publishApp");
 
-    cy.window().then((window) => {
-      cy.stub(window, "open").callsFake((url) => {
-        expect(!!url).to.be.true;
+      cy.window().then((window) => {
+        cy.stub(window, "open").callsFake((url) => {
+          expect(!!url).to.be.true;
+        });
       });
-    });
 
-    // deploy
-    _.agHelper.GetNClick(_.locators._publishButton);
-    cy.wait("@publishApp");
+      // deploy
+      _.agHelper.GetNClick(_.locators._publishButton);
+      cy.wait("@publishApp");
 
-    // current deployed version
-    _.agHelper.GetNClick(homePage.deployPopupOptionTrigger);
-    _.agHelper.AssertElementExist(homePage.currentDeployedPreviewBtn);
+      // current deployed version
+      _.agHelper.GetNClick(homePage.deployPopupOptionTrigger);
+      _.agHelper.AssertElementExist(homePage.currentDeployedPreviewBtn);
 
-    // connect to git
-    _.agHelper.GetNClick(homePage.connectToGitBtn);
-    _.agHelper.AssertElementVisibility(gitSyncLocators.gitSyncModal);
-    cy.get(gitSyncLocators.closeGitSyncModal).click();
+      // connect to git
+      _.agHelper.GetNClick(homePage.connectToGitBtn);
+      _.agHelper.AssertElementVisibility(gitSyncLocators.gitSyncModal);
+      cy.get(gitSyncLocators.closeGitSyncModal).click();
 
-    cy.get(gitSyncLocators.connectGitBottomBar).click();
-    _.agHelper.AssertElementVisibility(gitSyncLocators.gitSyncModal);
-    cy.get(gitSyncLocators.closeGitSyncModal).click();
-  });
-});
+      cy.get(gitSyncLocators.connectGitBottomBar).click();
+      _.agHelper.AssertElementVisibility(gitSyncLocators.gitSyncModal);
+      cy.get(gitSyncLocators.closeGitSyncModal).click();
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/RepoLimitExceededErrorModal_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/RepoLimitExceededErrorModal_spec.js
index cf275ba1ddfc..879543ef43b2 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/RepoLimitExceededErrorModal_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/RepoLimitExceededErrorModal_spec.js
@@ -11,7 +11,18 @@ import { REPO, CURRENT_REPO } from "../../../../../fixtures/REPO";
 let repoName1, repoName2, repoName3, repoName4, windowOpenSpy;
 describe(
   "Repo Limit Exceeded Error Modal",
-  { tags: ["@tag.Git"] },
+  {
+    tags: [
+      "@tag.Git",
+      "@tag.AccessControl",
+      "@tag.Workflows",
+      "@tag.Module",
+      "@tag.Theme",
+      "@tag.JS",
+      "@tag.Container",
+      "@tag.ImportExport",
+    ],
+  },
   function () {
     before(() => {
       const uuid = require("uuid");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/SwitchBranches_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/SwitchBranches_spec.js
index b411c8b79192..c652285ef448 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/SwitchBranches_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/SwitchBranches_spec.js
@@ -23,258 +23,276 @@ let parentBranchKey = "ParentBranch",
   branchQueryKey = "branch";
 
 let repoName;
-describe("Git sync:", { tags: ["@tag.Git", "@tag.Sanity"] }, function () {
-  before(() => {
-    gitSync.CreateNConnectToGit();
-    cy.get("@gitRepoName").then((repName) => {
-      repoName = repName;
+describe(
+  "Git sync:",
+  {
+    tags: [
+      "@tag.Git",
+      "@tag.Sanity",
+      "@tag.AccessControl",
+      "@tag.Workflows",
+      "@tag.Module",
+      "@tag.Theme",
+      "@tag.JS",
+      "@tag.Container",
+      "@tag.ImportExport",
+    ],
+  },
+  function () {
+    before(() => {
+      gitSync.CreateNConnectToGit();
+      cy.get("@gitRepoName").then((repName) => {
+        repoName = repName;
+      });
     });
-  });
-
-  it("1. create branch input", function () {
-    PageLeftPane.switchSegment(PagePaneSegment.UI);
-    cy.get(gitSyncLocators.branchButton).click();
 
-    // validate of the branch name
-    const hypenBranchName = "hypen-branch-name";
-    cy.get(gitSyncLocators.branchSearchInput).type(
-      `{selectall}${hypenBranchName}`,
-    );
-    agHelper.AssertAttribute(
-      gitSyncLocators.branchSearchInput,
-      "value",
-      "hypen-branch-name",
-    );
-    const specialBranchName = "special&branch-name~@#$%^&*()_+={}[]><,.";
-    cy.get(gitSyncLocators.branchSearchInput).type(
-      `{selectall}${specialBranchName}`,
-    );
-    agHelper.AssertAttribute(
-      gitSyncLocators.branchSearchInput,
-      "value",
-      "special_branch-name_____________________",
-    );
-    cy.get(gitSyncLocators.closeBranchList).click();
-  });
+    it("1. create branch input", function () {
+      PageLeftPane.switchSegment(PagePaneSegment.UI);
+      cy.get(gitSyncLocators.branchButton).click();
 
-  it("2. creates a new branch and create branch specific resources", function () {
-    cy.get(commonLocators.canvas).click({ force: true });
-    //cy.createGitBranch(parentBranchKey);
-    gitSync.CreateGitBranch(parentBranchKey, true);
-    cy.get("@gitbranchName").then((branName) => {
-      parentBranchKey = branName;
+      // validate of the branch name
+      const hypenBranchName = "hypen-branch-name";
+      cy.get(gitSyncLocators.branchSearchInput).type(
+        `{selectall}${hypenBranchName}`,
+      );
+      agHelper.AssertAttribute(
+        gitSyncLocators.branchSearchInput,
+        "value",
+        "hypen-branch-name",
+      );
+      const specialBranchName = "special&branch-name~@#$%^&*()_+={}[]><,.";
+      cy.get(gitSyncLocators.branchSearchInput).type(
+        `{selectall}${specialBranchName}`,
+      );
+      agHelper.AssertAttribute(
+        gitSyncLocators.branchSearchInput,
+        "value",
+        "special_branch-name_____________________",
+      );
+      cy.get(gitSyncLocators.closeBranchList).click();
     });
 
-    PageList.AddNewPage();
-    entityExplorer.RenameEntityFromExplorer(
-      "Page2",
-      "ParentPage1",
-      false,
-      EntityItems.Page,
-    );
-    dataSources.NavigateToDSCreateNew();
-    apiPage.CreateApi("ParentApi1");
-    jsEditor.CreateJSObject();
-    // Added because api name edit takes some time to
-    // reflect in api sidebar after the call passes.
-    // eslint-disable-next-line cypress/no-unnecessary-waiting
-    cy.wait(2000);
-    gitSync.CreateGitBranch(childBranchKey, true);
-    cy.get("@gitbranchName").then((branName) => {
-      childBranchKey = branName;
-    });
-    PageList.AddNewPage();
-    entityExplorer.RenameEntityFromExplorer(
-      "Page2",
-      "ChildPage1",
-      false,
-      EntityItems.Page,
-    );
-    dataSources.NavigateToDSCreateNew();
-    apiPage.CreateApi("ChildApi1");
-    jsEditor.CreateJSObject();
-    // Added because api name edit takes some time to
-    // reflect in api sidebar after the call passes.
-    // eslint-disable-next-line cypress/no-unnecessary-waiting
-    cy.wait(2000);
+    it("2. creates a new branch and create branch specific resources", function () {
+      cy.get(commonLocators.canvas).click({ force: true });
+      //cy.createGitBranch(parentBranchKey);
+      gitSync.CreateGitBranch(parentBranchKey, true);
+      cy.get("@gitbranchName").then((branName) => {
+        parentBranchKey = branName;
+      });
 
-    // A switch here should not show a 404 page
-    cy.switchGitBranch(parentBranchKey);
-    // When entity not found, takes them to the home page
-    PageList.VerifyIsCurrentPage("Page1");
+      PageList.AddNewPage();
+      entityExplorer.RenameEntityFromExplorer(
+        "Page2",
+        "ParentPage1",
+        false,
+        EntityItems.Page,
+      );
+      dataSources.NavigateToDSCreateNew();
+      apiPage.CreateApi("ParentApi1");
+      jsEditor.CreateJSObject();
+      // Added because api name edit takes some time to
+      // reflect in api sidebar after the call passes.
+      // eslint-disable-next-line cypress/no-unnecessary-waiting
+      cy.wait(2000);
+      gitSync.CreateGitBranch(childBranchKey, true);
+      cy.get("@gitbranchName").then((branName) => {
+        childBranchKey = branName;
+      });
+      PageList.AddNewPage();
+      entityExplorer.RenameEntityFromExplorer(
+        "Page2",
+        "ChildPage1",
+        false,
+        EntityItems.Page,
+      );
+      dataSources.NavigateToDSCreateNew();
+      apiPage.CreateApi("ChildApi1");
+      jsEditor.CreateJSObject();
+      // Added because api name edit takes some time to
+      // reflect in api sidebar after the call passes.
+      // eslint-disable-next-line cypress/no-unnecessary-waiting
+      cy.wait(2000);
 
-    EditorNavigation.SelectEntityByName("ParentPage1", EntityType.Page);
-    PageList.assertAbsence("ChildPage1");
-    PageLeftPane.switchSegment(PagePaneSegment.Queries);
-    PageLeftPane.assertAbsence("ChildApi1");
-    PageLeftPane.switchSegment(PagePaneSegment.JS);
-    PageLeftPane.assertAbsence("ChildJSAction1");
-  });
+      // A switch here should not show a 404 page
+      cy.switchGitBranch(parentBranchKey);
+      // When entity not found, takes them to the home page
+      PageList.VerifyIsCurrentPage("Page1");
+
+      EditorNavigation.SelectEntityByName("ParentPage1", EntityType.Page);
+      PageList.assertAbsence("ChildPage1");
+      PageLeftPane.switchSegment(PagePaneSegment.Queries);
+      PageLeftPane.assertAbsence("ChildApi1");
+      PageLeftPane.switchSegment(PagePaneSegment.JS);
+      PageLeftPane.assertAbsence("ChildJSAction1");
+    });
 
-  // rename entities
-  it("3. makes branch specific resource updates", function () {
-    cy.switchGitBranch(childBranchKey);
-    EditorNavigation.SelectEntityByName("ParentPage1", EntityType.Page);
-    entityExplorer.RenameEntityFromExplorer(
-      "ParentPage1",
-      "ParentPageRenamed",
-      false,
-      EntityItems.Page,
-    );
-    agHelper.RemoveUIElement(
-      "Tooltip",
-      Cypress.env("MESSAGES").ADD_QUERY_JS_TOOLTIP(),
-    );
-    PageLeftPane.switchSegment(PagePaneSegment.Queries);
-    entityExplorer.RenameEntityFromExplorer("ParentApi1", "ParentApiRenamed");
+    // rename entities
+    it("3. makes branch specific resource updates", function () {
+      cy.switchGitBranch(childBranchKey);
+      EditorNavigation.SelectEntityByName("ParentPage1", EntityType.Page);
+      entityExplorer.RenameEntityFromExplorer(
+        "ParentPage1",
+        "ParentPageRenamed",
+        false,
+        EntityItems.Page,
+      );
+      agHelper.RemoveUIElement(
+        "Tooltip",
+        Cypress.env("MESSAGES").ADD_QUERY_JS_TOOLTIP(),
+      );
+      PageLeftPane.switchSegment(PagePaneSegment.Queries);
+      entityExplorer.RenameEntityFromExplorer("ParentApi1", "ParentApiRenamed");
 
-    cy.switchGitBranch(parentBranchKey);
+      cy.switchGitBranch(parentBranchKey);
 
-    PageList.assertAbsence("ParentPageRenamed");
-    PageLeftPane.switchSegment(PagePaneSegment.Queries);
-    PageLeftPane.assertAbsence("ParentApiRenamed");
-  });
+      PageList.assertAbsence("ParentPageRenamed");
+      PageLeftPane.switchSegment(PagePaneSegment.Queries);
+      PageLeftPane.assertAbsence("ParentApiRenamed");
+    });
 
-  it("4. enables switching branch from the URL", () => {
-    cy.url().then((url) => {
-      EditorNavigation.SelectEntityByName("ParentPage1", EntityType.Page);
-      cy.dragAndDropToCanvas("tablewidgetv2", { x: 200, y: 200 });
-      cy.get(".t--widget-tablewidgetv2").should("exist");
-      cy.commitAndPush();
+    it("4. enables switching branch from the URL", () => {
+      cy.url().then((url) => {
+        EditorNavigation.SelectEntityByName("ParentPage1", EntityType.Page);
+        cy.dragAndDropToCanvas("tablewidgetv2", { x: 200, y: 200 });
+        cy.get(".t--widget-tablewidgetv2").should("exist");
+        cy.commitAndPush();
 
-      const urlObject = new URL(url);
-      urlObject.searchParams.set(branchQueryKey, childBranchKey);
-      cy.visit(urlObject.toString(), { timeout: 60000 });
+        const urlObject = new URL(url);
+        urlObject.searchParams.set(branchQueryKey, childBranchKey);
+        cy.visit(urlObject.toString(), { timeout: 60000 });
 
-      cy.get(".ads-v2-spinner").should("exist");
-      cy.get(".ads-v2-spinner").should("not.exist");
+        cy.get(".ads-v2-spinner").should("exist");
+        cy.get(".ads-v2-spinner").should("not.exist");
 
-      cy.get(".t--widget-tablewidgetv2").should("not.exist");
+        cy.get(".t--widget-tablewidgetv2").should("not.exist");
 
-      cy.commitAndPush();
+        cy.commitAndPush();
 
-      cy.latestDeployPreview();
+        cy.latestDeployPreview();
 
-      cy.get(".t--widget-tablewidgetv2").should("not.exist");
-      //cy.get(commonLocators.backToEditor).click();
-      cy.wait(2000);
-      cy.url().then((url) => {
-        const urlObject = new URL(url);
-        urlObject.searchParams.set(branchQueryKey, parentBranchKey);
-        cy.visit(urlObject.toString(), { timeout: 60000 });
+        cy.get(".t--widget-tablewidgetv2").should("not.exist");
+        //cy.get(commonLocators.backToEditor).click();
+        cy.wait(2000);
+        cy.url().then((url) => {
+          const urlObject = new URL(url);
+          urlObject.searchParams.set(branchQueryKey, parentBranchKey);
+          cy.visit(urlObject.toString(), { timeout: 60000 });
 
-        cy.wait("@getConsolidatedData").should(
-          "have.nested.property",
-          "response.body.responseMeta.status",
-          200,
-        );
-        cy.get(".t--page-switch-tab").contains("ParentPage1").click();
-        cy.get(".t--widget-tablewidgetv2").should("exist");
+          cy.wait("@getConsolidatedData").should(
+            "have.nested.property",
+            "response.body.responseMeta.status",
+            200,
+          );
+          cy.get(".t--page-switch-tab").contains("ParentPage1").click();
+          cy.get(".t--widget-tablewidgetv2").should("exist");
+        });
       });
     });
-  });
 
-  //Rename - hence skipping for Gitea
-  it.skip("5. test sync and prune branches", () => {
-    // uncomment once prune branch flow is complete
-    let tempBranch = "featureA";
-    const tempBranchRenamed = "newFeatureA";
-    deployMode.NavigateBacktoEditor();
-    gitSync.CreateGitBranch(tempBranch, true);
-    cy.get("@gitbranchName").then((branName) => {
-      tempBranch = branName;
+    //Rename - hence skipping for Gitea
+    it.skip("5. test sync and prune branches", () => {
+      // uncomment once prune branch flow is complete
+      let tempBranch = "featureA";
+      const tempBranchRenamed = "newFeatureA";
+      deployMode.NavigateBacktoEditor();
+      gitSync.CreateGitBranch(tempBranch, true);
+      cy.get("@gitbranchName").then((branName) => {
+        tempBranch = branName;
+      });
+      gitSync.CreateGitBranch(`${tempBranch}-1`, true);
+      // cy.get("@gitbranchName").then((branName) => {
+      //   tempBranch = branName;
+      // });
+      // rename branch API missing in TED.
+      // cy.renameBranchViaGithubApi(repoName, tempBranch, tempBranchRenamed);
+      cy.get(gitSyncLocators.branchButton).click();
+      cy.get(gitSyncLocators.branchSearchInput).type(
+        `{selectall}${tempBranch}`,
+      );
+      const tempBranchRegex = new RegExp(`^${tempBranch}$`);
+      const tempBranchRenamedRegex = new RegExp(`^${tempBranchRenamed}$`);
+      const remoteTempBranchRenamedRegex = new RegExp(
+        `^origin/${tempBranchRenamed}$`,
+      );
+      cy.get(gitSyncLocators.branchListItem).contains(tempBranchRegex);
+      cy.get(gitSyncLocators.syncBranches).click();
+      cy.get(gitSyncLocators.branchListItem)
+        .contains(tempBranchRegex)
+        .should("exist");
+      cy.get(gitSyncLocators.branchListItem)
+        .contains(remoteTempBranchRenamedRegex)
+        .should("exist");
+      cy.get(gitSyncLocators.closeBranchList).click();
+      cy.switchGitBranch(`origin/${tempBranchRenamed}`);
+      cy.switchGitBranch(`origin/${tempBranchRenamed}`, true);
+      cy.wait(4000); // wait for switch branch
+      // assert error toast
+      cy.contains(`origin/${tempBranchRenamed} already exists`);
+      cy.get(gitSyncLocators.closeBranchList).click();
     });
-    gitSync.CreateGitBranch(`${tempBranch}-1`, true);
-    // cy.get("@gitbranchName").then((branName) => {
-    //   tempBranch = branName;
-    // });
-    // rename branch API missing in TED.
-    // cy.renameBranchViaGithubApi(repoName, tempBranch, tempBranchRenamed);
-    cy.get(gitSyncLocators.branchButton).click();
-    cy.get(gitSyncLocators.branchSearchInput).type(`{selectall}${tempBranch}`);
-    const tempBranchRegex = new RegExp(`^${tempBranch}$`);
-    const tempBranchRenamedRegex = new RegExp(`^${tempBranchRenamed}$`);
-    const remoteTempBranchRenamedRegex = new RegExp(
-      `^origin/${tempBranchRenamed}$`,
-    );
-    cy.get(gitSyncLocators.branchListItem).contains(tempBranchRegex);
-    cy.get(gitSyncLocators.syncBranches).click();
-    cy.get(gitSyncLocators.branchListItem)
-      .contains(tempBranchRegex)
-      .should("exist");
-    cy.get(gitSyncLocators.branchListItem)
-      .contains(remoteTempBranchRenamedRegex)
-      .should("exist");
-    cy.get(gitSyncLocators.closeBranchList).click();
-    cy.switchGitBranch(`origin/${tempBranchRenamed}`);
-    cy.switchGitBranch(`origin/${tempBranchRenamed}`, true);
-    cy.wait(4000); // wait for switch branch
-    // assert error toast
-    cy.contains(`origin/${tempBranchRenamed} already exists`);
-    cy.get(gitSyncLocators.closeBranchList).click();
-  });
 
-  // Validate the error faced when user switches between the branches
-  it("6. no error faced when user switches branch with new page", function () {
-    deployMode.NavigateBacktoEditor(); //Adding since skipping 6th case
-    cy.generateUUID().then((uuid) => {
-      gitSync.CreateGitBranch(childBranchKey, true);
-      //cy.createGitBranch(childBranchKey);
-      PageList.AddNewPage();
-      cy.get(gitSyncLocators.branchButton).click({ force: true });
-      cy.get(gitSyncLocators.branchSearchInput).type("{selectall}master");
-      cy.wait(400);
-      cy.get(gitSyncLocators.branchListItem).contains("master").click();
-      cy.wait(4000);
-      PageLeftPane.switchSegment(PagePaneSegment.UI);
-      PageList.VerifyIsCurrentPage("Page1");
-      cy.get(".t--canvas-artboard").should("be.visible");
+    // Validate the error faced when user switches between the branches
+    it("6. no error faced when user switches branch with new page", function () {
+      deployMode.NavigateBacktoEditor(); //Adding since skipping 6th case
+      cy.generateUUID().then((uuid) => {
+        gitSync.CreateGitBranch(childBranchKey, true);
+        //cy.createGitBranch(childBranchKey);
+        PageList.AddNewPage();
+        cy.get(gitSyncLocators.branchButton).click({ force: true });
+        cy.get(gitSyncLocators.branchSearchInput).type("{selectall}master");
+        cy.wait(400);
+        cy.get(gitSyncLocators.branchListItem).contains("master").click();
+        cy.wait(4000);
+        PageLeftPane.switchSegment(PagePaneSegment.UI);
+        PageList.VerifyIsCurrentPage("Page1");
+        cy.get(".t--canvas-artboard").should("be.visible");
+      });
+      agHelper.RefreshPage();
     });
-    agHelper.RefreshPage();
-  });
 
-  it("7. branch list search", function () {
-    cy.get(".ads-v2-spinner").should("not.exist");
-    PageLeftPane.switchSegment(PagePaneSegment.UI);
-    cy.get(commonLocators.canvas).click({ force: true });
-    let parentBKey, childBKey;
-    gitSync.CreateGitBranch("parentBranch", true);
-    cy.get("@gitbranchName").then((branName) => {
-      parentBKey = branName;
-
-      gitSync.CreateGitBranch("childBranch", true);
+    it("7. branch list search", function () {
+      cy.get(".ads-v2-spinner").should("not.exist");
+      PageLeftPane.switchSegment(PagePaneSegment.UI);
+      cy.get(commonLocators.canvas).click({ force: true });
+      let parentBKey, childBKey;
+      gitSync.CreateGitBranch("parentBranch", true);
       cy.get("@gitbranchName").then((branName) => {
-        childBKey = branName;
+        parentBKey = branName;
 
-        cy.get(gitSyncLocators.branchButton).click();
-        cy.get(gitSyncLocators.branchSearchInput).type(
-          `{selectall}${parentBKey.slice(0, 3)}`,
-        );
-        cy.get(gitSyncLocators.branchListItem).contains(parentBKey);
+        gitSync.CreateGitBranch("childBranch", true);
+        cy.get("@gitbranchName").then((branName) => {
+          childBKey = branName;
 
-        cy.get(gitSyncLocators.branchSearchInput).type(
-          `{selectall}${childBKey.slice(0, 3)}`,
-        );
-        cy.get(gitSyncLocators.branchListItem).contains(childBKey);
+          cy.get(gitSyncLocators.branchButton).click();
+          cy.get(gitSyncLocators.branchSearchInput).type(
+            `{selectall}${parentBKey.slice(0, 3)}`,
+          );
+          cy.get(gitSyncLocators.branchListItem).contains(parentBKey);
 
-        cy.get(gitSyncLocators.branchSearchInput).type(
-          `{selectall}${branchQueryKey}`,
-        );
-        cy.get(gitSyncLocators.branchListItem).contains(childBKey);
-        cy.get(gitSyncLocators.branchListItem).contains(parentBKey);
+          cy.get(gitSyncLocators.branchSearchInput).type(
+            `{selectall}${childBKey.slice(0, 3)}`,
+          );
+          cy.get(gitSyncLocators.branchListItem).contains(childBKey);
 
-        cy.get(gitSyncLocators.branchSearchInput).type(`{selectall}abcde`);
-        cy.get(gitSyncLocators.branchListItem).should("not.exist");
+          cy.get(gitSyncLocators.branchSearchInput).type(
+            `{selectall}${branchQueryKey}`,
+          );
+          cy.get(gitSyncLocators.branchListItem).contains(childBKey);
+          cy.get(gitSyncLocators.branchListItem).contains(parentBKey);
 
-        cy.get(gitSyncLocators.branchSearchInput).clear();
-        cy.get(gitSyncLocators.branchListItem).contains(childBKey);
-        cy.get(gitSyncLocators.branchListItem).contains(parentBKey);
+          cy.get(gitSyncLocators.branchSearchInput).type(`{selectall}abcde`);
+          cy.get(gitSyncLocators.branchListItem).should("not.exist");
+
+          cy.get(gitSyncLocators.branchSearchInput).clear();
+          cy.get(gitSyncLocators.branchListItem).contains(childBKey);
+          cy.get(gitSyncLocators.branchListItem).contains(parentBKey);
+        });
       });
+      cy.get(gitSyncLocators.closeBranchList).click();
     });
-    cy.get(gitSyncLocators.closeBranchList).click();
-  });
 
-  after(() => {
-    gitSync.DeleteTestGithubRepo(repoName);
-  });
-});
+    after(() => {
+      gitSync.DeleteTestGithubRepo(repoName);
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitWithAutoLayout/conversion_of_git_connected_apps_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitWithAutoLayout/conversion_of_git_connected_apps_spec.js
index fc25d6683968..622095c9c8d9 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitWithAutoLayout/conversion_of_git_connected_apps_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitWithAutoLayout/conversion_of_git_connected_apps_spec.js
@@ -16,78 +16,101 @@ let parentBranchKey = "ParentBranch",
   childBranchKey = "ChildBranch";
 
 let repoName;
-describe("Git sync:", { tags: ["@tag.Git"] }, function () {
-  before(() => {
-    homePage.NavigateToHome();
-    agHelper.GenerateUUID();
-    cy.get("@guid").then((uid) => {
-      homePage.CreateNewWorkspace("AutoLayoutGit" + uid);
-      homePage.CreateAppInWorkspace("AutoLayoutGit" + uid);
+describe(
+  "Git sync:",
+  {
+    tags: [
+      "@tag.Git",
+      "@tag.AccessControl",
+      "@tag.Workflows",
+      "@tag.Module",
+      "@tag.Theme",
+      "@tag.JS",
+      "@tag.Container",
+      "@tag.ImportExport",
+    ],
+  },
+  function () {
+    before(() => {
+      homePage.NavigateToHome();
+      agHelper.GenerateUUID();
+      cy.get("@guid").then((uid) => {
+        homePage.CreateNewWorkspace("AutoLayoutGit" + uid);
+        homePage.CreateAppInWorkspace("AutoLayoutGit" + uid);
+      });
+
+      gitSync.CreateNConnectToGit();
+      cy.get("@gitRepoName").then((repName) => {
+        repoName = repName;
+      });
+      cy.wait(3000);
+
+      gitSync.CreateGitBranch(parentBranchKey, true);
+      cy.get("@gitbranchName").then((branName) => {
+        parentBranchKey = branName;
+      });
+
+      gitSync.CreateGitBranch(childBranchKey, true);
+      cy.get("@gitbranchName").then((branName) => {
+        childBranchKey = branName;
+      });
     });
 
-    gitSync.CreateNConnectToGit();
-    cy.get("@gitRepoName").then((repName) => {
-      repoName = repName;
-    });
-    cy.wait(3000);
-
-    gitSync.CreateGitBranch(parentBranchKey, true);
-    cy.get("@gitbranchName").then((branName) => {
-      parentBranchKey = branName;
-    });
-
-    gitSync.CreateGitBranch(childBranchKey, true);
-    cy.get("@gitbranchName").then((branName) => {
-      childBranchKey = branName;
-    });
-  });
+    it("1. when snapshot is restored from a page created before Conversion, it should refresh in the same page", () => {
+      entityExplorer.DragDropWidgetNVerify(
+        draggableWidgets.CONTAINER,
+        100,
+        100,
+      );
 
-  it("1. when snapshot is restored from a page created before Conversion, it should refresh in the same page", () => {
-    entityExplorer.DragDropWidgetNVerify(draggableWidgets.CONTAINER, 100, 100);
+      PageList.AddNewPage("New blank page");
 
-    PageList.AddNewPage("New blank page");
+      autoLayout.ConvertToAutoLayoutAndVerify();
 
-    autoLayout.ConvertToAutoLayoutAndVerify();
+      autoLayout.UseSnapshotFromBanner();
 
-    autoLayout.UseSnapshotFromBanner();
+      PageList.VerifyIsCurrentPage("Page2");
 
-    PageList.VerifyIsCurrentPage("Page2");
+      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
 
-    EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+      agHelper.Sleep();
 
-    agHelper.Sleep();
-
-    entityExplorer.ActionContextMenuByEntityName({
-      entityNameinLeftSidebar: "Page2",
-      entityType: EntityItems.Page,
+      entityExplorer.ActionContextMenuByEntityName({
+        entityNameinLeftSidebar: "Page2",
+        entityType: EntityItems.Page,
+      });
     });
-  });
 
-  it("2. when snapshot is restored from a page created after Conversion, it should redirected to home page", () => {
-    autoLayout.ConvertToAutoLayoutAndVerify();
+    it("2. when snapshot is restored from a page created after Conversion, it should redirected to home page", () => {
+      autoLayout.ConvertToAutoLayoutAndVerify();
 
-    PageList.AddNewPage("New blank page");
+      PageList.AddNewPage("New blank page");
 
-    autoLayout.UseSnapshotFromBanner();
+      autoLayout.UseSnapshotFromBanner();
 
-    PageList.VerifyIsCurrentPage("Page1");
-  });
+      PageList.VerifyIsCurrentPage("Page1");
+    });
 
-  it("3. Switch to parentBranch and when snapshot is restored from a page created after Conversion, it should redirected to home page", () => {
-    cy.switchGitBranch(parentBranchKey);
+    it("3. Switch to parentBranch and when snapshot is restored from a page created after Conversion, it should redirected to home page", () => {
+      cy.switchGitBranch(parentBranchKey);
 
-    entityExplorer.DragDropWidgetNVerify(draggableWidgets.CONTAINER, 100, 100);
+      entityExplorer.DragDropWidgetNVerify(
+        draggableWidgets.CONTAINER,
+        100,
+        100,
+      );
 
-    autoLayout.ConvertToAutoLayoutAndVerify();
+      autoLayout.ConvertToAutoLayoutAndVerify();
 
-    PageList.AddNewPage("New blank page");
+      PageList.AddNewPage("New blank page");
 
-    autoLayout.UseSnapshotFromBanner();
+      autoLayout.UseSnapshotFromBanner();
 
-    PageList.VerifyIsCurrentPage("Page1");
-  });
+      PageList.VerifyIsCurrentPage("Page1");
+    });
 
-  after(() => {
-    gitSync.DeleteTestGithubRepo(repoName);
-  });
-});
+    after(() => {
+      gitSync.DeleteTestGithubRepo(repoName);
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitWithJSLibrary/GitwithCustomJSLibrary_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitWithJSLibrary/GitwithCustomJSLibrary_spec.js
index 269e4c515585..7f11b3858468 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitWithJSLibrary/GitwithCustomJSLibrary_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitWithJSLibrary/GitwithCustomJSLibrary_spec.js
@@ -17,7 +17,20 @@ let repoName;
 
 describe(
   "Tests JS Library with Git",
-  { tags: ["@tag.Git", "@tag.excludeForAirgap", "@tag.Sanity"] },
+  {
+    tags: [
+      "@tag.Git",
+      "@tag.excludeForAirgap",
+      "@tag.Sanity",
+      "@tag.AccessControl",
+      "@tag.Workflows",
+      "@tag.Module",
+      "@tag.Theme",
+      "@tag.JS",
+      "@tag.Container",
+      "@tag.ImportExport",
+    ],
+  },
   () => {
     before(() => {
       homePage.NavigateToHome();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitWithTheming/GitWithTheming_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitWithTheming/GitWithTheming_spec.js
index 874af31e9891..ef0f304ce4ca 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitWithTheming/GitWithTheming_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitWithTheming/GitWithTheming_spec.js
@@ -4,7 +4,19 @@ const commonlocators = require("../../../../../locators/commonlocators.json");
 
 describe(
   "Git with Theming:",
-  { tags: ["@tag.Git", "@tag.Sanity"] },
+  {
+    tags: [
+      "@tag.Git",
+      "@tag.Sanity",
+      "@tag.AccessControl",
+      "@tag.Workflows",
+      "@tag.Module",
+      "@tag.Theme",
+      "@tag.JS",
+      "@tag.Container",
+      "@tag.ImportExport",
+    ],
+  },
   function () {
     const backgroudColorMaster = "rgb(22, 163, 74)";
     const backgroudColorChildBranch = "rgb(100, 116, 139)";
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Homepage/HomepageExperienceV2_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Homepage/HomepageExperienceV2_spec.ts
index a48460f5b01e..d0ce249e8942 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Homepage/HomepageExperienceV2_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Homepage/HomepageExperienceV2_spec.ts
@@ -8,7 +8,7 @@ import HomepageLocators from "../../../../locators/HomePage";
 
 describe(
   "Validate Homepage Experience V2 changes",
-  { tags: ["@tag.Workspace"] },
+  { tags: ["@tag.Workspace", "@tag.AccessControl"] },
   function () {
     before(() => {});
 
diff --git a/app/client/cypress/e2e/Regression/ClientSide/IDE/Canvas_Context_Property_Pane_1_spec.js b/app/client/cypress/e2e/Regression/ClientSide/IDE/Canvas_Context_Property_Pane_1_spec.js
index 0940b7775809..372500292450 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/IDE/Canvas_Context_Property_Pane_1_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/IDE/Canvas_Context_Property_Pane_1_spec.js
@@ -14,62 +14,82 @@ const page1 = "Page1";
 const page2 = "Page2";
 const api1 = "API1";
 
-describe("Canvas context Property Pane", { tags: ["@tag.IDE"] }, function () {
-  before(() => {
-    _.agHelper.AddDsl("editorContextdsl");
-
-    PageList.AddNewPage("New blank page");
-    cy.dragAndDropToCanvas("textwidget", { x: 300, y: 200 });
-    EditorNavigation.SelectEntityByName(page1, EntityType.Page);
-    _.apiPage.CreateApi(api1);
-    PageLeftPane.switchSegment(PagePaneSegment.UI);
-  });
-
-  beforeEach(() => {
-    _.agHelper.RefreshPage();
-  });
-
-  let propPaneBack = "[data-testid='t--property-pane-back-btn']";
-
-  it("1. Code Editor should have focus while switching between widgets, pages and Editor Panes - Label", function () {
-    propertyControlSelector = ".t--property-control-label";
-    verifyPropertyPaneContext(
-      () => {
-        cy.focusCodeInput(propertyControlSelector);
-      },
-      () => {
-        cy.assertSoftFocusOnCodeInput(propertyControlSelector);
-      },
-      "Button1",
-    );
-  });
+describe(
+  "Canvas context Property Pane",
+  { tags: ["@tag.IDE", "@tag.PropertyPane"] },
+  function () {
+    before(() => {
+      _.agHelper.AddDsl("editorContextdsl");
+
+      PageList.AddNewPage("New blank page");
+      cy.dragAndDropToCanvas("textwidget", { x: 300, y: 200 });
+      EditorNavigation.SelectEntityByName(page1, EntityType.Page);
+      _.apiPage.CreateApi(api1);
+      PageLeftPane.switchSegment(PagePaneSegment.UI);
+    });
 
-  it("2. Code Editor should have focus while switching between widgets, pages and Editor Panes", function () {
-    propertyControlSelector = `.t--property-control-animateloading input[type="checkbox"]`;
-    verifyPropertyPaneContext(
-      () => {
-        cy.get(propertyControlSelector).click({ force: true });
-      },
-      () => {
-        cy.get(propertyControlSelector).should("be.focused");
+    beforeEach(() => {
+      _.agHelper.RefreshPage();
+    });
+
+    let propPaneBack = "[data-testid='t--property-pane-back-btn']";
+
+    it("1. Code Editor should have focus while switching between widgets, pages and Editor Panes - Label", function () {
+      propertyControlSelector = ".t--property-control-label";
+      verifyPropertyPaneContext(
+        () => {
+          cy.focusCodeInput(propertyControlSelector);
+        },
+        () => {
+          cy.assertSoftFocusOnCodeInput(propertyControlSelector);
+        },
+        "Button1",
+      );
+    });
+
+    it("2. Code Editor should have focus while switching between widgets, pages and Editor Panes", function () {
+      propertyControlSelector = `.t--property-control-animateloading input[type="checkbox"]`;
+      verifyPropertyPaneContext(
+        () => {
+          cy.get(propertyControlSelector).click({ force: true });
+        },
+        () => {
+          cy.get(propertyControlSelector).should("be.focused");
+        },
+        "Button1",
+      );
+    });
+
+    it(
+      "3. Code Editor should have focus while switching between widgets, pages and Editor Panes",
+      { tags: ["@tag.excludeForAirgap"] },
+      function () {
+        // TODO: Since google recaptcha is not possible in airgap mode, skipping this test for now for airgapped version.
+        //Will modify the dsl to have maybe phone input widget to have a dropdown property control - Sangeeth
+        //if (!Cypress.env("AIRGAPPED")) {
+        //DropDown Property controls should have focus while switching between widgets, pages and Editor Panes
+        _.agHelper.RefreshPage();
+        propertyControlClickSelector = `.t--property-control-googlerecaptchaversion .rc-select-selection-search-input`;
+        propertyControlVerifySelector =
+          ".t--property-control-googlerecaptchaversion .rc-select-selection-search-input";
+
+        verifyPropertyPaneContext(
+          () => {
+            cy.get(propertyControlClickSelector).eq(0).click({ force: true });
+          },
+          () => {
+            cy.get(propertyControlVerifySelector).should("be.focused");
+          },
+          "Button1",
+        );
+        //}
       },
-      "Button1",
     );
-  });
-
-  it(
-    "3. Code Editor should have focus while switching between widgets, pages and Editor Panes",
-    { tags: ["@tag.excludeForAirgap"] },
-    function () {
-      // TODO: Since google recaptcha is not possible in airgap mode, skipping this test for now for airgapped version.
-      //Will modify the dsl to have maybe phone input widget to have a dropdown property control - Sangeeth
-      //if (!Cypress.env("AIRGAPPED")) {
-      //DropDown Property controls should have focus while switching between widgets, pages and Editor Panes
-      _.agHelper.RefreshPage();
-      propertyControlClickSelector = `.t--property-control-googlerecaptchaversion .rc-select-selection-search-input`;
-      propertyControlVerifySelector =
-        ".t--property-control-googlerecaptchaversion .rc-select-selection-search-input";
 
+    it("4. Code Editor should have focus while switching between widgets, pages and Editor Panes", function () {
+      //Icon Button Property controls should have focus while switching between widgets, pages and Editor Panes
+      propertyControlClickSelector = `.t--property-control-borderradius .ads-v2-segmented-control__segments-container`;
+      propertyControlVerifySelector = `.t--property-control-borderradius .ads-v2-segmented-control__segments-container[data-selected="true"]`;
       verifyPropertyPaneContext(
         () => {
           cy.get(propertyControlClickSelector).eq(0).click({ force: true });
@@ -78,120 +98,104 @@ describe("Canvas context Property Pane", { tags: ["@tag.IDE"] }, function () {
           cy.get(propertyControlVerifySelector).should("be.focused");
         },
         "Button1",
+        true,
       );
-      //}
-    },
-  );
-
-  it("4. Code Editor should have focus while switching between widgets, pages and Editor Panes", function () {
-    //Icon Button Property controls should have focus while switching between widgets, pages and Editor Panes
-    propertyControlClickSelector = `.t--property-control-borderradius .ads-v2-segmented-control__segments-container`;
-    propertyControlVerifySelector = `.t--property-control-borderradius .ads-v2-segmented-control__segments-container[data-selected="true"]`;
-    verifyPropertyPaneContext(
-      () => {
-        cy.get(propertyControlClickSelector).eq(0).click({ force: true });
-      },
-      () => {
-        cy.get(propertyControlVerifySelector).should("be.focused");
-      },
-      "Button1",
-      true,
-    );
-  });
+    });
 
-  it("5. ColorPicker Property controls should have focus while switching between widgets, pages and Editor Panes", function () {
-    let propertyControlSelector = `.t--property-control-buttoncolor input[type="text"]`;
-    verifyPropertyPaneContext(
-      () => {
-        cy.get(propertyControlSelector).click({ force: true });
-      },
-      () => {
-        cy.get(propertyControlSelector).should("be.focused");
-      },
-      "Button1",
-      true,
-    );
-  });
+    it("5. ColorPicker Property controls should have focus while switching between widgets, pages and Editor Panes", function () {
+      let propertyControlSelector = `.t--property-control-buttoncolor input[type="text"]`;
+      verifyPropertyPaneContext(
+        () => {
+          cy.get(propertyControlSelector).click({ force: true });
+        },
+        () => {
+          cy.get(propertyControlSelector).should("be.focused");
+        },
+        "Button1",
+        true,
+      );
+    });
 
-  it("6. ColorPicker Property controls should have focus while switching between widgets, pages and Editor Panes", function () {
-    propertySectionState = {
-      basic: false,
-      general: true,
-    };
+    it("6. ColorPicker Property controls should have focus while switching between widgets, pages and Editor Panes", function () {
+      propertySectionState = {
+        basic: false,
+        general: true,
+      };
 
-    if (!Cypress.env("AIRGAPPED")) {
+      if (!Cypress.env("AIRGAPPED")) {
+        propertySectionState = {
+          ...propertySectionState,
+          validation: false,
+          formsettings: true,
+        };
+      }
+
+      verifyPropertyPaneContext(
+        () => {
+          setPropertyPaneSectionState(propertySectionState);
+        },
+        () => {
+          verifyPropertyPaneSectionState(propertySectionState);
+        },
+        "Button1",
+      );
+    });
+
+    it("7. ColorPicker Property controls should have focus while switching between widgets, pages and Editor Panes", function () {
       propertySectionState = {
-        ...propertySectionState,
-        validation: false,
-        formsettings: true,
+        general: true,
+        icon: false,
+        color: true,
+        borderandshadow: false,
       };
-    }
 
-    verifyPropertyPaneContext(
-      () => {
-        setPropertyPaneSectionState(propertySectionState);
-      },
-      () => {
-        verifyPropertyPaneSectionState(propertySectionState);
-      },
-      "Button1",
-    );
-  });
-
-  it("7. ColorPicker Property controls should have focus while switching between widgets, pages and Editor Panes", function () {
-    propertySectionState = {
-      general: true,
-      icon: false,
-      color: true,
-      borderandshadow: false,
-    };
-
-    verifyPropertyPaneContext(
-      () => {
-        cy.get(`.ads-v2-tabs__list-tab:contains("Style")`).eq(0).click();
-        setPropertyPaneSectionState(propertySectionState);
-      },
-      () => {
-        verifyPropertyPaneSectionState(propertySectionState);
-      },
-      "Button1",
-    );
-  });
-
-  it("8. Layered PropertyPane - Code Editor should have focus while switching between widgets, pages and Editor Panes", function () {
-    propertyControlSelector = ".t--property-control-computedvalue";
-    verifyPropertyPaneContext(
-      () => {
-        cy.editColumn("step");
-        cy.focusCodeInput(propertyControlSelector);
-      },
-      () => {
-        cy.assertSoftFocusOnCodeInput(propertyControlSelector);
-      },
-      "Table1",
-    );
+      verifyPropertyPaneContext(
+        () => {
+          cy.get(`.ads-v2-tabs__list-tab:contains("Style")`).eq(0).click();
+          setPropertyPaneSectionState(propertySectionState);
+        },
+        () => {
+          verifyPropertyPaneSectionState(propertySectionState);
+        },
+        "Button1",
+      );
+    });
 
-    cy.get(propPaneBack).click();
-    cy.get(".t--property-pane-title").should("contain", "Table1");
-  });
+    it("8. Layered PropertyPane - Code Editor should have focus while switching between widgets, pages and Editor Panes", function () {
+      propertyControlSelector = ".t--property-control-computedvalue";
+      verifyPropertyPaneContext(
+        () => {
+          cy.editColumn("step");
+          cy.focusCodeInput(propertyControlSelector);
+        },
+        () => {
+          cy.assertSoftFocusOnCodeInput(propertyControlSelector);
+        },
+        "Table1",
+      );
 
-  it("9. Layered PropertyPane - Toggle Property controls should have focus while switching between widgets, pages and Editor Panes", function () {
-    let propertyControlSelector = `.t--property-control-cellwrapping input[type="checkbox"]`;
-    verifyPropertyPaneContext(
-      () => {
-        cy.editColumn("step");
-        cy.get(propertyControlSelector).click({ force: true });
-      },
-      () => {
-        cy.get(propertyControlSelector).should("be.focused");
-      },
-      "Table1",
-    );
+      cy.get(propPaneBack).click();
+      cy.get(".t--property-pane-title").should("contain", "Table1");
+    });
 
-    cy.get(propPaneBack).click();
-    cy.get(".t--property-pane-title").should("contain", "Table1");
-  });
-});
+    it("9. Layered PropertyPane - Toggle Property controls should have focus while switching between widgets, pages and Editor Panes", function () {
+      let propertyControlSelector = `.t--property-control-cellwrapping input[type="checkbox"]`;
+      verifyPropertyPaneContext(
+        () => {
+          cy.editColumn("step");
+          cy.get(propertyControlSelector).click({ force: true });
+        },
+        () => {
+          cy.get(propertyControlSelector).should("be.focused");
+        },
+        "Table1",
+      );
+
+      cy.get(propPaneBack).click();
+      cy.get(".t--property-pane-title").should("contain", "Table1");
+    });
+  },
+);
 
 let propertySectionClass = (section) =>
   `.t--property-pane-section-collapse-${section}`;
diff --git a/app/client/cypress/e2e/Regression/ClientSide/IDE/Canvas_Context_Property_Pane_2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/IDE/Canvas_Context_Property_Pane_2_spec.js
index 1d317d75898c..22b1cd7cb162 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/IDE/Canvas_Context_Property_Pane_2_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/IDE/Canvas_Context_Property_Pane_2_spec.js
@@ -11,165 +11,169 @@ const page1 = "Page1";
 const page2 = "Page2";
 const api1 = "API1";
 
-describe("Canvas context Property Pane", { tags: ["@tag.IDE"] }, function () {
-  before(() => {
-    _.agHelper.AddDsl("editorContextdsl");
-    PageList.AddNewPage("New blank page");
-    cy.dragAndDropToCanvas("textwidget", { x: 300, y: 200 });
-    EditorNavigation.SelectEntityByName(page1, EntityType.Page);
-    _.apiPage.CreateApi(api1);
-    PageLeftPane.switchSegment(PagePaneSegment.UI);
-  });
-
-  beforeEach(() => {
-    _.agHelper.RefreshPage();
-  });
-
-  let propPaneBack = "[data-testid='t--property-pane-back-btn']";
-
-  it("1. Layered PropertyPane - Property Sections should retain state while switching between widgets, pages and Editor Panes", () => {
-    let propertySectionState = {
-      data: false,
-      general: true,
-    };
-
-    verifyPropertyPaneContext(
-      () => {
-        cy.editColumn("step");
-        setPropertyPaneSectionState(propertySectionState);
-      },
-      () => {
-        cy.wait(500);
-        verifyPropertyPaneSectionState(propertySectionState);
-      },
-      "Table1",
-    );
-    cy.get(propPaneBack).click();
-    cy.get(".t--property-pane-title").should("contain", "Table1");
-  });
-
-  it("2. Layered PropertyPane - Property Tabs and Sections should retain state while switching between widgets, pages and Editor Panes", () => {
-    propertySectionState = {
-      textformatting: true,
-      color: false,
-    };
-
-    verifyPropertyPaneContext(
-      () => {
-        cy.editColumn("step");
-        cy.get(`.ads-v2-tabs__list-tab:contains("Style")`).eq(0).click();
-        setPropertyPaneSectionState(propertySectionState);
-      },
-      () => {
-        verifyPropertyPaneSectionState(propertySectionState);
-      },
-      "Table1",
-    );
-
-    cy.get(propPaneBack).click();
-    cy.get(".t--property-pane-title").should("contain", "Table1");
-  });
-
-  it("3. Multi Layered PropertyPane - Code Editor should have focus while switching between widgets, pages and Editor Panes", function () {
-    let propertyControlSelector = ".t--property-control-text";
-    verifyPropertyPaneContext(
-      () => {
-        cy.editColumn("status");
-        cy.editColumn("menuIteme63irwbvnd", false);
-        cy.focusCodeInput(propertyControlSelector);
-      },
-      () => {
-        cy.assertSoftFocusOnCodeInput(propertyControlSelector);
-      },
-      "Table1",
-    );
-
-    cy.get(propPaneBack).click();
-    cy.get(".t--property-pane-title").should("contain", "status");
-
-    cy.wait(500);
-    cy.get(propPaneBack).click();
-    cy.get(".t--property-pane-title").should("contain", "Table1");
-  });
-
-  it("4. Multi Layered PropertyPane - Toggle Property controls should have focus while switching between widgets, pages and Editor Panes", () => {
-    propertyControlSelector = `.t--property-control-visible input[type="checkbox"]`;
-    verifyPropertyPaneContext(
-      () => {
-        cy.editColumn("status");
-        cy.editColumn("menuIteme63irwbvnd", false);
-        cy.get(propertyControlSelector).click({ force: true });
-      },
-      () => {
-        cy.get(propertyControlSelector).should("be.focused");
-      },
-      "Table1",
-    );
-    cy.wait(500);
-    cy.get(propPaneBack).click();
-    cy.get(".t--property-pane-title").should("contain", "status");
-
-    cy.wait(500);
-    cy.get(propPaneBack).click();
-    cy.get(".t--property-pane-title").should("contain", "Table1");
-  });
-
-  it("5. Multi Layered PropertyPane - Property Sections should retain state while switching between widgets, pages and Editor Panes", () => {
-    let propertySectionState = {
-      basic: false,
-      general: true,
-    };
-
-    verifyPropertyPaneContext(
-      () => {
-        cy.editColumn("status");
-        cy.editColumn("menuIteme63irwbvnd", false);
-        setPropertyPaneSectionState(propertySectionState);
-      },
-      () => {
-        cy.wait(500);
-        verifyPropertyPaneSectionState(propertySectionState);
-      },
-      "Table1",
-    );
-
-    cy.wait(500);
-    cy.get(propPaneBack).click();
-    cy.get(".t--property-pane-title").should("contain", "status");
-
-    cy.wait(500);
-    cy.get(propPaneBack).click();
-    cy.get(".t--property-pane-title").should("contain", "Table1");
-  });
-
-  it("6. Multi Layered PropertyPane - Property Tabs and Sections should retain state while switching between widgets, pages and Editor Panes", () => {
-    propertySectionState = {
-      icon: true,
-      color: false,
-    };
-
-    verifyPropertyPaneContext(
-      () => {
-        cy.editColumn("status");
-        cy.editColumn("menuIteme63irwbvnd", false);
-        cy.get(`.ads-v2-tabs__list-tab:contains("Style")`).eq(0).click();
-        setPropertyPaneSectionState(propertySectionState);
-      },
-      () => {
-        verifyPropertyPaneSectionState(propertySectionState);
-      },
-      "Table1",
-    );
-
-    cy.wait(500);
-    cy.get(propPaneBack).click();
-    cy.get(".t--property-pane-title").should("contain", "status");
-
-    cy.wait(500);
-    cy.get(propPaneBack).click();
-    cy.get(".t--property-pane-title").should("contain", "Table1");
-  });
-});
+describe(
+  "Canvas context Property Pane",
+  { tags: ["@tag.IDE", "@tag.PropertyPane"] },
+  function () {
+    before(() => {
+      _.agHelper.AddDsl("editorContextdsl");
+      PageList.AddNewPage("New blank page");
+      cy.dragAndDropToCanvas("textwidget", { x: 300, y: 200 });
+      EditorNavigation.SelectEntityByName(page1, EntityType.Page);
+      _.apiPage.CreateApi(api1);
+      PageLeftPane.switchSegment(PagePaneSegment.UI);
+    });
+
+    beforeEach(() => {
+      _.agHelper.RefreshPage();
+    });
+
+    let propPaneBack = "[data-testid='t--property-pane-back-btn']";
+
+    it("1. Layered PropertyPane - Property Sections should retain state while switching between widgets, pages and Editor Panes", () => {
+      let propertySectionState = {
+        data: false,
+        general: true,
+      };
+
+      verifyPropertyPaneContext(
+        () => {
+          cy.editColumn("step");
+          setPropertyPaneSectionState(propertySectionState);
+        },
+        () => {
+          cy.wait(500);
+          verifyPropertyPaneSectionState(propertySectionState);
+        },
+        "Table1",
+      );
+      cy.get(propPaneBack).click();
+      cy.get(".t--property-pane-title").should("contain", "Table1");
+    });
+
+    it("2. Layered PropertyPane - Property Tabs and Sections should retain state while switching between widgets, pages and Editor Panes", () => {
+      propertySectionState = {
+        textformatting: true,
+        color: false,
+      };
+
+      verifyPropertyPaneContext(
+        () => {
+          cy.editColumn("step");
+          cy.get(`.ads-v2-tabs__list-tab:contains("Style")`).eq(0).click();
+          setPropertyPaneSectionState(propertySectionState);
+        },
+        () => {
+          verifyPropertyPaneSectionState(propertySectionState);
+        },
+        "Table1",
+      );
+
+      cy.get(propPaneBack).click();
+      cy.get(".t--property-pane-title").should("contain", "Table1");
+    });
+
+    it("3. Multi Layered PropertyPane - Code Editor should have focus while switching between widgets, pages and Editor Panes", function () {
+      let propertyControlSelector = ".t--property-control-text";
+      verifyPropertyPaneContext(
+        () => {
+          cy.editColumn("status");
+          cy.editColumn("menuIteme63irwbvnd", false);
+          cy.focusCodeInput(propertyControlSelector);
+        },
+        () => {
+          cy.assertSoftFocusOnCodeInput(propertyControlSelector);
+        },
+        "Table1",
+      );
+
+      cy.get(propPaneBack).click();
+      cy.get(".t--property-pane-title").should("contain", "status");
+
+      cy.wait(500);
+      cy.get(propPaneBack).click();
+      cy.get(".t--property-pane-title").should("contain", "Table1");
+    });
+
+    it("4. Multi Layered PropertyPane - Toggle Property controls should have focus while switching between widgets, pages and Editor Panes", () => {
+      propertyControlSelector = `.t--property-control-visible input[type="checkbox"]`;
+      verifyPropertyPaneContext(
+        () => {
+          cy.editColumn("status");
+          cy.editColumn("menuIteme63irwbvnd", false);
+          cy.get(propertyControlSelector).click({ force: true });
+        },
+        () => {
+          cy.get(propertyControlSelector).should("be.focused");
+        },
+        "Table1",
+      );
+      cy.wait(500);
+      cy.get(propPaneBack).click();
+      cy.get(".t--property-pane-title").should("contain", "status");
+
+      cy.wait(500);
+      cy.get(propPaneBack).click();
+      cy.get(".t--property-pane-title").should("contain", "Table1");
+    });
+
+    it("5. Multi Layered PropertyPane - Property Sections should retain state while switching between widgets, pages and Editor Panes", () => {
+      let propertySectionState = {
+        basic: false,
+        general: true,
+      };
+
+      verifyPropertyPaneContext(
+        () => {
+          cy.editColumn("status");
+          cy.editColumn("menuIteme63irwbvnd", false);
+          setPropertyPaneSectionState(propertySectionState);
+        },
+        () => {
+          cy.wait(500);
+          verifyPropertyPaneSectionState(propertySectionState);
+        },
+        "Table1",
+      );
+
+      cy.wait(500);
+      cy.get(propPaneBack).click();
+      cy.get(".t--property-pane-title").should("contain", "status");
+
+      cy.wait(500);
+      cy.get(propPaneBack).click();
+      cy.get(".t--property-pane-title").should("contain", "Table1");
+    });
+
+    it("6. Multi Layered PropertyPane - Property Tabs and Sections should retain state while switching between widgets, pages and Editor Panes", () => {
+      propertySectionState = {
+        icon: true,
+        color: false,
+      };
+
+      verifyPropertyPaneContext(
+        () => {
+          cy.editColumn("status");
+          cy.editColumn("menuIteme63irwbvnd", false);
+          cy.get(`.ads-v2-tabs__list-tab:contains("Style")`).eq(0).click();
+          setPropertyPaneSectionState(propertySectionState);
+        },
+        () => {
+          verifyPropertyPaneSectionState(propertySectionState);
+        },
+        "Table1",
+      );
+
+      cy.wait(500);
+      cy.get(propPaneBack).click();
+      cy.get(".t--property-pane-title").should("contain", "status");
+
+      cy.wait(500);
+      cy.get(propPaneBack).click();
+      cy.get(".t--property-pane-title").should("contain", "Table1");
+    });
+  },
+);
 
 let propertySectionClass = (section) =>
   `.t--property-pane-section-collapse-${section}`;
diff --git a/app/client/cypress/e2e/Regression/ClientSide/IDE/Canvas_Context_Selected_Widgets_spec.js b/app/client/cypress/e2e/Regression/ClientSide/IDE/Canvas_Context_Selected_Widgets_spec.js
index d2f599c696dc..ae55672fb463 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/IDE/Canvas_Context_Selected_Widgets_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/IDE/Canvas_Context_Selected_Widgets_spec.js
@@ -13,7 +13,7 @@ const api1 = "API1";
 
 describe(
   "Canvas context widget selection",
-  { tags: ["@tag.IDE"] },
+  { tags: ["@tag.IDE", "@tag.PropertyPane"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("editorContextdsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/IDE/Command_Click_Navigation_spec.js b/app/client/cypress/e2e/Regression/ClientSide/IDE/Command_Click_Navigation_spec.js
index 1ae8d3082b1a..114e4230103b 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/IDE/Command_Click_Navigation_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/IDE/Command_Click_Navigation_spec.js
@@ -29,180 +29,192 @@ const JSInput2TestCode =
 
 let repoName;
 
-describe("1. CommandClickNavigation", { tags: ["@tag.IDE"] }, function () {
-  it("1. Import application & Assert few things", () => {
-    homePage.NavigateToHome();
-    cy.reload();
-    homePage.ImportApp("ContextSwitching.json");
-    cy.wait("@importNewApplication").then((interception) => {
-      agHelper.Sleep();
-      const { isPartialImport } = interception.response.body.data;
-      if (isPartialImport) {
-        // should reconnect modal
-        cy.get(reconnectDatasourceModal.SkipToAppBtn).click({
-          force: true,
-        });
-        agHelper.Sleep(2000);
-      } else {
-        homePage.AssertImportToast();
-      }
-    });
-
-    //Assert link and and style
-    EditorNavigation.SelectEntityByName("Text1", EntityType.Widget, {}, [
-      "Container1",
-    ]);
-
-    cy.updateCodeInput(".t--property-control-text", "{{ Graphql_Query.data }}");
-
-    cy.get(`[${NAVIGATION_ATTRIBUTE}="Graphql_Query"]`)
-      .should("have.length", 1)
-      .should("have.text", "Graphql_Query")
-      .realHover()
-      .should("have.css", "cursor", "text");
-
-    // TODO how to hover with cmd or ctrl to assert pointer?
+describe(
+  "1. CommandClickNavigation",
+  { tags: ["@tag.IDE", "@tag.PropertyPane"] },
+  function () {
+    it("1. Import application & Assert few things", () => {
+      homePage.NavigateToHome();
+      cy.reload();
+      homePage.ImportApp("ContextSwitching.json");
+      cy.wait("@importNewApplication").then((interception) => {
+        agHelper.Sleep();
+        const { isPartialImport } = interception.response.body.data;
+        if (isPartialImport) {
+          // should reconnect modal
+          cy.get(reconnectDatasourceModal.SkipToAppBtn).click({
+            force: true,
+          });
+          agHelper.Sleep(2000);
+        } else {
+          homePage.AssertImportToast();
+        }
+      });
+
+      //Assert link and and style
+      EditorNavigation.SelectEntityByName("Text1", EntityType.Widget, {}, [
+        "Container1",
+      ]);
+
+      cy.updateCodeInput(
+        ".t--property-control-text",
+        "{{ Graphql_Query.data }}",
+      );
+
+      cy.get(`[${NAVIGATION_ATTRIBUTE}="Graphql_Query"]`)
+        .should("have.length", 1)
+        .should("have.text", "Graphql_Query")
+        .realHover()
+        .should("have.css", "cursor", "text");
+
+      // TODO how to hover with cmd or ctrl to assert pointer?
+
+      // Assert navigation only when cmd or ctrl is pressed
 
-    // Assert navigation only when cmd or ctrl is pressed
+      agHelper.Sleep();
+      cy.get(`[${NAVIGATION_ATTRIBUTE}="Graphql_Query"]`).click({
+        force: true,
+      });
+      cy.url().should("not.contain", "/api/");
+
+      cy.get(`[${NAVIGATION_ATTRIBUTE}="Graphql_Query"]`).click({
+        ctrlKey: true,
+        force: true,
+      });
+
+      cy.url().should("contain", "/api/");
+
+      //Assert working on url field
+      cy.updateCodeInput(
+        ".t--dataSourceField",
+        "http://host.docker.internal:5001/{{ SQL_Query.data }}",
+      );
+      agHelper.Sleep();
 
-    agHelper.Sleep();
-    cy.get(`[${NAVIGATION_ATTRIBUTE}="Graphql_Query"]`).click({ force: true });
-    cy.url().should("not.contain", "/api/");
+      cy.get(`[${NAVIGATION_ATTRIBUTE}="SQL_Query"]`)
+        .should("have.length", 1)
+        .click({ cmdKey: true, force: true });
 
-    cy.get(`[${NAVIGATION_ATTRIBUTE}="Graphql_Query"]`).click({
-      ctrlKey: true,
-      force: true,
+      cy.url().should("contain", "/queries/");
     });
 
-    cy.url().should("contain", "/api/");
-
-    //Assert working on url field
-    cy.updateCodeInput(
-      ".t--dataSourceField",
-      "http://host.docker.internal:5001/{{ SQL_Query.data }}",
-    );
-    agHelper.Sleep();
-
-    cy.get(`[${NAVIGATION_ATTRIBUTE}="SQL_Query"]`)
-      .should("have.length", 1)
-      .click({ cmdKey: true, force: true });
-
-    cy.url().should("contain", "/queries/");
-  });
-
-  it("2. Will open & close modals ", () => {
-    cy.updateCodeInput(
-      ".t--actionConfiguration\\.body",
-      "SELECT * from {{ Button3.text }}",
-    );
-    agHelper.Sleep();
-    cy.get(`[${NAVIGATION_ATTRIBUTE}="Button3"]`)
-      .should("have.length", 1)
-      .click({ cmdKey: true });
-
-    cy.url().should("not.contain", "/queries/");
-
-    //CLose modal
-    cy.updateCodeInput(
-      `${locators._propertyControl}tooltip`,
-      "{{ Image1.image }}",
-    );
-
-    // TODO: Debug why image1 data-navigate-to wasn't found
-    // cy.get(`[${NAVIGATION_ATTRIBUTE}="Image1"]`)
-    //   .should("have.length", 1)
-    //   .click({ cmdKey: true });
-  });
-
-  it("3. Will navigate to specific JS Functions", () => {
-    // It was found that when having git connected,
-    // cmd clicking to JS function reloaded the app. Will assert that does not happen
-    cy.generateUUID().then((uid) => {
-      const repoName = uid;
-      gitSync.CreateNConnectToGit(repoName);
-      gitSync.CreateGitBranch(repoName);
-    });
-
-    cy.get("@gitRepoName").then((repName) => {
-      repoName = repName;
+    it("2. Will open & close modals ", () => {
+      cy.updateCodeInput(
+        ".t--actionConfiguration\\.body",
+        "SELECT * from {{ Button3.text }}",
+      );
+      agHelper.Sleep();
+      cy.get(`[${NAVIGATION_ATTRIBUTE}="Button3"]`)
+        .should("have.length", 1)
+        .click({ cmdKey: true });
+
+      cy.url().should("not.contain", "/queries/");
+
+      //CLose modal
+      cy.updateCodeInput(
+        `${locators._propertyControl}tooltip`,
+        "{{ Image1.image }}",
+      );
+
+      // TODO: Debug why image1 data-navigate-to wasn't found
+      // cy.get(`[${NAVIGATION_ATTRIBUTE}="Image1"]`)
+      //   .should("have.length", 1)
+      //   .click({ cmdKey: true });
     });
 
-    EditorNavigation.SelectEntityByName("Text1", EntityType.Widget, {}, [
-      "Container1",
-    ]);
-    cy.updateCodeInput(".t--property-control-text", "{{ JSObject1.myFun1() }}");
+    it("3. Will navigate to specific JS Functions", () => {
+      // It was found that when having git connected,
+      // cmd clicking to JS function reloaded the app. Will assert that does not happen
+      cy.generateUUID().then((uid) => {
+        const repoName = uid;
+        gitSync.CreateNConnectToGit(repoName);
+        gitSync.CreateGitBranch(repoName);
+      });
+
+      cy.get("@gitRepoName").then((repName) => {
+        repoName = repName;
+      });
+
+      EditorNavigation.SelectEntityByName("Text1", EntityType.Widget, {}, [
+        "Container1",
+      ]);
+      cy.updateCodeInput(
+        ".t--property-control-text",
+        "{{ JSObject1.myFun1() }}",
+      );
 
-    agHelper.Sleep();
+      agHelper.Sleep();
 
-    cy.get(`[${NAVIGATION_ATTRIBUTE}="JSObject1.myFun1"]`).click({
-      cmdKey: true,
-      force: true,
-    });
+      cy.get(`[${NAVIGATION_ATTRIBUTE}="JSObject1.myFun1"]`).click({
+        cmdKey: true,
+        force: true,
+      });
 
-    cy.assertCursorOnCodeInput(".js-editor", { ch: 1, line: 3 });
-    agHelper.Sleep();
+      cy.assertCursorOnCodeInput(".js-editor", { ch: 1, line: 3 });
+      agHelper.Sleep();
 
-    // Assert context switching works when going back to canvas
-    EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+      // Assert context switching works when going back to canvas
+      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
 
-    cy.get(`div[data-testid='t--selected']`).should("have.length", 1);
-    cy.get(".t--property-pane-title").should("contain", "Text1");
+      cy.get(`div[data-testid='t--selected']`).should("have.length", 1);
+      cy.get(".t--property-pane-title").should("contain", "Text1");
 
-    // Go back to JS editor
-    cy.get(`[${NAVIGATION_ATTRIBUTE}="JSObject1.myFun1"]`).click({
-      ctrlKey: true,
+      // Go back to JS editor
+      cy.get(`[${NAVIGATION_ATTRIBUTE}="JSObject1.myFun1"]`).click({
+        ctrlKey: true,
+      });
     });
-  });
 
-  it("4. Will navigate within Js Object properly", () => {
-    cy.updateCodeInput(".js-editor", JSInputTestCode);
-    agHelper.Sleep(2000);
-    cy.get(`[${NAVIGATION_ATTRIBUTE}="JSObject1.myVar1"]`).click({
-      ctrlKey: true,
-    });
-    cy.getCodeInput(".js-editor").then((input) => {
-      const codeMirrorInput = input[0].CodeMirror;
-      codeMirrorInput.focus();
-    });
-    cy.assertCursorOnCodeInput(".js-editor", { ch: 2, line: 1 });
-    agHelper.Sleep();
-    cy.get(`[${NAVIGATION_ATTRIBUTE}="JSObject1.myFun1"]`).click({
-      ctrlKey: true,
-    });
-    cy.getCodeInput(".js-editor").then((input) => {
-      const codeMirrorInput = input[0].CodeMirror;
-      codeMirrorInput.focus();
-    });
-
-    cy.assertCursorOnCodeInput(".js-editor", { ch: 2, line: 2 });
-    agHelper.Sleep();
-    cy.get(`[${NAVIGATION_ATTRIBUTE}="JSObject2.myFun1"]`).click({
-      ctrlKey: true,
+    it("4. Will navigate within Js Object properly", () => {
+      cy.updateCodeInput(".js-editor", JSInputTestCode);
+      agHelper.Sleep(2000);
+      cy.get(`[${NAVIGATION_ATTRIBUTE}="JSObject1.myVar1"]`).click({
+        ctrlKey: true,
+      });
+      cy.getCodeInput(".js-editor").then((input) => {
+        const codeMirrorInput = input[0].CodeMirror;
+        codeMirrorInput.focus();
+      });
+      cy.assertCursorOnCodeInput(".js-editor", { ch: 2, line: 1 });
+      agHelper.Sleep();
+      cy.get(`[${NAVIGATION_ATTRIBUTE}="JSObject1.myFun1"]`).click({
+        ctrlKey: true,
+      });
+      cy.getCodeInput(".js-editor").then((input) => {
+        const codeMirrorInput = input[0].CodeMirror;
+        codeMirrorInput.focus();
+      });
+
+      cy.assertCursorOnCodeInput(".js-editor", { ch: 2, line: 2 });
+      agHelper.Sleep();
+      cy.get(`[${NAVIGATION_ATTRIBUTE}="JSObject2.myFun1"]`).click({
+        ctrlKey: true,
+      });
+
+      cy.getCodeInput(".js-editor").then((input) => {
+        const codeMirrorInput = input[0].CodeMirror;
+        expect(codeMirrorInput.getValue()).to.equal(JSInput2TestCode);
+      });
     });
 
-    cy.getCodeInput(".js-editor").then((input) => {
-      const codeMirrorInput = input[0].CodeMirror;
-      expect(codeMirrorInput.getValue()).to.equal(JSInput2TestCode);
+    // Functionality isn't implemented yet
+    // it("5. Will work with string arguments in framework functions", () => {
+    //   entityExplorer.ExpandCollapseEntity("Widgets");
+    // EditorNavigation.SelectEntityByName("Button1", EntityType.Widget, {}, ["Container1"]);
+    //   cy.get(PROPERTY_SELECTOR.onClick).find(".t--js-toggle").click();
+    //   cy.updateCodeInput(
+    //     PROPERTY_SELECTOR.onClick,
+    //     "{{ resetWidget('Input1') }}",
+    //   );
+    //   agHelper.Sleep();
+    //   cy.get(`[${NAVIGATION_ATTRIBUTE}="Input1"]`)
+    //     .should("have.length", 1)
+    //     .click({ cmdKey: true });
+    // });
+
+    after(() => {
+      //clean up
+      gitSync.DeleteTestGithubRepo(repoName);
     });
-  });
-
-  // Functionality isn't implemented yet
-  // it("5. Will work with string arguments in framework functions", () => {
-  //   entityExplorer.ExpandCollapseEntity("Widgets");
-  // EditorNavigation.SelectEntityByName("Button1", EntityType.Widget, {}, ["Container1"]);
-  //   cy.get(PROPERTY_SELECTOR.onClick).find(".t--js-toggle").click();
-  //   cy.updateCodeInput(
-  //     PROPERTY_SELECTOR.onClick,
-  //     "{{ resetWidget('Input1') }}",
-  //   );
-  //   agHelper.Sleep();
-  //   cy.get(`[${NAVIGATION_ATTRIBUTE}="Input1"]`)
-  //     .should("have.length", 1)
-  //     .click({ cmdKey: true });
-  // });
-
-  after(() => {
-    //clean up
-    gitSync.DeleteTestGithubRepo(repoName);
-  });
-});
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/IDE/Editor_Segment_Context_Switching_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/IDE/Editor_Segment_Context_Switching_spec.ts
index 615ac3388915..1c08e1f480c2 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/IDE/Editor_Segment_Context_Switching_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/IDE/Editor_Segment_Context_Switching_spec.ts
@@ -11,7 +11,7 @@ import reconnectDatasourceModal from "../../../../locators/ReconnectLocators";
 
 describe(
   "Editor Segment Context Switch",
-  { tags: ["@tag.IDE", "@tag.ImportExport"] },
+  { tags: ["@tag.IDE", "@tag.ImportExport", "@tag.PropertyPane", "@tag.Git"] },
   function () {
     before("Import the test application", () => {
       homePage.CreateNewWorkspace("IDETest", true);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/IDE/MaintainContext&Focus_spec.js b/app/client/cypress/e2e/Regression/ClientSide/IDE/Focus_retentions_inputs_spec.js
similarity index 63%
rename from app/client/cypress/e2e/Regression/ClientSide/IDE/MaintainContext&Focus_spec.js
rename to app/client/cypress/e2e/Regression/ClientSide/IDE/Focus_retentions_inputs_spec.js
index a6d5681ba0cb..85b373a4cdd4 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/IDE/MaintainContext&Focus_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/IDE/Focus_retentions_inputs_spec.js
@@ -1,22 +1,23 @@
 import reconnectDatasourceModal from "../../../../locators/ReconnectLocators";
 import {
   agHelper,
-  apiPage,
   dataSources,
   homePage,
   locators,
 } from "../../../../support/Objects/ObjectsCore";
 import EditorNavigation, {
+  PageLeftPane,
   EntityType,
+  PagePaneSegment,
 } from "../../../../support/Pages/EditorNavigation";
 
 const apiwidget = require("../../../../locators/apiWidgetslocator.json");
 const queryLocators = require("../../../../locators/QueryEditor.json");
 
-describe("MaintainContext&Focus", { tags: ["@tag.IDE"] }, function () {
+describe("Focus Retention of Inputs", { tags: ["@tag.IDE"] }, function () {
   before("Import the test application", () => {
-    homePage.CreateNewWorkspace("MaintainContext&Focus", true);
-    homePage.ImportApp("ContextSwitching.json", "MaintainContext");
+    homePage.NavigateToHome();
+    homePage.ImportApp("ContextSwitching.json");
     cy.wait("@importNewApplication").then((interception) => {
       agHelper.Sleep();
       const { isPartialImport } = interception.response.body.data;
@@ -46,26 +47,26 @@ describe("MaintainContext&Focus", { tags: ["@tag.IDE"] }, function () {
 
     cy.focusCodeInput(".t--graphql-query-editor", { ch: 4, line: 1 });
 
-    EditorNavigation.SelectEntityByName("Rest_Api_1", EntityType.Api);
+    PageLeftPane.selectItem("Rest_Api_1");
 
     cy.wait(1000);
     cy.xpath("//span[contains(text(), 'Params')]").click();
     cy.focusCodeInput(apiwidget.queryKey);
     cy.wait("@saveAction");
 
-    EditorNavigation.SelectEntityByName("Rest_Api_2", EntityType.Api);
+    PageLeftPane.selectItem("Rest_Api_2");
 
     cy.wait(1000);
-    cy.xpath("//span[contains(text(), 'Headers')]").click();
+    agHelper.GetNClick("//span[contains(text(), 'Headers')]", 0);
     cy.updateCodeInput(apiwidget.headerValue, "test");
     cy.wait("@saveAction");
 
-    EditorNavigation.SelectEntityByName("SQL_Query", EntityType.Query);
+    PageLeftPane.selectItem("SQL_Query");
     cy.wait(1000);
     cy.focusCodeInput(".t--actionConfiguration\\.body", { ch: 5, line: 0 });
     cy.wait("@saveAction");
 
-    EditorNavigation.SelectEntityByName("S3_Query", EntityType.Query);
+    PageLeftPane.selectItem("S3_Query");
 
     cy.wait(1000);
     cy.focusCodeInput(".t--actionConfiguration\\.formData\\.bucket\\.data", {
@@ -75,25 +76,18 @@ describe("MaintainContext&Focus", { tags: ["@tag.IDE"] }, function () {
     cy.wait(1000);
     cy.wait("@saveAction");
 
-    EditorNavigation.SelectEntityByName("JSObject1", EntityType.JSObject);
+    PageLeftPane.switchSegment(PagePaneSegment.JS);
+
+    PageLeftPane.selectItem("JSObject1");
 
     cy.wait(1000);
     cy.focusCodeInput(".js-editor", { ch: 4, line: 4 });
     cy.wait("@saveAction");
 
-    EditorNavigation.SelectEntityByName("JSObject2", EntityType.JSObject);
+    PageLeftPane.selectItem("JSObject2");
 
     cy.wait(1000);
     cy.focusCodeInput(".js-editor", { ch: 2, line: 2 });
-
-    EditorNavigation.SelectEntityByName("Mongo_Query", EntityType.Query);
-
-    cy.wait(1000);
-    dataSources.EnterJSContext({
-      fieldLabel: "Collection",
-      fieldValue: "TestCollection",
-    });
-    cy.wait("@saveAction");
   });
 
   it("2. Maintains focus on property/Api/Query/Js Pane", () => {
@@ -106,8 +100,14 @@ describe("MaintainContext&Focus", { tags: ["@tag.IDE"] }, function () {
       line: 0,
     });
 
+    PageLeftPane.switchSegment(PagePaneSegment.Queries);
+
     //Maintains focus on the API pane
-    EditorNavigation.SelectEntityByName("Graphql_Query", EntityType.Api);
+    PageLeftPane.selectItem("Graphql_Query");
+
+    agHelper
+      .GetElement(locators._queryName)
+      .should("have.text", "Graphql_Query");
 
     cy.xpath("//span[contains(text(), 'Body')]/parent::button").should(
       "have.attr",
@@ -116,10 +116,20 @@ describe("MaintainContext&Focus", { tags: ["@tag.IDE"] }, function () {
     );
     cy.assertCursorOnCodeInput(".t--graphql-query-editor", { ch: 4, line: 1 });
 
-    EditorNavigation.SelectEntityByName("Rest_Api_1", EntityType.Api);
-    // cy.assertCursorOnCodeInput(apiwidget.headerValue);
+    PageLeftPane.selectItem("Rest_Api_1");
+
+    agHelper.GetElement(locators._queryName).should("have.text", "Rest_Api_1");
 
-    EditorNavigation.SelectEntityByName("Rest_Api_2", EntityType.Api);
+    cy.xpath("//span[contains(text(), 'Params')]/parent::button").should(
+      "have.attr",
+      "aria-selected",
+      "true",
+    );
+    cy.assertCursorOnCodeInput(apiwidget.queryKey, { ch: 0, line: 0 });
+
+    PageLeftPane.selectItem("Rest_Api_2");
+
+    agHelper.GetElement(locators._queryName).should("have.text", "Rest_Api_2");
 
     cy.xpath("//span[contains(text(), 'Headers')]/parent::button").should(
       "have.attr",
@@ -129,61 +139,35 @@ describe("MaintainContext&Focus", { tags: ["@tag.IDE"] }, function () {
     cy.assertCursorOnCodeInput(apiwidget.headerValue);
 
     //Maintains focus on Query panes
-    EditorNavigation.SelectEntityByName("SQL_Query", EntityType.Query);
+    PageLeftPane.selectItem("SQL_Query");
+
+    agHelper.GetElement(locators._queryName).should("have.text", "SQL_Query");
 
     cy.assertCursorOnCodeInput(".t--actionConfiguration\\.body", {
       ch: 5,
       line: 0,
     });
 
-    EditorNavigation.SelectEntityByName("S3_Query", EntityType.Query);
+    PageLeftPane.selectItem("S3_Query");
 
     cy.assertCursorOnCodeInput(
       ".t--actionConfiguration\\.formData\\.bucket\\.data",
       { ch: 2, line: 0 },
     );
 
-    // Removing as the Mongo collection is now converted to dropdown
-    // entityExplorer.SelectEntityByName("Mongo_Query");
-
-    // cy.assertCursorOnCodeInput(
-    //   ".t--actionConfiguration\\.formData\\.collection\\.data",
-    // );
+    PageLeftPane.switchSegment(PagePaneSegment.JS);
 
     //Maintains focus on JS Objects
-    EditorNavigation.SelectEntityByName("JSObject1", EntityType.JSObject);
+    PageLeftPane.selectItem("JSObject1");
 
     cy.assertCursorOnCodeInput(".js-editor", { ch: 2, line: 4 });
 
-    EditorNavigation.SelectEntityByName("JSObject2", EntityType.JSObject);
+    PageLeftPane.selectItem("JSObject2");
 
     cy.assertCursorOnCodeInput(".js-editor", { ch: 2, line: 2 });
   });
 
-  it("3. Check if selected tab on right tab persists", () => {
-    EditorNavigation.SelectEntityByName("Rest_Api_1", EntityType.Api);
-    apiPage.SelectRightPaneTab("Connections");
-    EditorNavigation.SelectEntityByName("SQL_Query", EntityType.Query);
-    EditorNavigation.SelectEntityByName("Rest_Api_1", EntityType.Api);
-    apiPage.AssertRightPaneSelectedTab("Connections");
-
-    //Check if the URL is persisted while switching pages
-    cy.Createpage("Page2");
-
-    EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
-    EditorNavigation.SelectEntityByName("Rest_Api_1", EntityType.Api);
-
-    EditorNavigation.SelectEntityByName("Page2", EntityType.Page);
-    cy.dragAndDropToCanvas("textwidget", { x: 300, y: 200 });
-
-    EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
-    cy.get(".t--nameOfApi .bp3-editable-text-content").should(
-      "contain",
-      "Rest_Api_1",
-    );
-  });
-
-  it("4. Datasource edit mode has to be maintained", () => {
+  it("3. Datasource edit mode has to be maintained", () => {
     EditorNavigation.SelectEntityByName("Appsmith", EntityType.Datasource);
     dataSources.EditDatasource();
     EditorNavigation.SelectEntityByName("Github", EntityType.Datasource);
@@ -192,7 +176,7 @@ describe("MaintainContext&Focus", { tags: ["@tag.IDE"] }, function () {
     dataSources.AssertDSEditViewMode("Edit");
   });
 
-  it("5. Maintain focus of form control inputs", () => {
+  it("4. Maintain focus of form control inputs", () => {
     EditorNavigation.SelectEntityByName("SQL_Query", EntityType.Query);
     dataSources.ToggleUsePreparedStatement(false);
     EditorNavigation.SelectEntityByName("S3_Query", EntityType.Query);
@@ -202,14 +186,15 @@ describe("MaintainContext&Focus", { tags: ["@tag.IDE"] }, function () {
 
     EditorNavigation.SelectEntityByName("SQL_Query", EntityType.Query);
     cy.get(".bp3-editable-text-content").should("contain.text", "SQL_Query");
-    cy.get(".t--form-control-SWITCH input").should("be.focused");
+    cy.xpath(queryLocators.querySettingsTab).click();
+    agHelper.GetElement(dataSources._usePreparedStatement).should("be.focused");
     EditorNavigation.SelectEntityByName("S3_Query", EntityType.Query);
     agHelper.Sleep();
     cy.xpath(queryLocators.querySettingsTab).click();
     cy.xpath(queryLocators.queryTimeout).should("be.focused");
   });
 
-  it("6. Bug 21999 Maintain focus of code editor when Escape is pressed with autcomplete open + Bug 22960", () => {
+  it("5. Bug 21999 Maintain focus of code editor when Escape is pressed with autcomplete open + Bug 22960", () => {
     EditorNavigation.SelectEntityByName("JSObject1", EntityType.JSObject);
 
     cy.assertCursorOnCodeInput(".js-editor", { ch: 2, line: 4 });
diff --git a/app/client/cypress/e2e/Regression/ClientSide/IDE/IDE_Add_Pane_Interactions_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/IDE/IDE_Add_Pane_Interactions_spec.ts
index e8bd59c4233b..afbfca8469b7 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/IDE/IDE_Add_Pane_Interactions_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/IDE/IDE_Add_Pane_Interactions_spec.ts
@@ -10,81 +10,85 @@ import AddView from "../../../../support/Pages/IDE/AddView";
 const agHelper = ObjectsRegistry.AggregateHelper;
 const commonLocators = ObjectsRegistry.CommonLocators;
 
-describe("IDE add pane interactions", { tags: ["@tag.IDE"] }, () => {
-  it("1. UI tab add interactions", () => {
-    // check add pane is open
-    PageLeftPane.assertInAddView();
-    // close add pane to show blank state
-    PageLeftPane.closeAddView();
-    // click on add button and check add state
-    PageLeftPane.switchToAddNew();
-    // check add pane
-    PageLeftPane.assertInAddView();
-    // drag and drop a widget and list view should be opened
-    cy.dragAndDropToCanvas("textwidget", { x: 300, y: 200 });
-    // check listing ui
-    PageLeftPane.selectedItem().contains("Text1");
-    // click add button
-    PageLeftPane.switchToAddNew();
-    // check add pane is open
-    PageLeftPane.assertInAddView();
-    // close add pane
-    PageLeftPane.closeAddView();
-    // click on canvas and check add pane visible or not
-    agHelper.GetNClick(commonLocators._canvas).click();
-    // check add pane
-    PageLeftPane.assertInAddView();
-  });
+describe(
+  "IDE add pane interactions",
+  { tags: ["@tag.IDE", "@tag.PropertyPane"] },
+  () => {
+    it("1. UI tab add interactions", () => {
+      // check add pane is open
+      PageLeftPane.assertInAddView();
+      // close add pane to show blank state
+      PageLeftPane.closeAddView();
+      // click on add button and check add state
+      PageLeftPane.switchToAddNew();
+      // check add pane
+      PageLeftPane.assertInAddView();
+      // drag and drop a widget and list view should be opened
+      cy.dragAndDropToCanvas("textwidget", { x: 300, y: 200 });
+      // check listing ui
+      PageLeftPane.selectedItem().contains("Text1");
+      // click add button
+      PageLeftPane.switchToAddNew();
+      // check add pane is open
+      PageLeftPane.assertInAddView();
+      // close add pane
+      PageLeftPane.closeAddView();
+      // click on canvas and check add pane visible or not
+      agHelper.GetNClick(commonLocators._canvas).click();
+      // check add pane
+      PageLeftPane.assertInAddView();
+    });
 
-  it("2. JS tab add interactions", () => {
-    /** Fullscreen  */
-    //  switch to JS  tab from UI
-    PageLeftPane.switchSegment(PagePaneSegment.JS);
-    // check and click on blank state add button
-    PageLeftPane.switchToAddNew();
-    // check listing UI
-    PageLeftPane.assertInListView();
-    // click on add btn in the listing UI
-    PageLeftPane.switchToAddNew();
-    // check item got added or not
-    PageLeftPane.assertInListView();
-    PageLeftPane.assertItemCount(2);
-    /** Splitscreen  */
-    // switch to splitscreen
-    EditorNavigation.SwitchScreenMode(EditorViewMode.SplitScreen);
-    // click on add
-    FileTabs.switchToAddNew();
-    // check tabs count to verify js added or not
-    FileTabs.assertTabCount(3);
-  });
+    it("2. JS tab add interactions", () => {
+      /** Fullscreen  */
+      //  switch to JS  tab from UI
+      PageLeftPane.switchSegment(PagePaneSegment.JS);
+      // check and click on blank state add button
+      PageLeftPane.switchToAddNew();
+      // check listing UI
+      PageLeftPane.assertInListView();
+      // click on add btn in the listing UI
+      PageLeftPane.switchToAddNew();
+      // check item got added or not
+      PageLeftPane.assertInListView();
+      PageLeftPane.assertItemCount(2);
+      /** Splitscreen  */
+      // switch to splitscreen
+      EditorNavigation.SwitchScreenMode(EditorViewMode.SplitScreen);
+      // click on add
+      FileTabs.switchToAddNew();
+      // check tabs count to verify js added or not
+      FileTabs.assertTabCount(3);
+    });
 
-  it("3. Queries tab add interactions", () => {
-    /** Fullscreen  */
-    EditorNavigation.SwitchScreenMode(EditorViewMode.FullScreen);
-    //  switch to Query  tab from JS
-    PageLeftPane.switchSegment(PagePaneSegment.Queries);
-    // check and click on blank state add button
-    PageLeftPane.switchToAddNew();
-    // check add pane
-    PageLeftPane.assertInAddView();
-    // close add tab
-    FileTabs.closeTab("new_query");
-    // open add pane to add item
-    PageLeftPane.switchToAddNew();
-    // add item
-    cy.get(".t--new-blank-api").children("div").first().click();
-    // check item added or not
-    PageLeftPane.assertPresence("Api1");
-    /** Splitscreen  */
-    // switch to splitscreen
-    EditorNavigation.SwitchScreenMode(EditorViewMode.SplitScreen);
-    // click on add
-    FileTabs.switchToAddNew();
-    // check add pane
-    PageLeftPane.assertInAddView();
-    // add item
-    cy.get(".t--new-blank-api").children("div").first().click();
-    // check tabs count to verify js added or not
-    FileTabs.assertTabCount(2);
-  });
-});
+    it("3. Queries tab add interactions", () => {
+      /** Fullscreen  */
+      EditorNavigation.SwitchScreenMode(EditorViewMode.FullScreen);
+      //  switch to Query  tab from JS
+      PageLeftPane.switchSegment(PagePaneSegment.Queries);
+      // check and click on blank state add button
+      PageLeftPane.switchToAddNew();
+      // check add pane
+      PageLeftPane.assertInAddView();
+      // close add tab
+      FileTabs.closeTab("new_query");
+      // open add pane to add item
+      PageLeftPane.switchToAddNew();
+      // add item
+      cy.get(".t--new-blank-api").children("div").first().click();
+      // check item added or not
+      PageLeftPane.assertPresence("Api1");
+      /** Splitscreen  */
+      // switch to splitscreen
+      EditorNavigation.SwitchScreenMode(EditorViewMode.SplitScreen);
+      // click on add
+      FileTabs.switchToAddNew();
+      // check add pane
+      PageLeftPane.assertInAddView();
+      // add item
+      cy.get(".t--new-blank-api").children("div").first().click();
+      // check tabs count to verify js added or not
+      FileTabs.assertTabCount(2);
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/JSLibrary/Library_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/JSLibrary/Library_spec.ts
index 49f4bf743879..16d7edefd6a3 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/JSLibrary/Library_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/JSLibrary/Library_spec.ts
@@ -18,7 +18,7 @@ import {
 
 describe(
   "Tests JS Libraries",
-  { tags: ["@tag.excludeForAirgap", "@tag.JS"] },
+  { tags: ["@tag.excludeForAirgap", "@tag.JS", "@tag.Binding"] },
   () => {
     it("1. Validates Library install/uninstall", () => {
       AppSidebar.navigate(AppSidebarButton.Libraries);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/JSObject/JSObjectMutation_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/JSObject/JSObjectMutation_spec.ts
index a41a81b44da9..dbcd6c681a5a 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/JSObject/JSObjectMutation_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/JSObject/JSObjectMutation_spec.ts
@@ -6,7 +6,7 @@ import EditorNavigation, {
 } from "../../../../support/Pages/EditorNavigation";
 const commonlocators = require("../../../../locators/commonlocators.json");
 
-describe("JSObject testing", { tags: ["@tag.JS"] }, () => {
+describe("JSObject testing", { tags: ["@tag.JS", "@tag.Binding"] }, () => {
   before(() => {
     _.homePage.NavigateToHome();
     _.homePage.ImportApp("JSObjectMutationTestApp.json");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/JSObject/JS_Editor_Assert_NoFunctionAvailableText_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/JSObject/JS_Editor_Assert_NoFunctionAvailableText_spec.ts
index 50d4c7342248..c7dff5820601 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/JSObject/JS_Editor_Assert_NoFunctionAvailableText_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/JSObject/JS_Editor_Assert_NoFunctionAvailableText_spec.ts
@@ -1,9 +1,12 @@
 import { jsEditor } from "../../../../support/Objects/ObjectsCore";
 
-describe("List no functions on empty collection", { tags: ["@tag.JS"] }, () => {
-  it("1. Bug 9585: should not show functions when whole code is deleted", () => {
-    jsEditor.CreateJSObject(
-      `export default {
+describe(
+  "List no functions on empty collection",
+  { tags: ["@tag.JS", "@tag.Binding"] },
+  () => {
+    it("1. Bug 9585: should not show functions when whole code is deleted", () => {
+      jsEditor.CreateJSObject(
+        `export default {
   myFun1: () => {
     function hi(a,b) {
       console.log(a,b);
@@ -14,15 +17,16 @@ describe("List no functions on empty collection", { tags: ["@tag.JS"] }, () => {
     //use async-await or promises
   }
 }`,
-      {
-        completeReplace: true,
-        toRun: false,
-        prettify: false,
-      },
-    );
+        {
+          completeReplace: true,
+          toRun: false,
+          prettify: false,
+        },
+      );
 
-    jsEditor.AssertSelectedFunction("myFun1");
-    jsEditor.ClearJSObj();
-    jsEditor.AssertSelectedFunction("No function available");
-  });
-});
+      jsEditor.AssertSelectedFunction("myFun1");
+      jsEditor.ClearJSObj();
+      jsEditor.AssertSelectedFunction("No function available");
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Linting/AsyncFunctionsBoundInSyncFields_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Linting/AsyncFunctionsBoundInSyncFields_Spec.ts
index 18789f6bb53b..2bea53ce8a8b 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Linting/AsyncFunctionsBoundInSyncFields_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Linting/AsyncFunctionsBoundInSyncFields_Spec.ts
@@ -15,7 +15,7 @@ import EditorNavigation, {
 
 describe(
   "Linting async JSFunctions bound to data fields",
-  { tags: ["@tag.JS"] },
+  { tags: ["@tag.JS", "@tag.Binding"] },
   () => {
     before(() => {
       entityExplorer.DragDropWidgetNVerify("buttonwidget", 300, 300);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Linting/BasicLint_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Linting/BasicLint_spec.ts
index 4331996e14fa..46c873407562 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Linting/BasicLint_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Linting/BasicLint_spec.ts
@@ -57,7 +57,7 @@ const createMySQLDatasourceQuery = () => {
   dataSources.CreateQueryForDS(dsName, `SELECT * FROM spacecrafts LIMIT 10;`);
 };
 
-describe("Linting", { tags: ["@tag.JS"] }, () => {
+describe("Linting", { tags: ["@tag.JS", "@tag.Binding"] }, () => {
   before(() => {
     entityExplorer.DragDropWidgetNVerify("buttonwidget", 300, 300);
     dataSources.CreateDataSource("MySql");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Linting/EntityPropertiesLint_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Linting/EntityPropertiesLint_spec.ts
index eb36be4f9522..f0dd10369320 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Linting/EntityPropertiesLint_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Linting/EntityPropertiesLint_spec.ts
@@ -15,107 +15,113 @@ import EditorNavigation, {
   PagePaneSegment,
 } from "../../../../support/Pages/EditorNavigation";
 
-describe("Linting of entity properties", { tags: ["@tag.JS"] }, () => {
-  before(() => {
-    entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON, 300, 300);
-  });
+describe(
+  "Linting of entity properties",
+  { tags: ["@tag.JS", "@tag.Binding"] },
+  () => {
+    before(() => {
+      entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON, 300, 300);
+    });
 
-  it("1. Shows correct lint error when wrong Api property is binded", () => {
-    const invalidProperty = "unknownProperty";
-    // create Api1
-    apiPage.CreateAndFillApi(
-      dataManager.dsValues[dataManager.defaultEnviorment].mockApiUrl,
-    );
-    // Edit Button onclick property
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    propPane.EnterJSContext(
-      "onClick",
-      `{{function(){
+    it("1. Shows correct lint error when wrong Api property is binded", () => {
+      const invalidProperty = "unknownProperty";
+      // create Api1
+      apiPage.CreateAndFillApi(
+        dataManager.dsValues[dataManager.defaultEnviorment].mockApiUrl,
+      );
+      // Edit Button onclick property
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      propPane.EnterJSContext(
+        "onClick",
+        `{{function(){
         console.log(Api1.${invalidProperty})
     }()}}`,
-    );
-    cy.wait(200);
-    cy.focused().blur();
-    propPane.UpdatePropertyFieldValue("Label", `{{Api1.${invalidProperty}}}`);
-    agHelper.AssertElementLength(locators._lintErrorElement, 2);
-    agHelper.HoverElement(locators._lintErrorElement);
-    agHelper.AssertContains(`"${invalidProperty}" doesn't exist in Api1`);
-    agHelper.GetNClick(locators._canvas);
-  });
+      );
+      cy.wait(200);
+      cy.focused().blur();
+      propPane.UpdatePropertyFieldValue("Label", `{{Api1.${invalidProperty}}}`);
+      agHelper.AssertElementLength(locators._lintErrorElement, 2);
+      agHelper.HoverElement(locators._lintErrorElement);
+      agHelper.AssertContains(`"${invalidProperty}" doesn't exist in Api1`);
+      agHelper.GetNClick(locators._canvas);
+    });
 
-  it("2. Shows correct lint error when wrong JSObject property is binded", () => {
-    // create JSObject
-    jsEditor.CreateJSObject(
-      `export default {
+    it("2. Shows correct lint error when wrong JSObject property is binded", () => {
+      // create JSObject
+      jsEditor.CreateJSObject(
+        `export default {
       myFun1: () => {
         console.log("JSOBJECT 1")
       }
   }`,
-      {
-        paste: true,
-        completeReplace: true,
-        toRun: false,
-        shouldCreateNewJSObj: true,
-      },
-    );
-    const invalidProperty = "unknownFunction";
-    // Edit Button onclick and text property
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    propPane.EnterJSContext(
-      "onClick",
-      `{{function(){
+        {
+          paste: true,
+          completeReplace: true,
+          toRun: false,
+          shouldCreateNewJSObj: true,
+        },
+      );
+      const invalidProperty = "unknownFunction";
+      // Edit Button onclick and text property
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      propPane.EnterJSContext(
+        "onClick",
+        `{{function(){
         console.log(JSObject1.${invalidProperty})
     }()}}`,
-    );
-    cy.wait(200);
-    propPane.UpdatePropertyFieldValue(
-      "Label",
-      `{{JSObject1.${invalidProperty}}}`,
-    );
-    // Assert lint errors
-    agHelper.AssertElementLength(locators._lintErrorElement, 2);
-    agHelper.HoverElement(locators._lintErrorElement);
-    agHelper.AssertContains(`"${invalidProperty}" doesn't exist in JSObject1`);
+      );
+      cy.wait(200);
+      propPane.UpdatePropertyFieldValue(
+        "Label",
+        `{{JSObject1.${invalidProperty}}}`,
+      );
+      // Assert lint errors
+      agHelper.AssertElementLength(locators._lintErrorElement, 2);
+      agHelper.HoverElement(locators._lintErrorElement);
+      agHelper.AssertContains(
+        `"${invalidProperty}" doesn't exist in JSObject1`,
+      );
 
-    // Edit JS Object and add "unknown" function
-    EditorNavigation.SelectEntityByName("JSObject1", EntityType.JSObject);
-    jsEditor.EditJSObj(`export default {
+      // Edit JS Object and add "unknown" function
+      EditorNavigation.SelectEntityByName("JSObject1", EntityType.JSObject);
+      jsEditor.EditJSObj(`export default {
       ${invalidProperty}: () => {
         console.log("JSOBJECT 1")
       }
   }`);
-    // select button, and assert that no lint is present
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    agHelper.AssertElementAbsence(locators._lintErrorElement);
-    // delete JSObject
-    PageLeftPane.switchSegment(PagePaneSegment.JS);
-    entityExplorer.ActionContextMenuByEntityName({
-      entityNameinLeftSidebar: "JSObject1",
-      action: "Delete",
-      entityType: entityItems.JSObject,
-    });
-    // select button, and assert that lint error is present
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    agHelper.AssertElementLength(locators._lintErrorElement, 2);
-    agHelper.HoverElement(locators._lintErrorElement);
-    agHelper.AssertContains(`'JSObject1' is not defined`);
-    // create js object
-    jsEditor.CreateJSObject(
-      `export default {
+      // select button, and assert that no lint is present
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      agHelper.AssertElementAbsence(locators._lintErrorElement);
+      // delete JSObject
+      PageLeftPane.switchSegment(PagePaneSegment.JS);
+      entityExplorer.ActionContextMenuByEntityName({
+        entityNameinLeftSidebar: "JSObject1",
+        action: "Delete",
+        entityType: entityItems.JSObject,
+      });
+      // select button, and assert that lint error is present
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      agHelper.AssertElementLength(locators._lintErrorElement, 2);
+      agHelper.HoverElement(locators._lintErrorElement);
+      agHelper.AssertContains(`'JSObject1' is not defined`);
+      // create js object
+      jsEditor.CreateJSObject(
+        `export default {
         ${invalidProperty}: () => {
         console.log("JSOBJECT 1")
       }
   }`,
-      {
-        paste: true,
-        completeReplace: true,
-        toRun: false,
-        shouldCreateNewJSObj: true,
-      },
-    );
+        {
+          paste: true,
+          completeReplace: true,
+          toRun: false,
+          shouldCreateNewJSObj: true,
+        },
+      );
 
-    // select button, and assert that no lint error is present
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    agHelper.AssertElementAbsence(locators._lintErrorElement);
-  });
-});
+      // select button, and assert that no lint error is present
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      agHelper.AssertElementAbsence(locators._lintErrorElement);
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Linting/ErrorReporting_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Linting/ErrorReporting_spec.ts
index 0ffeaa75873b..e25cd04e84cb 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Linting/ErrorReporting_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Linting/ErrorReporting_spec.ts
@@ -15,7 +15,7 @@ import EditorNavigation, {
   PagePaneSegment,
 } from "../../../../support/Pages/EditorNavigation";
 
-describe("Lint error reporting", { tags: ["@tag.JS"] }, () => {
+describe("Lint error reporting", { tags: ["@tag.JS", "@tag.Binding"] }, () => {
   before(() => {
     entityExplorer.DragDropWidgetNVerify("tablewidgetv2", 300, 500);
     table.AddSampleTableData();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Onboarding/StartFromData_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Onboarding/StartFromData_spec.ts
index da36efe2b28c..5f2158612d3d 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Onboarding/StartFromData_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Onboarding/StartFromData_spec.ts
@@ -10,7 +10,14 @@ import {
 
 describe(
   "Start with data userflow : Create different datasources and save",
-  { tags: ["@tag.excludeForAirgap", "@tag.Datasource"] },
+  {
+    tags: [
+      "@tag.excludeForAirgap",
+      "@tag.Datasource",
+      "@tag.Git",
+      "@tag.AccessControl",
+    ],
+  },
   function () {
     beforeEach(() => {
       homePage.Signout();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/JSEnabledByDefaultExperiment_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/JSEnabledByDefaultExperiment_spec.ts
index b1da841ffe3d..45a89965b271 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/JSEnabledByDefaultExperiment_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/JSEnabledByDefaultExperiment_spec.ts
@@ -1,5 +1,4 @@
 import OneClickBindingLocator from "../../../../locators/OneClickBindingLocator";
-import { featureFlagIntercept } from "../../../../support/Objects/FeatureFlags";
 import {
   agHelper,
   apiPage,
@@ -23,10 +22,6 @@ describe(
   () => {
     let datasourceName: string;
     before(() => {
-      featureFlagIntercept({
-        rollout_js_enabled_one_click_binding_enabled: true,
-      });
-
       dataSources.CreateDataSource("Postgres");
 
       cy.get("@dsName").then((dsName) => {
diff --git a/app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/TableWidget/OneClickBindingMysql_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/TableWidget/OneClickBindingMysql_spec.ts
index 1ae360fd1052..19620479ef55 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/TableWidget/OneClickBindingMysql_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/TableWidget/OneClickBindingMysql_spec.ts
@@ -16,7 +16,7 @@ const oneClickBinding = new OneClickBinding();
 
 describe(
   "Table widget one click binding feature",
-  { tags: ["@tag.Widget"] },
+  { tags: ["@tag.Widget", "@tag.Binding"] },
   () => {
     it("1.should check that queries are created and bound to table widget properly", () => {
       entityExplorer.DragDropWidgetNVerify(draggableWidgets.TABLE, 400);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/spec_utility.ts b/app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/spec_utility.ts
index 91b52c0d116c..ba218d46f170 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/spec_utility.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/spec_utility.ts
@@ -12,7 +12,22 @@ export class OneClickBinding {
     column: Record<string, string> = {},
   ) {
     agHelper.GetNClick(oneClickBindingLocator.datasourceDropdownSelector);
-
+    agHelper.GetElement("[role='menu']").then(($menu) => {
+      if (
+        $menu.find(oneClickBindingLocator.datasourceQuerySelector()).length > 0
+      ) {
+        cy.wrap($menu)
+          .find(oneClickBindingLocator.datasourceQuerySelector())
+          .should("have.length.greaterThan", 0)
+          .each(($item) => {
+            cy.wrap($item)
+              .find("img")
+              .should(($img) => {
+                expect($img).to.have.attr("src").and.not.be.empty;
+              });
+          });
+      }
+    });
     expandLoadMoreOptions();
 
     agHelper.AssertElementAbsence(oneClickBindingLocator.connectData);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/ApiError_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/ApiError_spec.ts
index 993674bed8de..622e3eee2419 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/ApiError_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/ApiError_spec.ts
@@ -4,27 +4,31 @@ import EditorNavigation, {
   EditorViewMode,
 } from "../../../../support/Pages/EditorNavigation";
 
-describe("Api Error Debugger", { tags: ["@tag.IDE"] }, () => {
-  before(() => {
-    // Create api that causes an error
-    _.apiPage.CreateAndFillApi("https://fakeapi/user");
-  });
-  it("it shows error message", () => {
-    _.apiPage.RunAPI(false);
-    _.debuggerHelper.AssertOpen(PageType.API);
-    _.apiPage.ResponseStatusCheck("PE-RST-5000");
-  });
-  it("it shows debug button and navigates", () => {
-    _.apiPage.DebugError();
-    _.debuggerHelper.AssertSelectedTab(
-      Cypress.env("MESSAGES").DEBUGGER_ERRORS(),
-    );
-    _.debuggerHelper.AssertErrorCount(1);
-    EditorNavigation.SwitchScreenMode(EditorViewMode.SplitScreen);
-    _.apiPage.DebugError();
-    _.debuggerHelper.AssertSelectedTab(
-      Cypress.env("MESSAGES").DEBUGGER_ERRORS(),
-    );
-    _.debuggerHelper.AssertErrorCount(1);
-  });
-});
+describe(
+  "Api Error Debugger",
+  { tags: ["@tag.IDE", "@tag.PropertyPane"] },
+  () => {
+    before(() => {
+      // Create api that causes an error
+      _.apiPage.CreateAndFillApi("https://fakeapi/user");
+    });
+    it("it shows error message", () => {
+      _.apiPage.RunAPI(false);
+      _.debuggerHelper.AssertOpen(PageType.API);
+      _.apiPage.ResponseStatusCheck("PE-RST-5000");
+    });
+    it("it shows debug button and navigates", () => {
+      _.apiPage.DebugError();
+      _.debuggerHelper.AssertSelectedTab(
+        Cypress.env("MESSAGES").DEBUGGER_ERRORS(),
+      );
+      _.debuggerHelper.AssertErrorCount(1);
+      EditorNavigation.SwitchScreenMode(EditorViewMode.SplitScreen);
+      _.apiPage.DebugError();
+      _.debuggerHelper.AssertSelectedTab(
+        Cypress.env("MESSAGES").DEBUGGER_ERRORS(),
+      );
+      _.debuggerHelper.AssertErrorCount(1);
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/EntityBottomBar_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/EntityBottomBar_spec.ts
index 23d9464dffc1..806170b30ff9 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/EntityBottomBar_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/EntityBottomBar_spec.ts
@@ -2,152 +2,159 @@ import * as _ from "../../../../support/Objects/ObjectsCore";
 import { PageType } from "../../../../support/Pages/DebuggerHelper";
 import EditorNavigation from "../../../../support/Pages/EditorNavigation";
 
-describe("Entity bottom bar", { tags: ["@tag.IDE"] }, () => {
-  it("1. Debugger should be closable", () => {
-    //Verify if bottom bar is closed.
-    _.debuggerHelper.AssertClosed();
-    //verify if bottom bar is open on clicking debugger icon in canvas.
-    _.debuggerHelper.OpenDebugger();
-    _.debuggerHelper.AssertOpen(PageType.Canvas);
-    //Verify if selected tab is errors in tab title.
-    _.debuggerHelper.AssertSelectedTab(
-      Cypress.env("MESSAGES").DEBUGGER_ERRORS(),
-    );
-    // verify if bottom bar is closed on clicking close icon in canvas.
-    _.debuggerHelper.CloseBottomBar();
-    _.debuggerHelper.AssertClosed();
-  });
-
-  it("2. Jseditor bottom bar should be collapsable", () => {
-    _.jsEditor.CreateJSObject(` return "hello world";`);
-    //Verify if bottom bar opens JSEditor.
-    _.debuggerHelper.AssertOpen(PageType.JsEditor);
-    // Verify if selected tab is response.
-    _.debuggerHelper.AssertSelectedTab(
-      Cypress.env("MESSAGES").DEBUGGER_RESPONSE(),
-    );
-    //Verify if bottom bar is closed on clicking close icon in JSEditor.
-    _.debuggerHelper.CloseBottomBar();
-    _.debuggerHelper.AssertClosed();
-    //Verify if bottom bar is open on executing JSFunction.
-    _.jsEditor.RunJSObj();
-    _.debuggerHelper.AssertOpen(PageType.JsEditor);
-    //verify if response tab is selected on execution JSFunction.
-    _.debuggerHelper.AssertSelectedTab(
-      Cypress.env("MESSAGES").DEBUGGER_RESPONSE(),
-    );
-    //verify if bottom bar is closed on switching to canvas page.
-    EditorNavigation.ShowCanvas();
-    _.debuggerHelper.AssertClosed();
-  });
+describe(
+  "Entity bottom bar",
+  { tags: ["@tag.IDE", "@tag.PropertyPane"] },
+  () => {
+    it("1. Debugger should be closable", () => {
+      //Verify if bottom bar is closed.
+      _.debuggerHelper.AssertClosed();
+      //verify if bottom bar is open on clicking debugger icon in canvas.
+      _.debuggerHelper.OpenDebugger();
+      _.debuggerHelper.AssertOpen(PageType.Canvas);
+      //Verify if selected tab is errors in tab title.
+      _.debuggerHelper.AssertSelectedTab(
+        Cypress.env("MESSAGES").DEBUGGER_ERRORS(),
+      );
+      // verify if bottom bar is closed on clicking close icon in canvas.
+      _.debuggerHelper.CloseBottomBar();
+      _.debuggerHelper.AssertClosed();
+    });
 
-  it("3. Api bottom pane should be collapsable", () => {
-    _.apiPage.CreateAndFillApi(
-      _.dataManager.dsValues[_.dataManager.defaultEnviorment].mockApiUrl,
-    );
-    //Verify that the errors tab is still closed.
-    _.debuggerHelper.AssertClosed();
-    //Verify if bottom bar opens on clicking debugger icon in api page.
-    _.debuggerHelper.OpenDebugger();
-    _.debuggerHelper.AssertOpen(PageType.API);
-    //Verify if selected tab is errors in tab title.
-    _.debuggerHelper.AssertSelectedTab(
-      Cypress.env("MESSAGES").DEBUGGER_ERRORS(),
-    );
-    //Verify if bottom bar is open on executing api.
-    _.apiPage.RunAPI();
-    _.agHelper.Sleep(1000);
-    _.debuggerHelper.AssertOpen(PageType.API);
-    //verify if response tab is selected on execution api.
-    _.debuggerHelper.AssertSelectedTab(
-      Cypress.env("MESSAGES").DEBUGGER_RESPONSE(),
-    );
-  });
+    it("2. Jseditor bottom bar should be collapsable", () => {
+      _.jsEditor.CreateJSObject(` return "hello world";`);
+      //Verify if bottom bar opens JSEditor.
+      _.debuggerHelper.AssertOpen(PageType.JsEditor);
+      // Verify if selected tab is response.
+      _.debuggerHelper.AssertSelectedTab(
+        Cypress.env("MESSAGES").DEBUGGER_RESPONSE(),
+      );
+      //Verify if bottom bar is closed on clicking close icon in JSEditor.
+      _.debuggerHelper.CloseBottomBar();
+      _.debuggerHelper.AssertClosed();
+      //Verify if bottom bar is open on executing JSFunction.
+      _.jsEditor.RunJSObj();
+      _.debuggerHelper.AssertOpen(PageType.JsEditor);
+      //verify if response tab is selected on execution JSFunction.
+      _.debuggerHelper.AssertSelectedTab(
+        Cypress.env("MESSAGES").DEBUGGER_RESPONSE(),
+      );
+      //verify if bottom bar is closed on switching to canvas page.
+      EditorNavigation.ShowCanvas();
+      _.debuggerHelper.AssertClosed();
+    });
 
-  it("4. Bottom bar in Datasource", () => {
-    //Verify if bottom bar remain open on shifting to create new datasource page.
-    _.dataSources.NavigateToDSCreateNew();
-    //Expecting errors tab to be closed as this is now a datasource
-    _.debuggerHelper.AssertClosed();
-    //Verify if bottom bar opens on clicking debugger icon in datasource page.
-    _.debuggerHelper.OpenDebugger();
-    _.debuggerHelper.AssertOpen(PageType.DataSources);
-  });
+    it("3. Api bottom pane should be collapsable", () => {
+      _.apiPage.CreateAndFillApi(
+        _.dataManager.dsValues[_.dataManager.defaultEnviorment].mockApiUrl,
+      );
+      //Verify that the errors tab is still closed.
+      _.debuggerHelper.AssertClosed();
+      //Verify if bottom bar opens on clicking debugger icon in api page.
+      _.debuggerHelper.OpenDebugger();
+      _.debuggerHelper.AssertOpen(PageType.API);
+      //Verify if selected tab is errors in tab title.
+      _.debuggerHelper.AssertSelectedTab(
+        Cypress.env("MESSAGES").DEBUGGER_ERRORS(),
+      );
+      //Verify if bottom bar is open on executing api.
+      _.apiPage.RunAPI();
+      _.agHelper.Sleep(1000);
+      _.debuggerHelper.AssertOpen(PageType.API);
+      //verify if response tab is selected on execution api.
+      _.debuggerHelper.AssertSelectedTab(
+        Cypress.env("MESSAGES").DEBUGGER_RESPONSE(),
+      );
+    });
 
-  it(
-    "5. Query bottom bar should be collapsable",
-    { tags: ["@tag.excludeForAirgap"] },
-    () => {
-      _.dataSources.CreateMockDB("Users").then((dbName) => {
-        //Verify if bottom bar remain open on shifting to active datasource page.
-        _.debuggerHelper.AssertOpen(PageType.DataSources);
-        //Verify if selected tab is errors and error count is
-        //Verify if selected tab is errors in tab title.
-        _.debuggerHelper.AssertSelectedTab(
-          Cypress.env("MESSAGES").DEBUGGER_ERRORS(),
-        );
-        //Verify if bottom bar is closed on clicking close icon in active datasource page.
-        _.debuggerHelper.CloseBottomBar();
-        _.debuggerHelper.AssertClosed();
-        //Verify if bottom bar opens on clicking debugger icon in query page.
-        _.dataSources.CreateQueryAfterDSSaved();
-        _.debuggerHelper.OpenDebugger();
-        _.debuggerHelper.AssertOpen(PageType.Query);
-        //Verify if bottom bar is closed on clicking close icon in query page.
-        _.debuggerHelper.CloseBottomBar();
-        _.debuggerHelper.AssertClosed();
-        //Create and run query.
+    it("4. Bottom bar in Datasource", () => {
+      //Verify if bottom bar remain open on shifting to create new datasource page.
+      _.dataSources.NavigateToDSCreateNew();
+      //Expecting errors tab to be closed as this is now a datasource
+      _.debuggerHelper.AssertClosed();
+      //Verify if bottom bar opens on clicking debugger icon in datasource page.
+      _.debuggerHelper.OpenDebugger();
+      _.debuggerHelper.AssertOpen(PageType.DataSources);
+    });
 
-        _.dataSources.EnterQuery(
-          "SELECT * FROM users ORDER BY id LIMIT 10;",
-          1000,
-        );
-        _.dataSources.RunQuery();
-        //Verify if bottom bar is open on executing query.
-        _.debuggerHelper.AssertOpen(PageType.Query);
-        //Verify if response atb is selected on executing query.
-        _.debuggerHelper.AssertSelectedTab(
-          Cypress.env("MESSAGES").DEBUGGER_RESPONSE(),
-        );
-        // clean up
-        _.dataSources.DeleteQuery("Query1");
-        _.dataSources.DeleteDatasourceFromWithinDS(dbName);
-      });
-    },
-  );
+    it(
+      "5. Query bottom bar should be collapsable",
+      { tags: ["@tag.excludeForAirgap"] },
+      () => {
+        _.dataSources.CreateMockDB("Users").then((dbName) => {
+          //Verify if bottom bar remain open on shifting to active datasource page.
+          _.debuggerHelper.AssertOpen(PageType.DataSources);
+          //Verify if selected tab is errors and error count is
+          //Verify if selected tab is errors in tab title.
+          _.debuggerHelper.AssertSelectedTab(
+            Cypress.env("MESSAGES").DEBUGGER_ERRORS(),
+          );
+          //Verify if bottom bar is closed on clicking close icon in active datasource page.
+          _.debuggerHelper.CloseBottomBar();
+          _.debuggerHelper.AssertClosed();
+          //Verify if bottom bar opens on clicking debugger icon in query page.
+          _.dataSources.CreateQueryAfterDSSaved();
+          _.debuggerHelper.OpenDebugger();
+          _.debuggerHelper.AssertOpen(PageType.Query);
+          //Verify if bottom bar is closed on clicking close icon in query page.
+          _.debuggerHelper.CloseBottomBar();
+          _.debuggerHelper.AssertClosed();
+          //Create and run query.
 
-  it("airgap", "5. Query bottom bar should be collapsable - airgap", () => {
-    _.dataSources.CreateDataSource("Postgres");
-    //Verify if bottom bar remain open on shifting to active datasource page.
-    _.debuggerHelper.AssertOpen(PageType.DataSources);
-    //Verify if selected tab is errors and error count is
-    //Verify if selected tab is errors in tab title.
-    _.debuggerHelper.AssertSelectedTab(
-      Cypress.env("MESSAGES").DEBUGGER_ERRORS(),
+          _.dataSources.EnterQuery(
+            "SELECT * FROM users ORDER BY id LIMIT 10;",
+            1000,
+          );
+          _.dataSources.RunQuery();
+          //Verify if bottom bar is open on executing query.
+          _.debuggerHelper.AssertOpen(PageType.Query);
+          //Verify if response atb is selected on executing query.
+          _.debuggerHelper.AssertSelectedTab(
+            Cypress.env("MESSAGES").DEBUGGER_RESPONSE(),
+          );
+          // clean up
+          _.dataSources.DeleteQuery("Query1");
+          _.dataSources.DeleteDatasourceFromWithinDS(dbName);
+        });
+      },
     );
-    //Verify if bottom bar is closed on clicking close icon in active datasource page.
-    _.debuggerHelper.CloseBottomBar();
-    _.debuggerHelper.AssertClosed();
-    //Verify if bottom bar opens on clicking debugger icon in query page.
-    _.dataSources.CreateQueryAfterDSSaved();
-    _.debuggerHelper.OpenDebugger();
-    _.debuggerHelper.AssertOpen(PageType.Query);
-    //Verify if bottom bar is closed on clicking close icon in query page.
-    _.debuggerHelper.CloseBottomBar();
-    _.debuggerHelper.AssertClosed();
-    //Create and run query.
-    _.dataSources.EnterQuery("SELECT * FROM users ORDER BY id LIMIT 10;", 1000);
-    _.dataSources.RunQuery();
-    //Verify if bottom bar is open on executing query.
-    _.debuggerHelper.AssertOpen(PageType.Query);
-    //Verify if response atb is selected on executing query.
-    _.debuggerHelper.AssertSelectedTab(
-      Cypress.env("MESSAGES").DEBUGGER_RESPONSE(),
-    );
-    // clean up
-    _.dataSources.DeleteQuery("Query1");
-    cy.get("@dsName").then(($dsName) => {
-      _.dataSources.DeleteDatasourceFromWithinDS($dsName as any);
+
+    it("airgap", "5. Query bottom bar should be collapsable - airgap", () => {
+      _.dataSources.CreateDataSource("Postgres");
+      //Verify if bottom bar remain open on shifting to active datasource page.
+      _.debuggerHelper.AssertOpen(PageType.DataSources);
+      //Verify if selected tab is errors and error count is
+      //Verify if selected tab is errors in tab title.
+      _.debuggerHelper.AssertSelectedTab(
+        Cypress.env("MESSAGES").DEBUGGER_ERRORS(),
+      );
+      //Verify if bottom bar is closed on clicking close icon in active datasource page.
+      _.debuggerHelper.CloseBottomBar();
+      _.debuggerHelper.AssertClosed();
+      //Verify if bottom bar opens on clicking debugger icon in query page.
+      _.dataSources.CreateQueryAfterDSSaved();
+      _.debuggerHelper.OpenDebugger();
+      _.debuggerHelper.AssertOpen(PageType.Query);
+      //Verify if bottom bar is closed on clicking close icon in query page.
+      _.debuggerHelper.CloseBottomBar();
+      _.debuggerHelper.AssertClosed();
+      //Create and run query.
+      _.dataSources.EnterQuery(
+        "SELECT * FROM users ORDER BY id LIMIT 10;",
+        1000,
+      );
+      _.dataSources.RunQuery();
+      //Verify if bottom bar is open on executing query.
+      _.debuggerHelper.AssertOpen(PageType.Query);
+      //Verify if response atb is selected on executing query.
+      _.debuggerHelper.AssertSelectedTab(
+        Cypress.env("MESSAGES").DEBUGGER_RESPONSE(),
+      );
+      // clean up
+      _.dataSources.DeleteQuery("Query1");
+      cy.get("@dsName").then(($dsName) => {
+        _.dataSources.DeleteDatasourceFromWithinDS($dsName as any);
+      });
     });
-  });
-});
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/ExportApplication_spec.js b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/ExportApplication_spec.js
index 277e1e97a638..09e935730799 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/ExportApplication_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/ExportApplication_spec.js
@@ -8,7 +8,7 @@ import {
 
 describe(
   "Export application as a JSON file",
-  { tags: ["@tag.ImportExport"] },
+  { tags: ["@tag.ImportExport", "@tag.Git"] },
   function () {
     let workspaceId, appid;
 
diff --git a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Inspect_Element_spec.js b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Inspect_Element_spec.js
index 5e5adb4afa46..a6cca25ae4a7 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Inspect_Element_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Inspect_Element_spec.js
@@ -2,7 +2,9 @@ import * as _ from "../../../../support/Objects/ObjectsCore";
 
 describe(
   "Inspect Entity",
-  { tags: ["@tag.Widget", "@tag.PropertyPane"] },
+  {
+    tags: ["@tag.Widget", "@tag.PropertyPane", "@tag.Binding"],
+  },
   function () {
     before(() => {
       _.agHelper.AddDsl("debuggerDependencyDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Logs1_spec.js b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Logs1_spec.js
index a6aa206e83a7..9e55cbb57f9e 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Logs1_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Logs1_spec.js
@@ -19,135 +19,139 @@ const generateTestLogString = () => {
   return logString;
 };
 
-describe("Debugger logs", { tags: ["@tag.Widget", "@tag.IDE"] }, function () {
-  this.beforeEach(() => {
-    logString = generateTestLogString();
-  });
+describe(
+  "Debugger logs",
+  { tags: ["@tag.Widget", "@tag.IDE", "@tag.PropertyPane", "@tag.Binding"] },
+  function () {
+    this.beforeEach(() => {
+      logString = generateTestLogString();
+    });
 
-  it("1. Console log on button click with normal moustache binding", function () {
-    ee.DragDropWidgetNVerify("buttonwidget", 200, 200);
-    // Testing with normal log in moustache binding
-    propPane.EnterJSContext("onClick", `{{console.log("${logString}")}}`);
-    agHelper.Sleep(2000);
-    agHelper.ClickButton("Submit");
-    debuggerHelper.OpenDebugger();
-    agHelper.GetNClick(jsEditor._logsTab);
-    debuggerHelper.DoesConsoleLogExist(logString);
-  });
+    it("1. Console log on button click with normal moustache binding", function () {
+      ee.DragDropWidgetNVerify("buttonwidget", 200, 200);
+      // Testing with normal log in moustache binding
+      propPane.EnterJSContext("onClick", `{{console.log("${logString}")}}`);
+      agHelper.Sleep(2000);
+      agHelper.ClickButton("Submit");
+      debuggerHelper.OpenDebugger();
+      agHelper.GetNClick(jsEditor._logsTab);
+      debuggerHelper.DoesConsoleLogExist(logString);
+    });
 
-  it("2. Console log on button click with arrow function IIFE", function () {
-    debuggerHelper.ClearLogs();
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    // Testing with normal log in iifee
-    propPane.EnterJSContext(
-      "onClick",
-      `{{(() => {
+    it("2. Console log on button click with arrow function IIFE", function () {
+      debuggerHelper.ClearLogs();
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      // Testing with normal log in iifee
+      propPane.EnterJSContext(
+        "onClick",
+        `{{(() => {
           console.log('${logString}');
         }) () }}`,
-    );
-    agHelper.ClickButton("Submit");
-    debuggerHelper.DoesConsoleLogExist(logString);
-  });
+      );
+      agHelper.ClickButton("Submit");
+      debuggerHelper.DoesConsoleLogExist(logString);
+    });
 
-  it("3. Console log on button click with function keyword IIFE", function () {
-    debuggerHelper.ClearLogs();
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    // Testing with normal log in iifee
-    propPane.EnterJSContext(
-      "onClick",
-      `{{ function () {
+    it("3. Console log on button click with function keyword IIFE", function () {
+      debuggerHelper.ClearLogs();
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      // Testing with normal log in iifee
+      propPane.EnterJSContext(
+        "onClick",
+        `{{ function () {
           console.log('${logString}');
         } () }}`,
-    );
-    agHelper.ClickButton("Submit");
-    debuggerHelper.DoesConsoleLogExist(logString);
-  });
+      );
+      agHelper.ClickButton("Submit");
+      debuggerHelper.DoesConsoleLogExist(logString);
+    });
 
-  it("4. Console log on button click with async function IIFE", function () {
-    debuggerHelper.ClearLogs();
-    // Testing with normal log in iifee
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    propPane.EnterJSContext(
-      "onClick",
-      `{{(async() => {
+    it("4. Console log on button click with async function IIFE", function () {
+      debuggerHelper.ClearLogs();
+      // Testing with normal log in iifee
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      propPane.EnterJSContext(
+        "onClick",
+        `{{(async() => {
           console.log('${logString}');
         }) () }}`,
-    );
-    agHelper.ClickButton("Submit");
-    debuggerHelper.DoesConsoleLogExist(logString);
-  });
+      );
+      agHelper.ClickButton("Submit");
+      debuggerHelper.DoesConsoleLogExist(logString);
+    });
 
-  it("5. Console log on button click with mixed function IIFE", function () {
-    debuggerHelper.ClearLogs();
-    // Testing with normal log in iifee
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    const logStringChild = generateTestLogString();
-    propPane.EnterJSContext(
-      "onClick",
-      `{{ function () {
+    it("5. Console log on button click with mixed function IIFE", function () {
+      debuggerHelper.ClearLogs();
+      // Testing with normal log in iifee
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      const logStringChild = generateTestLogString();
+      propPane.EnterJSContext(
+        "onClick",
+        `{{ function () {
           console.log('${logString}');
           (async () => {console.log('${logStringChild}')})();
         } () }}`,
-    );
-    agHelper.ClickButton("Submit");
-    debuggerHelper.DoesConsoleLogExist(logString);
-    debuggerHelper.DoesConsoleLogExist(logStringChild);
-  });
+      );
+      agHelper.ClickButton("Submit");
+      debuggerHelper.DoesConsoleLogExist(logString);
+      debuggerHelper.DoesConsoleLogExist(logStringChild);
+    });
 
-  it("6. Console log grouping on button click", function () {
-    debuggerHelper.ClearLogs();
-    // Testing with normal log in iifee
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    propPane.EnterJSContext(
-      "onClick",
-      `{{ function () {
+    it("6. Console log grouping on button click", function () {
+      debuggerHelper.ClearLogs();
+      // Testing with normal log in iifee
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      propPane.EnterJSContext(
+        "onClick",
+        `{{ function () {
           console.log('${logString}');
           console.log('${logString}');
           console.log('${logString}');
           console.log('${logString}');
           console.log('${logString}');
         } () }}`,
-    );
-    agHelper.Sleep(); //Wait for CI flakyness
-    agHelper.ClickButton("Submit");
-    debuggerHelper.DoesConsoleLogExist(logString);
-    debuggerHelper.AssertConsecutiveConsoleLogCount(5);
-  });
+      );
+      agHelper.Sleep(); //Wait for CI flakyness
+      agHelper.ClickButton("Submit");
+      debuggerHelper.DoesConsoleLogExist(logString);
+      debuggerHelper.AssertConsecutiveConsoleLogCount(5);
+    });
 
-  it("7. Console log grouping on button click with different log in between", function () {
-    debuggerHelper.ClearLogs();
-    // Testing with normal log in iifee
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    propPane.EnterJSContext(
-      "onClick",
-      `{{ function () {
+    it("7. Console log grouping on button click with different log in between", function () {
+      debuggerHelper.ClearLogs();
+      // Testing with normal log in iifee
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      propPane.EnterJSContext(
+        "onClick",
+        `{{ function () {
           console.log('${logString}');
           console.log('${logString}');
           console.log('Different ${logString}');
           console.log('${logString}');
         } () }}`,
-    );
-    agHelper.ClickButton("Submit");
-    debuggerHelper.DoesConsoleLogExist(logString);
-    debuggerHelper.DoesConsoleLogExist(`Different ${logString}`);
-    debuggerHelper.AssertConsecutiveConsoleLogCount(2);
-  });
+      );
+      agHelper.ClickButton("Submit");
+      debuggerHelper.DoesConsoleLogExist(logString);
+      debuggerHelper.DoesConsoleLogExist(`Different ${logString}`);
+      debuggerHelper.AssertConsecutiveConsoleLogCount(2);
+    });
 
-  it("8. Console log grouping on button click from different source", function () {
-    debuggerHelper.ClearLogs();
-    // Testing with normal log in iifee
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    propPane.EnterJSContext("onClick", `{{console.log("${logString}")}}`);
-    // Add another button
-    ee.DragDropWidgetNVerify("buttonwidget", 400, 400);
-    propPane.UpdatePropertyFieldValue("Label", "Submit2");
-    propPane.EnterJSContext("onClick", `{{console.log("${logString}")}}`);
-    agHelper.Sleep(2000);
-    agHelper.ClickButton("Submit");
-    agHelper.ClickButton("Submit2");
-    debuggerHelper.DoesConsoleLogExist(logString);
-    debuggerHelper.AssertConsecutiveConsoleLogCount(0);
-    propPane.DeleteWidgetFromPropertyPane("Button1");
-    propPane.DeleteWidgetFromPropertyPane("Button2");
-  });
-});
+    it("8. Console log grouping on button click from different source", function () {
+      debuggerHelper.ClearLogs();
+      // Testing with normal log in iifee
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      propPane.EnterJSContext("onClick", `{{console.log("${logString}")}}`);
+      // Add another button
+      ee.DragDropWidgetNVerify("buttonwidget", 400, 400);
+      propPane.UpdatePropertyFieldValue("Label", "Submit2");
+      propPane.EnterJSContext("onClick", `{{console.log("${logString}")}}`);
+      agHelper.Sleep(2000);
+      agHelper.ClickButton("Submit");
+      agHelper.ClickButton("Submit2");
+      debuggerHelper.DoesConsoleLogExist(logString);
+      debuggerHelper.AssertConsecutiveConsoleLogCount(0);
+      propPane.DeleteWidgetFromPropertyPane("Button1");
+      propPane.DeleteWidgetFromPropertyPane("Button2");
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Logs2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Logs2_spec.js
index fa3358209b5d..e3579989ff1d 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Logs2_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Logs2_spec.js
@@ -14,34 +14,37 @@ const generateTestLogString = () => {
   return logString;
 };
 
-describe("Debugger logs", { tags: ["@tag.IDE"] }, function () {
-  this.beforeEach(() => {
-    logString = generateTestLogString();
-  });
+describe(
+  "Debugger logs",
+  { tags: ["@tag.IDE", "@tag.PropertyPane"] },
+  function () {
+    this.beforeEach(() => {
+      logString = generateTestLogString();
+    });
 
-  it("1. Console log on text widget with normal moustache binding", function () {
-    PageLeftPane.switchSegment(PagePaneSegment.UI);
-    _.entityExplorer.DragDropWidgetNVerify("textwidget", 400, 400);
-    _.propPane.UpdatePropertyFieldValue(
-      "Text",
-      `{{(function(){
+    it("1. Console log on text widget with normal moustache binding", function () {
+      PageLeftPane.switchSegment(PagePaneSegment.UI);
+      _.entityExplorer.DragDropWidgetNVerify("textwidget", 400, 400);
+      _.propPane.UpdatePropertyFieldValue(
+        "Text",
+        `{{(function(){
   	const temp = "Hello!"
 
   	console.log("${logString}");
   	return temp;
   })()}}`,
-    );
-    _.agHelper.RefreshPage();
-    // Wait for the debugger icon to be visible
-    _.agHelper.AssertElementVisibility(".t--debugger-count");
-    _.debuggerHelper.OpenDebugger();
-    _.agHelper.GetNClick(_.jsEditor._logsTab);
-    _.debuggerHelper.DoesConsoleLogExist(logString);
-  });
+      );
+      _.agHelper.RefreshPage();
+      // Wait for the debugger icon to be visible
+      _.agHelper.AssertElementVisibility(".t--debugger-count");
+      _.debuggerHelper.OpenDebugger();
+      _.agHelper.GetNClick(_.jsEditor._logsTab);
+      _.debuggerHelper.DoesConsoleLogExist(logString);
+    });
 
-  it("2. Console log in sync function", function () {
-    _.jsEditor.CreateJSObject(
-      `export default {
+    it("2. Console log in sync function", function () {
+      _.jsEditor.CreateJSObject(
+        `export default {
         myFun1: () => {
   	      console.log("${logString}");
   	      return "sync";
@@ -50,21 +53,21 @@ describe("Debugger logs", { tags: ["@tag.IDE"] }, function () {
           return 1;
         }
       }`,
-      {
-        paste: true,
-        completeReplace: true,
-        toRun: true,
-        shouldCreateNewJSObj: true,
-        prettify: false,
-      },
-    );
-    _.agHelper.GetNClick(_.jsEditor._logsTab);
-    _.debuggerHelper.DoesConsoleLogExist(logString);
-  });
+        {
+          paste: true,
+          completeReplace: true,
+          toRun: true,
+          shouldCreateNewJSObj: true,
+          prettify: false,
+        },
+      );
+      _.agHelper.GetNClick(_.jsEditor._logsTab);
+      _.debuggerHelper.DoesConsoleLogExist(logString);
+    });
 
-  it("3. Console log in async function", function () {
-    _.jsEditor.CreateJSObject(
-      `export default {
+    it("3. Console log in async function", function () {
+      _.jsEditor.CreateJSObject(
+        `export default {
         myFun1: async () => {
   	      console.log("${logString}");
   	      return "async";
@@ -73,17 +76,17 @@ describe("Debugger logs", { tags: ["@tag.IDE"] }, function () {
           return 1;
         }
       }`,
-      {
-        paste: true,
-        completeReplace: true,
-        toRun: false,
-        shouldCreateNewJSObj: false,
-        prettify: false,
-      },
-    );
+        {
+          paste: true,
+          completeReplace: true,
+          toRun: false,
+          shouldCreateNewJSObj: false,
+          prettify: false,
+        },
+      );
 
-    // Edit JSObject and verify no logs are visible
-    _.jsEditor.EditJSObj(`export default {
+      // Edit JSObject and verify no logs are visible
+      _.jsEditor.EditJSObj(`export default {
       myFun1: async () => {
         console.log("${logString}");
         return "async";
@@ -92,21 +95,21 @@ describe("Debugger logs", { tags: ["@tag.IDE"] }, function () {
         return 2;
       }
     }`);
-    _.debuggerHelper.DoesConsoleLogExist(logString, false);
+      _.debuggerHelper.DoesConsoleLogExist(logString, false);
 
-    // Run function and verify logs are visible
-    _.agHelper.GetNClick(_.jsEditor._runButton);
-    _.agHelper.GetNClick(_.jsEditor._logsTab);
-    _.debuggerHelper.DoesConsoleLogExist(logString);
-  });
-
-  it("4. Console log after API succedes", function () {
-    cy.fixture("testdata").then(function (dataSet) {
-      _.apiPage.CreateAndFillApi(dataSet.baseUrl + dataSet.methods, "Api1");
+      // Run function and verify logs are visible
+      _.agHelper.GetNClick(_.jsEditor._runButton);
+      _.agHelper.GetNClick(_.jsEditor._logsTab);
+      _.debuggerHelper.DoesConsoleLogExist(logString);
     });
-    const returnText = "success";
-    _.jsEditor.CreateJSObject(
-      `export default {
+
+    it("4. Console log after API succedes", function () {
+      cy.fixture("testdata").then(function (dataSet) {
+        _.apiPage.CreateAndFillApi(dataSet.baseUrl + dataSet.methods, "Api1");
+      });
+      const returnText = "success";
+      _.jsEditor.CreateJSObject(
+        `export default {
         myFun1: async () => {
           return storeValue("test", "test").then(() => {
             console.log("${logString} Started");
@@ -123,43 +126,43 @@ describe("Debugger logs", { tags: ["@tag.IDE"] }, function () {
           return 1;
         }
       }`,
-      {
-        paste: true,
-        completeReplace: true,
-        toRun: false,
-        shouldCreateNewJSObj: true,
-      },
-    );
-
-    cy.get("@jsObjName").then((jsObjName) => {
-      _.agHelper.Sleep(2000);
-      _.jsEditor.RunJSObj();
-      _.agHelper.GetNClick(_.jsEditor._logsTab);
-      _.debuggerHelper.DoesConsoleLogExist(`${logString} Started`);
-      _.debuggerHelper.DoesConsoleLogExist(`${logString} Success`);
-      _.entityExplorer.DragDropWidgetNVerify("textwidget", 200, 600);
-      _.propPane.UpdatePropertyFieldValue(
-        "Text",
-        `{{${jsObjName}.myFun1.data}}`,
-      );
-      _.agHelper.GetNAssertElementText(
-        commonlocators.textWidgetContainer,
-        returnText,
-        "have.text",
-        1,
+        {
+          paste: true,
+          completeReplace: true,
+          toRun: false,
+          shouldCreateNewJSObj: true,
+        },
       );
-    });
-  });
 
-  it("5. Console log after API execution fails", function () {
-    cy.fixture("testdata").then(function (dataSet) {
-      _.apiPage.CreateAndFillApi(
-        dataSet.baseUrl + dataSet.methods + "xyz",
-        "Api2",
-      );
+      cy.get("@jsObjName").then((jsObjName) => {
+        _.agHelper.Sleep(2000);
+        _.jsEditor.RunJSObj();
+        _.agHelper.GetNClick(_.jsEditor._logsTab);
+        _.debuggerHelper.DoesConsoleLogExist(`${logString} Started`);
+        _.debuggerHelper.DoesConsoleLogExist(`${logString} Success`);
+        _.entityExplorer.DragDropWidgetNVerify("textwidget", 200, 600);
+        _.propPane.UpdatePropertyFieldValue(
+          "Text",
+          `{{${jsObjName}.myFun1.data}}`,
+        );
+        _.agHelper.GetNAssertElementText(
+          commonlocators.textWidgetContainer,
+          returnText,
+          "have.text",
+          1,
+        );
+      });
     });
-    _.jsEditor.CreateJSObject(
-      `export default {
+
+    it("5. Console log after API execution fails", function () {
+      cy.fixture("testdata").then(function (dataSet) {
+        _.apiPage.CreateAndFillApi(
+          dataSet.baseUrl + dataSet.methods + "xyz",
+          "Api2",
+        );
+      });
+      _.jsEditor.CreateJSObject(
+        `export default {
         myFun1: async () => {
           console.log("${logString} Started");
           return Api2.run().then(()=>{
@@ -174,22 +177,22 @@ describe("Debugger logs", { tags: ["@tag.IDE"] }, function () {
           return 1;
         }
       }`,
-      {
-        paste: true,
-        completeReplace: true,
-        toRun: false,
-        shouldCreateNewJSObj: true,
-      },
-    );
-    _.jsEditor.RunJSObj();
-    _.agHelper.GetNClick(_.jsEditor._logsTab);
-    _.debuggerHelper.DoesConsoleLogExist(`${logString} Started`);
-    _.debuggerHelper.DoesConsoleLogExist(`${logString} Failed`);
-  });
+        {
+          paste: true,
+          completeReplace: true,
+          toRun: false,
+          shouldCreateNewJSObj: true,
+        },
+      );
+      _.jsEditor.RunJSObj();
+      _.agHelper.GetNClick(_.jsEditor._logsTab);
+      _.debuggerHelper.DoesConsoleLogExist(`${logString} Started`);
+      _.debuggerHelper.DoesConsoleLogExist(`${logString} Failed`);
+    });
 
-  it("6. Console log source inside nested function", function () {
-    _.jsEditor.CreateJSObject(
-      `export default {
+    it("6. Console log source inside nested function", function () {
+      _.jsEditor.CreateJSObject(
+        `export default {
         myFun1: async () => {
           console.log("Parent ${logString}");
           return Api1.run(()=>{console.log("Child ${logString}");});
@@ -198,22 +201,22 @@ describe("Debugger logs", { tags: ["@tag.IDE"] }, function () {
           return 1;
         }
       }`,
-      {
-        paste: true,
-        completeReplace: true,
-        toRun: false,
-        shouldCreateNewJSObj: false,
-      },
-    );
-    _.jsEditor.RunJSObj();
-    _.agHelper.GetNClick(_.jsEditor._logsTab);
-    _.debuggerHelper.DoesConsoleLogExist(`Parent ${logString}`);
-    _.debuggerHelper.DoesConsoleLogExist(`Child ${logString}`);
-  });
+        {
+          paste: true,
+          completeReplace: true,
+          toRun: false,
+          shouldCreateNewJSObj: false,
+        },
+      );
+      _.jsEditor.RunJSObj();
+      _.agHelper.GetNClick(_.jsEditor._logsTab);
+      _.debuggerHelper.DoesConsoleLogExist(`Parent ${logString}`);
+      _.debuggerHelper.DoesConsoleLogExist(`Child ${logString}`);
+    });
 
-  it("7. Console log grouping", function () {
-    _.jsEditor.CreateJSObject(
-      `export default {
+    it("7. Console log grouping", function () {
+      _.jsEditor.CreateJSObject(
+        `export default {
         myFun1: async () => {
           console.log("${logString}");
           console.log("${logString}");
@@ -225,22 +228,22 @@ describe("Debugger logs", { tags: ["@tag.IDE"] }, function () {
           return 1;
         }
       }`,
-      {
-        paste: true,
-        completeReplace: true,
-        toRun: false,
-        shouldCreateNewJSObj: true,
-      },
-    );
-    _.jsEditor.RunJSObj();
-    _.agHelper.GetNClick(_.jsEditor._logsTab);
-    _.debuggerHelper.DoesConsoleLogExist(`${logString}`);
-    _.debuggerHelper.AssertConsecutiveConsoleLogCount(5);
-  });
+        {
+          paste: true,
+          completeReplace: true,
+          toRun: false,
+          shouldCreateNewJSObj: true,
+        },
+      );
+      _.jsEditor.RunJSObj();
+      _.agHelper.GetNClick(_.jsEditor._logsTab);
+      _.debuggerHelper.DoesConsoleLogExist(`${logString}`);
+      _.debuggerHelper.AssertConsecutiveConsoleLogCount(5);
+    });
 
-  it("8. Console log should not mutate the passed object", function () {
-    _.jsEditor.CreateJSObject(
-      `export default {
+    it("8. Console log should not mutate the passed object", function () {
+      _.jsEditor.CreateJSObject(
+        `export default {
         myFun1: () => {
   	      let data = [];
           console.log("start:", data);
@@ -253,21 +256,21 @@ describe("Debugger logs", { tags: ["@tag.IDE"] }, function () {
           return 1;
         }
       }`,
-      {
-        paste: true,
-        completeReplace: true,
-        toRun: true,
-        shouldCreateNewJSObj: true,
-        prettify: false,
-      },
-    );
-    _.agHelper.GetNClick(_.jsEditor._logsTab);
-    _.debuggerHelper.DoesConsoleLogExist("start: []");
-    _.debuggerHelper.DoesConsoleLogExist("end: [0,1,2,3,4]");
-  });
+        {
+          paste: true,
+          completeReplace: true,
+          toRun: true,
+          shouldCreateNewJSObj: true,
+          prettify: false,
+        },
+      );
+      _.agHelper.GetNClick(_.jsEditor._logsTab);
+      _.debuggerHelper.DoesConsoleLogExist("start: []");
+      _.debuggerHelper.DoesConsoleLogExist("end: [0,1,2,3,4]");
+    });
 
-  it("9. Bug #19115 - Objects that start with an underscore `_JSObject1` fail to be navigated from the debugger", function () {
-    const JSOBJECT_WITH_UNNECCESARY_SEMICOLON = `export default {
+    it("9. Bug #19115 - Objects that start with an underscore `_JSObject1` fail to be navigated from the debugger", function () {
+      const JSOBJECT_WITH_UNNECCESARY_SEMICOLON = `export default {
         myFun1: () => {
             //write code here
             if (1) {
@@ -277,29 +280,29 @@ describe("Debugger logs", { tags: ["@tag.IDE"] }, function () {
     }
     `;
 
-    _.jsEditor.CreateJSObject(JSOBJECT_WITH_UNNECCESARY_SEMICOLON, {
-      paste: true,
-      completeReplace: true,
-      toRun: false,
-      shouldCreateNewJSObj: true,
-    });
+      _.jsEditor.CreateJSObject(JSOBJECT_WITH_UNNECCESARY_SEMICOLON, {
+        paste: true,
+        completeReplace: true,
+        toRun: false,
+        shouldCreateNewJSObj: true,
+      });
 
-    EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
-    _.agHelper.AssertElementVisibility(".t--debugger-count");
-    _.debuggerHelper.OpenDebugger();
+      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+      _.agHelper.AssertElementVisibility(".t--debugger-count");
+      _.debuggerHelper.OpenDebugger();
 
-    _.debuggerHelper.ClicklogEntityLink();
+      _.debuggerHelper.ClicklogEntityLink();
 
-    cy.get(".t--js-action-name-edit-field").should("exist");
-  });
+      cy.get(".t--js-action-name-edit-field").should("exist");
+    });
 
-  it("10. Bug #24039 - Logs errors from setInterval callback into debugger", () => {
-    _.entityExplorer.DragDropWidgetNVerify("buttonwidget", 400, 600);
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    _.propPane.SelectPlatformFunction("onClick", "Set interval");
-    _.agHelper.EnterActionValue(
-      "Callback function",
-      `{{() => {
+    it("10. Bug #24039 - Logs errors from setInterval callback into debugger", () => {
+      _.entityExplorer.DragDropWidgetNVerify("buttonwidget", 400, 600);
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      _.propPane.SelectPlatformFunction("onClick", "Set interval");
+      _.agHelper.EnterActionValue(
+        "Callback function",
+        `{{() => {
         try {
           Test.run();
         } catch (e) {
@@ -308,14 +311,15 @@ describe("Debugger logs", { tags: ["@tag.IDE"] }, function () {
         }
       }
       }}`,
-    );
-    _.agHelper.EnterActionValue("Id", "myInterval");
-    _.agHelper.Sleep();
-    _.agHelper.GetNClick(_.jsEditor._logsTab);
-    _.debuggerHelper.ClearLogs();
-    _.agHelper.ClickButton("Submit");
-    _.debuggerHelper.DoesConsoleLogExist(
-      "Uncaught ReferenceError: Test is not defined",
-    );
-  });
-});
+      );
+      _.agHelper.EnterActionValue("Id", "myInterval");
+      _.agHelper.Sleep();
+      _.agHelper.GetNClick(_.jsEditor._logsTab);
+      _.debuggerHelper.ClearLogs();
+      _.agHelper.ClickButton("Submit");
+      _.debuggerHelper.DoesConsoleLogExist(
+        "Uncaught ReferenceError: Test is not defined",
+      );
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/PageOnLoad_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/PageOnLoad_spec.ts
index 7a0ddf08e3e1..e189897cc756 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/PageOnLoad_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/PageOnLoad_spec.ts
@@ -10,7 +10,7 @@ const testdata = require("../../../../fixtures/testdata.json");
 
 describe(
   "Check debugger logs state when there are onPageLoad actions",
-  { tags: ["@tag.IDE", "@tag.Datasource"] },
+  { tags: ["@tag.IDE", "@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   function () {
     before(() => {
       agHelper.AddDsl("debuggerTableDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/PreviewMode_spec.js b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/PreviewMode_spec.js
index 6370ecf28669..b6083515f654 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/PreviewMode_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/PreviewMode_spec.js
@@ -6,7 +6,7 @@ import * as _ from "../../../../support/Objects/ObjectsCore";
 
 describe(
   "Preview mode functionality",
-  { tags: ["@tag.IDE", "@tag.Sanity"] },
+  { tags: ["@tag.IDE", "@tag.Sanity", "@tag.PropertyPane"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("previewMode");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Replay_Editor_spec.js b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Replay_Editor_spec.js
index dd5b11c69edf..51b7f35df772 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Replay_Editor_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Replay_Editor_spec.js
@@ -11,7 +11,15 @@ import {
 
 describe(
   "Undo/Redo functionality",
-  { tags: ["@tag.JS", "@tag.Datasource"] },
+  {
+    tags: [
+      "@tag.JS",
+      "@tag.Datasource",
+      "@tag.Git",
+      "@tag.AccessControl",
+      "@tag.Binding",
+    ],
+  },
   function () {
     const modifierKey = Cypress.platform === "darwin" ? "meta" : "ctrl";
     let postgresDatasourceName;
diff --git a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Replay_spec.js b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Replay_spec.js
index f4c9e6fec7e1..98a7fdbf9ebb 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Replay_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Replay_spec.js
@@ -14,7 +14,7 @@ import EditorNavigation, {
 
 describe(
   "Undo/Redo functionality",
-  { tags: ["@tag.Widget", "@tag.PropertyPane"] },
+  { tags: ["@tag.Widget", "@tag.PropertyPane", "@tag.Binding"] },
   function () {
     const modifierKey = Cypress.platform === "darwin" ? "meta" : "ctrl";
 
diff --git a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Resize_spec.js b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Resize_spec.js
index 0f56a228f4f3..ce93dfe06123 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Resize_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Resize_spec.js
@@ -3,7 +3,7 @@ import { agHelper, propPane } from "../../../../support/Objects/ObjectsCore";
 
 describe(
   "Canvas Resize",
-  { tags: ["@tag.Widget", "@tag.AutoHeight"] },
+  { tags: ["@tag.Widget", "@tag.AutoHeight", "@tag.Binding"] },
   function () {
     before(() => {
       agHelper.AddDsl("CanvasResizeDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Unique_key_spec.js b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Unique_key_spec.js
index 581acca07d88..52bfa47dda35 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Unique_key_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Unique_key_spec.js
@@ -4,49 +4,53 @@ import * as _ from "../../../../support/Objects/ObjectsCore";
 // Since we cannot test the root cause as it does not show up on the DOM, we are testing the sideEffects
 // the root cause is when widget has same keys, which are not visible in DOM but confuses React when the list is modified.
 // please refer to issue, https://github.com/appsmithorg/appsmith/issues/7415 for more details.
-describe("Unique react keys", { tags: ["@tag.Widget"] }, function () {
-  afterEach(() => {
-    _.agHelper.SaveLocalStorageCache();
-  });
-
-  beforeEach(() => {
-    _.agHelper.RestoreLocalStorageCache();
-    _.agHelper.AddDsl("basicDsl");
-  });
-
-  it("1. Should not create duplicate versions of widget on drop from explorer", function () {
-    cy.dragAndDropToCanvas("chartwidget", { x: 200, y: 200 });
-    cy.dragAndDropToCanvas("selectwidget", { x: 200, y: 600 });
-    cy.dragAndDropToCanvas("selectwidget", { x: 200, y: 700 });
-
-    cy.openPropertyPane("chartwidget");
-    cy.deleteWidget(widgetsPage.chartWidget);
-
-    cy.get(widgetsPage.selectwidget).should("have.length", 2);
-  });
-
-  it("2. Should not create duplicate versions of widget on widget copy", function () {
-    const modifierKey = Cypress.platform === "darwin" ? "meta" : "ctrl";
-    cy.dragAndDropToCanvas("chartwidget", { x: 200, y: 200 });
-    cy.dragAndDropToCanvas("selectwidget", { x: 200, y: 600 });
-    //copy and paste
-    cy.openPropertyPane("selectwidget");
-    cy.get("body").type(`{${modifierKey}}c`);
-    // eslint-disable-next-line cypress/no-unnecessary-waiting
-    cy.wait(500);
-    cy.get("body").click();
-    cy.get("body").type(`{${modifierKey}}v`, { force: true });
-    cy.wait("@updateLayout").should(
-      "have.nested.property",
-      "response.body.responseMeta.status",
-      200,
-    );
-
-    cy.get(widgetsPage.selectwidget).should("have.length", 2);
-
-    cy.openPropertyPane("chartwidget");
-    cy.deleteWidget(widgetsPage.chartWidget);
-
-    cy.get(widgetsPage.selectwidget).should("have.length", 2);
-  });
-});
+describe(
+  "Unique react keys",
+  { tags: ["@tag.Widget", "@tag.Binding"] },
+  function () {
+    afterEach(() => {
+      _.agHelper.SaveLocalStorageCache();
+    });
+
+    beforeEach(() => {
+      _.agHelper.RestoreLocalStorageCache();
+      _.agHelper.AddDsl("basicDsl");
+    });
+
+    it("1. Should not create duplicate versions of widget on drop from explorer", function () {
+      cy.dragAndDropToCanvas("chartwidget", { x: 200, y: 200 });
+      cy.dragAndDropToCanvas("selectwidget", { x: 200, y: 600 });
+      cy.dragAndDropToCanvas("selectwidget", { x: 200, y: 700 });
+
+      cy.openPropertyPane("chartwidget");
+      cy.deleteWidget(widgetsPage.chartWidget);
+
+      cy.get(widgetsPage.selectwidget).should("have.length", 2);
+    });
+
+    it("2. Should not create duplicate versions of widget on widget copy", function () {
+      const modifierKey = Cypress.platform === "darwin" ? "meta" : "ctrl";
+      cy.dragAndDropToCanvas("chartwidget", { x: 200, y: 200 });
+      cy.dragAndDropToCanvas("selectwidget", { x: 200, y: 600 });
+      //copy and paste
+      cy.openPropertyPane("selectwidget");
+      cy.get("body").type(`{${modifierKey}}c`);
+      // eslint-disable-next-line cypress/no-unnecessary-waiting
+      cy.wait(500);
+      cy.get("body").click();
+      cy.get("body").type(`{${modifierKey}}v`, { force: true });
+      cy.wait("@updateLayout").should(
+        "have.nested.property",
+        "response.body.responseMeta.status",
+        200,
+      );
+
+      cy.get(widgetsPage.selectwidget).should("have.length", 2);
+
+      cy.openPropertyPane("chartwidget");
+      cy.deleteWidget(widgetsPage.chartWidget);
+
+      cy.get(widgetsPage.selectwidget).should("have.length", 2);
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/ViewMode_spec.js b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/ViewMode_spec.js
index 1b3c7b6c0d15..6b1c90b4ebef 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/ViewMode_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/ViewMode_spec.js
@@ -14,55 +14,59 @@ Cypress.Commands.add("getSharedUrl", () => {
   return Cypress.sharedStore.url;
 });
 
-describe("Preview mode functionality", { tags: ["@tag.IDE"] }, () => {
-  before(() => {
-    agHelper.AddDsl("previewMode");
-    deployMode.DeployApp();
-    cy.url().then((url) => cy.setSharedUrl(url));
-  });
+describe(
+  "Preview mode functionality",
+  { tags: ["@tag.IDE", "@tag.PropertyPane"] },
+  () => {
+    before(() => {
+      agHelper.AddDsl("previewMode");
+      deployMode.DeployApp();
+      cy.url().then((url) => cy.setSharedUrl(url));
+    });
 
-  beforeEach(() => {
-    cy.getSharedUrl().then((url) => {
-      agHelper.VisitNAssert(url, "getConsolidatedData"),
-        agHelper.AssertElementVisibility(
-          locators._widgetInDeployed(draggableWidgets.BUTTON),
-        );
+    beforeEach(() => {
+      cy.getSharedUrl().then((url) => {
+        agHelper.VisitNAssert(url, "getConsolidatedData"),
+          agHelper.AssertElementVisibility(
+            locators._widgetInDeployed(draggableWidgets.BUTTON),
+          );
+      });
     });
-  });
 
-  it("1. on click of apps on header, it should take to application home page", function () {
-    cy.get(appNavigationLocators.userProfileDropdownButton).should("exist");
-    cy.get(
-      `${appNavigationLocators.header} ${appNavigationLocators.backToAppsButton}`,
-    ).click();
-    agHelper.AssertURL(Cypress.config().baseUrl + "applications");
-  });
+    it("1. on click of apps on header, it should take to application home page", function () {
+      cy.get(appNavigationLocators.userProfileDropdownButton).should("exist");
+      cy.get(
+        `${appNavigationLocators.header} ${appNavigationLocators.backToAppsButton}`,
+      ).click();
+      agHelper.AssertURL(Cypress.config().baseUrl + "applications");
+    });
 
-  it("2. In the published app with embed=true, there should be no header", function () {
-    cy.url().then((url) => {
-      url = new URL(url);
-      url.searchParams.append("embed", "true");
-      agHelper.VisitNAssert(url.toString(), "getConsolidatedData");
-      agHelper.AssertElementVisibility(
-        locators._widgetInDeployed(draggableWidgets.BUTTON),
-      );
+    it("2. In the published app with embed=true, there should be no header", function () {
+      cy.url().then((url) => {
+        url = new URL(url);
+        url.searchParams.append("embed", "true");
+        agHelper.VisitNAssert(url.toString(), "getConsolidatedData");
+        agHelper.AssertElementVisibility(
+          locators._widgetInDeployed(draggableWidgets.BUTTON),
+        );
+      });
+      agHelper.AssertElementAbsence(appNavigationLocators.header);
     });
-    agHelper.AssertElementAbsence(appNavigationLocators.header);
-  });
 
-  it("3. In the published app with embed=true&navbar=true, navigator should be visible without user settings", function () {
-    cy.url().then((url) => {
-      url = new URL(url);
-      url.searchParams.append("embed", "true");
-      url.searchParams.append("navbar", "true");
-      agHelper.VisitNAssert(url.toString(), "getConsolidatedData");
-      agHelper.AssertElementVisibility(
-        locators._widgetInDeployed(draggableWidgets.BUTTON),
+    it("3. In the published app with embed=true&navbar=true, navigator should be visible without user settings", function () {
+      cy.url().then((url) => {
+        url = new URL(url);
+        url.searchParams.append("embed", "true");
+        url.searchParams.append("navbar", "true");
+        agHelper.VisitNAssert(url.toString(), "getConsolidatedData");
+        agHelper.AssertElementVisibility(
+          locators._widgetInDeployed(draggableWidgets.BUTTON),
+        );
+      });
+      agHelper.AssertElementVisibility(appNavigationLocators.header);
+      agHelper.AssertElementAbsence(
+        appNavigationLocators.userProfileDropdownButton,
       );
     });
-    agHelper.AssertElementVisibility(appNavigationLocators.header);
-    agHelper.AssertElementAbsence(
-      appNavigationLocators.userProfileDropdownButton,
-    );
-  });
-});
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Widget_Error_spec.js b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Widget_Error_spec.js
index 2f35d8795cba..bfe9d67b984b 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Widget_Error_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Widget_Error_spec.js
@@ -6,80 +6,89 @@ const widgetLocators = require("../../../../locators/Widgets.json");
 import * as _ from "../../../../support/Objects/ObjectsCore";
 import { WIDGET } from "../../../../locators/WidgetLocators";
 
-describe("Widget error state", { tags: ["@tag.Widget"] }, function () {
-  const modifierKey = Cypress.platform === "darwin" ? "meta" : "ctrl";
+describe(
+  "Widget error state",
+  { tags: ["@tag.Widget", "@tag.Binding"] },
+  function () {
+    const modifierKey = Cypress.platform === "darwin" ? "meta" : "ctrl";
+
+    before(() => {
+      _.agHelper.AddDsl("buttondsl");
+    });
+
+    it("1. Check widget error state", function () {
+      cy.openPropertyPane("buttonwidget");
+
+      cy.get(".t--property-control-visible").find(".t--js-toggle").click();
+      cy.EnableAllCodeEditors();
+
+      cy.testJsontext("visible", "Test");
+
+      //Check if the current value is shown in the debugger
+
+      _.debuggerHelper.OpenDebugger();
+      cy.get("[data-testid=t--tab-ERROR_TAB]").click();
+      //This feature is disabled in updated error log - epic 17720
+      // _.debuggerHelper.LogStateContains("Test");
+    });
+
+    it("2. Switch to error tab when clicked on the debug button", function () {
+      cy.get("[data-testid=t--tab-LOGS_TAB]").click();
+      cy.get(".t--property-control-onclick").find(".t--js-toggle").click();
+      cy.EnableAllCodeEditors();
+      cy.testJsontext("onclick", "{{testApi.run()}}");
+      cy.get(widgetLocators.buttonWidget).click();
+
+      cy.get(".t--toast-debug-button").click();
+      cy.get("[data-testid='t--tab-ERROR_TAB']").should(
+        "have.attr",
+        "aria-selected",
+        "true",
+      );
+
+      // All errors should be expanded by default
+      //Updated count to 2 as the decision to show the widget trigger lint errors to show in the debugger
+      _.debuggerHelper.AssertVisibleErrorMessagesCount(2);
+
+      // Recent errors are shown at the top of the list
+      cy.testJsontext("label", "{{[]}}");
+      //This feature is disabled in updated error log - epic 17720
+      // _.debuggerHelper.LogStateContains("text", 0);
+    });
 
-  before(() => {
-    _.agHelper.AddDsl("buttondsl");
-  });
-
-  it("1. Check widget error state", function () {
-    cy.openPropertyPane("buttonwidget");
-
-    cy.get(".t--property-control-visible").find(".t--js-toggle").click();
-    cy.EnableAllCodeEditors();
-
-    cy.testJsontext("visible", "Test");
-
-    //Check if the current value is shown in the debugger
-
-    _.debuggerHelper.OpenDebugger();
-    cy.get("[data-testid=t--tab-ERROR]").click();
-    //This feature is disabled in updated error log - epic 17720
-    // _.debuggerHelper.LogStateContains("Test");
-  });
-
-  it("2. Switch to error tab when clicked on the debug button", function () {
-    cy.get("[data-testid=t--tab-LOGS_TAB]").click();
-    cy.get(".t--property-control-onclick").find(".t--js-toggle").click();
-    cy.EnableAllCodeEditors();
-    cy.testJsontext("onclick", "{{testApi.run()}}");
-    cy.get(widgetLocators.buttonWidget).click();
-
-    cy.get(".t--toast-debug-button").click();
-    cy.get("[data-testid='t--tab-ERROR']").should(
-      "have.attr",
-      "aria-selected",
-      "true",
-    );
-
-    // All errors should be expanded by default
-    //Updated count to 2 as the decision to show the widget trigger lint errors to show in the debugger
-    _.debuggerHelper.AssertVisibleErrorMessagesCount(2);
-
-    // Recent errors are shown at the top of the list
-    cy.testJsontext("label", "{{[]}}");
     //This feature is disabled in updated error log - epic 17720
-    // _.debuggerHelper.LogStateContains("text", 0);
-  });
-
-  //This feature is disabled in updated error log - epic 17720
-  // it("6. Clicking on a message should open the search menu", function() {
-  //   _.debuggerHelper.ClickErrorMessage(0);
-  //   _.debuggerHelper.AssertContextMenuItemVisible();
-  // });
+    // it("6. Clicking on a message should open the search menu", function() {
+    //   _.debuggerHelper.ClickErrorMessage(0);
+    //   _.debuggerHelper.AssertContextMenuItemVisible();
+    // });
 
-  it("3. Undoing widget deletion should show errors if present + Bug 2760", function () {
-    cy.deleteWidget();
-    _.debuggerHelper.AssertVisibleErrorMessagesCount(0);
-    cy.get("body").type(`{${modifierKey}}z`);
-    _.debuggerHelper.AssertVisibleErrorMessagesCount(3);
+    it("3. Undoing widget deletion should show errors if present + Bug 2760", function () {
+      cy.deleteWidget();
+      _.debuggerHelper.AssertVisibleErrorMessagesCount(0);
+      cy.get("body").type(`{${modifierKey}}z`);
+      _.debuggerHelper.AssertVisibleErrorMessagesCount(3);
 
-    //Bug-2760: Error log on a widget property not clearing out when the widget property is deleted
-    _.entityExplorer.DragDropWidgetNVerify(WIDGET.TABLE, 150, 300);
+      //Bug-2760: Error log on a widget property not clearing out when the widget property is deleted
+      _.entityExplorer.DragDropWidgetNVerify(WIDGET.TABLE, 150, 300);
 
-    EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
+      EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
 
-    _.table.AddSampleTableData();
+      _.table.AddSampleTableData();
 
-    _.table.AddColumn("customColumn1");
-    _.propPane.OpenTableColumnSettings("customColumn1");
-    _.propPane.UpdatePropertyFieldValue("Computed value", "{{test}}");
+      _.table.AddColumn("customColumn1");
+      _.propPane.OpenTableColumnSettings("customColumn1");
+      _.propPane.UpdatePropertyFieldValue("Computed value", "{{test}}");
 
-    _.debuggerHelper.AssertDebugError("test is not defined", "", false, false);
+      _.debuggerHelper.AssertDebugError(
+        "test is not defined",
+        "",
+        false,
+        false,
+      );
 
-    _.table.DeleteColumn("customColumn1");
+      _.table.DeleteColumn("customColumn1");
 
-    _.debuggerHelper.DebuggerListDoesnotContain("test is not defined");
-  });
-});
+      _.debuggerHelper.DebuggerListDoesnotContain("test is not defined");
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/PartialImportExport/PartialExport_Widgets_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/PartialImportExport/PartialExport_Widgets_spec.ts
index e2926e346de2..fac384da89ec 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/PartialImportExport/PartialExport_Widgets_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/PartialImportExport/PartialExport_Widgets_spec.ts
@@ -10,7 +10,7 @@ const fixtureName = "PartialImportExportSampleApp.json";
 
 describe(
   "Partial export functionality",
-  { tags: ["@tag.ImportExport"] },
+  { tags: ["@tag.ImportExport", "@tag.Git"] },
   () => {
     before(() => {
       homePage.ImportApp(`PartialImportExport/${fixtureName}`);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/PartialImportExport/PartialExport_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/PartialImportExport/PartialExport_spec.ts
index 0abc10bb2950..1a44872d2491 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/PartialImportExport/PartialExport_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/PartialImportExport/PartialExport_spec.ts
@@ -9,7 +9,7 @@ const fixtureName = "PartialImportExportSampleApp.json";
 
 describe(
   "Partial export functionality",
-  { tags: ["@tag.ImportExport"] },
+  { tags: ["@tag.ImportExport", "@tag.Git"] },
   () => {
     before(() => {
       agHelper.GenerateUUID();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/PartialImportExport/PartialImport_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/PartialImportExport/PartialImport_spec.ts
index df763dc68b4a..8bab0d96a520 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/PartialImportExport/PartialImport_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/PartialImportExport/PartialImport_spec.ts
@@ -2,7 +2,7 @@ import { partialImportExport } from "../../../../support/Objects/ObjectsCore";
 
 describe(
   "Partial import functionality",
-  { tags: ["@tag.ImportExport"] },
+  { tags: ["@tag.ImportExport", "@tag.Git"] },
   () => {
     beforeEach(() => {
       partialImportExport.OpenImportModal();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/PeekOverlay/PeekOverlay_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/PeekOverlay/PeekOverlay_Spec.ts
index 32b7f224dcd3..8208f09385a4 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/PeekOverlay/PeekOverlay_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/PeekOverlay/PeekOverlay_Spec.ts
@@ -9,7 +9,7 @@ import {
   dataManager,
 } from "../../../../support/Objects/ObjectsCore";
 
-describe("Peek overlay", { tags: ["@tag.JS"] }, () => {
+describe("Peek overlay", { tags: ["@tag.JS", "@tag.Binding"] }, () => {
   it("1. Main test", () => {
     entityExplorer.DragDropWidgetNVerify("tablewidgetv2", 500, 100);
     table.AddSampleTableData();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Performance/LinkRelPreload_Spec.js b/app/client/cypress/e2e/Regression/ClientSide/Performance/LinkRelPreload_Spec.js
index fef8d63271a3..27bcc72e937a 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Performance/LinkRelPreload_Spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Performance/LinkRelPreload_Spec.js
@@ -30,7 +30,7 @@ import { AppSidebar } from "../../../../support/Pages/EditorNavigation";
 
 describe(
   "html should include preload metadata for all code-split javascript",
-  { tags: ["@tag.IDE"] },
+  { tags: ["@tag.IDE", "@tag.PropertyPane"] },
   function () {
     before(() => {
       cy.addDsl(emptyDSL);
@@ -112,7 +112,7 @@ function testPreloadMetadata(viewOrEditMode) {
       (link) => (window.CDN_URL ?? "/") + link,
     );
 
-    const requestsToCompare = unique(
+    const allRequestsDuringPageLoad = unique(
       jsRequests.filter(
         (link) =>
           // Exclude link bundle requests. We don’t really care about being precise
@@ -120,7 +120,7 @@ function testPreloadMetadata(viewOrEditMode) {
           !link.includes("-icons."),
       ),
     );
-    const linksToCompare = unique(
+    const preloadLinks = unique(
       links.filter(
         (link) =>
           // Exclude link bundle preloads. We don’t really care about being precise
@@ -132,16 +132,11 @@ function testPreloadMetadata(viewOrEditMode) {
       ),
     );
 
-    const actuallyLoadedFiles = `[${
-      requestsToCompare.length
-    } items] ${requestsToCompare.sort().join(", ")}`;
-    const preloadedFiles = `[${linksToCompare.length} items] ${linksToCompare
-      .sort()
-      .join(", ")}`;
-
-    // Comparing strings instead of deep-equalling arrays because this is the only way
-    // to see which chunks are actually missing: https://github.com/cypress-io/cypress/issues/4084
-    cy.wrap(actuallyLoadedFiles).should("equal", preloadedFiles);
+    // check if req
+    const isSubset = preloadLinks.every((item) =>
+      allRequestsDuringPageLoad.includes(item),
+    );
+    expect(isSubset).to.be.true;
   });
 }
 
diff --git a/app/client/cypress/e2e/Regression/ClientSide/PublishedApps/PublishedModeToastToggle_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/PublishedApps/PublishedModeToastToggle_Spec.ts
index 512cb0bb3292..67c1ff0d9d78 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/PublishedApps/PublishedModeToastToggle_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/PublishedApps/PublishedModeToastToggle_Spec.ts
@@ -11,7 +11,7 @@ const PAGE_LOAD_MSG = `The action "Incorrect_users" has failed.`;
 
 describe(
   "Published mode toggle toast with debug flag in the url",
-  { tags: ["@tag.JS"] },
+  { tags: ["@tag.JS", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("publishedModeToastToggleDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Refactoring/Refactoring_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Refactoring/Refactoring_spec.ts
index 29381ced5848..993d7649a4f1 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Refactoring/Refactoring_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Refactoring/Refactoring_spec.ts
@@ -19,7 +19,7 @@ import EditorNavigation, {
 
 describe(
   "Validate JS Object Refactoring does not affect the comments & variables",
-  { tags: ["@tag.PropertyPane"] },
+  { tags: ["@tag.PropertyPane", "@tag.Binding"] },
   () => {
     let dsName: any;
 
diff --git a/app/client/cypress/e2e/Regression/ClientSide/SetProperty/SetOptions_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/SetProperty/SetOptions_Spec.ts
index ea42c3971091..e2760744b5e1 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/SetProperty/SetOptions_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/SetProperty/SetOptions_Spec.ts
@@ -17,7 +17,7 @@ import EditorNavigation, {
 
 describe(
   "Widget Property Setters - Part III - Tc #2409 - Validates SetOptions",
-  { tags: ["@tag.Widget", "@tag.JS"] },
+  { tags: ["@tag.Widget", "@tag.JS", "@tag.Binding"] },
   () => {
     before(() => {
       entityExplorer.DragDropWidgetNVerify(draggableWidgets.INPUT_V2, 300);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/SetProperty/WidgetPropertySetters1_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/SetProperty/WidgetPropertySetters1_spec.ts
index cacf76c350a7..a8c40048624f 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/SetProperty/WidgetPropertySetters1_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/SetProperty/WidgetPropertySetters1_spec.ts
@@ -156,7 +156,7 @@ Object.values(setterMethodsToTest).forEach(
 
 describe(
   "Linting warning for setter methods",
-  { tags: ["@tag.Widget"] },
+  { tags: ["@tag.Widget", "@tag.Binding"] },
   function () {
     it("Lint error when setter is used in a data field", function () {
       entityExplorer.DragDropWidgetNVerify(WIDGET.BUTTON, 200, 200);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/SetProperty/WidgetPropertySetters2_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/SetProperty/WidgetPropertySetters2_spec.ts
index 69fb9d670ce2..a89504d1794d 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/SetProperty/WidgetPropertySetters2_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/SetProperty/WidgetPropertySetters2_spec.ts
@@ -17,7 +17,7 @@ import EditorNavigation, {
 
 describe(
   "Widget Property Setters - Part II - Tc #2409",
-  { tags: ["@tag.Widget", "@tag.JS"] },
+  { tags: ["@tag.Widget", "@tag.JS", "@tag.Binding"] },
   () => {
     it("1. Bug 25287 - CurrencyInput does not update value when set using CurrencyInput.text", () => {
       entityExplorer.DragDropWidgetNVerify(draggableWidgets.CURRENCY_INPUT);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Templates/CreateNewAppFromTemplates_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Templates/CreateNewAppFromTemplates_spec.ts
index 291512d7c45c..77ddb00725b3 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Templates/CreateNewAppFromTemplates_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Templates/CreateNewAppFromTemplates_spec.ts
@@ -14,6 +14,10 @@ describe(
       "@tag.Workspace",
       "@tag.Templates",
       "@tag.Sanity",
+      "@tag.Git",
+      "@tag.ImportExport",
+      "@tag.Fork",
+      "@tag.AccessControl",
     ],
   },
   function () {
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Templates/Filtering/TemplatesModal_filtering_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Templates/Filtering/TemplatesModal_filtering_spec.ts
index 1276999a927e..af8634765018 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Templates/Filtering/TemplatesModal_filtering_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Templates/Filtering/TemplatesModal_filtering_spec.ts
@@ -8,7 +8,15 @@ import reconnectDatasourceLocators from "../../../../../locators/ReconnectLocato
 
 describe(
   "Bug 17276 - Templates modal filtering",
-  { tags: ["@tag.excludeForAirgap", "@tag.Templates"] },
+  {
+    tags: [
+      "@tag.excludeForAirgap",
+      "@tag.Templates",
+      "@tag.Git",
+      "@tag.ImportExport",
+      "@tag.Fork",
+    ],
+  },
   () => {
     const NAME_FILTER = "order";
 
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Templates/Fork_Template_Existing_app_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Templates/Fork_Template_Existing_app_spec.js
index 7cc1d638ed58..1bc69d6f919b 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Templates/Fork_Template_Existing_app_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Templates/Fork_Template_Existing_app_spec.js
@@ -23,7 +23,16 @@ beforeEach(() => {
 
 describe(
   "Fork a template to the current app from new page popover",
-  { tags: ["@tag.Templates", "@tag.excludeForAirgap", "@tag.Sanity"] },
+  {
+    tags: [
+      "@tag.Templates",
+      "@tag.excludeForAirgap",
+      "@tag.Sanity",
+      "@tag.Git",
+      "@tag.ImportExport",
+      "@tag.Fork",
+    ],
+  },
   () => {
     it("1. Fork template from page section", () => {
       //Fork template button to be visible always
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Templates/Fork_Template_To_App_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Templates/Fork_Template_To_App_spec.ts
index 46bd1a99a335..d023f346c1ad 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Templates/Fork_Template_To_App_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Templates/Fork_Template_To_App_spec.ts
@@ -10,7 +10,15 @@ import PageList from "../../../../support/Pages/PageList";
 
 describe(
   "Fork a template to the current app",
-  { tags: ["@tag.Templates", "@tag.excludeForAirgap"] },
+  {
+    tags: [
+      "@tag.Templates",
+      "@tag.excludeForAirgap",
+      "@tag.Git",
+      "@tag.ImportExport",
+      "@tag.Fork",
+    ],
+  },
   () => {
     it("1. Fork a template to the current app + Bug 17477", () => {
       PageList.AddNewPage("Add page from template");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Templates/TemplatesPage_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Templates/TemplatesPage_spec.ts
index 63fff9dfdc8f..1bd8e9054d2f 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Templates/TemplatesPage_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Templates/TemplatesPage_spec.ts
@@ -3,7 +3,16 @@ import PageList from "../../../../support/Pages/PageList";
 
 describe(
   "Templates page",
-  { tags: ["@tag.Templates", "@tag.excludeForAirgap", "@tag.Sanity"] },
+  {
+    tags: [
+      "@tag.Templates",
+      "@tag.excludeForAirgap",
+      "@tag.Sanity",
+      "@tag.Git",
+      "@tag.ImportExport",
+      "@tag.Fork",
+    ],
+  },
   () => {
     it("1. Templates Modal should have show only 'allowPageImport:true' templates", () => {
       cy.fixture("Templates/AllowPageImportTemplates.json").then((data) => {
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ThemingTests/ThemeReset_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ThemingTests/ThemeReset_spec.js
index a72457484ac4..4182b5ca123a 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ThemingTests/ThemeReset_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/ThemingTests/ThemeReset_spec.js
@@ -4,42 +4,49 @@ import { ObjectsRegistry } from "../../../../support/Objects/Registry";
 
 const appSettings = ObjectsRegistry.AppSettings;
 
-describe("Theme validation usecases", { tags: ["@tag.Theme"] }, function () {
-  it("1. Drag and drop button widget, change value and check reset flow", function () {
-    // drop button widget
-    cy.dragAndDropToCanvas("buttonwidget", { x: 300, y: 300 });
-    cy.get(".t--widget-buttonwidget").should("exist");
+describe(
+  "Theme validation usecases",
+  { tags: ["@tag.Theme", "@tag.Git"] },
+  function () {
+    it("1. Drag and drop button widget, change value and check reset flow", function () {
+      // drop button widget
+      cy.dragAndDropToCanvas("buttonwidget", { x: 300, y: 300 });
+      cy.get(".t--widget-buttonwidget").should("exist");
 
-    // open property pane
-    cy.openPropertyPane("buttonwidget");
-    cy.moveToStyleTab();
-    // change color to red
-    cy.get(widgetsPage.buttonColor).click({ force: true }).clear().type("red");
+      // open property pane
+      cy.openPropertyPane("buttonwidget");
+      cy.moveToStyleTab();
+      // change color to red
+      cy.get(widgetsPage.buttonColor)
+        .click({ force: true })
+        .clear()
+        .type("red");
 
-    // click on canvas to see the theming pane
-    cy.get("#canvas-selection-0").click({ force: true });
+      // click on canvas to see the theming pane
+      cy.get("#canvas-selection-0").click({ force: true });
 
-    appSettings.OpenAppSettings();
-    appSettings.GoToThemeSettings();
-    // reset theme
-    cy.contains("Theme properties")
-      .closest("div")
-      .siblings()
-      .first()
-      .find("button")
-      .click({ force: true });
-    cy.contains("Reset widget styles").click({ force: true });
+      appSettings.OpenAppSettings();
+      appSettings.GoToThemeSettings();
+      // reset theme
+      cy.contains("Theme properties")
+        .closest("div")
+        .siblings()
+        .first()
+        .find("button")
+        .click({ force: true });
+      cy.contains("Reset widget styles").click({ force: true });
 
-    cy.get(`${commonlocators.themeCard} > main > main`)
-      .first()
-      .invoke("css", "background-color")
-      .then((backgroudColor) => {
-        cy.get(widgetsPage.widgetBtn).should(
-          "have.css",
-          "background-color",
-          backgroudColor,
-        );
-      });
-    appSettings.ClosePane();
-  });
-});
+      cy.get(`${commonlocators.themeCard} > main > main`)
+        .first()
+        .invoke("css", "background-color")
+        .then((backgroudColor) => {
+          cy.get(widgetsPage.widgetBtn).should(
+            "have.css",
+            "background-color",
+            backgroudColor,
+          );
+        });
+      appSettings.ClosePane();
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ThemingTests/Theme_Basic_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ThemingTests/Theme_Basic_spec.js
index 0b23706fdc26..06b3bdf11d4f 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ThemingTests/Theme_Basic_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/ThemingTests/Theme_Basic_spec.js
@@ -15,766 +15,776 @@ import {
 
 const containerShadowElement = `${widgetsPage.containerWidget}`;
 
-describe("App Theming funtionality", { tags: ["@tag.Theme"] }, function () {
-  let themesSection = (sectionName, themeName) =>
-    "//*[text()='" +
-    sectionName +
-    "']/following-sibling::div//*[text()='" +
-    themeName +
-    "']";
-  let applyTheme = (sectionName, themeName) =>
-    themesSection(sectionName, themeName) +
-    "/parent::div/following-sibling::div[contains(@class, 't--theme-card')]//div[text()='Apply theme']";
-  let themesDeletebtn = (sectionName, themeName) =>
-    themesSection(sectionName, themeName) + "/following-sibling::button";
-
-  it("1. Checks if theme can be changed to one of the existing themes", function () {
-    appSettings.OpenAppSettings();
-    appSettings.GoToThemeSettings();
-    cy.get(commonlocators.changeThemeBtn).click({ force: true });
-    agHelper.AssertAutoSave();
-    // select a theme
-    cy.get(commonlocators.themeCard).last().click({ force: true });
-    agHelper.AssertAutoSave();
-    // check for alert
-    cy.get(`${commonlocators.themeCard}`)
-      .last()
-      .siblings("div")
-      .first()
-      .invoke("text")
-      .then((text) => {
-        cy.get(commonlocators.toastmsg).contains(`Theme ${text} applied`);
-      });
-
-    // check if color of canvas is same as theme bg color
-    cy.get(`${commonlocators.themeCard} > main`)
-      .last()
-      .invoke("css", "background-color")
-      .then((backgroudColor) => {
-        cy.get(commonlocators.canvas).should(
-          "have.css",
-          "background-color",
-          backgroudColor,
-        );
-      });
-  });
-
-  it("2. Checks if theme can be edited", function () {
-    cy.get(commonlocators.selectThemeBackBtn).click({ force: true });
-    appSettings.ClosePane();
-
-    // drop a button & container widget and click on body
-    cy.dragAndDropToCanvas("buttonwidget", { x: 100, y: 100 });
-    cy.dragAndDropToCanvas("containerwidget", { x: 200, y: 200 });
-    cy.get("canvas").first(0).trigger("click", { force: true });
-
-    appSettings.OpenAppSettings();
-    appSettings.GoToThemeSettings();
-
-    //Click the back button //Commenting below since expanded by default
-    //cy.get(commonlocators.selectThemeBackBtn).click({ force: true });
-
-    //Click the border radius toggle
-    // cy.contains("Border")
-    //   .click({ force: true })
-    //   .wait(500);
-
-    // change app border radius
-    cy.get(commonlocators.themeAppBorderRadiusBtn).eq(1).click({ force: true });
-    agHelper.AssertAutoSave();
-    // check if border radius is changed on button
-    cy.get(commonlocators.themeAppBorderRadiusBtn)
-      .eq(1)
-      .invoke("css", "border-top-left-radius")
-      .then((borderRadius) => {
-        cy.get(widgetsPage.widgetBtn).should(
-          "have.css",
-          "border-radius",
-          borderRadius,
-        );
-
-        // publish the app
-        // deployMode.DeployApp();
-        cy.get(widgetsPage.widgetBtn).should(
-          "have.css",
-          "border-radius",
-          borderRadius,
-        );
-      });
+describe(
+  "App Theming funtionality",
+  { tags: ["@tag.Theme", "@tag.Git"] },
+  function () {
+    let themesSection = (sectionName, themeName) =>
+      "//*[text()='" +
+      sectionName +
+      "']/following-sibling::div//*[text()='" +
+      themeName +
+      "']";
+    let applyTheme = (sectionName, themeName) =>
+      themesSection(sectionName, themeName) +
+      "/parent::div/following-sibling::div[contains(@class, 't--theme-card')]//div[text()='Apply theme']";
+    let themesDeletebtn = (sectionName, themeName) =>
+      themesSection(sectionName, themeName) + "/following-sibling::button";
+
+    it("1. Checks if theme can be changed to one of the existing themes", function () {
+      appSettings.OpenAppSettings();
+      appSettings.GoToThemeSettings();
+      cy.get(commonlocators.changeThemeBtn).click({ force: true });
+      agHelper.AssertAutoSave();
+      // select a theme
+      cy.get(commonlocators.themeCard).last().click({ force: true });
+      agHelper.AssertAutoSave();
+      // check for alert
+      cy.get(`${commonlocators.themeCard}`)
+        .last()
+        .siblings("div")
+        .first()
+        .invoke("text")
+        .then((text) => {
+          cy.get(commonlocators.toastmsg).contains(`Theme ${text} applied`);
+        });
 
-    //Change the color://Commenting below since expanded by default
-    //cy.contains("Color").click({ force: true });
-
-    //Change the primary color:
-    cy.get(widgetsPage.colorPickerV2Popover).click({ force: true }).click();
-    cy.get(widgetsPage.colorPickerV2Color)
-      .eq(-3)
-      .then(($elem) => {
-        cy.get($elem).click({ force: true });
-        cy.get(widgetsPage.widgetBtn).should(
-          "have.css",
-          "background-color",
-          $elem.css("background-color"),
-        );
-      });
+      // check if color of canvas is same as theme bg color
+      cy.get(`${commonlocators.themeCard} > main`)
+        .last()
+        .invoke("css", "background-color")
+        .then((backgroudColor) => {
+          cy.get(commonlocators.canvas).should(
+            "have.css",
+            "background-color",
+            backgroudColor,
+          );
+        });
+    });
 
-    //Change the background color:
-    //cy.get("[data-testid='theme-backgroundColor']").click({ force: true });
-    agHelper.GetNClick("[data-testid='theme-backgroundColor']");
-    agHelper.AssertAutoSave();
-
-    cy.get(widgetsPage.colorPickerV2Popover).click({ force: true }).click();
-    cy.get(widgetsPage.colorPickerV2Color)
-      .first()
-      .then(($elem) => {
-        cy.get($elem).click({ force: true });
-        cy.get(commonlocators.canvas).should(
-          "have.css",
-          "background-color",
-          $elem.css("background-color"),
-        );
-      });
+    it("2. Checks if theme can be edited", function () {
+      cy.get(commonlocators.selectThemeBackBtn).click({ force: true });
+      appSettings.ClosePane();
+
+      // drop a button & container widget and click on body
+      cy.dragAndDropToCanvas("buttonwidget", { x: 100, y: 100 });
+      cy.dragAndDropToCanvas("containerwidget", { x: 200, y: 200 });
+      cy.get("canvas").first(0).trigger("click", { force: true });
+
+      appSettings.OpenAppSettings();
+      appSettings.GoToThemeSettings();
+
+      //Click the back button //Commenting below since expanded by default
+      //cy.get(commonlocators.selectThemeBackBtn).click({ force: true });
+
+      //Click the border radius toggle
+      // cy.contains("Border")
+      //   .click({ force: true })
+      //   .wait(500);
+
+      // change app border radius
+      cy.get(commonlocators.themeAppBorderRadiusBtn)
+        .eq(1)
+        .click({ force: true });
+      agHelper.AssertAutoSave();
+      // check if border radius is changed on button
+      cy.get(commonlocators.themeAppBorderRadiusBtn)
+        .eq(1)
+        .invoke("css", "border-top-left-radius")
+        .then((borderRadius) => {
+          cy.get(widgetsPage.widgetBtn).should(
+            "have.css",
+            "border-radius",
+            borderRadius,
+          );
 
-    // Change the shadow
-    cy.get("[data-value='M']").eq(1).click({ force: true });
-    cy.get("[data-value='M']")
-      .eq(1)
-      .invoke("css", "box-shadow")
-      .then((boxShadow) => {
-        cy.get(containerShadowElement).should(
-          "have.css",
-          "box-shadow",
-          boxShadow,
-        );
-      });
+          // publish the app
+          // deployMode.DeployApp();
+          cy.get(widgetsPage.widgetBtn).should(
+            "have.css",
+            "border-radius",
+            borderRadius,
+          );
+        });
 
-    //Change the font //Commenting below since expanded by default
-    //cy.contains("Font").click({ force: true });
+      //Change the color://Commenting below since expanded by default
+      //cy.contains("Color").click({ force: true });
 
-    agHelper.GetNClick(".rc-select-selection-search-input").then(($elem) => {
-      agHelper.GetNClick($elem);
-      cy.get(".rc-virtual-list-holder div")
-        .children()
-        .eq(2)
-        .then(($childElem) => {
-          cy.get($childElem).click({ force: true });
+      //Change the primary color:
+      cy.get(widgetsPage.colorPickerV2Popover).click({ force: true }).click();
+      cy.get(widgetsPage.colorPickerV2Color)
+        .eq(-3)
+        .then(($elem) => {
+          cy.get($elem).click({ force: true });
           cy.get(widgetsPage.widgetBtn).should(
             "have.css",
-            "font-family",
-            `${$childElem.children().last().text()}"Nunito Sans", sans-serif`,
+            "background-color",
+            $elem.css("background-color"),
           );
         });
-    });
-  });
-
-  it("4. Verify user able to change between saved theme & already existing Featured themes", () => {
-    cy.get(commonlocators.changeThemeBtn).click({ force: true });
-
-    //#region Pampas
-    cy.xpath(applyTheme("Featured themes", "Pampas"))
-      .click({ force: true })
-      .wait(1000); //Changing to one of Featured themes
-    cy.contains("Applied theme")
-      .click()
-      .parent()
-      .siblings()
-      .find(".t--theme-card > main > section > div > main")
-      .eq(0)
-      .invoke("css", "background-color")
-      .then((backgroudColor) => {
-        expect(backgroudColor).to.eq("rgb(5, 150, 105)");
-      });
 
-    cy.contains("Applied theme")
-      // .click()
-      .parent()
-      .siblings()
-      .find(".t--theme-card > main > section > div > main")
-      .eq(1)
-      .invoke("css", "background-color")
-      .then((backgroudColor) => {
-        expect(backgroudColor).to.eq("rgb(236, 253, 245)");
-      });
+      //Change the background color:
+      //cy.get("[data-testid='theme-backgroundColor']").click({ force: true });
+      agHelper.GetNClick("[data-testid='theme-backgroundColor']");
+      agHelper.AssertAutoSave();
+
+      cy.get(widgetsPage.colorPickerV2Popover).click({ force: true }).click();
+      cy.get(widgetsPage.colorPickerV2Color)
+        .first()
+        .then(($elem) => {
+          cy.get($elem).click({ force: true });
+          cy.get(commonlocators.canvas).should(
+            "have.css",
+            "background-color",
+            $elem.css("background-color"),
+          );
+        });
 
-    //#endregion
-
-    //#region Classic
-    cy.xpath(applyTheme("Featured themes", "Classic"))
-      .click({ force: true })
-      .wait(1000); //Changing to one of Featured themes
-    cy.contains("Applied theme")
-      // .click()
-      .parent()
-      .siblings()
-      .find(".t--theme-card > main > section > div > main")
-      .eq(0)
-      .invoke("css", "background-color")
-      .then((backgroudColor) => {
-        expect(backgroudColor).to.eq("rgb(22, 163, 74)");
-      });
+      // Change the shadow
+      cy.get("[data-value='M']").eq(1).click({ force: true });
+      cy.get("[data-value='M']")
+        .eq(1)
+        .invoke("css", "box-shadow")
+        .then((boxShadow) => {
+          cy.get(containerShadowElement).should(
+            "have.css",
+            "box-shadow",
+            boxShadow,
+          );
+        });
 
-    cy.contains("Applied theme")
-      // .click()
-      .parent()
-      .siblings()
-      .find(".t--theme-card > main > section > div > main")
-      .eq(1)
-      .invoke("css", "background-color")
-      .then((backgroudColor) => {
-        expect(backgroudColor).to.eq("rgb(246, 246, 246)");
+      //Change the font //Commenting below since expanded by default
+      //cy.contains("Font").click({ force: true });
+
+      agHelper.GetNClick(".rc-select-selection-search-input").then(($elem) => {
+        agHelper.GetNClick($elem);
+        cy.get(".rc-virtual-list-holder div")
+          .children()
+          .eq(2)
+          .then(($childElem) => {
+            cy.get($childElem).click({ force: true });
+            cy.get(widgetsPage.widgetBtn).should(
+              "have.css",
+              "font-family",
+              `${$childElem.children().last().text()}"Nunito Sans", sans-serif`,
+            );
+          });
       });
+    });
 
-    //#endregion
-
-    //#region Modern
-    cy.xpath(applyTheme("Featured themes", "Modern"))
-      .click({ force: true })
-      .wait(1000); //Changing to one of Featured themes
-    cy.contains("Applied theme")
-      // .click()
-      .parent()
-      .siblings()
-      .find(".t--theme-card > main > section > div > main")
-      .eq(0)
-      .invoke("css", "background-color")
-      .then((backgroudColor) => {
-        expect(backgroudColor).to.eq("rgb(85, 61, 233)");
-      });
+    it("4. Verify user able to change between saved theme & already existing Featured themes", () => {
+      cy.get(commonlocators.changeThemeBtn).click({ force: true });
+
+      //#region Pampas
+      cy.xpath(applyTheme("Featured themes", "Pampas"))
+        .click({ force: true })
+        .wait(1000); //Changing to one of Featured themes
+      cy.contains("Applied theme")
+        .click()
+        .parent()
+        .siblings()
+        .find(".t--theme-card > main > section > div > main")
+        .eq(0)
+        .invoke("css", "background-color")
+        .then((backgroudColor) => {
+          expect(backgroudColor).to.eq("rgb(5, 150, 105)");
+        });
 
-    cy.contains("Applied theme")
-      // .click()
-      .parent()
-      .siblings()
-      .find(".t--theme-card > main > section > div > main")
-      .eq(1)
-      .invoke("css", "background-color")
-      .then((backgroudColor) => {
-        expect(backgroudColor).to.eq("rgb(248, 250, 252)");
-      });
+      cy.contains("Applied theme")
+        // .click()
+        .parent()
+        .siblings()
+        .find(".t--theme-card > main > section > div > main")
+        .eq(1)
+        .invoke("css", "background-color")
+        .then((backgroudColor) => {
+          expect(backgroudColor).to.eq("rgb(236, 253, 245)");
+        });
 
-    //#endregion
-
-    //#region Sunrise
-    cy.xpath(applyTheme("Featured themes", "Sunrise"))
-      .click({ force: true })
-      .wait(1000); //Changing to one of Featured themes
-    cy.contains("Applied theme")
-      // .click()
-      .parent()
-      .siblings()
-      .find(".t--theme-card > main > section > div > main")
-      .eq(0)
-      .invoke("css", "background-color")
-      .then((backgroudColor) => {
-        expect(backgroudColor).to.eq("rgb(239, 68, 68)");
-      });
+      //#endregion
+
+      //#region Classic
+      cy.xpath(applyTheme("Featured themes", "Classic"))
+        .click({ force: true })
+        .wait(1000); //Changing to one of Featured themes
+      cy.contains("Applied theme")
+        // .click()
+        .parent()
+        .siblings()
+        .find(".t--theme-card > main > section > div > main")
+        .eq(0)
+        .invoke("css", "background-color")
+        .then((backgroudColor) => {
+          expect(backgroudColor).to.eq("rgb(22, 163, 74)");
+        });
 
-    cy.contains("Applied theme")
-      // .click()
-      .parent()
-      .siblings()
-      .find(".t--theme-card > main > section > div > main")
-      .eq(1)
-      .invoke("css", "background-color")
-      .then((backgroudColor) => {
-        expect(backgroudColor).to.eq("rgb(255, 241, 242)");
-      });
-    //#endregion
-
-    //#region Water Lily
-    cy.xpath(applyTheme("Featured themes", "Water Lily"))
-      .click({ force: true })
-      .wait(1000); //Changing to one of Featured themes
-    cy.contains("Applied theme")
-      // .click()
-      .parent()
-      .siblings()
-      .find(".t--theme-card > main > section > div > main")
-      .eq(0)
-      .invoke("css", "background-color")
-      .then((backgroudColor) => {
-        expect(backgroudColor).to.eq("rgb(219, 39, 119)");
-      });
+      cy.contains("Applied theme")
+        // .click()
+        .parent()
+        .siblings()
+        .find(".t--theme-card > main > section > div > main")
+        .eq(1)
+        .invoke("css", "background-color")
+        .then((backgroudColor) => {
+          expect(backgroudColor).to.eq("rgb(246, 246, 246)");
+        });
 
-    cy.contains("Applied theme")
-      // .click()
-      .parent()
-      .siblings()
-      .find(".t--theme-card > main > section > div > main")
-      .eq(1)
-      .invoke("css", "background-color")
-      .then((backgroudColor) => {
-        expect(backgroudColor).to.eq("rgb(253, 242, 248)");
-      });
-    //#endregion
-
-    //#region Pacific
-    cy.xpath(applyTheme("Featured themes", "Pacific"))
-      .click({ force: true })
-      .wait(1000); //Changing to one of Featured themes
-    cy.contains("Applied theme")
-      // .click()
-      .parent()
-      .siblings()
-      .find(".t--theme-card > main > section > div > main")
-      .eq(0)
-      .invoke("css", "background-color")
-      .then((backgroudColor) => {
-        expect(backgroudColor).to.eq("rgb(8, 145, 178)");
-      });
+      //#endregion
+
+      //#region Modern
+      cy.xpath(applyTheme("Featured themes", "Modern"))
+        .click({ force: true })
+        .wait(1000); //Changing to one of Featured themes
+      cy.contains("Applied theme")
+        // .click()
+        .parent()
+        .siblings()
+        .find(".t--theme-card > main > section > div > main")
+        .eq(0)
+        .invoke("css", "background-color")
+        .then((backgroudColor) => {
+          expect(backgroudColor).to.eq("rgb(85, 61, 233)");
+        });
 
-    cy.contains("Applied theme")
-      // .click()
-      .parent()
-      .siblings()
-      .find(".t--theme-card > main > section > div > main")
-      .eq(1)
-      .invoke("css", "background-color")
-      .then((backgroudColor) => {
-        expect(backgroudColor).to.eq("rgb(236, 254, 255)");
-      });
-    //#endregion
-
-    //#region Earth
-    cy.xpath(applyTheme("Featured themes", "Earth"))
-      .click({ force: true })
-      .wait(1000); //Changing to one of Featured themes
-    cy.contains("Applied theme")
-      // .click()
-      .parent()
-      .siblings()
-      .find(".t--theme-card > main > section > div > main")
-      .eq(0)
-      .invoke("css", "background-color")
-      .then((backgroudColor) => {
-        expect(backgroudColor).to.eq("rgb(59, 130, 246)");
-      });
+      cy.contains("Applied theme")
+        // .click()
+        .parent()
+        .siblings()
+        .find(".t--theme-card > main > section > div > main")
+        .eq(1)
+        .invoke("css", "background-color")
+        .then((backgroudColor) => {
+          expect(backgroudColor).to.eq("rgb(248, 250, 252)");
+        });
 
-    cy.contains("Applied theme")
-      // .click()
-      .parent()
-      .siblings()
-      .find(".t--theme-card > main > section > div > main")
-      .eq(1)
-      .invoke("css", "background-color")
-      .then((backgroudColor) => {
-        expect(backgroudColor).to.eq("rgb(239, 246, 255)");
-      });
-    //#endregion
-
-    //#region Moon
-    cy.xpath(applyTheme("Featured themes", "Moon"))
-      .click({ force: true })
-      .wait(1000); //Changing to one of Featured themes
-    cy.contains("Applied theme")
-      // .click()
-      .parent()
-      .siblings()
-      .find(".t--theme-card > main > section > div > main")
-      .eq(0)
-      .invoke("css", "background-color")
-      .then((backgroudColor) => {
-        expect(backgroudColor).to.eq("rgb(100, 116, 139)");
-      });
+      //#endregion
+
+      //#region Sunrise
+      cy.xpath(applyTheme("Featured themes", "Sunrise"))
+        .click({ force: true })
+        .wait(1000); //Changing to one of Featured themes
+      cy.contains("Applied theme")
+        // .click()
+        .parent()
+        .siblings()
+        .find(".t--theme-card > main > section > div > main")
+        .eq(0)
+        .invoke("css", "background-color")
+        .then((backgroudColor) => {
+          expect(backgroudColor).to.eq("rgb(239, 68, 68)");
+        });
 
-    cy.contains("Applied theme")
-      // .click()
-      .parent()
-      .siblings()
-      .find(".t--theme-card > main > section > div > main")
-      .eq(1)
-      .invoke("css", "background-color")
-      .then((backgroudColor) => {
-        expect(backgroudColor).to.eq("rgb(248, 250, 252)");
-      });
-    //#endregion
-  });
-
-  it("5. Verify widgets conform to the selected theme in Publish mode", () => {
-    deployMode.DeployApp();
-
-    //cy.wait(4000); //for theme to settle
-
-    cy.get("body").should(
-      "have.css",
-      "font-family",
-      `"Nunito Sans", sans-serif`,
-    ); //Font
-
-    cy.xpath("//div[@id='root']//section/parent::div").should(
-      "have.css",
-      "background-color",
-      "rgb(248, 250, 252)",
-    ); //Background Color
-    cy.get(widgetsPage.widgetBtn).should(
-      "have.css",
-      "background-color",
-      "rgb(100, 116, 139)",
-    ); //Widget Color
-
-    cy.get(widgetsPage.widgetBtn).should("have.css", "border-radius", "0px"); //Border Radius
-
-    cy.get(widgetsPage.widgetBtn).should("have.css", "box-shadow", "none"); //Shadow
-
-    deployMode.NavigateBacktoEditor();
-  });
-
-  it("6. Verify Adding new Individual widgets & it can change Color, Border radius, Shadow & can revert [Color/Border Radius] to already selected theme", () => {
-    cy.dragAndDropToCanvas("buttonwidget", { x: 200, y: 400 }); //another button widget
-    cy.moveToStyleTab();
-    //Change Color & verify
-    cy.get(widgetsPage.colorPickerV2Popover).click({ force: true }).click();
-    cy.get(widgetsPage.colorPickerV2TailwindColor)
-      .eq(33)
-      .then(($elem) => {
-        cy.get($elem).click({ force: true });
-        cy.get(".t--widget-button2 button").should(
-          "have.css",
-          "background-color",
-          $elem.css("background-color"), //rgb(134, 239, 172)
-        ); //new widget with its own color
-
-        cy.get(".t--widget-button1 button").should(
-          "have.css",
-          "background-color",
-          "rgb(100, 116, 139)",
-        ); //old widgets still conforming to theme color
-      });
+      cy.contains("Applied theme")
+        // .click()
+        .parent()
+        .siblings()
+        .find(".t--theme-card > main > section > div > main")
+        .eq(1)
+        .invoke("css", "background-color")
+        .then((backgroudColor) => {
+          expect(backgroudColor).to.eq("rgb(255, 241, 242)");
+        });
+      //#endregion
+
+      //#region Water Lily
+      cy.xpath(applyTheme("Featured themes", "Water Lily"))
+        .click({ force: true })
+        .wait(1000); //Changing to one of Featured themes
+      cy.contains("Applied theme")
+        // .click()
+        .parent()
+        .siblings()
+        .find(".t--theme-card > main > section > div > main")
+        .eq(0)
+        .invoke("css", "background-color")
+        .then((backgroudColor) => {
+          expect(backgroudColor).to.eq("rgb(219, 39, 119)");
+        });
 
-    //Change Border & verify
-
-    cy.get(".border-t-2").eq(0).click();
-    cy.get(".border-t-2")
-      .eq(0)
-      .invoke("css", "border-top-left-radius")
-      .then((borderRadius) => {
-        cy.get(".t--widget-button2 button").should(
-          "have.css",
-          "border-radius",
-          borderRadius, //0px
-        );
-        cy.get(".t--widget-button1 button").should(
-          "have.css",
-          "border-radius",
-          "0px",
-        );
-      });
+      cy.contains("Applied theme")
+        // .click()
+        .parent()
+        .siblings()
+        .find(".t--theme-card > main > section > div > main")
+        .eq(1)
+        .invoke("css", "background-color")
+        .then((backgroudColor) => {
+          expect(backgroudColor).to.eq("rgb(253, 242, 248)");
+        });
+      //#endregion
+
+      //#region Pacific
+      cy.xpath(applyTheme("Featured themes", "Pacific"))
+        .click({ force: true })
+        .wait(1000); //Changing to one of Featured themes
+      cy.contains("Applied theme")
+        // .click()
+        .parent()
+        .siblings()
+        .find(".t--theme-card > main > section > div > main")
+        .eq(0)
+        .invoke("css", "background-color")
+        .then((backgroudColor) => {
+          expect(backgroudColor).to.eq("rgb(8, 145, 178)");
+        });
 
-    //Change Shadow & verify
-    cy.contains(".ads-v2-segmented-control-value-0", "Large").click();
-
-    cy.get(".t--widget-button1 button").should(
-      "have.css",
-      "box-shadow",
-      "none",
-    );
-
-    agHelper.AssertAutoSave();
-    deployMode.DeployApp();
-
-    //Verify Background color
-    cy.get(".t--widget-button2 button").should(
-      "have.css",
-      "background-color",
-      "rgb(190, 24, 93)",
-    ); //new widget with its own color
-
-    ////old widgets still conforming to theme color
-    cy.get(".t--widget-button1 button").should(
-      "have.css",
-      "background-color",
-      "rgb(100, 116, 139)",
-    );
-
-    //Verify Border radius
-    cy.get(".t--widget-button2 button").should(
-      "have.css",
-      "border-radius",
-      "0px",
-    );
-    cy.get(".t--widget-button1 button").should(
-      "have.css",
-      "border-radius",
-      "0px",
-    );
-
-    //Verify Box shadow
-    cy.get(".t--widget-button2 button").should(
-      "have.css",
-      "box-shadow",
-      "rgba(0, 0, 0, 0.1) 0px 10px 15px -3px, rgba(0, 0, 0, 0.05) 0px 4px 6px -2px",
-    );
-    cy.get(".t--widget-button1 button").should(
-      "have.css",
-      "box-shadow",
-      "none",
-    );
-
-    deployMode.NavigateBacktoEditor();
-    //Resetting back to theme
-    EditorNavigation.SelectEntityByName("Button2", EntityType.Widget);
-    cy.moveToStyleTab();
-    cy.get(".t--property-control-buttoncolor .reset-button").then(($elem) => {
-      $elem[0].removeAttribute("display: none");
-      $elem[0].click();
-    });
+      cy.contains("Applied theme")
+        // .click()
+        .parent()
+        .siblings()
+        .find(".t--theme-card > main > section > div > main")
+        .eq(1)
+        .invoke("css", "background-color")
+        .then((backgroudColor) => {
+          expect(backgroudColor).to.eq("rgb(236, 254, 255)");
+        });
+      //#endregion
+
+      //#region Earth
+      cy.xpath(applyTheme("Featured themes", "Earth"))
+        .click({ force: true })
+        .wait(1000); //Changing to one of Featured themes
+      cy.contains("Applied theme")
+        // .click()
+        .parent()
+        .siblings()
+        .find(".t--theme-card > main > section > div > main")
+        .eq(0)
+        .invoke("css", "background-color")
+        .then((backgroudColor) => {
+          expect(backgroudColor).to.eq("rgb(59, 130, 246)");
+        });
 
-    cy.get(".t--widget-button2 button").should(
-      "have.css",
-      "background-color",
-      "rgb(100, 116, 139)",
-    ); //verify widget reverted to theme color
-    cy.get(".t--property-control-borderradius .reset-button").then(($elem) => {
-      $elem[0].removeAttribute("display: none");
-      $elem[0].click();
+      cy.contains("Applied theme")
+        // .click()
+        .parent()
+        .siblings()
+        .find(".t--theme-card > main > section > div > main")
+        .eq(1)
+        .invoke("css", "background-color")
+        .then((backgroudColor) => {
+          expect(backgroudColor).to.eq("rgb(239, 246, 255)");
+        });
+      //#endregion
+
+      //#region Moon
+      cy.xpath(applyTheme("Featured themes", "Moon"))
+        .click({ force: true })
+        .wait(1000); //Changing to one of Featured themes
+      cy.contains("Applied theme")
+        // .click()
+        .parent()
+        .siblings()
+        .find(".t--theme-card > main > section > div > main")
+        .eq(0)
+        .invoke("css", "background-color")
+        .then((backgroudColor) => {
+          expect(backgroudColor).to.eq("rgb(100, 116, 139)");
+        });
+
+      cy.contains("Applied theme")
+        // .click()
+        .parent()
+        .siblings()
+        .find(".t--theme-card > main > section > div > main")
+        .eq(1)
+        .invoke("css", "background-color")
+        .then((backgroudColor) => {
+          expect(backgroudColor).to.eq("rgb(248, 250, 252)");
+        });
+      //#endregion
     });
-    cy.get(".t--widget-button2 button").should(
-      "have.css",
-      "border-radius",
-      "0px",
-    );
-
-    //the new widget with reverted styles also conforming to theme
-    deployMode.DeployApp();
-
-    cy.wait(4000); //for theme to settle
-    cy.get("body").should(
-      "have.css",
-      "font-family",
-      `"Nunito Sans", sans-serif`,
-    ); //Font
-
-    cy.xpath("//div[@id='root']//section/parent::div").should(
-      "have.css",
-      "background-color",
-      "rgb(248, 250, 252)",
-    ); //Background Color
-    cy.get(".t--widget-button1 button").should(
-      "have.css",
-      "background-color",
-      "rgb(100, 116, 139)",
-    ); //Widget Color
-    cy.get("body").then(($ele) => {
-      if ($ele.find(widgetsPage.widgetBtn).length <= 1) {
-        cy.reload();
-        cy.wait(4000);
-      }
+
+    it("5. Verify widgets conform to the selected theme in Publish mode", () => {
+      deployMode.DeployApp();
+
+      //cy.wait(4000); //for theme to settle
+
+      cy.get("body").should(
+        "have.css",
+        "font-family",
+        `"Nunito Sans", sans-serif`,
+      ); //Font
+
+      cy.xpath("//div[@id='root']//section/parent::div").should(
+        "have.css",
+        "background-color",
+        "rgb(248, 250, 252)",
+      ); //Background Color
+      cy.get(widgetsPage.widgetBtn).should(
+        "have.css",
+        "background-color",
+        "rgb(100, 116, 139)",
+      ); //Widget Color
+
+      cy.get(widgetsPage.widgetBtn).should("have.css", "border-radius", "0px"); //Border Radius
+
+      cy.get(widgetsPage.widgetBtn).should("have.css", "box-shadow", "none"); //Shadow
+
+      deployMode.NavigateBacktoEditor();
     });
-    cy.get(".t--widget-button2 button").should(
-      "have.css",
-      "background-color",
-      "rgb(100, 116, 139)",
-    ); //Widget Color
-
-    cy.get(".t--widget-button1 button").should(
-      "have.css",
-      "border-radius",
-      "0px",
-    ); //Border Radius
-    cy.get(".t--widget-button2 button").should(
-      "have.css",
-      "border-radius",
-      "0px",
-    ); //Border Radius
-
-    cy.get(".t--widget-button1 button").should(
-      "have.css",
-      "box-shadow",
-      "none",
-    ); //Shadow
-    cy.get(".t--widget-button2 button").should(
-      "have.css",
-      "box-shadow",
-      "rgba(0, 0, 0, 0.1) 0px 10px 15px -3px, rgba(0, 0, 0, 0.05) 0px 4px 6px -2px",
-    ); //Since Shadow revert option does not exixts
-    deployMode.NavigateBacktoEditor();
-  });
-
-  it("7. Verify Chainging theme should not affect Individual widgets with changed Color, Border radius, Shadow & can revert to newly selected theme", () => {
-    cy.get("canvas").first(0).trigger("click", { force: true });
-
-    appSettings.OpenAppSettings();
-    appSettings.GoToThemeSettings();
-
-    cy.get(commonlocators.changeThemeBtn).click({ force: true });
-
-    //Changing to one of Featured themes & then changing individual widget properties
-    cy.xpath(applyTheme("Featured themes", "Sunrise"))
-      .click({ force: true })
-      .wait(2000);
-
-    //Change individual widget properties for Button1
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    cy.moveToStyleTab();
-
-    //Change Color & verify
-    cy.get(widgetsPage.colorPickerV2Popover).click({ force: true }).click();
-    cy.get(widgetsPage.colorPickerV2TailwindColor)
-      .eq(13)
-      .then(($elem) => {
-        cy.get($elem).click({ force: true });
-        cy.get(".t--widget-button1 button").should(
-          "have.css",
-          "background-color",
-          $elem.css("background-color"),
-        ); //new widget with its own color
-
-        cy.get(".t--widget-button2 button").should(
-          "have.css",
-          "background-color",
-          "rgb(239, 68, 68)",
-        ); //old widgets still conforming to theme color
-      });
 
-    //Change Border & verify
-
-    cy.get(".border-t-2").eq(1).click().wait(500);
-    cy.get(".border-t-2")
-      .eq(1)
-      .invoke("css", "border-top-left-radius")
-      .then((borderRadius) => {
-        cy.get(".t--widget-button1 button").should(
-          "have.css",
-          "border-radius",
-          borderRadius, //6px
-        );
-
-        cy.get(".t--widget-button2 button").should(
-          "have.css",
-          "border-radius",
-          "24px",
-        );
+    it("6. Verify Adding new Individual widgets & it can change Color, Border radius, Shadow & can revert [Color/Border Radius] to already selected theme", () => {
+      cy.dragAndDropToCanvas("buttonwidget", { x: 200, y: 400 }); //another button widget
+      cy.moveToStyleTab();
+      //Change Color & verify
+      cy.get(widgetsPage.colorPickerV2Popover).click({ force: true }).click();
+      cy.get(widgetsPage.colorPickerV2TailwindColor)
+        .eq(33)
+        .then(($elem) => {
+          cy.get($elem).click({ force: true });
+          cy.get(".t--widget-button2 button").should(
+            "have.css",
+            "background-color",
+            $elem.css("background-color"), //rgb(134, 239, 172)
+          ); //new widget with its own color
+
+          cy.get(".t--widget-button1 button").should(
+            "have.css",
+            "background-color",
+            "rgb(100, 116, 139)",
+          ); //old widgets still conforming to theme color
+        });
+
+      //Change Border & verify
+
+      cy.get(".border-t-2").eq(0).click();
+      cy.get(".border-t-2")
+        .eq(0)
+        .invoke("css", "border-top-left-radius")
+        .then((borderRadius) => {
+          cy.get(".t--widget-button2 button").should(
+            "have.css",
+            "border-radius",
+            borderRadius, //0px
+          );
+          cy.get(".t--widget-button1 button").should(
+            "have.css",
+            "border-radius",
+            "0px",
+          );
+        });
+
+      //Change Shadow & verify
+      cy.contains(".ads-v2-segmented-control-value-0", "Large").click();
+
+      cy.get(".t--widget-button1 button").should(
+        "have.css",
+        "box-shadow",
+        "none",
+      );
+
+      agHelper.AssertAutoSave();
+      deployMode.DeployApp();
+
+      //Verify Background color
+      cy.get(".t--widget-button2 button").should(
+        "have.css",
+        "background-color",
+        "rgb(190, 24, 93)",
+      ); //new widget with its own color
+
+      ////old widgets still conforming to theme color
+      cy.get(".t--widget-button1 button").should(
+        "have.css",
+        "background-color",
+        "rgb(100, 116, 139)",
+      );
+
+      //Verify Border radius
+      cy.get(".t--widget-button2 button").should(
+        "have.css",
+        "border-radius",
+        "0px",
+      );
+      cy.get(".t--widget-button1 button").should(
+        "have.css",
+        "border-radius",
+        "0px",
+      );
+
+      //Verify Box shadow
+      cy.get(".t--widget-button2 button").should(
+        "have.css",
+        "box-shadow",
+        "rgba(0, 0, 0, 0.1) 0px 10px 15px -3px, rgba(0, 0, 0, 0.05) 0px 4px 6px -2px",
+      );
+      cy.get(".t--widget-button1 button").should(
+        "have.css",
+        "box-shadow",
+        "none",
+      );
+
+      deployMode.NavigateBacktoEditor();
+      //Resetting back to theme
+      EditorNavigation.SelectEntityByName("Button2", EntityType.Widget);
+      cy.moveToStyleTab();
+      cy.get(".t--property-control-buttoncolor .reset-button").then(($elem) => {
+        $elem[0].removeAttribute("display: none");
+        $elem[0].click();
       });
 
-    //Change Shadow & verify
-    cy.contains(".ads-v2-segmented-control-value-0", "Small").click();
-    cy.get(".t--widget-button2 button").should(
-      "have.css",
-      "box-shadow",
-      //same value as previous box shadow selection
-      //since revertion is not possible for box shadow - hence this widget maintains the same value
-      "rgba(0, 0, 0, 0.1) 0px 10px 15px -3px, rgba(0, 0, 0, 0.05) 0px 4px 6px -2px",
-    );
-
-    agHelper.AssertAutoSave();
-
-    //Add deploy mode verification here also!
-    deployMode.DeployApp();
-
-    //Verify Background color
-    cy.get(".t--widget-button1 button").should(
-      "have.css",
-      "background-color",
-      "rgb(161, 98, 7)",
-    ); //new widget with its own color
-
-    ////old widgets still conforming to theme color
-    cy.get(".t--widget-button2 button").should(
-      "have.css",
-      "background-color",
-      "rgb(239, 68, 68)",
-    );
-
-    //Verify Border radius
-    cy.get(".t--widget-button1 button").should(
-      "have.css",
-      "border-radius",
-      "6px",
-    );
-    cy.get(".t--widget-button2 button").should(
-      "have.css",
-      "border-radius",
-      "24px",
-    );
-
-    //Verify Box shadow
-    cy.get(".t--widget-button1 button").should(
-      "have.css",
-      "box-shadow",
-      "rgba(0, 0, 0, 0.1) 0px 1px 3px 0px, rgba(0, 0, 0, 0.06) 0px 1px 2px 0px",
-    );
-    cy.get(".t--widget-button2 button").should(
-      "have.css",
-      "box-shadow",
-      "rgba(0, 0, 0, 0.1) 0px 10px 15px -3px, rgba(0, 0, 0, 0.05) 0px 4px 6px -2px",
-    );
-
-    deployMode.NavigateBacktoEditor();
-    //Resetting back to theme
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    cy.moveToStyleTab();
-    cy.get(".t--property-control-buttoncolor .reset-button").then(($elem) => {
-      $elem[0].removeAttribute("display: none");
-      $elem[0].click();
+      cy.get(".t--widget-button2 button").should(
+        "have.css",
+        "background-color",
+        "rgb(100, 116, 139)",
+      ); //verify widget reverted to theme color
+      cy.get(".t--property-control-borderradius .reset-button").then(
+        ($elem) => {
+          $elem[0].removeAttribute("display: none");
+          $elem[0].click();
+        },
+      );
+      cy.get(".t--widget-button2 button").should(
+        "have.css",
+        "border-radius",
+        "0px",
+      );
+
+      //the new widget with reverted styles also conforming to theme
+      deployMode.DeployApp();
+
+      cy.wait(4000); //for theme to settle
+      cy.get("body").should(
+        "have.css",
+        "font-family",
+        `"Nunito Sans", sans-serif`,
+      ); //Font
+
+      cy.xpath("//div[@id='root']//section/parent::div").should(
+        "have.css",
+        "background-color",
+        "rgb(248, 250, 252)",
+      ); //Background Color
+      cy.get(".t--widget-button1 button").should(
+        "have.css",
+        "background-color",
+        "rgb(100, 116, 139)",
+      ); //Widget Color
+      cy.get("body").then(($ele) => {
+        if ($ele.find(widgetsPage.widgetBtn).length <= 1) {
+          cy.reload();
+          cy.wait(4000);
+        }
+      });
+      cy.get(".t--widget-button2 button").should(
+        "have.css",
+        "background-color",
+        "rgb(100, 116, 139)",
+      ); //Widget Color
+
+      cy.get(".t--widget-button1 button").should(
+        "have.css",
+        "border-radius",
+        "0px",
+      ); //Border Radius
+      cy.get(".t--widget-button2 button").should(
+        "have.css",
+        "border-radius",
+        "0px",
+      ); //Border Radius
+
+      cy.get(".t--widget-button1 button").should(
+        "have.css",
+        "box-shadow",
+        "none",
+      ); //Shadow
+      cy.get(".t--widget-button2 button").should(
+        "have.css",
+        "box-shadow",
+        "rgba(0, 0, 0, 0.1) 0px 10px 15px -3px, rgba(0, 0, 0, 0.05) 0px 4px 6px -2px",
+      ); //Since Shadow revert option does not exixts
+      deployMode.NavigateBacktoEditor();
     });
 
-    cy.get(".t--widget-button1 button").should(
-      "have.css",
-      "background-color",
-      "rgb(239, 68, 68)",
-    ); //verify widget reverted to theme color
+    it("7. Verify Chainging theme should not affect Individual widgets with changed Color, Border radius, Shadow & can revert to newly selected theme", () => {
+      cy.get("canvas").first(0).trigger("click", { force: true });
 
-    cy.get(".t--property-control-borderradius .reset-button").then(($elem) => {
-      $elem[0].removeAttribute("display: none");
-      $elem[0].click();
-    });
-    cy.get(".t--widget-button1 button").should(
-      "have.css",
-      "border-radius",
-      "24px",
-    );
-
-    //the new widget with reverted styles also conforming to theme
-    deployMode.DeployApp();
-
-    cy.wait(4000); //for theme to settle
-    cy.get("body").should("have.css", "font-family", "Rubik, sans-serif"); //Font for Rounded theme
-
-    cy.xpath("//div[@id='root']//section/parent::div").should(
-      "have.css",
-      "background-color",
-      "rgb(255, 241, 242)",
-    ); //Background Color of canvas
-
-    cy.get(".t--widget-button1 button").should(
-      "have.css",
-      "background-color",
-      "rgb(239, 68, 68)",
-    ); //Widget Color
-    cy.get("body").then(($ele) => {
-      if ($ele.find(widgetsPage.widgetBtn).length <= 1) {
-        cy.reload();
-        cy.wait(4000);
-      }
+      appSettings.OpenAppSettings();
+      appSettings.GoToThemeSettings();
+
+      cy.get(commonlocators.changeThemeBtn).click({ force: true });
+
+      //Changing to one of Featured themes & then changing individual widget properties
+      cy.xpath(applyTheme("Featured themes", "Sunrise"))
+        .click({ force: true })
+        .wait(2000);
+
+      //Change individual widget properties for Button1
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      cy.moveToStyleTab();
+
+      //Change Color & verify
+      cy.get(widgetsPage.colorPickerV2Popover).click({ force: true }).click();
+      cy.get(widgetsPage.colorPickerV2TailwindColor)
+        .eq(13)
+        .then(($elem) => {
+          cy.get($elem).click({ force: true });
+          cy.get(".t--widget-button1 button").should(
+            "have.css",
+            "background-color",
+            $elem.css("background-color"),
+          ); //new widget with its own color
+
+          cy.get(".t--widget-button2 button").should(
+            "have.css",
+            "background-color",
+            "rgb(239, 68, 68)",
+          ); //old widgets still conforming to theme color
+        });
+
+      //Change Border & verify
+
+      cy.get(".border-t-2").eq(1).click().wait(500);
+      cy.get(".border-t-2")
+        .eq(1)
+        .invoke("css", "border-top-left-radius")
+        .then((borderRadius) => {
+          cy.get(".t--widget-button1 button").should(
+            "have.css",
+            "border-radius",
+            borderRadius, //6px
+          );
+
+          cy.get(".t--widget-button2 button").should(
+            "have.css",
+            "border-radius",
+            "24px",
+          );
+        });
+
+      //Change Shadow & verify
+      cy.contains(".ads-v2-segmented-control-value-0", "Small").click();
+      cy.get(".t--widget-button2 button").should(
+        "have.css",
+        "box-shadow",
+        //same value as previous box shadow selection
+        //since revertion is not possible for box shadow - hence this widget maintains the same value
+        "rgba(0, 0, 0, 0.1) 0px 10px 15px -3px, rgba(0, 0, 0, 0.05) 0px 4px 6px -2px",
+      );
+
+      agHelper.AssertAutoSave();
+
+      //Add deploy mode verification here also!
+      deployMode.DeployApp();
+
+      //Verify Background color
+      cy.get(".t--widget-button1 button").should(
+        "have.css",
+        "background-color",
+        "rgb(161, 98, 7)",
+      ); //new widget with its own color
+
+      ////old widgets still conforming to theme color
+      cy.get(".t--widget-button2 button").should(
+        "have.css",
+        "background-color",
+        "rgb(239, 68, 68)",
+      );
+
+      //Verify Border radius
+      cy.get(".t--widget-button1 button").should(
+        "have.css",
+        "border-radius",
+        "6px",
+      );
+      cy.get(".t--widget-button2 button").should(
+        "have.css",
+        "border-radius",
+        "24px",
+      );
+
+      //Verify Box shadow
+      cy.get(".t--widget-button1 button").should(
+        "have.css",
+        "box-shadow",
+        "rgba(0, 0, 0, 0.1) 0px 1px 3px 0px, rgba(0, 0, 0, 0.06) 0px 1px 2px 0px",
+      );
+      cy.get(".t--widget-button2 button").should(
+        "have.css",
+        "box-shadow",
+        "rgba(0, 0, 0, 0.1) 0px 10px 15px -3px, rgba(0, 0, 0, 0.05) 0px 4px 6px -2px",
+      );
+
+      deployMode.NavigateBacktoEditor();
+      //Resetting back to theme
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      cy.moveToStyleTab();
+      cy.get(".t--property-control-buttoncolor .reset-button").then(($elem) => {
+        $elem[0].removeAttribute("display: none");
+        $elem[0].click();
+      });
+
+      cy.get(".t--widget-button1 button").should(
+        "have.css",
+        "background-color",
+        "rgb(239, 68, 68)",
+      ); //verify widget reverted to theme color
+
+      cy.get(".t--property-control-borderradius .reset-button").then(
+        ($elem) => {
+          $elem[0].removeAttribute("display: none");
+          $elem[0].click();
+        },
+      );
+      cy.get(".t--widget-button1 button").should(
+        "have.css",
+        "border-radius",
+        "24px",
+      );
+
+      //the new widget with reverted styles also conforming to theme
+      deployMode.DeployApp();
+
+      cy.wait(4000); //for theme to settle
+      cy.get("body").should("have.css", "font-family", "Rubik, sans-serif"); //Font for Rounded theme
+
+      cy.xpath("//div[@id='root']//section/parent::div").should(
+        "have.css",
+        "background-color",
+        "rgb(255, 241, 242)",
+      ); //Background Color of canvas
+
+      cy.get(".t--widget-button1 button").should(
+        "have.css",
+        "background-color",
+        "rgb(239, 68, 68)",
+      ); //Widget Color
+      cy.get("body").then(($ele) => {
+        if ($ele.find(widgetsPage.widgetBtn).length <= 1) {
+          cy.reload();
+          cy.wait(4000);
+        }
+      });
+      cy.get(".t--widget-button2 button").should(
+        "have.css",
+        "background-color",
+        "rgb(239, 68, 68)",
+      ); //Widget Color
+
+      cy.get(".t--widget-button1 button").should(
+        "have.css",
+        "border-radius",
+        "24px",
+      ); //Border Radius
+      cy.get(".t--widget-button2 button").should(
+        "have.css",
+        "border-radius",
+        "24px",
+      ); //Border Radius
+
+      cy.get(".t--widget-button1 button").should(
+        "have.css",
+        "box-shadow",
+        "rgba(0, 0, 0, 0.1) 0px 1px 3px 0px, rgba(0, 0, 0, 0.06) 0px 1px 2px 0px",
+      ); //Shadow
+      cy.get(".t--widget-button2 button").should(
+        "have.css",
+        "box-shadow",
+        "rgba(0, 0, 0, 0.1) 0px 10px 15px -3px, rgba(0, 0, 0, 0.05) 0px 4px 6px -2px",
+      ); //Since Shadow revert option does not exixts
+
+      deployMode.NavigateBacktoEditor();
     });
-    cy.get(".t--widget-button2 button").should(
-      "have.css",
-      "background-color",
-      "rgb(239, 68, 68)",
-    ); //Widget Color
-
-    cy.get(".t--widget-button1 button").should(
-      "have.css",
-      "border-radius",
-      "24px",
-    ); //Border Radius
-    cy.get(".t--widget-button2 button").should(
-      "have.css",
-      "border-radius",
-      "24px",
-    ); //Border Radius
-
-    cy.get(".t--widget-button1 button").should(
-      "have.css",
-      "box-shadow",
-      "rgba(0, 0, 0, 0.1) 0px 1px 3px 0px, rgba(0, 0, 0, 0.06) 0px 1px 2px 0px",
-    ); //Shadow
-    cy.get(".t--widget-button2 button").should(
-      "have.css",
-      "box-shadow",
-      "rgba(0, 0, 0, 0.1) 0px 10px 15px -3px, rgba(0, 0, 0, 0.05) 0px 4px 6px -2px",
-    ); //Since Shadow revert option does not exixts
-
-    deployMode.NavigateBacktoEditor();
-  });
-});
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ThemingTests/Theme_FormWidget_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ThemingTests/Theme_FormWidget_spec.js
index 8761ba5c3c5e..1ca6afa882f6 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ThemingTests/Theme_FormWidget_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/ThemingTests/Theme_FormWidget_spec.js
@@ -20,225 +20,237 @@ const themelocator = require("../../../../locators/ThemeLocators.json");
 let themeBackgroudColor;
 let themeFont;
 
-describe("Theme validation usecases", { tags: ["@tag.Theme"] }, function () {
-  it("1. Drag and drop form widget and validate Default font and list of font validation", function () {
-    entityExplorer.DragDropWidgetNVerify(draggableWidgets.FORM);
-    agHelper.GetNClick(locators._canvas);
-    appSettings.OpenAppSettings();
-    appSettings.GoToThemeSettings();
-    //Border validation
-    //cy.contains("Border").click({ force: true });
-    cy.get(themelocator.border).should("have.length", "3");
-    cy.borderMouseover(0, "none");
-    cy.borderMouseover(1, "M");
-    cy.borderMouseover(2, "L");
-    cy.get(themelocator.border).eq(2).click({ force: true });
-    cy.wait("@updateTheme").should(
-      "have.nested.property",
-      "response.body.responseMeta.status",
-      200,
-    );
-    cy.wait(2000);
-    cy.contains("Border").click({ force: true });
-
-    //Shadow validation
-    //cy.contains("Shadow").click({ force: true });
-    cy.xpath(theme.locators._boxShadow("L")).click({ force: true });
-    cy.wait("@updateTheme").should(
-      "have.nested.property",
-      "response.body.responseMeta.status",
-      200,
-    );
-    cy.wait(2000);
-    cy.contains("Shadow").click({ force: true });
-
-    //Font
-    cy.xpath(
-      "//p[text()='App font']/following-sibling::section//div//input",
-    ).then(($elem) => {
-      cy.get($elem).click({ force: true });
-      cy.wait(250);
-      cy.fixture("fontData").then(function (testdata) {
-        this.testdata = testdata;
+describe(
+  "Theme validation usecases",
+  { tags: ["@tag.Theme", "@tag.Git"] },
+  function () {
+    it("1. Drag and drop form widget and validate Default font and list of font validation", function () {
+      entityExplorer.DragDropWidgetNVerify(draggableWidgets.FORM);
+      agHelper.GetNClick(locators._canvas);
+      appSettings.OpenAppSettings();
+      appSettings.GoToThemeSettings();
+      //Border validation
+      //cy.contains("Border").click({ force: true });
+      cy.get(themelocator.border).should("have.length", "3");
+      cy.borderMouseover(0, "none");
+      cy.borderMouseover(1, "M");
+      cy.borderMouseover(2, "L");
+      cy.get(themelocator.border).eq(2).click({ force: true });
+      cy.wait("@updateTheme").should(
+        "have.nested.property",
+        "response.body.responseMeta.status",
+        200,
+      );
+      cy.wait(2000);
+      cy.contains("Border").click({ force: true });
+
+      //Shadow validation
+      //cy.contains("Shadow").click({ force: true });
+      cy.xpath(theme.locators._boxShadow("L")).click({ force: true });
+      cy.wait("@updateTheme").should(
+        "have.nested.property",
+        "response.body.responseMeta.status",
+        200,
+      );
+      cy.wait(2000);
+      cy.contains("Shadow").click({ force: true });
+
+      //Font
+      cy.xpath(
+        "//p[text()='App font']/following-sibling::section//div//input",
+      ).then(($elem) => {
+        cy.get($elem).click({ force: true });
+        cy.wait(250);
+        cy.fixture("fontData").then(function (testdata) {
+          this.testdata = testdata;
+        });
+
+        cy.get(themelocator.fontsSelected)
+          //.eq(10)
+          .should("contain.text", "Nunito Sans");
+
+        cy.get(".rc-virtual-list .rc-select-item-option")
+          .find(".leading-normal")
+          .eq(2)
+          .then(($childElem) => {
+            cy.get($childElem).click({ force: true });
+            cy.get(".t--draggable-buttonwidget button :contains('Sub')").should(
+              "have.css",
+              "font-family",
+              `Poppins, sans-serif`,
+            );
+            //themeFont = `${$childElem.children().last().text()}, sans-serif`;
+            themeFont = `Poppins, sans-serif`;
+
+            cy.contains("Font").click({ force: true });
+
+            //Color
+            //cy.contains("Color").click({ force: true });
+            cy.wait(2000);
+            cy.colorMouseover(0, "Primary color");
+            cy.validateColor("Primary", "#553DE9");
+            cy.colorMouseover(1, "Background color");
+            cy.validateColor("Background", "#F8FAFC");
+
+            cy.get(themelocator.inputColor).click({ force: true });
+            cy.chooseColor(0, themelocator.greenColor);
+
+            cy.get(themelocator.inputColor).should("have.value", "#15803d");
+            cy.get(themelocator.inputColor).clear({ force: true });
+            cy.wait(2000);
+            theme.ChangeThemeColor(16, "Background");
+            cy.get(themelocator.inputColor).should("have.value", "#86efac"); //Red
+            cy.wait(2000);
+
+            cy.get(themelocator.inputColor).eq(0).click({ force: true });
+            cy.get(themelocator.inputColor).click({ force: true });
+            cy.get('[data-testid="color-picker"]')
+              .first()
+              .click({ force: true });
+            cy.get("[style='background-color: rgb(21, 128, 61);']")
+              .last()
+              .click();
+            cy.wait(2000);
+            cy.get(themelocator.inputColor).should("have.value", "#15803d");
+            cy.get(themelocator.inputColor).clear({ force: true });
+            cy.wait(2000);
+            theme.ChangeThemeColor(9, "Primary");
+            cy.get(themelocator.inputColor).should("have.value", "#7f1d1d"); //Black
+            cy.wait(2000);
+            cy.contains("Color").click({ force: true });
+            appSettings.ClosePane();
+
+            //Publish the App and validate Font across the app
+            deployMode.DeployApp();
+            cy.get(".bp3-button:contains('Sub')").should(
+              "have.css",
+              "font-family",
+              themeFont,
+            );
+            cy.get(".bp3-button:contains('Reset')").should(
+              "have.css",
+              "font-family",
+              themeFont,
+            );
+          });
       });
+      deployMode.NavigateBacktoEditor();
+    });
 
-      cy.get(themelocator.fontsSelected)
-        //.eq(10)
-        .should("contain.text", "Nunito Sans");
+    it("2. Validate Default Theme change across application", function () {
+      propPane.RenameWidget("Form1", "FormTest");
+      propPane.MoveToTab("Style");
+      cy.get(widgetsPage.backgroundcolorPickerNew)
+        .first()
+        .click({ force: true });
+      cy.get("[style='background-color: rgb(21, 128, 61);']").last().click();
+      cy.wait(2000);
+      cy.get(formWidgetsPage.formD)
+        .should("have.css", "background-color")
+        .and("eq", "rgb(21, 128, 61)");
+      cy.get("#canvas-selection-0").click({ force: true });
 
-      cy.get(".rc-virtual-list .rc-select-item-option")
-        .find(".leading-normal")
-        .eq(2)
-        .then(($childElem) => {
-          cy.get($childElem).click({ force: true });
-          cy.get(".t--draggable-buttonwidget button :contains('Sub')").should(
-            "have.css",
-            "font-family",
-            `Poppins, sans-serif`,
-          );
-          //themeFont = `${$childElem.children().last().text()}, sans-serif`;
-          themeFont = `Poppins, sans-serif`;
-
-          cy.contains("Font").click({ force: true });
-
-          //Color
-          //cy.contains("Color").click({ force: true });
-          cy.wait(2000);
-          cy.colorMouseover(0, "Primary color");
-          cy.validateColor("Primary", "#553DE9");
-          cy.colorMouseover(1, "Background color");
-          cy.validateColor("Background", "#F8FAFC");
-
-          cy.get(themelocator.inputColor).click({ force: true });
-          cy.chooseColor(0, themelocator.greenColor);
-
-          cy.get(themelocator.inputColor).should("have.value", "#15803d");
-          cy.get(themelocator.inputColor).clear({ force: true });
-          cy.wait(2000);
-          theme.ChangeThemeColor(16, "Background");
-          cy.get(themelocator.inputColor).should("have.value", "#86efac"); //Red
-          cy.wait(2000);
-
-          cy.get(themelocator.inputColor).eq(0).click({ force: true });
-          cy.get(themelocator.inputColor).click({ force: true });
-          cy.get('[data-testid="color-picker"]').first().click({ force: true });
-          cy.get("[style='background-color: rgb(21, 128, 61);']")
+      appSettings.OpenAppSettings();
+      appSettings.GoToThemeSettings();
+      //Change the Theme
+      cy.get(commonlocators.changeThemeBtn).click({ force: true });
+      cy.get(themelocator.currentTheme).click({ force: true });
+      cy.get(".t--theme-card main > main")
+        .first()
+        .invoke("css", "background-color")
+        .then((CurrentBackgroudColor) => {
+          cy.get(".bp3-button:contains('Sub')")
             .last()
-            .click();
-          cy.wait(2000);
-          cy.get(themelocator.inputColor).should("have.value", "#15803d");
-          cy.get(themelocator.inputColor).clear({ force: true });
-          cy.wait(2000);
-          theme.ChangeThemeColor(9, "Primary");
-          cy.get(themelocator.inputColor).should("have.value", "#7f1d1d"); //Black
-          cy.wait(2000);
-          cy.contains("Color").click({ force: true });
-          appSettings.ClosePane();
-
-          //Publish the App and validate Font across the app
-          deployMode.DeployApp();
-          cy.get(".bp3-button:contains('Sub')").should(
+            .invoke("css", "background-color")
+            .then((selectedBackgroudColor) => {
+              expect(CurrentBackgroudColor).to.equal(selectedBackgroudColor);
+              themeBackgroudColor = CurrentBackgroudColor;
+              appSettings.ClosePane();
+            });
+        });
+    });
+
+    it("3. Validate Theme change across application", function () {
+      EditorNavigation.SelectEntityByName("FormTest", EntityType.Widget);
+      propPane.MoveToTab("Style");
+      cy.get(widgetsPage.backgroundcolorPickerNew)
+        .first()
+        .click({ force: true });
+      cy.get("[style='background-color: rgb(21, 128, 61);']").last().click();
+      cy.wait(2000);
+      cy.get(formWidgetsPage.formD)
+        .should("have.css", "background-color")
+        .and("eq", "rgb(21, 128, 61)");
+
+      cy.get("#canvas-selection-0").click({ force: true });
+
+      appSettings.OpenAppSettings();
+      appSettings.GoToThemeSettings();
+      //Change the Theme
+      cy.get(commonlocators.changeThemeBtn).click({ force: true });
+      // select a theme
+      cy.get(commonlocators.themeCard).last().click({ force: true });
+
+      // check for alert
+      cy.get(`${commonlocators.themeCard}`)
+        .last()
+        .siblings("div")
+        .first()
+        .invoke("text")
+        .then((text) => {
+          cy.get(commonlocators.toastmsg).contains(`Theme ${text} applied`);
+        });
+      cy.get(`${commonlocators.themeCard} > main`)
+        .last()
+        .invoke("css", "background-color")
+        .then((backgroudColor) => {
+          cy.get(commonlocators.canvas).should(
             "have.css",
-            "font-family",
-            themeFont,
+            "background-color",
+            backgroudColor,
           );
-          cy.get(".bp3-button:contains('Reset')").should(
+        });
+      cy.get(themelocator.currentTheme).click({ force: true });
+      cy.get(".t--theme-card > main")
+        .first()
+        .invoke("css", "background-color")
+        .then((backgroudColor) => {
+          cy.get(commonlocators.canvas).should(
             "have.css",
-            "font-family",
-            themeFont,
+            "background-color",
+            backgroudColor,
           );
         });
+      cy.get(".t--theme-card main > main")
+        .first()
+        .invoke("css", "background-color")
+        .then((CurrentBackgroudColor) => {
+          cy.get(".t--theme-card main > main")
+            .last()
+            .invoke("css", "background-color")
+            .then((selectedBackgroudColor) => {
+              expect(CurrentBackgroudColor).to.equal(selectedBackgroudColor);
+              themeBackgroudColor = CurrentBackgroudColor;
+              appSettings.ClosePane();
+            });
+        });
+      EditorNavigation.SelectEntityByName("FormTest", EntityType.Widget);
+      propPane.MoveToTab("Style");
+      cy.get(widgetsPage.backgroundcolorPickerNew)
+        .first()
+        .click({ force: true });
+      cy.get("[style='background-color: rgb(126, 34, 206);']").first().click();
+      cy.wait(2000);
+      cy.get(formWidgetsPage.formD)
+        .should("have.css", "background-color")
+        .and("eq", "rgb(126, 34, 206)");
+
+      //Publish the App and validate Theme across the app
+      deployMode.DeployApp();
+      //Bug Form backgroud colour reset in Publish mode
+      cy.get(formWidgetsPage.formD)
+        .should("have.css", "background-color")
+        .and("eq", "rgb(126, 34, 206)");
     });
-    deployMode.NavigateBacktoEditor();
-  });
-
-  it("2. Validate Default Theme change across application", function () {
-    propPane.RenameWidget("Form1", "FormTest");
-    propPane.MoveToTab("Style");
-    cy.get(widgetsPage.backgroundcolorPickerNew).first().click({ force: true });
-    cy.get("[style='background-color: rgb(21, 128, 61);']").last().click();
-    cy.wait(2000);
-    cy.get(formWidgetsPage.formD)
-      .should("have.css", "background-color")
-      .and("eq", "rgb(21, 128, 61)");
-    cy.get("#canvas-selection-0").click({ force: true });
-
-    appSettings.OpenAppSettings();
-    appSettings.GoToThemeSettings();
-    //Change the Theme
-    cy.get(commonlocators.changeThemeBtn).click({ force: true });
-    cy.get(themelocator.currentTheme).click({ force: true });
-    cy.get(".t--theme-card main > main")
-      .first()
-      .invoke("css", "background-color")
-      .then((CurrentBackgroudColor) => {
-        cy.get(".bp3-button:contains('Sub')")
-          .last()
-          .invoke("css", "background-color")
-          .then((selectedBackgroudColor) => {
-            expect(CurrentBackgroudColor).to.equal(selectedBackgroudColor);
-            themeBackgroudColor = CurrentBackgroudColor;
-            appSettings.ClosePane();
-          });
-      });
-  });
-
-  it("3. Validate Theme change across application", function () {
-    EditorNavigation.SelectEntityByName("FormTest", EntityType.Widget);
-    propPane.MoveToTab("Style");
-    cy.get(widgetsPage.backgroundcolorPickerNew).first().click({ force: true });
-    cy.get("[style='background-color: rgb(21, 128, 61);']").last().click();
-    cy.wait(2000);
-    cy.get(formWidgetsPage.formD)
-      .should("have.css", "background-color")
-      .and("eq", "rgb(21, 128, 61)");
-
-    cy.get("#canvas-selection-0").click({ force: true });
-
-    appSettings.OpenAppSettings();
-    appSettings.GoToThemeSettings();
-    //Change the Theme
-    cy.get(commonlocators.changeThemeBtn).click({ force: true });
-    // select a theme
-    cy.get(commonlocators.themeCard).last().click({ force: true });
-
-    // check for alert
-    cy.get(`${commonlocators.themeCard}`)
-      .last()
-      .siblings("div")
-      .first()
-      .invoke("text")
-      .then((text) => {
-        cy.get(commonlocators.toastmsg).contains(`Theme ${text} applied`);
-      });
-    cy.get(`${commonlocators.themeCard} > main`)
-      .last()
-      .invoke("css", "background-color")
-      .then((backgroudColor) => {
-        cy.get(commonlocators.canvas).should(
-          "have.css",
-          "background-color",
-          backgroudColor,
-        );
-      });
-    cy.get(themelocator.currentTheme).click({ force: true });
-    cy.get(".t--theme-card > main")
-      .first()
-      .invoke("css", "background-color")
-      .then((backgroudColor) => {
-        cy.get(commonlocators.canvas).should(
-          "have.css",
-          "background-color",
-          backgroudColor,
-        );
-      });
-    cy.get(".t--theme-card main > main")
-      .first()
-      .invoke("css", "background-color")
-      .then((CurrentBackgroudColor) => {
-        cy.get(".t--theme-card main > main")
-          .last()
-          .invoke("css", "background-color")
-          .then((selectedBackgroudColor) => {
-            expect(CurrentBackgroudColor).to.equal(selectedBackgroudColor);
-            themeBackgroudColor = CurrentBackgroudColor;
-            appSettings.ClosePane();
-          });
-      });
-    EditorNavigation.SelectEntityByName("FormTest", EntityType.Widget);
-    propPane.MoveToTab("Style");
-    cy.get(widgetsPage.backgroundcolorPickerNew).first().click({ force: true });
-    cy.get("[style='background-color: rgb(126, 34, 206);']").first().click();
-    cy.wait(2000);
-    cy.get(formWidgetsPage.formD)
-      .should("have.css", "background-color")
-      .and("eq", "rgb(126, 34, 206)");
-
-    //Publish the App and validate Theme across the app
-    deployMode.DeployApp();
-    //Bug Form backgroud colour reset in Publish mode
-    cy.get(formWidgetsPage.formD)
-      .should("have.css", "background-color")
-      .and("eq", "rgb(126, 34, 206)");
-  });
-});
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ThemingTests/Theme_MultiSelectWidget_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ThemingTests/Theme_MultiSelectWidget_spec.js
index 0f149cf2179a..4e6f553f23ff 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ThemingTests/Theme_MultiSelectWidget_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/ThemingTests/Theme_MultiSelectWidget_spec.js
@@ -16,7 +16,7 @@ let themeFont;
 
 describe(
   "Theme validation usecase for multi-select widget",
-  { tags: ["@tag.Theme"] },
+  { tags: ["@tag.Theme", "@tag.Git"] },
   function () {
     it("1. Drag and drop multi-select widget and validate Default font and list of font validation + Bug 15007", function () {
       entityExplorer.DragDropWidgetNVerify(
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Audio/AudioRecorder1_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Audio/AudioRecorder1_spec.ts
index a883cdd8c5a0..1906771330e9 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Audio/AudioRecorder1_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Audio/AudioRecorder1_spec.ts
@@ -13,7 +13,7 @@ import EditorNavigation, {
 
 describe(
   "Audio Recorder functionality tests",
-  { tags: ["@tag.Widget", "@tag.Audio"] },
+  { tags: ["@tag.Widget", "@tag.Audio", "@tag.Binding"] },
   () => {
     before(() => {
       entityExplorer.DragDropWidgetNVerify(
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Audio/AudioRecorder_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Audio/AudioRecorder_spec.js
index df109cf90c4a..9f0ec20ec711 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Audio/AudioRecorder_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Audio/AudioRecorder_spec.js
@@ -2,7 +2,7 @@ const widgetName = "audiorecorderwidget";
 
 describe(
   "AudioRecorder Widget",
-  { tags: ["@tag.Widget", "@tag.Audio"] },
+  { tags: ["@tag.Widget", "@tag.Audio", "@tag.Binding"] },
   () => {
     it("Drag & drop AudioRecorder and Text widgets", () => {
       cy.dragAndDropToCanvas(widgetName, { x: 300, y: 300 });
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Audio/audio_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Audio/audio_spec.js
index 216b9ae6902e..92b0cb1fa316 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Audio/audio_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Audio/audio_spec.js
@@ -4,7 +4,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Audio Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Audio"] },
+  { tags: ["@tag.Widget", "@tag.Audio", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("audioWidgetDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Button/Button2_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Button/Button2_spec.ts
index 4cfc7b8c890d..f3dc601cbcf1 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Button/Button2_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Button/Button2_spec.ts
@@ -19,7 +19,7 @@ import EditorNavigation, {
 
 describe(
   "Button widget testcases",
-  { tags: ["@tag.Widget", "@tag.Button"] },
+  { tags: ["@tag.Widget", "@tag.Button", "@tag.Binding"] },
   () => {
     before(() => {
       apiPage.CreateAndFillApi(
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Button/ButtonGroup2_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Button/ButtonGroup2_spec.ts
index 11ad27541986..df1c74b3436e 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Button/ButtonGroup2_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Button/ButtonGroup2_spec.ts
@@ -15,7 +15,7 @@ import EditorNavigation, {
 
 describe(
   "Button Group Widget Test",
-  { tags: ["@tag.Widget", "@tag.Button"] },
+  { tags: ["@tag.Widget", "@tag.Button", "@tag.Binding"] },
   function () {
     before("Login to the app and navigate to the workspace", function () {
       entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON_GROUP);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Button/ButtonGroup_MenuButton_Width_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Button/ButtonGroup_MenuButton_Width_spec.js
index a6ad1506f52d..d73126ed9902 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Button/ButtonGroup_MenuButton_Width_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Button/ButtonGroup_MenuButton_Width_spec.js
@@ -3,7 +3,7 @@ import { agHelper } from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "In a button group widget, menu button width",
-  { tags: ["@tag.Widget", "@tag.Button"] },
+  { tags: ["@tag.Widget", "@tag.Button", "@tag.Binding"] },
   function () {
     before(() => {
       agHelper.AddDsl("ButtonGroup_MenuButton_Width_dsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Button/ButtonGroup_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Button/ButtonGroup_spec.js
index 6d1b1fb35f1f..1e64e83a5c58 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Button/ButtonGroup_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Button/ButtonGroup_spec.js
@@ -18,7 +18,7 @@ const menuButton =
 
 describe(
   "Button Group Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Button"] },
+  { tags: ["@tag.Widget", "@tag.Button", "@tag.Binding"] },
   function () {
     before(() => {
       entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON_GROUP);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Button/ButtonLintErrorValidation_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Button/ButtonLintErrorValidation_spec.js
index 93bcb3dbd81d..435651a97ba7 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Button/ButtonLintErrorValidation_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Button/ButtonLintErrorValidation_spec.js
@@ -3,7 +3,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Linting warning validation with button widget",
-  { tags: ["@tag.Widget", "@tag.Button"] },
+  { tags: ["@tag.Widget", "@tag.Button", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("buttonLintErrorDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Button/Button_onClickAction_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Button/Button_onClickAction_spec.js
index 703cfc151a18..a387f885c206 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Button/Button_onClickAction_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Button/Button_onClickAction_spec.js
@@ -16,7 +16,7 @@ import {
 
 describe(
   "Button Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Button", "@tag.Sanity"] },
+  { tags: ["@tag.Widget", "@tag.Button", "@tag.Sanity", "@tag.Binding"] },
   function () {
     before(() => {
       agHelper.AddDsl("newFormDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Button/Button_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Button/Button_spec.js
index 0c0824d67989..542929627921 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Button/Button_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Button/Button_spec.js
@@ -12,7 +12,7 @@ const iconAlignmentProperty = ".t--property-control-position";
 
 describe(
   "Button Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Button"] },
+  { tags: ["@tag.Widget", "@tag.Button", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("newFormDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Button/Button_tooltip_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Button/Button_tooltip_spec.js
index ea098127276b..2bfd4ced8ae9 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Button/Button_tooltip_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Button/Button_tooltip_spec.js
@@ -5,7 +5,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Button Widget Functionality - Validate tooltip visibility",
-  { tags: ["@tag.Widget", "@tag.Button"] },
+  { tags: ["@tag.Widget", "@tag.Button", "@tag.Binding"] },
   function () {
     before(() => {
       _.entityExplorer.DragDropWidgetNVerify(
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Camera/CameraImage_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Camera/CameraImage_Spec.ts
index e0438a393e29..8572db562db6 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Camera/CameraImage_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Camera/CameraImage_Spec.ts
@@ -15,7 +15,7 @@ import PageList from "../../../../../support/Pages/PageList";
 
 describe(
   "Camera widget - Image test",
-  { tags: ["@tag.Widget", "@tag.Camera", "@tag.Visual"] },
+  { tags: ["@tag.Widget", "@tag.Camera", "@tag.Visual", "@tag.Binding"] },
   () => {
     before(() => {
       //Reset video source to default incase it got changed in other specs
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Camera/CameraVideo_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Camera/CameraVideo_Spec.ts
index 9c010aa16c69..b949463c9abf 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Camera/CameraVideo_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Camera/CameraVideo_Spec.ts
@@ -14,7 +14,7 @@ import EditorNavigation, {
 
 describe(
   "Camera widget - Video test",
-  { tags: ["@tag.Widget", "@tag.Camera", "@tag.Visual"] },
+  { tags: ["@tag.Widget", "@tag.Camera", "@tag.Visual", "@tag.Binding"] },
   () => {
     before(() => {
       //Reset video source to default incase it got changed in other specs
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Chart/ChartDataPoint_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Chart/ChartDataPoint_Spec.ts
index 3f12e9eb6f7d..05ae81bb802f 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Chart/ChartDataPoint_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Chart/ChartDataPoint_Spec.ts
@@ -16,7 +16,7 @@ let dataSet: any, dsl: any;
 
 describe(
   "Input widget test with default value from chart datapoint",
-  { tags: ["@tag.Widget", "@tag.Chart", "@tag.Sanity"] },
+  { tags: ["@tag.Widget", "@tag.Chart", "@tag.Sanity", "@tag.Binding"] },
   () => {
     //beforeEach - to enable re-attempt passing!
     beforeEach(() => {
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Chart/ChartWidgetErrors_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Chart/ChartWidgetErrors_spec.ts
index fdded5f5f7f4..ea59fb84bc85 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Chart/ChartWidgetErrors_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Chart/ChartWidgetErrors_spec.ts
@@ -7,7 +7,7 @@ import {
 
 describe(
   "Chart renders widget errors",
-  { tags: ["@tag.Widget", "@tag.Chart"] },
+  { tags: ["@tag.Widget", "@tag.Chart", "@tag.Binding"] },
   () => {
     it("1. If there are syntax errors, the errors are displayed inside the chart widget", function () {
       entityExplorer.DragDropWidgetNVerify(draggableWidgets.CHART);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Chart/Chart_Widget_Loading_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Chart/Chart_Widget_Loading_spec.js
index d4a956c29f0c..57747db1c832 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Chart/Chart_Widget_Loading_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Chart/Chart_Widget_Loading_spec.js
@@ -9,7 +9,7 @@ import EditorNavigation, {
 let dsname;
 describe(
   "Chart Widget Skeleton Loading Functionality",
-  { tags: ["@tag.Widget", "@tag.Chart"] },
+  { tags: ["@tag.Widget", "@tag.Chart", "@tag.Binding"] },
   function () {
     before(() => {
       agHelper.AddDsl("ChartLoadingDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Chart/Custom3DChartSpec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Chart/Custom3DChartSpec.ts
index 696303aad3cc..3e2f532a06e2 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Chart/Custom3DChartSpec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Chart/Custom3DChartSpec.ts
@@ -7,7 +7,7 @@ const publicWidgetsPage = require("../../../../../locators/publishWidgetspage.js
 
 describe.skip(
   "3D Custom EChart feature",
-  { tags: ["@tag.Widget", "@tag.Chart", "@tag.Visual"] },
+  { tags: ["@tag.Widget", "@tag.Chart", "@tag.Visual", "@tag.Binding"] },
   function () {
     it("1. 3D EChart Custom Chart Widget Functionality", function () {
       _.agHelper.RefreshPage();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Chart/Custom_Chart_Data_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Chart/Custom_Chart_Data_spec.js
index d416f39a8998..dd84c19b891c 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Chart/Custom_Chart_Data_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Chart/Custom_Chart_Data_spec.js
@@ -2,7 +2,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Chart Widget Functionality around custom chart data",
-  { tags: ["@tag.Widget", "@tag.Chart"] },
+  { tags: ["@tag.Widget", "@tag.Chart", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("chartCustomDataDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Chart/Custom_Chart_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Chart/Custom_Chart_spec.js
index 6e204e3cacc9..1e0a8370e278 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Chart/Custom_Chart_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Chart/Custom_Chart_spec.js
@@ -8,7 +8,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Chart Widget Functionality around custom chart feature",
-  { tags: ["@tag.Widget", "@tag.Chart"] },
+  { tags: ["@tag.Widget", "@tag.Chart", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("chartUpdatedDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Checkbox/CheckBoxLintErrorMultipleRowValidation_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Checkbox/CheckBoxLintErrorMultipleRowValidation_spec.js
index e2a827abac06..358fe39e3e54 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Checkbox/CheckBoxLintErrorMultipleRowValidation_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Checkbox/CheckBoxLintErrorMultipleRowValidation_spec.js
@@ -3,7 +3,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Linting warning validation with Checkbox widget",
-  { tags: ["@tag.Widget", "@tag.Checkbox"] },
+  { tags: ["@tag.Widget", "@tag.Checkbox", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("snippetDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Checkbox/CheckBoxMultipleLintError_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Checkbox/CheckBoxMultipleLintError_spec.js
index 704cccbc8298..6f54c58e01d6 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Checkbox/CheckBoxMultipleLintError_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Checkbox/CheckBoxMultipleLintError_spec.js
@@ -3,7 +3,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Linting warning validation with Checkbox widget",
-  { tags: ["@tag.Widget", "@tag.Checkbox"] },
+  { tags: ["@tag.Widget", "@tag.Checkbox", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("snippetErrordsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Checkbox/CheckBox_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Checkbox/CheckBox_spec.js
index e6d56424297e..7ac312e30571 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Checkbox/CheckBox_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Checkbox/CheckBox_spec.js
@@ -6,7 +6,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Checkbox Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Checkbox"] },
+  { tags: ["@tag.Widget", "@tag.Checkbox", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("newFormDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Checkbox/CheckboxGroup1_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Checkbox/CheckboxGroup1_spec.js
index af4469692416..ec713566d2ed 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Checkbox/CheckboxGroup1_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Checkbox/CheckboxGroup1_spec.js
@@ -2,7 +2,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "checkboxgroupwidget Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Checkbox"] },
+  { tags: ["@tag.Widget", "@tag.Checkbox", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("emptyDSL");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Checkbox/CheckboxGroup2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Checkbox/CheckboxGroup2_spec.js
index 10c00970efb8..81ba7c6278a6 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Checkbox/CheckboxGroup2_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Checkbox/CheckboxGroup2_spec.js
@@ -8,7 +8,7 @@ import {
 
 describe(
   "Checkbox Group Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Checkbox"] },
+  { tags: ["@tag.Widget", "@tag.Checkbox", "@tag.Binding"] },
   function () {
     before(() => {
       agHelper.AddDsl("checkboxgroupDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Checkbox/CheckboxGroup_withQuery_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Checkbox/CheckboxGroup_withQuery_spec.js
index f1117e54f003..958b4f596e3e 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Checkbox/CheckboxGroup_withQuery_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Checkbox/CheckboxGroup_withQuery_spec.js
@@ -8,7 +8,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Checkbox Group Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Checkbox"] },
+  { tags: ["@tag.Widget", "@tag.Checkbox", "@tag.Binding"] },
   function () {
     let dsName;
     before(() => {
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/CodeScanner/CodeScanner1_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/CodeScanner/CodeScanner1_spec.ts
index 25d66aff6821..e0bc3666badc 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/CodeScanner/CodeScanner1_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/CodeScanner/CodeScanner1_spec.ts
@@ -8,7 +8,7 @@ const codeScannerDisabledSVGIconOnPublishPage = `${publish.codescannerwidget} ${
 
 describe(
   "Code Scanner widget's functionality",
-  { tags: ["@tag.Widget", "@tag.Scanner"] },
+  { tags: ["@tag.Widget", "@tag.Scanner", "@tag.Binding"] },
   () => {
     it("1 => Check if code scanner widget can be dropped on the canvas", () => {
       // Drop the widget
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/CodeScanner/CodeScanner2_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/CodeScanner/CodeScanner2_spec.ts
index 32604807f288..27be8c47b5ad 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/CodeScanner/CodeScanner2_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/CodeScanner/CodeScanner2_spec.ts
@@ -14,7 +14,7 @@ import EditorNavigation, {
 
 describe(
   "Code scanner widget tests",
-  { tags: ["@tag.Widget", "@tag.Scanner"] },
+  { tags: ["@tag.Widget", "@tag.Scanner", "@tag.Binding"] },
   () => {
     before(() => {
       //Reset video source to default
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ContainerTest2_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ContainerTest2_spec.ts
index 9045781906b6..6c3a3a61a605 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ContainerTest2_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ContainerTest2_spec.ts
@@ -12,7 +12,9 @@ import EditorNavigation, {
 
 describe(
   "Rich Text Editor widget Tests",
-  { tags: ["@tag.Widget", "@tag.Container"] },
+  {
+    tags: ["@tag.Widget", "@tag.Container", "@tag.AutoHeight", "@tag.Binding"],
+  },
   function () {
     before(() => {
       agHelper.AddDsl("ContainerWithOtherWidgetsDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Container_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Container_spec.js
index 4f9ba8fe2103..cfff72ba14c2 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Container_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Container_spec.js
@@ -11,7 +11,9 @@ const boxShadowOptions = {
 
 describe(
   "Container Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Container"] },
+  {
+    tags: ["@tag.Widget", "@tag.Container", "@tag.AutoHeight", "@tag.Binding"],
+  },
   function () {
     before(() => {
       _.agHelper.AddDsl("containerdsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/CurrencyInput/CurrencyInputDynamicCurrencyCode_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/CurrencyInput/CurrencyInputDynamicCurrencyCode_spec.js
index 5186338e7759..89be8b321e77 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/CurrencyInput/CurrencyInputDynamicCurrencyCode_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/CurrencyInput/CurrencyInputDynamicCurrencyCode_spec.js
@@ -4,7 +4,7 @@ const widgetName = "currencyinputwidget";
 
 describe(
   "Currency input widget - ",
-  { tags: ["@tag.Widget", "@tag.CurrencyInput"] },
+  { tags: ["@tag.Widget", "@tag.CurrencyInput", "@tag.Binding"] },
   () => {
     before(() => {
       _.agHelper.AddDsl("CurrencyInputDynamic");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/CurrencyInput/CurrencyInput_ShowStepArrows_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/CurrencyInput/CurrencyInput_ShowStepArrows_spec.js
index ffb298164e73..a4febaa8886b 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/CurrencyInput/CurrencyInput_ShowStepArrows_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/CurrencyInput/CurrencyInput_ShowStepArrows_spec.js
@@ -5,7 +5,7 @@ const widgetName = "currencyinputwidget";
 
 describe(
   "Currency Widget showStepArrows Functionality - ",
-  { tags: ["@tag.Widget", "@tag.CurrencyInput"] },
+  { tags: ["@tag.Widget", "@tag.CurrencyInput", "@tag.Binding"] },
   function () {
     it("1. Validate that For new currency input widgets being dragged, the value for showStepArrows should be set to false", () => {
       cy.dragAndDropToCanvas(widgetName, { x: 300, y: 400 });
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/CurrencyInput/CurrencyInput_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/CurrencyInput/CurrencyInput_spec.js
index 3292ad922fdf..b4fdfe4d25cf 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/CurrencyInput/CurrencyInput_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/CurrencyInput/CurrencyInput_spec.js
@@ -6,7 +6,7 @@ const widgetInput = `.t--widget-${widgetName} input`;
 
 describe(
   "Currency widget - ",
-  { tags: ["@tag.Widget", "@tag.CurrencyInput"] },
+  { tags: ["@tag.Widget", "@tag.CurrencyInput", "@tag.Binding"] },
   () => {
     before(() => {
       _.agHelper.AddDsl("emptyDSL");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Custom/CustomWidgetDefaultComponent_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Custom/CustomWidgetDefaultComponent_spec.ts
index 94b740264599..7716e7dbfa06 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Custom/CustomWidgetDefaultComponent_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Custom/CustomWidgetDefaultComponent_spec.ts
@@ -12,7 +12,7 @@ import EditorNavigation, {
 
 describe(
   "Custom widget Tests",
-  { tags: ["@tag.Widget", "@tag.excludeForAirgap"] },
+  { tags: ["@tag.Widget", "@tag.excludeForAirgap", "@tag.Binding"] },
   function () {
     before(() => {
       entityExplorer.DragDropWidgetNVerify("customwidget", 550, 100);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Custom/CustomWidgetEditorPropertyPane_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Custom/CustomWidgetEditorPropertyPane_spec.ts
index 6805ad328817..166dd8006e76 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Custom/CustomWidgetEditorPropertyPane_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Custom/CustomWidgetEditorPropertyPane_spec.ts
@@ -7,7 +7,7 @@ import {
 
 describe(
   "Custom widget Tests",
-  { tags: ["@tag.Widget", "@tag.excludeForAirgap"] },
+  { tags: ["@tag.Widget", "@tag.excludeForAirgap", "@tag.Binding"] },
   function () {
     before(() => {
       agHelper.AddDsl("customWidget");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Datepicker/DatePicker1_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Datepicker/DatePicker1_spec.js
index 4759b6b77fdb..67573cfc47e7 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Datepicker/DatePicker1_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Datepicker/DatePicker1_spec.js
@@ -7,7 +7,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "DatePicker Widget Property pane tests with js bindings",
-  { tags: ["@tag.Widget", "@tag.Datepicker"] },
+  { tags: ["@tag.Widget", "@tag.Datepicker", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("datePicker2dsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Datepicker/DatePicker2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Datepicker/DatePicker2_spec.js
index e9eaf610b9c0..065f0c7a9e4f 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Datepicker/DatePicker2_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Datepicker/DatePicker2_spec.js
@@ -7,7 +7,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "DatePicker Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Datepicker"] },
+  { tags: ["@tag.Widget", "@tag.Datepicker", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("newFormDsl");
@@ -19,10 +19,10 @@ describe(
 
     // ADS changes to date input property causes this test to fail
     // skipping it temporarily.
-    it.skip("DatePicker-Date Name validation", function () {
+    it("DatePicker-Date Name validation", function () {
       // changing the date to today
       cy.get(formWidgetsPage.defaultDate).click();
-      cy.SetDateToToday();
+      cy.get(formWidgetsPage.dayPickerToday).click();
 
       //changing the Button Name
       cy.widgetText(
@@ -30,16 +30,14 @@ describe(
         formWidgetsPage.datepickerWidget,
         widgetsPage.widgetNameSpan,
       );
-
       // change the date to next day
       cy.get(formWidgetsPage.defaultDate).click();
 
       /**
        * setDate--> is a Command to select the date in the date picker
-       * @param1 --> its takes currentday+ <future day> eg: 1
-       * @param2 --> user date formate
        */
-      cy.setDate(1, "ddd MMM DD YYYY");
+
+      cy.setDate(1);
       const nextDay = dayjs().add(1, "days").format("DD/MM/YYYY");
       cy.log(nextDay);
       cy.get(formWidgetsPage.datepickerWidget + " .bp3-input").should(
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Datepicker/DatePicker3_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Datepicker/DatePicker3_spec.ts
index 71e8bf1e95c4..b2aee9b4ea00 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Datepicker/DatePicker3_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Datepicker/DatePicker3_spec.ts
@@ -8,7 +8,7 @@ import {
   propPane,
 } from "../../../../../support/Objects/ObjectsCore";
 
-import { format } from "date-fns";
+import { format } from "date-fns/format.cjs";
 import { datePickerlocators } from "../../../../../locators/WidgetLocators";
 import EditorNavigation, {
   EntityType,
@@ -16,7 +16,7 @@ import EditorNavigation, {
 
 describe(
   "Date picker widget testcases",
-  { tags: ["@tag.Widget", "@tag.Datepicker"] },
+  { tags: ["@tag.Widget", "@tag.Datepicker", "@tag.Binding"] },
   () => {
     before(() => {
       entityExplorer.DragDropWidgetNVerify(draggableWidgets.DATEPICKER);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Datepicker/DatePickerV2Updated_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Datepicker/DatePickerV2Updated_spec.js
index 10f3ff529b1b..1b634205dfe3 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Datepicker/DatePickerV2Updated_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Datepicker/DatePickerV2Updated_spec.js
@@ -3,7 +3,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "DatePicker Widget Property pane tests with js bindings",
-  { tags: ["@tag.Widget", "@tag.Datepicker"] },
+  { tags: ["@tag.Widget", "@tag.Datepicker", "@tag.Binding"] },
   function () {
     beforeEach(() => {
       _.agHelper.RestoreLocalStorageCache();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Datepicker/DatePickerV2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Datepicker/DatePickerV2_spec.js
index 953307c20c63..7bc4efc0936d 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Datepicker/DatePickerV2_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Datepicker/DatePickerV2_spec.js
@@ -9,7 +9,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "DatePicker Widget Property pane tests with js bindings",
-  { tags: ["@tag.Widget", "@tag.Datepicker"] },
+  { tags: ["@tag.Widget", "@tag.Datepicker", "@tag.Binding"] },
   function () {
     beforeEach(() => {
       _.agHelper.RestoreLocalStorageCache();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Datepicker/DatePicker_Toggle_js_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Datepicker/DatePicker_Toggle_js_spec.js
index 3ff25dc51f59..6b706e4798c7 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Datepicker/DatePicker_Toggle_js_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Datepicker/DatePicker_Toggle_js_spec.js
@@ -4,7 +4,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "DatePicker",
-  { tags: ["@tag.Widget", "@tag.Datepicker"] },
+  { tags: ["@tag.Widget", "@tag.Datepicker", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("newFormDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Datepicker/DatePicker_With_Switch_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Datepicker/DatePicker_With_Switch_spec.js
index a120e800f977..f5257949830a 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Datepicker/DatePicker_With_Switch_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Datepicker/DatePicker_With_Switch_spec.js
@@ -9,7 +9,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Switch Widget within Form widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Datepicker"] },
+  { tags: ["@tag.Widget", "@tag.Datepicker", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("datepicker_switchDsl");
@@ -28,11 +28,14 @@ describe(
       cy.closePropertyPane();
     });
     // Skipping tests due to issue - https://www.notion.so/appsmith/f353d8c6bd664f79ad858a42010cdfc8?v=f04cde23f6424aeb9d5a6e389cd172bd&p=0717892d43684c40bae4e2c87b8308cb&pm=s
-    it.skip("Date Widget with Reset widget being switch widget", function () {
+    it("Date Widget with Reset widget being switch widget", function () {
       EditorNavigation.SelectEntityByName("DatePicker1", EntityType.Widget);
 
+      cy.get(formWidgetsPage.datePickerInput).click();
+      _.agHelper.GetNClick(widgetsPage.todayText);
+      cy.get(formWidgetsPage.defaultDate).click();
+      _.agHelper.GetNClick(".ads-v2-datepicker__calender-today");
       cy.get(formWidgetsPage.defaultDate).click();
-      cy.SetDateToToday();
       cy.setDate(1, "ddd MMM DD YYYY");
       const nextDay = dayjs().format("DD/MM/YYYY");
       cy.log(nextDay);
@@ -51,18 +54,10 @@ describe(
       cy.get(widgetsPage.switchWidgetInactive).should("be.visible");
     });
 
-    it.skip("DatePicker-Date change and validate switch widget status", function () {
+    it("DatePicker-Date change and validate switch widget status", function () {
       cy.get(widgetsPage.datepickerInput).click({ force: true });
-      cy.SetDateToToday();
-      cy.get(widgetsPage.switchWidgetActive).should("be.visible");
-      cy.get(".t--toast-action span")
-        .last()
-        .invoke("text")
-        .then((text) => {
-          const toasttext = text;
-          cy.log(toasttext);
-          expect(text.trim()).to.equal(toasttext.trim());
-        });
+      _.agHelper.GetNClick(widgetsPage.todayText);
+      _.agHelper.AssertClassExists(".bp3-switch", "t--switch-widget-active");
     });
   },
 );
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Disabled_Widgets_drag_validation_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Disabled_Widgets_drag_validation_spec.js
index 525223a5711b..3e28c329db56 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Disabled_Widgets_drag_validation_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Disabled_Widgets_drag_validation_spec.js
@@ -3,7 +3,7 @@ import * as _ from "../../../../support/Objects/ObjectsCore";
 
 describe(
   "Disabled Widgets drag Functionality",
-  { tags: ["@tag.Widget"] },
+  { tags: ["@tag.Widget", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("disabledWidgetsDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Divider/Widget_Divider_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Divider/Widget_Divider_spec.ts
index 7975e17717c4..51c3fd4afcfe 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Divider/Widget_Divider_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Divider/Widget_Divider_spec.ts
@@ -13,7 +13,7 @@ import EditorNavigation, {
 
 describe(
   "Divider Widget functionality tests",
-  { tags: ["@tag.Widget", "@tag.Divider"] },
+  { tags: ["@tag.Widget", "@tag.Divider", "@tag.Binding"] },
   () => {
     before(() => {
       entityExplorer.DragDropWidgetNVerify(draggableWidgets.DIVIDER, 200, 200);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/DocumentViewer/DocumentViewer_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/DocumentViewer/DocumentViewer_spec.ts
index 490bc3c766c4..38d9da17a918 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/DocumentViewer/DocumentViewer_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/DocumentViewer/DocumentViewer_spec.ts
@@ -15,17 +15,15 @@ import EditorNavigation, {
 } from "../../../../../support/Pages/EditorNavigation";
 
 const ppt =
-  "https://ssz.sgp1.digitaloceanspaces.com/3ZEO2582C29EA0KKK2/ppt-on-population-pptxafa26c44-208f-46a3-89cc-8a5c020b6863.pptx";
-const pngImage =
-  "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcRb8umIiCU_K6ac-xS-ni4y6SP7XAd8C7Ms3Q&usqp=CAU";
+  "http://host.docker.internal:4200/ppt-on-population-pptxafa26c44-208f-46a3-89cc-8a5c020b6863.pptx";
+const pngImage = "https://www.appsmith.com/favicon.png";
 const jpgImage =
   "https://community.appsmith.com/sites/default/files/styles/small_thumbnail/public/2024-03/aws-logo.jpg?itok=yG4bpfFs";
-const pdf =
-  "https://www.learningcontainer.com/wp-content/uploads/2019/09/sample-pdf-file.pdf";
+const pdf = "http://host.docker.internal:4200/sample-pdf-file.pdf";
 
 describe(
   "DocumentViewer Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.DocumentViewer"] },
+  { tags: ["@tag.Widget", "@tag.DocumentViewer", "@tag.Binding"] },
   () => {
     before(() => {
       entityExplorer.DragDropWidgetNVerify("filepickerwidgetv2", 400, 900);
@@ -212,10 +210,7 @@ describe(
       agHelper.AssertElementExist(
         locators._widgetInDeployed("documentviewerwidget"),
       );
-      agHelper.AssertContains(
-        "Current file type is not supported",
-        "not.exist",
-      );
+      agHelper.AssertContains("Current file type is not supported");
       deployMode.NavigateBacktoEditor();
       //Should not show an jpg image file"
       EditorNavigation.SelectEntityByName("DocumentViewer1", EntityType.Widget);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Dropdown/DropDownWidget_value_reset_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Dropdown/DropDownWidget_value_reset_spec.js
index fa229a8df155..19961a302d3a 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Dropdown/DropDownWidget_value_reset_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Dropdown/DropDownWidget_value_reset_spec.js
@@ -9,7 +9,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Dropdown Widget Check value does not reset on navigation",
-  { tags: ["@tag.Widget", "@tag.Dropdown"] },
+  { tags: ["@tag.Widget", "@tag.Dropdown", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("dropDownWidget_reset_check_dsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Dropdown/Dropdown_onOptionChange_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Dropdown/Dropdown_onOptionChange_spec.js
index e78f872fca7f..f6c2128c334a 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Dropdown/Dropdown_onOptionChange_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Dropdown/Dropdown_onOptionChange_spec.js
@@ -17,7 +17,7 @@ import {
 
 describe(
   "Dropdown Widget",
-  { tags: ["@tag.Widget", "@tag.Dropdown"] },
+  { tags: ["@tag.Widget", "@tag.Dropdown", "@tag.Binding"] },
   function () {
     before(() => {
       agHelper.AddDsl("newFormDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Dropdown/Dropdown_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Dropdown/Dropdown_spec.js
index 29003b4017cd..aea162b8819f 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Dropdown/Dropdown_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Dropdown/Dropdown_spec.js
@@ -5,7 +5,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Dropdown Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Dropdown"] },
+  { tags: ["@tag.Widget", "@tag.Dropdown", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("emptyDSL");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Filepicker/FilePicker2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Filepicker/FilePicker2_spec.js
index c70ecb7c4f19..fa2f96fe9a84 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Filepicker/FilePicker2_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Filepicker/FilePicker2_spec.js
@@ -7,7 +7,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "FilePicker Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Filepicker"] },
+  { tags: ["@tag.Widget", "@tag.Filepicker", "@tag.Binding"] },
   function () {
     afterEach(() => {
       _.agHelper.SaveLocalStorageCache();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Filepicker/FilePicker3_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Filepicker/FilePicker3_spec.ts
index d2e1fc25f393..aa02ef5e2841 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Filepicker/FilePicker3_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Filepicker/FilePicker3_spec.ts
@@ -12,7 +12,7 @@ import EditorNavigation, {
 
 describe(
   "Verify file picker widget",
-  { tags: ["@tag.Widget", "@tag.Filepicker"] },
+  { tags: ["@tag.Widget", "@tag.Filepicker", "@tag.Binding"] },
   () => {
     before(() => {
       agHelper.AddDsl("filepickerDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Filepicker/FilePickerV2_CSV_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Filepicker/FilePickerV2_CSV_spec.js
index f27a969cf0c9..975f23e23fb7 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Filepicker/FilePickerV2_CSV_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Filepicker/FilePickerV2_CSV_spec.js
@@ -12,7 +12,7 @@ const ARRAY_CSV_HELPER_TEXT = `All non CSV, XLS(X), JSON or TSV filetypes will h
 
 describe(
   "File picker widget v2",
-  { tags: ["@tag.Widget", "@tag.Filepicker"] },
+  { tags: ["@tag.Widget", "@tag.Filepicker", "@tag.Binding"] },
   () => {
     before(() => {
       agHelper.AddDsl("filePickerTableDSL");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Filepicker/FilePickerV2_Widget_Reskinning_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Filepicker/FilePickerV2_Widget_Reskinning_spec.js
index d44345f8cee7..bd22bae61244 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Filepicker/FilePickerV2_Widget_Reskinning_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Filepicker/FilePickerV2_Widget_Reskinning_spec.js
@@ -4,7 +4,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Checkbox Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Filepicker"] },
+  { tags: ["@tag.Widget", "@tag.Filepicker", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("filePickerV2WidgetReskinDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Filepicker/FilePickerV2_Widget_reset_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Filepicker/FilePickerV2_Widget_reset_spec.js
index 53e652424106..abb8c22096fc 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Filepicker/FilePickerV2_Widget_reset_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Filepicker/FilePickerV2_Widget_reset_spec.js
@@ -5,7 +5,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "File Picker Widget V2 Functionality",
-  { tags: ["@tag.Widget", "@tag.Filepicker"] },
+  { tags: ["@tag.Widget", "@tag.Filepicker", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("filePickerV2_reset_check_dsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Filepicker/FilePickerV2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Filepicker/FilePickerV2_spec.js
index 47253f3d615a..b6d361738491 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Filepicker/FilePickerV2_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Filepicker/FilePickerV2_spec.js
@@ -12,7 +12,7 @@ const widgetName = "filepickerwidgetv2";
 
 describe(
   "File picker widget v2",
-  { tags: ["@tag.Widget", "@tag.Filepicker"] },
+  { tags: ["@tag.Widget", "@tag.Filepicker", "@tag.Binding"] },
   () => {
     it("1. Drag & drop FilePicker/Text widgets", () => {
       cy.dragAndDropToCanvas(widgetName, { x: 300, y: 300 });
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Filepicker/FilePicker_with_fileTypes_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Filepicker/FilePicker_with_fileTypes_spec.js
index e8343a336b45..bbb10da14572 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Filepicker/FilePicker_with_fileTypes_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Filepicker/FilePicker_with_fileTypes_spec.js
@@ -7,7 +7,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "FilePicker Widget Functionality with different file types",
-  { tags: ["@tag.Widget", "@tag.Filepicker"] },
+  { tags: ["@tag.Widget", "@tag.Filepicker", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("filepickerDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Filepicker/Filepicker1_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Filepicker/Filepicker1_spec.js
index 50226155ed4b..b951a50a447e 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Filepicker/Filepicker1_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Filepicker/Filepicker1_spec.js
@@ -10,7 +10,7 @@ import EditorNavigation, {
 
 describe(
   "FilePicker Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Filepicker"] },
+  { tags: ["@tag.Widget", "@tag.Filepicker", "@tag.Binding"] },
   function () {
     before(() => {
       entityExplorer.DragDropWidgetNVerify(draggableWidgets.FILEPICKER);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Form/FormData_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Form/FormData_spec.js
index 51f1939d259b..cce668c46f50 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Form/FormData_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Form/FormData_spec.js
@@ -1,24 +1,28 @@
 import * as _ from "../../../../../support/Objects/ObjectsCore";
 
-describe("Form data", { tags: ["@tag.Widget", "@tag.Form"] }, function () {
-  before(() => {
-    _.agHelper.AddDsl("formDataDsl");
-  });
+describe(
+  "Form data",
+  { tags: ["@tag.Widget", "@tag.Form", "@tag.Binding"] },
+  function () {
+    before(() => {
+      _.agHelper.AddDsl("formDataDsl");
+    });
 
-  it("CheckboxGroupWidget, MultiSelectTreeWidget, MultiSelectWidgetV2, SelectWidget, SingleSelectTreeWidget, SwitchGroupWidget, PhoneInputWidget, InputWidgetV2 and CurrencyInputWidget should have value props of which values are not null or undefined to be included as a form data", function () {
-    // Check form data
-    cy.get("[data-testid='container-wrapper-vannrar7rd'] span")
-      .should("exist")
-      .and(($formData) => {
-        expect($formData).to.contain("FormCheckboxGroupWidget");
-        expect($formData).to.contain("FormMultiSelectTreeWidget");
-        expect($formData).to.contain("FormMultiSelectWidgetV2");
-        expect($formData).to.contain("FormSingleSelectTreeWidget");
-        expect($formData).to.contain("FormSwitchGroupWidget");
-        expect($formData).to.contain("FormSelectWidget");
-        expect($formData).to.contain("FormPhoneInputWidget");
-        expect($formData).to.contain("FormInputWidgetV2");
-        expect($formData).to.contain("FormCurrencyInputWidget");
-      });
-  });
-});
+    it("CheckboxGroupWidget, MultiSelectTreeWidget, MultiSelectWidgetV2, SelectWidget, SingleSelectTreeWidget, SwitchGroupWidget, PhoneInputWidget, InputWidgetV2 and CurrencyInputWidget should have value props of which values are not null or undefined to be included as a form data", function () {
+      // Check form data
+      cy.get("[data-testid='container-wrapper-vannrar7rd'] span")
+        .should("exist")
+        .and(($formData) => {
+          expect($formData).to.contain("FormCheckboxGroupWidget");
+          expect($formData).to.contain("FormMultiSelectTreeWidget");
+          expect($formData).to.contain("FormMultiSelectWidgetV2");
+          expect($formData).to.contain("FormSingleSelectTreeWidget");
+          expect($formData).to.contain("FormSwitchGroupWidget");
+          expect($formData).to.contain("FormSelectWidget");
+          expect($formData).to.contain("FormPhoneInputWidget");
+          expect($formData).to.contain("FormInputWidgetV2");
+          expect($formData).to.contain("FormCurrencyInputWidget");
+        });
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Form/FormReset_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Form/FormReset_spec.js
index 06bf2a8ca9e3..a01f0728e1a5 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Form/FormReset_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Form/FormReset_spec.js
@@ -3,7 +3,7 @@ import widgets from "../../../../../locators/Widgets.json";
 
 describe(
   "Form reset functionality",
-  { tags: ["@tag.Widget", "@tag.Form"] },
+  { tags: ["@tag.Widget", "@tag.Form", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("formResetDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Form/FormWidget_Nested_HasChanges_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Form/FormWidget_Nested_HasChanges_spec.js
index afd94896bde7..146d23800805 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Form/FormWidget_Nested_HasChanges_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Form/FormWidget_Nested_HasChanges_spec.js
@@ -1,17 +1,21 @@
 import * as _ from "../../../../../support/Objects/ObjectsCore";
 
-describe("Form Widget", { tags: ["@tag.Widget", "@tag.Form"] }, () => {
-  before(() => {
-    _.agHelper.AddDsl("formHasChangesDsl");
-  });
+describe(
+  "Form Widget",
+  { tags: ["@tag.Widget", "@tag.Form", "@tag.Binding"] },
+  () => {
+    before(() => {
+      _.agHelper.AddDsl("formHasChangesDsl");
+    });
 
-  it("Check hasChanges meta property", () => {
-    // Check if isDirty is false for the first time
-    cy.contains(".t--widget-textwidget", "false").should("exist");
-    // Interact with UI
-    cy.get(`.t--widget-checkboxwidget label`).first().click();
-    // Check if isDirty is set to true
-    cy.contains(".t--widget-textwidget", "false").should("not.exist");
-    cy.contains(".t--widget-textwidget", "true").should("exist");
-  });
-});
+    it("Check hasChanges meta property", () => {
+      // Check if isDirty is false for the first time
+      cy.contains(".t--widget-textwidget", "false").should("exist");
+      // Interact with UI
+      cy.get(`.t--widget-checkboxwidget label`).first().click();
+      // Check if isDirty is set to true
+      cy.contains(".t--widget-textwidget", "false").should("not.exist");
+      cy.contains(".t--widget-textwidget", "true").should("exist");
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Form/FormWidget_Select_TreeSelect_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Form/FormWidget_Select_TreeSelect_spec.js
index a5914c3f5d45..48540b1e7f85 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Form/FormWidget_Select_TreeSelect_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Form/FormWidget_Select_TreeSelect_spec.js
@@ -4,7 +4,7 @@ import { agHelper } from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Form Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Form"] },
+  { tags: ["@tag.Widget", "@tag.Form", "@tag.Binding"] },
   function () {
     before(() => {
       agHelper.AddDsl("formSelectTreeselectDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Form/FormWidget_With_RichTextEditor_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Form/FormWidget_With_RichTextEditor_spec.js
index ae07e8828be1..08dadf6b8ed3 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Form/FormWidget_With_RichTextEditor_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Form/FormWidget_With_RichTextEditor_spec.js
@@ -4,7 +4,7 @@ const widgetsPage = require("../../../../../locators/Widgets.json");
 
 describe(
   "RichTextEditor Widget Functionality in Form",
-  { tags: ["@tag.Widget", "@tag.Form", "@tag.TextEditor"] },
+  { tags: ["@tag.Widget", "@tag.Form", "@tag.TextEditor", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("formWithRTEDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Form/FormWidget_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Form/FormWidget_spec.js
index bacf2927b2e5..1e0e8b65336f 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Form/FormWidget_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Form/FormWidget_spec.js
@@ -11,7 +11,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Form Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Form"] },
+  { tags: ["@tag.Widget", "@tag.Form", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("formdsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Form/FormWithSwitch_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Form/FormWithSwitch_spec.js
index 17d8f6b74a01..99052f9d079f 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Form/FormWithSwitch_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Form/FormWithSwitch_spec.js
@@ -8,7 +8,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Switch Widget within Form widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Form"] },
+  { tags: ["@tag.Widget", "@tag.Form", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("formSwitchDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Form/Form_With_CheckBox_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Form/Form_With_CheckBox_spec.js
index d5ffd22fa129..855123bb9978 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Form/Form_With_CheckBox_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Form/Form_With_CheckBox_spec.js
@@ -5,7 +5,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Checkbox Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Form"] },
+  { tags: ["@tag.Widget", "@tag.Form", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("formWidgetdsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Iframe/IframeTest_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Iframe/IframeTest_spec.ts
index 51b452e6c3ca..3d67faf40033 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Iframe/IframeTest_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Iframe/IframeTest_spec.ts
@@ -10,7 +10,7 @@ import testdata from "../../../../../fixtures/testdata.json";
 
 describe(
   "Iframe widget Tests",
-  { tags: ["@tag.Widget", "@tag.Iframe"] },
+  { tags: ["@tag.Widget", "@tag.Iframe", "@tag.Binding"] },
   function () {
     before(() => {
       entityExplorer.DragDropWidgetNVerify("iframewidget", 550, 100);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Iframe/Iframe_onSrcDocChange_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Iframe/Iframe_onSrcDocChange_spec.js
index 79a84b9f6afc..4f08e92318ff 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Iframe/Iframe_onSrcDocChange_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Iframe/Iframe_onSrcDocChange_spec.js
@@ -10,7 +10,7 @@ const page1 = "Page1";
 
 describe(
   "Iframe Widget functionality",
-  { tags: ["@tag.Widget", "@tag.Iframe"] },
+  { tags: ["@tag.Widget", "@tag.Iframe", "@tag.Binding"] },
   function () {
     it("1.Import application json", function () {
       cy.visit("/applications", { timeout: 60000 });
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Iframe/Iframe_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Iframe/Iframe_spec.js
index 49d29ff6dccd..62890ddc7413 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Iframe/Iframe_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Iframe/Iframe_spec.js
@@ -2,7 +2,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Iframe Widget functionality",
-  { tags: ["@tag.Widget", "@tag.Iframe"] },
+  { tags: ["@tag.Widget", "@tag.Iframe", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("IframeDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Image/Image2_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Image/Image2_Spec.ts
index bf7d32d38521..e991a66c2742 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Image/Image2_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Image/Image2_Spec.ts
@@ -13,7 +13,7 @@ import EditorNavigation, {
 
 describe(
   "Image widget tests",
-  { tags: ["@tag.Widget", "@tag.Image"] },
+  { tags: ["@tag.Widget", "@tag.Image", "@tag.Binding"] },
   function () {
     const image = (src: string) => 'img[src="' + src + '"]';
     const jpgImg =
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Image/Image3_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Image/Image3_Spec.ts
index 1b0fb86b0fc9..e0cbcad39cc5 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Image/Image3_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Image/Image3_Spec.ts
@@ -13,7 +13,7 @@ import EditorNavigation, {
 
 describe(
   "Image widget - Rotation & Download",
-  { tags: ["@tag.Widget", "@tag.Image"] },
+  { tags: ["@tag.Widget", "@tag.Image", "@tag.Binding"] },
   function () {
     const jpgImg =
       "https://community.appsmith.com/sites/default/files/styles/small_thumbnail/public/2024-03/aws-logo.jpg?itok=yG4bpfFs";
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Image/Image_base64_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Image/Image_base64_spec.js
index 804e8531ef9c..b10747276f83 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Image/Image_base64_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Image/Image_base64_spec.js
@@ -3,7 +3,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Image Widget Functionality with base64",
-  { tags: ["@tag.Widget", "@tag.Image"] },
+  { tags: ["@tag.Widget", "@tag.Image", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("base64imagedsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Image/Image_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Image/Image_spec.js
index 7059d211196b..01e0a4a32783 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Image/Image_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Image/Image_spec.js
@@ -10,7 +10,7 @@ import {
 
 describe(
   "Image Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Image"] },
+  { tags: ["@tag.Widget", "@tag.Image", "@tag.Binding"] },
   function () {
     before(() => {
       agHelper.AddDsl("displayWidgetDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Image/Image_validation_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Image/Image_validation_spec.js
index 682c2031eb03..fac0f3e7dd80 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Image/Image_validation_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Image/Image_validation_spec.js
@@ -3,7 +3,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Image Widget Validation Image Urls",
-  { tags: ["@tag.Widget", "@tag.Image"] },
+  { tags: ["@tag.Widget", "@tag.Image", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("displayWidgetDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Input/Input2_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Input/Input2_Spec.ts
index cc81c42a399a..9000508eafc0 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Input/Input2_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Input/Input2_Spec.ts
@@ -13,7 +13,7 @@ import EditorNavigation, {
 
 describe(
   "InputV2 widget tests",
-  { tags: ["@tag.Widget", "@tag.Input"] },
+  { tags: ["@tag.Widget", "@tag.Input", "@tag.Binding"] },
   function () {
     let testcases,
       multilineData = `[
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Input/Input3_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Input/Input3_Spec.ts
index fb0886bd52a2..18d754517aa4 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Input/Input3_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Input/Input3_Spec.ts
@@ -13,7 +13,7 @@ import EditorNavigation, {
 
 describe(
   "InputV2 widget tests - continuation",
-  { tags: ["@tag.Widget", "@tag.Input"] },
+  { tags: ["@tag.Widget", "@tag.Input", "@tag.Binding"] },
   function () {
     before(() => {
       entityExplorer.DragDropWidgetNVerify(draggableWidgets.INPUT_V2);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Input/Input_MaxChar_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Input/Input_MaxChar_spec.js
index 444b07a3905f..140adc42e50f 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Input/Input_MaxChar_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Input/Input_MaxChar_spec.js
@@ -4,7 +4,7 @@ const widgetsPage = require("../../../../../locators/Widgets.json");
 
 describe(
   "Input Widget Max Char Functionality",
-  { tags: ["@tag.Widget", "@tag.Input"] },
+  { tags: ["@tag.Widget", "@tag.Input", "@tag.Binding"] },
   function () {
     afterEach(() => {
       _.agHelper.SaveLocalStorageCache();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Input/Input_Multiline_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Input/Input_Multiline_spec.js
index 48e4c3fd1ffb..1b5f1d4cc77c 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Input/Input_Multiline_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Input/Input_Multiline_spec.js
@@ -8,7 +8,7 @@ import homePage from "../../../../../locators/HomePage";
 
 describe(
   "Input Widget Multiline feature",
-  { tags: ["@tag.Widget", "@tag.Input"] },
+  { tags: ["@tag.Widget", "@tag.Input", "@tag.Binding"] },
   function () {
     const modifierKey = Cypress.platform === "darwin" ? "meta" : "ctrl";
     it("1. Single-line text with different heights i.e. Auto height and Fixed", () => {
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Input/Input_OnFocus_OnBlur_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Input/Input_OnFocus_OnBlur_spec.js
index 4d3c2f4b3fc5..0eb799fdeefa 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Input/Input_OnFocus_OnBlur_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Input/Input_OnFocus_OnBlur_spec.js
@@ -14,7 +14,7 @@ const agHelper = ObjectsRegistry.AggregateHelper;
 
 describe(
   "Input Widget Property tests onFocus and onBlur",
-  { tags: ["@tag.Widget", "@tag.Input"] },
+  { tags: ["@tag.Widget", "@tag.Input", "@tag.Binding"] },
   function () {
     it("1. onBlur and onFocus should be triggered from the input widget", () => {
       cy.dragAndDropToCanvas(inputWidgetName, { x: 300, y: 200 });
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Input/Input_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Input/Input_spec.js
index 2491002404c2..b94fa422bd60 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Input/Input_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Input/Input_spec.js
@@ -5,7 +5,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Input Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Input"] },
+  { tags: ["@tag.Widget", "@tag.Input", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("newFormDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Input/Inputv2_ShowStepArrows_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Input/Inputv2_ShowStepArrows_spec.js
index b29bd02cf410..ebc4162c2d1b 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Input/Inputv2_ShowStepArrows_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Input/Inputv2_ShowStepArrows_spec.js
@@ -5,7 +5,7 @@ const widgetName = "inputwidgetv2";
 
 describe(
   "Input Widget V2 showStepArrows Functionality - ",
-  { tags: ["@tag.Widget", "@tag.Input"] },
+  { tags: ["@tag.Widget", "@tag.Input", "@tag.Binding"] },
   function () {
     it("1. Validate that dataType - NUMBER, For new widgets being dragged, the value for showStepArrows should be set to false", () => {
       cy.dragAndDropToCanvas(widgetName, { x: 300, y: 400 });
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Input/Inputv2_inside_List_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Input/Inputv2_inside_List_spec.js
index 63c7a790bd05..291ece7961e1 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Input/Inputv2_inside_List_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Input/Inputv2_inside_List_spec.js
@@ -3,176 +3,184 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 const widgetName = "inputwidgetv2";
 const widgetInput = `.t--widget-${widgetName} input`;
 
-describe("Input widget V2 - ", { tags: ["@tag.Widget", "@tag.Input"] }, () => {
-  before(() => {
-    _.agHelper.AddDsl("InputWidgetV2InsideListDSL");
-  });
+describe(
+  "Input widget V2 - ",
+  { tags: ["@tag.Widget", "@tag.Input", "@tag.Binding"] },
+  () => {
+    before(() => {
+      _.agHelper.AddDsl("InputWidgetV2InsideListDSL");
+    });
 
-  it("1. Validate input widget resets OnSubmit", () => {
-    cy.openPropertyPane(widgetName);
-    cy.getAlert("onSubmit", "Submitted!!");
-    cy.get(widgetInput).clear({ force: true });
-    cy.wait(300);
-    cy.get(widgetInput).type("test{enter}"); //Clicking enter submits the form here
-    cy.wait(300);
-    cy.get(widgetInput).should("contain.value", "");
-  });
+    it("1. Validate input widget resets OnSubmit", () => {
+      cy.openPropertyPane(widgetName);
+      cy.getAlert("onSubmit", "Submitted!!");
+      cy.get(widgetInput).clear({ force: true });
+      cy.wait(300);
+      cy.get(widgetInput).type("test{enter}"); //Clicking enter submits the form here
+      cy.wait(300);
+      cy.get(widgetInput).should("contain.value", "");
+    });
 
-  it("2. Validate DataType - TEXT can be entered into Input widget", () => {
-    [
-      {
-        input: "test",
-        expected: "test:true:false",
-      },
-      {
-        input: "test123",
-        expected: "test123:true:false",
-      },
-      {
-        input: "123",
-        expected: "123:true:false",
-      },
-      {
-        input: "",
-        expected: ":true:false",
-      },
-      {
-        input: "$100.22",
-        expected: "$100.22:true:false",
-      },
-      {
-        input: "test@appsmith.com",
-        expected: "test@appsmith.com:true:false",
-      },
-    ].forEach(({ expected, input }) => enterAndTest(input, expected));
-  });
+    it("2. Validate DataType - TEXT can be entered into Input widget", () => {
+      [
+        {
+          input: "test",
+          expected: "test:true:false",
+        },
+        {
+          input: "test123",
+          expected: "test123:true:false",
+        },
+        {
+          input: "123",
+          expected: "123:true:false",
+        },
+        {
+          input: "",
+          expected: ":true:false",
+        },
+        {
+          input: "$100.22",
+          expected: "$100.22:true:false",
+        },
+        {
+          input: "test@appsmith.com",
+          expected: "test@appsmith.com:true:false",
+        },
+      ].forEach(({ expected, input }) => enterAndTest(input, expected));
+    });
 
-  it("3. Validate DataType - NUMBER can be entered into Input widget", () => {
-    cy.openPropertyPane(widgetName);
-    cy.selectDropdownValue(".t--property-control-datatype input", "Number");
+    it("3. Validate DataType - NUMBER can be entered into Input widget", () => {
+      cy.openPropertyPane(widgetName);
+      cy.selectDropdownValue(".t--property-control-datatype input", "Number");
 
-    cy.get(".t--property-control-required label").last().click({ force: true });
+      cy.get(".t--property-control-required label")
+        .last()
+        .click({ force: true });
 
-    cy.selectDropdownValue(".t--property-control-datatype input", "Number");
-    [
-      {
-        input: "invalid",
-        expected: "null:true:false",
-      },
-      {
-        input: "invalid123",
-        expected: "123:true:false",
-      },
-      {
-        input: "123",
-        expected: "123:true:false",
-      },
-      {
-        input: "-",
-        expected: "null:true:false",
-      },
-      {
-        input: "",
-        expected: "null:true:false",
-      },
-      {
-        input: "$100.22",
-        expected: "100.22:true:false",
-      },
-      {
-        input: "invalid@appsmith.com",
-        expected: "null:true:false",
-      },
-      {
-        input: "1.001",
-        expected: "1.001:true:false",
-      },
-      {
-        input: "1.1.",
-        expected: "null:true:false",
-      },
-    ].forEach(({ expected, input }) => enterAndTest(input, expected));
-  });
+      cy.selectDropdownValue(".t--property-control-datatype input", "Number");
+      [
+        {
+          input: "invalid",
+          expected: "null:true:false",
+        },
+        {
+          input: "invalid123",
+          expected: "123:true:false",
+        },
+        {
+          input: "123",
+          expected: "123:true:false",
+        },
+        {
+          input: "-",
+          expected: "null:true:false",
+        },
+        {
+          input: "",
+          expected: "null:true:false",
+        },
+        {
+          input: "$100.22",
+          expected: "100.22:true:false",
+        },
+        {
+          input: "invalid@appsmith.com",
+          expected: "null:true:false",
+        },
+        {
+          input: "1.001",
+          expected: "1.001:true:false",
+        },
+        {
+          input: "1.1.",
+          expected: "null:true:false",
+        },
+      ].forEach(({ expected, input }) => enterAndTest(input, expected));
+    });
 
-  it("4. Validate DataType - PASSWORD can be entered into Input widget", () => {
-    cy.openPropertyPane(widgetName);
-    cy.selectDropdownValue(".t--property-control-datatype input", "Password");
-    [
-      {
-        input: "test",
-        expected: "test:true:false",
-      },
-      {
-        input: "test123",
-        expected: "test123:true:false",
-      },
-      {
-        input: "123",
-        expected: "123:true:false",
-      },
-      {
-        input: "-",
-        expected: "-:true:false",
-      },
-      {
-        input: "",
-        expected: ":true:false",
-      },
-      {
-        input: "$100.22",
-        expected: "$100.22:true:false",
-      },
-      {
-        input: "test@appsmith.com",
-        expected: "test@appsmith.com:true:false",
-      },
-    ].forEach(({ expected, input }) => enterAndTest(input, expected));
-  });
+    it("4. Validate DataType - PASSWORD can be entered into Input widget", () => {
+      cy.openPropertyPane(widgetName);
+      cy.selectDropdownValue(".t--property-control-datatype input", "Password");
+      [
+        {
+          input: "test",
+          expected: "test:true:false",
+        },
+        {
+          input: "test123",
+          expected: "test123:true:false",
+        },
+        {
+          input: "123",
+          expected: "123:true:false",
+        },
+        {
+          input: "-",
+          expected: "-:true:false",
+        },
+        {
+          input: "",
+          expected: ":true:false",
+        },
+        {
+          input: "$100.22",
+          expected: "$100.22:true:false",
+        },
+        {
+          input: "test@appsmith.com",
+          expected: "test@appsmith.com:true:false",
+        },
+      ].forEach(({ expected, input }) => enterAndTest(input, expected));
+    });
 
-  it("5. Validate DataType - EMAIL can be entered into Input widget", () => {
-    cy.openPropertyPane(widgetName);
-    cy.selectDropdownValue(".t--property-control-datatype input", "Email");
+    it("5. Validate DataType - EMAIL can be entered into Input widget", () => {
+      cy.openPropertyPane(widgetName);
+      cy.selectDropdownValue(".t--property-control-datatype input", "Email");
 
-    cy.get(".t--property-control-required label").last().click({ force: true });
+      cy.get(".t--property-control-required label")
+        .last()
+        .click({ force: true });
 
-    [
-      {
-        input: "test",
-        expected: "test:true:false",
-      },
-      {
-        input: "test123",
-        expected: "test123:true:false",
-      },
-      {
-        input: "123",
-        expected: "123:true:false",
-      },
-      {
-        input: "-",
-        expected: "-:true:false",
-      },
-      {
-        input: "",
-        expected: ":true:false",
-      },
-      {
-        input: "$100.22",
-        expected: "$100.22:true:false",
-      },
-      {
-        input: "test@appsmith.com",
-        expected: "test@appsmith.com:true:false",
-      },
-    ].forEach(({ expected, input }) => enterAndTest(input, expected));
-  });
+      [
+        {
+          input: "test",
+          expected: "test:true:false",
+        },
+        {
+          input: "test123",
+          expected: "test123:true:false",
+        },
+        {
+          input: "123",
+          expected: "123:true:false",
+        },
+        {
+          input: "-",
+          expected: "-:true:false",
+        },
+        {
+          input: "",
+          expected: ":true:false",
+        },
+        {
+          input: "$100.22",
+          expected: "$100.22:true:false",
+        },
+        {
+          input: "test@appsmith.com",
+          expected: "test@appsmith.com:true:false",
+        },
+      ].forEach(({ expected, input }) => enterAndTest(input, expected));
+    });
 
-  function enterAndTest(text, expected) {
-    cy.get(`.t--widget-${widgetName} input`).clear({ force: true });
-    cy.wait(300);
-    if (text) {
-      cy.get(`.t--widget-${widgetName} input`).click().type(text);
+    function enterAndTest(text, expected) {
+      cy.get(`.t--widget-${widgetName} input`).clear({ force: true });
+      cy.wait(300);
+      if (text) {
+        cy.get(`.t--widget-${widgetName} input`).click().type(text);
+      }
+      cy.get(".t--widget-textwidget").should("contain", expected);
     }
-    cy.get(".t--widget-textwidget").should("contain", expected);
-  }
-});
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Input/Inputv2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Input/Inputv2_spec.js
index b3fce85a21c5..3c9f53e826d6 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Input/Inputv2_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Input/Inputv2_spec.js
@@ -3,479 +3,498 @@ import { agHelper } from "../../../../../support/Objects/ObjectsCore";
 const widgetName = "inputwidgetv2";
 const widgetInput = `.t--widget-${widgetName} input`;
 
-describe("Input widget V2 - ", { tags: ["@tag.Widget", "@tag.Input"] }, () => {
-  it("1. DragDrop Input & Label/Text widgets", () => {
-    cy.dragAndDropToCanvas(widgetName, { x: 300, y: 300 });
-    cy.get(`.t--widget-${widgetName}`).should("exist");
-    cy.dragAndDropToCanvas("textwidget", { x: 300, y: 500 });
-    cy.openPropertyPane("textwidget");
-    cy.updateCodeInput(
-      ".t--property-control-text",
-      `{{Input1.text}}:{{Input1.value}}:{{Input1.isValid}}`,
-    );
-  });
-
-  it("2. Validate input widget resets OnSubmit", () => {
-    cy.openPropertyPane(widgetName);
-    cy.getAlert("onSubmit", "Submitted!!");
-    cy.get(widgetInput).clear();
-    cy.wait(300);
-    cy.get(widgetInput).type("test{enter}"); //Clicking enter submits the form here
-    cy.wait(300);
-    cy.get(widgetInput).should("contain.value", "");
-
-    cy.selectDropdownValue(".t--property-control-datatype input", "Number");
-
-    cy.get(widgetInput).clear();
-    cy.get(widgetInput).type("1.0010{enter}"); //Clicking enter submits the form here
-    cy.wait(300);
-    cy.get(widgetInput).should("contain.value", "");
-  });
-
-  it("3. Validate DataType - TEXT can be entered into Input widget", () => {
-    cy.selectDropdownValue(
-      ".t--property-control-datatype input",
-      "Single-line text",
-    );
-    [
-      {
-        input: "test",
-        expected: "test:test:true",
-      },
-      {
-        input: "test123",
-        expected: "test123:test123:true",
-      },
-      {
-        input: "123",
-        expected: "123:123:true",
-      },
-      {
-        input: "",
-        expected: "::true",
-      },
-      {
-        input: "$100.22",
-        expected: "$100.22:$100.22:true",
-      },
-      {
-        input: "test@appsmith.com",
-        expected: "test@appsmith.com:test@appsmith.com:true",
-      },
-    ].forEach(({ expected, input }) => enterAndTest(input, expected));
-
-    cy.openPropertyPane(widgetName);
-
-    //required: on
-    cy.get(".t--property-control-required label").last().click({ force: true });
-
-    [
-      {
-        input: "test",
-        expected: "test:test:true",
-      },
-      {
-        input: "test123",
-        expected: "test123:test123:true",
-      },
-      {
-        input: "123",
-        expected: "123:123:true",
-      },
-      {
-        input: "-",
-        expected: "-:-:true",
-      },
-      {
-        input: "",
-        expected: "::false",
-      },
-      {
-        input: "$100.22",
-        expected: "$100.22:$100.22:true",
-      },
-      {
-        input: "test@appsmith.com",
-        expected: "test@appsmith.com:test@appsmith.com:true",
-      },
-      {
-        input: "",
-        expected: "::false",
-      },
-    ].forEach(({ expected, input }) => enterAndTest(input, expected));
-  });
-
-  it("4. Validate DataType - NUMBER can be entered into Input widget", () => {
-    cy.openPropertyPane(widgetName);
-    cy.selectDropdownValue(".t--property-control-datatype input", "Number");
-    [
-      {
-        input: "invalid",
-        expected: "null:null:false",
-      },
-      {
-        input: "invalid123",
-        expected: "123:123:true",
-      },
-      {
-        input: "123",
-        expected: "123:123:true",
-      },
-      {
-        input: "-",
-        expected: "null:null:false",
-      },
-      {
-        input: "",
-        expected: "null:null:false",
-      },
-      {
-        input: "$100.22",
-        expected: "100.22:100.22:true",
-      },
-      {
-        input: "invalid@appsmith.com",
-        expected: "null:null:false",
-      },
-      {
-        input: "1.001",
-        expected: "1.001:1.001:true",
-      },
-      {
-        input: "1.1.",
-        expected: "null:null:false",
-      },
-    ].forEach(({ expected, input }) => enterAndTest(input, expected));
-
-    //required: off
-    cy.get(".t--property-control-required label").last().click({ force: true });
-
-    cy.selectDropdownValue(".t--property-control-datatype input", "Number");
-    [
-      {
-        input: "invalid",
-        expected: "null:null:true",
-      },
-      {
-        input: "invalid123",
-        expected: "123:123:true",
-      },
-      {
-        input: "123",
-        expected: "123:123:true",
-      },
-      {
-        input: "-",
-        expected: "null:null:false",
-      },
-      {
-        input: "",
-        expected: "null:null:true",
-      },
-      {
-        input: "$100.22",
-        expected: "100.22:100.22:true",
-      },
-      {
-        input: "invalid@appsmith.com",
-        expected: "null:null:false",
-      },
-      {
-        input: "1.001",
-        expected: "1.001:1.001:true",
-      },
-      {
-        input: "1.1.",
-        expected: "null:null:false",
-      },
-    ].forEach(({ expected, input }) => enterAndTest(input, expected));
-  });
-
-  it("5. Validate DataType - PASSWORD can be entered into Input widget", () => {
-    cy.openPropertyPane(widgetName);
-    cy.selectDropdownValue(".t--property-control-datatype input", "Password");
-    [
-      {
-        input: "test",
-        expected: "test:test:true",
-      },
-      {
-        input: "test123",
-        expected: "test123:test123:true",
-      },
-      {
-        input: "123",
-        expected: "123:123:true",
-      },
-      {
-        input: "-",
-        expected: "-:-:true",
-      },
-      {
-        input: "",
-        expected: "::true",
-      },
-      {
-        input: "$100.22",
-        expected: "$100.22:$100.22:true",
-      },
-      {
-        input: "test@appsmith.com",
-        expected: "test@appsmith.com:test@appsmith.com:true",
-      },
-    ].forEach(({ expected, input }) => enterAndTest(input, expected));
-
-    //required: on
-    cy.get(".t--property-control-required label").last().click({ force: true });
-
-    [
-      {
-        input: "test",
-        expected: "test:test:true",
-      },
-      {
-        input: "test123",
-        expected: "test123:test123:true",
-      },
-      {
-        input: "123",
-        expected: "123:123:true",
-      },
-      {
-        input: "-",
-        expected: "-:-:true",
-      },
-      {
-        input: "",
-        expected: "::false",
-      },
-      {
-        input: "$100.22",
-        expected: "$100.22:$100.22:true",
-      },
-      {
-        input: "test@appsmith.com",
-        expected: "test@appsmith.com:test@appsmith.com:true",
-      },
-    ].forEach(({ expected, input }) => enterAndTest(input, expected));
-
-    validateAutocompleteAttribute();
-  });
-
-  it("6. Validate DataType - EMAIL can be entered into Input widget", () => {
-    cy.openPropertyPane(widgetName);
-    cy.selectDropdownValue(".t--property-control-datatype input", "Email");
-    [
-      {
-        input: "test",
-        expected: "test:test:false",
-      },
-      {
-        input: "test123",
-        expected: "test123:test123:false",
-      },
-      {
-        input: "123",
-        expected: "123:123:false",
-      },
-      {
-        input: "-",
-        expected: "-:-:false",
-      },
-      {
-        input: "",
-        expected: "::false",
-      },
-      {
-        input: "$100.22",
-        expected: "$100.22:$100.22:false",
-      },
-      {
-        input: "test@appsmith.com",
-        expected: "test@appsmith.com:test@appsmith.com:true",
-      },
-    ].forEach(({ expected, input }) => enterAndTest(input, expected));
-
-    //required: off
-    cy.get(".t--property-control-required label").last().click({ force: true });
-
-    [
-      {
-        input: "test",
-        expected: "test:test:false",
-      },
-      {
-        input: "test123",
-        expected: "test123:test123:false",
-      },
-      {
-        input: "123",
-        expected: "123:123:false",
-      },
-      {
-        input: "-",
-        expected: "-:-:false",
-      },
-      {
-        input: "",
-        expected: "::true",
-      },
-      {
-        input: "$100.22",
-        expected: "$100.22:$100.22:false",
-      },
-      {
-        input: "test@appsmith.com",
-        expected: "test@appsmith.com:test@appsmith.com:true",
-      },
-    ].forEach(({ expected, input }) => enterAndTest(input, expected));
-
-    validateAutocompleteAttribute();
-  });
-
-  it("7. Validating other properties - Input validity with #valid", () => {
-    cy.openPropertyPane(widgetName);
-    [
-      ["{{1 === 2}}", "false", true],
-      ["", "true", false],
-      ["{{1 === 1}}", "true", true],
-      ["", "true", false],
-    ].forEach(([input, expected, isValueDynamic]) => {
-      cy.updateCodeInput(".t--property-control-valid", input);
-      cy.wait(500);
-      isValueDynamic && cy.validateEvaluatedValue(expected);
+describe(
+  "Input widget V2 - ",
+  { tags: ["@tag.Widget", "@tag.Input", "@tag.Binding"] },
+  () => {
+    it("1. DragDrop Input & Label/Text widgets", () => {
+      cy.dragAndDropToCanvas(widgetName, { x: 300, y: 300 });
+      cy.get(`.t--widget-${widgetName}`).should("exist");
+      cy.dragAndDropToCanvas("textwidget", { x: 300, y: 500 });
+      cy.openPropertyPane("textwidget");
+      cy.updateCodeInput(
+        ".t--property-control-text",
+        `{{Input1.text}}:{{Input1.value}}:{{Input1.isValid}}`,
+      );
     });
-  });
-
-  it("8. onSubmit should be triggered with the whole input value", () => {
-    cy.openPropertyPane(widgetName);
-    cy.selectDropdownValue(
-      ".t--property-control-datatype input",
-      "Single-line text",
-    );
-    cy.get(".t--property-control-required label").last().click({ force: true });
-    // Set onSubmit action, storing value
-    cy.get(".t--property-control-onsubmit").find(".t--js-toggle").click();
-    cy.updateCodeInput(
-      ".t--property-control-onsubmit",
-      "{{storeValue('textPayloadOnSubmit',Input1.text)}}",
-    );
-    // Bind to stored value above
-    cy.openPropertyPane("textwidget");
-    cy.updateCodeInput(
-      ".t--property-control-text",
-      "{{appsmith.store.textPayloadOnSubmit}}",
-    );
-    agHelper.AssertAutoSave();
-
-    cy.closePropertyPane();
-    cy.get(widgetInput).clear();
-    cy.wait(300);
-    // Input text and hit enter key
-    cy.get(widgetInput).type("test{enter}");
-    // Assert if the Text widget contains the whole value, test
-    cy.get(".t--widget-textwidget").should("have.text", "test");
-  });
-
-  it("9. changing default text should change text", () => {
-    cy.openPropertyPane("textwidget");
-    cy.updateCodeInput(
-      ".t--property-control-text",
-      `{{Input1.text}}:{{Input1.value}}:{{Input1.isValid}}`,
-    );
-    cy.openPropertyPane(widgetName);
-    cy.updateCodeInput(".t--property-control-defaultvalue", `test`);
-    // wait for evaluations
-    cy.wait(300);
-    cy.get(`.t--widget-${widgetName} input`).should("contain.value", "test");
-    cy.get(".t--widget-textwidget").should("contain", "test:test:true");
-
-    cy.updateCodeInput(".t--property-control-defaultvalue", `anotherText`);
-    // wait for evaluations
-    cy.wait(300);
-    cy.get(`.t--widget-${widgetName} input`).should(
-      "contain.value",
-      "anotherText",
-    );
-    cy.get(".t--widget-textwidget").should(
-      "contain",
-      "anotherText:anotherText:true",
-    );
-
-    cy.selectDropdownValue(".t--property-control-datatype input", "Number");
-
-    cy.updateCodeInput(".t--property-control-defaultvalue", `{{1}}`);
-    // wait for evaluations
-    cy.wait(300);
-    cy.get(`.t--widget-${widgetName} input`).should("contain.value", "1");
-    cy.get(".t--widget-textwidget").should("contain", "1:1:true");
-
-    cy.updateCodeInput(".t--property-control-defaultvalue", `{{1.00010000}}`);
-    // wait for evaluations
-    cy.wait(300);
-    cy.get(`.t--widget-${widgetName} input`).should("contain.value", "1.0001");
-    cy.get(".t--widget-textwidget").should("contain", "1.0001:1.0001:true");
-  });
-
-  it("10. Check isDirty meta property", function () {
-    cy.openPropertyPane("textwidget");
-    cy.updateCodeInput(".t--property-control-text", `{{Input1.isDirty}}`);
-    // Init isDirty
-    cy.openPropertyPane(widgetName);
-    cy.selectDropdownValue(
-      ".t--property-control-datatype input",
-      "Single-line text",
-    );
-    cy.updateCodeInput(".t--property-control-defaultvalue", "a");
-    // Check if initial value of isDirty is false
-    cy.get(".t--widget-textwidget").should("contain", "false");
-    // Interact with UI
-    cy.get(widgetInput).clear();
-    cy.wait(300);
-    cy.get(widgetInput).type("b");
-    cy.wait(300);
-    // Check if isDirty is set to true
-    cy.get(".t--widget-textwidget").should("contain", "true");
-    // Change defaultText
-    cy.openPropertyPane(widgetName);
-    cy.updateCodeInput(".t--property-control-defaultvalue", "c");
-    // Check if isDirty is reset to false
-    cy.get(".t--widget-textwidget").should("contain", "false");
-  });
-
-  function enterAndTest(text, expected) {
-    cy.get(`.t--widget-${widgetName} input`).clear();
-    cy.wait(300);
-    if (text) {
-      cy.get(`.t--widget-${widgetName} input`)
-        .click({ force: true })
-        .type(text);
+
+    it("2. Validate input widget resets OnSubmit", () => {
+      cy.openPropertyPane(widgetName);
+      cy.getAlert("onSubmit", "Submitted!!");
+      cy.get(widgetInput).clear();
+      cy.wait(300);
+      cy.get(widgetInput).type("test{enter}"); //Clicking enter submits the form here
+      cy.wait(300);
+      cy.get(widgetInput).should("contain.value", "");
+
+      cy.selectDropdownValue(".t--property-control-datatype input", "Number");
+
+      cy.get(widgetInput).clear();
+      cy.get(widgetInput).type("1.0010{enter}"); //Clicking enter submits the form here
+      cy.wait(300);
+      cy.get(widgetInput).should("contain.value", "");
+    });
+
+    it("3. Validate DataType - TEXT can be entered into Input widget", () => {
+      cy.selectDropdownValue(
+        ".t--property-control-datatype input",
+        "Single-line text",
+      );
+      [
+        {
+          input: "test",
+          expected: "test:test:true",
+        },
+        {
+          input: "test123",
+          expected: "test123:test123:true",
+        },
+        {
+          input: "123",
+          expected: "123:123:true",
+        },
+        {
+          input: "",
+          expected: "::true",
+        },
+        {
+          input: "$100.22",
+          expected: "$100.22:$100.22:true",
+        },
+        {
+          input: "test@appsmith.com",
+          expected: "test@appsmith.com:test@appsmith.com:true",
+        },
+      ].forEach(({ expected, input }) => enterAndTest(input, expected));
+
+      cy.openPropertyPane(widgetName);
+
+      //required: on
+      cy.get(".t--property-control-required label")
+        .last()
+        .click({ force: true });
+
+      [
+        {
+          input: "test",
+          expected: "test:test:true",
+        },
+        {
+          input: "test123",
+          expected: "test123:test123:true",
+        },
+        {
+          input: "123",
+          expected: "123:123:true",
+        },
+        {
+          input: "-",
+          expected: "-:-:true",
+        },
+        {
+          input: "",
+          expected: "::false",
+        },
+        {
+          input: "$100.22",
+          expected: "$100.22:$100.22:true",
+        },
+        {
+          input: "test@appsmith.com",
+          expected: "test@appsmith.com:test@appsmith.com:true",
+        },
+        {
+          input: "",
+          expected: "::false",
+        },
+      ].forEach(({ expected, input }) => enterAndTest(input, expected));
+    });
+
+    it("4. Validate DataType - NUMBER can be entered into Input widget", () => {
+      cy.openPropertyPane(widgetName);
+      cy.selectDropdownValue(".t--property-control-datatype input", "Number");
+      [
+        {
+          input: "invalid",
+          expected: "null:null:false",
+        },
+        {
+          input: "invalid123",
+          expected: "123:123:true",
+        },
+        {
+          input: "123",
+          expected: "123:123:true",
+        },
+        {
+          input: "-",
+          expected: "null:null:false",
+        },
+        {
+          input: "",
+          expected: "null:null:false",
+        },
+        {
+          input: "$100.22",
+          expected: "100.22:100.22:true",
+        },
+        {
+          input: "invalid@appsmith.com",
+          expected: "null:null:false",
+        },
+        {
+          input: "1.001",
+          expected: "1.001:1.001:true",
+        },
+        {
+          input: "1.1.",
+          expected: "null:null:false",
+        },
+      ].forEach(({ expected, input }) => enterAndTest(input, expected));
+
+      //required: off
+      cy.get(".t--property-control-required label")
+        .last()
+        .click({ force: true });
+
+      cy.selectDropdownValue(".t--property-control-datatype input", "Number");
+      [
+        {
+          input: "invalid",
+          expected: "null:null:true",
+        },
+        {
+          input: "invalid123",
+          expected: "123:123:true",
+        },
+        {
+          input: "123",
+          expected: "123:123:true",
+        },
+        {
+          input: "-",
+          expected: "null:null:false",
+        },
+        {
+          input: "",
+          expected: "null:null:true",
+        },
+        {
+          input: "$100.22",
+          expected: "100.22:100.22:true",
+        },
+        {
+          input: "invalid@appsmith.com",
+          expected: "null:null:false",
+        },
+        {
+          input: "1.001",
+          expected: "1.001:1.001:true",
+        },
+        {
+          input: "1.1.",
+          expected: "null:null:false",
+        },
+      ].forEach(({ expected, input }) => enterAndTest(input, expected));
+    });
+
+    it("5. Validate DataType - PASSWORD can be entered into Input widget", () => {
+      cy.openPropertyPane(widgetName);
+      cy.selectDropdownValue(".t--property-control-datatype input", "Password");
+      [
+        {
+          input: "test",
+          expected: "test:test:true",
+        },
+        {
+          input: "test123",
+          expected: "test123:test123:true",
+        },
+        {
+          input: "123",
+          expected: "123:123:true",
+        },
+        {
+          input: "-",
+          expected: "-:-:true",
+        },
+        {
+          input: "",
+          expected: "::true",
+        },
+        {
+          input: "$100.22",
+          expected: "$100.22:$100.22:true",
+        },
+        {
+          input: "test@appsmith.com",
+          expected: "test@appsmith.com:test@appsmith.com:true",
+        },
+      ].forEach(({ expected, input }) => enterAndTest(input, expected));
+
+      //required: on
+      cy.get(".t--property-control-required label")
+        .last()
+        .click({ force: true });
+
+      [
+        {
+          input: "test",
+          expected: "test:test:true",
+        },
+        {
+          input: "test123",
+          expected: "test123:test123:true",
+        },
+        {
+          input: "123",
+          expected: "123:123:true",
+        },
+        {
+          input: "-",
+          expected: "-:-:true",
+        },
+        {
+          input: "",
+          expected: "::false",
+        },
+        {
+          input: "$100.22",
+          expected: "$100.22:$100.22:true",
+        },
+        {
+          input: "test@appsmith.com",
+          expected: "test@appsmith.com:test@appsmith.com:true",
+        },
+      ].forEach(({ expected, input }) => enterAndTest(input, expected));
+
+      validateAutocompleteAttribute();
+    });
+
+    it("6. Validate DataType - EMAIL can be entered into Input widget", () => {
+      cy.openPropertyPane(widgetName);
+      cy.selectDropdownValue(".t--property-control-datatype input", "Email");
+      [
+        {
+          input: "test",
+          expected: "test:test:false",
+        },
+        {
+          input: "test123",
+          expected: "test123:test123:false",
+        },
+        {
+          input: "123",
+          expected: "123:123:false",
+        },
+        {
+          input: "-",
+          expected: "-:-:false",
+        },
+        {
+          input: "",
+          expected: "::false",
+        },
+        {
+          input: "$100.22",
+          expected: "$100.22:$100.22:false",
+        },
+        {
+          input: "test@appsmith.com",
+          expected: "test@appsmith.com:test@appsmith.com:true",
+        },
+      ].forEach(({ expected, input }) => enterAndTest(input, expected));
+
+      //required: off
+      cy.get(".t--property-control-required label")
+        .last()
+        .click({ force: true });
+
+      [
+        {
+          input: "test",
+          expected: "test:test:false",
+        },
+        {
+          input: "test123",
+          expected: "test123:test123:false",
+        },
+        {
+          input: "123",
+          expected: "123:123:false",
+        },
+        {
+          input: "-",
+          expected: "-:-:false",
+        },
+        {
+          input: "",
+          expected: "::true",
+        },
+        {
+          input: "$100.22",
+          expected: "$100.22:$100.22:false",
+        },
+        {
+          input: "test@appsmith.com",
+          expected: "test@appsmith.com:test@appsmith.com:true",
+        },
+      ].forEach(({ expected, input }) => enterAndTest(input, expected));
+
+      validateAutocompleteAttribute();
+    });
+
+    it("7. Validating other properties - Input validity with #valid", () => {
+      cy.openPropertyPane(widgetName);
+      [
+        ["{{1 === 2}}", "false", true],
+        ["", "true", false],
+        ["{{1 === 1}}", "true", true],
+        ["", "true", false],
+      ].forEach(([input, expected, isValueDynamic]) => {
+        cy.updateCodeInput(".t--property-control-valid", input);
+        cy.wait(500);
+        isValueDynamic && cy.validateEvaluatedValue(expected);
+      });
+    });
+
+    it("8. onSubmit should be triggered with the whole input value", () => {
+      cy.openPropertyPane(widgetName);
+      cy.selectDropdownValue(
+        ".t--property-control-datatype input",
+        "Single-line text",
+      );
+      cy.get(".t--property-control-required label")
+        .last()
+        .click({ force: true });
+      // Set onSubmit action, storing value
+      cy.get(".t--property-control-onsubmit").find(".t--js-toggle").click();
+      cy.updateCodeInput(
+        ".t--property-control-onsubmit",
+        "{{storeValue('textPayloadOnSubmit',Input1.text)}}",
+      );
+      // Bind to stored value above
+      cy.openPropertyPane("textwidget");
+      cy.updateCodeInput(
+        ".t--property-control-text",
+        "{{appsmith.store.textPayloadOnSubmit}}",
+      );
+      agHelper.AssertAutoSave();
+
+      cy.closePropertyPane();
+      cy.get(widgetInput).clear();
+      cy.wait(300);
+      // Input text and hit enter key
+      cy.get(widgetInput).type("test{enter}");
+      // Assert if the Text widget contains the whole value, test
+      cy.get(".t--widget-textwidget").should("have.text", "test");
+    });
+
+    it("9. changing default text should change text", () => {
+      cy.openPropertyPane("textwidget");
+      cy.updateCodeInput(
+        ".t--property-control-text",
+        `{{Input1.text}}:{{Input1.value}}:{{Input1.isValid}}`,
+      );
+      cy.openPropertyPane(widgetName);
+      cy.updateCodeInput(".t--property-control-defaultvalue", `test`);
+      // wait for evaluations
+      cy.wait(300);
+      cy.get(`.t--widget-${widgetName} input`).should("contain.value", "test");
+      cy.get(".t--widget-textwidget").should("contain", "test:test:true");
+
+      cy.updateCodeInput(".t--property-control-defaultvalue", `anotherText`);
+      // wait for evaluations
+      cy.wait(300);
+      cy.get(`.t--widget-${widgetName} input`).should(
+        "contain.value",
+        "anotherText",
+      );
+      cy.get(".t--widget-textwidget").should(
+        "contain",
+        "anotherText:anotherText:true",
+      );
+
+      cy.selectDropdownValue(".t--property-control-datatype input", "Number");
+
+      cy.updateCodeInput(".t--property-control-defaultvalue", `{{1}}`);
+      // wait for evaluations
+      cy.wait(300);
+      cy.get(`.t--widget-${widgetName} input`).should("contain.value", "1");
+      cy.get(".t--widget-textwidget").should("contain", "1:1:true");
+
+      cy.updateCodeInput(".t--property-control-defaultvalue", `{{1.00010000}}`);
+      // wait for evaluations
+      cy.wait(300);
+      cy.get(`.t--widget-${widgetName} input`).should(
+        "contain.value",
+        "1.0001",
+      );
+      cy.get(".t--widget-textwidget").should("contain", "1.0001:1.0001:true");
+    });
+
+    it("10. Check isDirty meta property", function () {
+      cy.openPropertyPane("textwidget");
+      cy.updateCodeInput(".t--property-control-text", `{{Input1.isDirty}}`);
+      // Init isDirty
+      cy.openPropertyPane(widgetName);
+      cy.selectDropdownValue(
+        ".t--property-control-datatype input",
+        "Single-line text",
+      );
+      cy.updateCodeInput(".t--property-control-defaultvalue", "a");
+      // Check if initial value of isDirty is false
+      cy.get(".t--widget-textwidget").should("contain", "false");
+      // Interact with UI
+      cy.get(widgetInput).clear();
+      cy.wait(300);
+      cy.get(widgetInput).type("b");
+      cy.wait(300);
+      // Check if isDirty is set to true
+      cy.get(".t--widget-textwidget").should("contain", "true");
+      // Change defaultText
+      cy.openPropertyPane(widgetName);
+      cy.updateCodeInput(".t--property-control-defaultvalue", "c");
+      // Check if isDirty is reset to false
+      cy.get(".t--widget-textwidget").should("contain", "false");
+    });
+
+    function enterAndTest(text, expected) {
+      cy.get(`.t--widget-${widgetName} input`).clear();
+      cy.wait(300);
+      if (text) {
+        cy.get(`.t--widget-${widgetName} input`)
+          .click({ force: true })
+          .type(text);
+      }
+      cy.get(".t--widget-textwidget").should("contain", expected);
+    }
+
+    function validateAutocompleteAttribute() {
+      //validate autocomplete behaviour for email and password
+
+      cy.openPropertyPane("textwidget");
+      cy.openPropertyPane(widgetName);
+      //check if autofill toggle option is present and is checked by default
+      cy.get(".t--property-control-allowautofill input").should("be.checked");
+      //check if autocomplete attribute is not present in the text widget when autofill is enabled
+      cy.get(widgetInput).should("not.have.attr", "autocomplete");
+
+      //toggle off autofill
+      cy.get(".t--property-control-allowautofill input").click({ force: true });
+      cy.get(".t--property-control-allowautofill input").should(
+        "not.be.checked",
+      );
+
+      //autocomplete should now be present in the text widget
+      cy.get(widgetInput).should("have.attr", "autocomplete", "off");
+
+      //select a non email or password option
+      cy.selectDropdownValue(".t--property-control-datatype input", "text");
+      //autofill toggle should not be present as this restores autofill to be enabled
+      cy.get(".t--property-control-allowautofill input").should("not.exist");
+      //autocomplete attribute should not be present in the text widget
+      cy.get(widgetInput).should("not.have.attr", "autocomplete");
     }
-    cy.get(".t--widget-textwidget").should("contain", expected);
-  }
-
-  function validateAutocompleteAttribute() {
-    //validate autocomplete behaviour for email and password
-
-    cy.openPropertyPane("textwidget");
-    cy.openPropertyPane(widgetName);
-    //check if autofill toggle option is present and is checked by default
-    cy.get(".t--property-control-allowautofill input").should("be.checked");
-    //check if autocomplete attribute is not present in the text widget when autofill is enabled
-    cy.get(widgetInput).should("not.have.attr", "autocomplete");
-
-    //toggle off autofill
-    cy.get(".t--property-control-allowautofill input").click({ force: true });
-    cy.get(".t--property-control-allowautofill input").should("not.be.checked");
-
-    //autocomplete should now be present in the text widget
-    cy.get(widgetInput).should("have.attr", "autocomplete", "off");
-
-    //select a non email or password option
-    cy.selectDropdownValue(".t--property-control-datatype input", "text");
-    //autofill toggle should not be present as this restores autofill to be enabled
-    cy.get(".t--property-control-allowautofill input").should("not.exist");
-    //autocomplete attribute should not be present in the text widget
-    cy.get(widgetInput).should("not.have.attr", "autocomplete");
-  }
-});
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_ArrayField_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_ArrayField_spec.js
index 249fb2cf6118..fa62fb571058 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_ArrayField_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_ArrayField_spec.js
@@ -18,7 +18,7 @@ import {
 
 describe(
   "JSON Form Widget Array Field",
-  { tags: ["@tag.Widget", "@tag.JSONForm"] },
+  { tags: ["@tag.Widget", "@tag.JSONForm", "@tag.Binding"] },
   () => {
     beforeEach(() => {
       agHelper.RestoreLocalStorageCache();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_AutoGenerateFormDisabled_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_AutoGenerateFormDisabled_spec.js
index 23894738bcb6..d1c22d3395f0 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_AutoGenerateFormDisabled_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_AutoGenerateFormDisabled_spec.js
@@ -13,7 +13,7 @@ import {
 
 describe(
   "JSON Form Widget AutoGenerate Disabled",
-  { tags: ["@tag.Widget", "@tag.JSONForm", "@tag.Sanity"] },
+  { tags: ["@tag.Widget", "@tag.JSONForm", "@tag.Sanity", "@tag.Binding"] },
   () => {
     before(() => {
       agHelper.AddDsl("jsonFormDslWithSchemaAndWithoutSourceData");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_AutoGenerateFormEnabled_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_AutoGenerateFormEnabled_spec.js
index 11a286f7a227..cb9567470239 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_AutoGenerateFormEnabled_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_AutoGenerateFormEnabled_spec.js
@@ -16,7 +16,7 @@ let locators = ObjectsRegistry.CommonLocators;
 
 describe(
   "JSON Form Widget AutoGenerate Enabled",
-  { tags: ["@tag.Widget", "@tag.JSONForm", "@tag.Sanity"] },
+  { tags: ["@tag.Widget", "@tag.JSONForm", "@tag.Sanity", "@tag.Binding"] },
   () => {
     beforeEach(() => {
       agHelper.RestoreLocalStorageCache();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_Basic_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_Basic_spec.js
index c2f299b7b882..43e96747d500 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_Basic_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_Basic_spec.js
@@ -11,7 +11,7 @@ const {
 
 describe(
   "JsonForm widget basis c usecases",
-  { tags: ["@tag.Widget", "@tag.JSONForm", "@tag.Sanity"] },
+  { tags: ["@tag.Widget", "@tag.JSONForm", "@tag.Sanity", "@tag.Binding"] },
   function () {
     before(() => {
       cy.dragAndDropToCanvas("jsonformwidget", { x: 200, y: 200 });
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_CurrencyField_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_CurrencyField_spec.ts
index 3ffce22e58e7..2284c8b7e86b 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_CurrencyField_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_CurrencyField_spec.ts
@@ -10,7 +10,7 @@ import {
 
 describe(
   "Modal Widget background color spec",
-  { tags: ["@tag.Widget", "@tag.JSONForm"] },
+  { tags: ["@tag.Widget", "@tag.JSONForm", "@tag.Binding"] },
   () => {
     const schema = {
       name: "John",
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_CustomField_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_CustomField_spec.js
index 594790b9c9aa..282c6019f97e 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_CustomField_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_CustomField_spec.js
@@ -16,7 +16,7 @@ const fieldPrefix = ".t--jsonformfield";
 
 describe(
   "JSON Form Widget Custom Field",
-  { tags: ["@tag.Widget", "@tag.JSONForm"] },
+  { tags: ["@tag.Widget", "@tag.JSONForm", "@tag.Binding"] },
   () => {
     it("uses the custom field when the accessor matches", () => {
       const formDsl = JSON.parse(
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FieldChange_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FieldChange_spec.js
index 1db07042fae4..2b0b27cffebc 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FieldChange_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FieldChange_spec.js
@@ -17,7 +17,7 @@ const fieldPrefix = ".t--jsonformfield";
 
 describe(
   "JSON Form Widget Field Change",
-  { tags: ["@tag.Widget", "@tag.JSONForm"] },
+  { tags: ["@tag.Widget", "@tag.JSONForm", "@tag.Binding"] },
   () => {
     before(() => {
       cy.addDsl(dslWithSchema);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FieldEvents_1_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FieldEvents_1_spec.js
index 42b42ebb6628..9cc6aec506a2 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FieldEvents_1_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FieldEvents_1_spec.js
@@ -20,7 +20,7 @@ const toggleJSButton = (name) => `.t--property-control-${name} .t--js-toggle`;
 
 describe(
   "Radio Group Field",
-  { tags: ["@tag.Widget", "@tag.JSONForm"] },
+  { tags: ["@tag.Widget", "@tag.JSONForm", "@tag.Binding"] },
   () => {
     beforeEach(() => {
       agHelper.RestoreLocalStorageCache();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FieldEvents_2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FieldEvents_2_spec.js
index 37545555a21d..7635d6eea567 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FieldEvents_2_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FieldEvents_2_spec.js
@@ -19,7 +19,7 @@ const toggleJSButton = (name) => `.t--property-control-${name} .t--js-toggle`;
 
 describe(
   "Radio Group Field",
-  { tags: ["@tag.Widget", "@tag.JSONForm"] },
+  { tags: ["@tag.Widget", "@tag.JSONForm", "@tag.Binding"] },
   () => {
     beforeEach(() => {
       agHelper.RestoreLocalStorageCache();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FieldProperties_1_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FieldProperties_1_spec.js
index 42db1f388a0a..ca9d0fcae3da 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FieldProperties_1_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FieldProperties_1_spec.js
@@ -17,7 +17,7 @@ const fieldPrefix = ".t--jsonformfield";
 
 describe(
   "Text Field Property Control",
-  { tags: ["@tag.Widget", "@tag.JSONForm"] },
+  { tags: ["@tag.Widget", "@tag.JSONForm", "@tag.Binding"] },
   () => {
     beforeEach(() => {
       agHelper.RestoreLocalStorageCache();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FieldProperties_2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FieldProperties_2_spec.js
index 6fc4a81e50d7..f9ebebd9647e 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FieldProperties_2_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FieldProperties_2_spec.js
@@ -17,7 +17,7 @@ const fieldPrefix = ".t--jsonformfield";
 
 describe(
   "Text Field Property Control",
-  { tags: ["@tag.Widget", "@tag.JSONForm"] },
+  { tags: ["@tag.Widget", "@tag.JSONForm", "@tag.Binding"] },
   () => {
     beforeEach(() => {
       agHelper.RestoreLocalStorageCache();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FilterText_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FilterText_spec.js
index bd4e1e806623..155c4dd218a8 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FilterText_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FilterText_spec.js
@@ -17,7 +17,7 @@ let locators = ObjectsRegistry.CommonLocators;
 
 describe(
   "JSONForm Select field - filterText update action trigger ",
-  { tags: ["@tag.Widget", "@tag.JSONForm"] },
+  { tags: ["@tag.Widget", "@tag.JSONForm", "@tag.Binding"] },
   () => {
     beforeEach(() => {
       agHelper.RestoreLocalStorageCache();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_Footer_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_Footer_spec.js
index 42dcad420de6..d4bb83690837 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_Footer_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_Footer_spec.js
@@ -2,7 +2,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 const commonlocators = require("../../../../../locators/commonlocators.json");
 describe(
   "JSONForm Footer spec",
-  { tags: ["@tag.Widget", "@tag.JSONForm"] },
+  { tags: ["@tag.Widget", "@tag.JSONForm", "@tag.Binding"] },
   () => {
     beforeEach(() => {
       _.agHelper.RestoreLocalStorageCache();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FormBindings_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FormBindings_spec.js
index 20aa79224afa..9f7a36d61c45 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FormBindings_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FormBindings_spec.js
@@ -11,7 +11,7 @@ const locators = ObjectsRegistry.CommonLocators;
 
 describe(
   "JSON Form Widget Form Bindings",
-  { tags: ["@tag.Widget", "@tag.JSONForm"] },
+  { tags: ["@tag.Widget", "@tag.JSONForm", "@tag.Binding"] },
   () => {
     afterEach(() => {
       agHelper.SaveLocalStorageCache();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FormProperties_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FormProperties_spec.js
index a01cff55777f..9787c93addc4 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FormProperties_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FormProperties_spec.js
@@ -22,7 +22,7 @@ import {
 
 describe(
   "JSON Form Widget Form Bindings",
-  { tags: ["@tag.Widget", "@tag.JSONForm"] },
+  { tags: ["@tag.Widget", "@tag.JSONForm", "@tag.Binding"] },
   () => {
     beforeEach(() => {
       agHelper.RestoreLocalStorageCache();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_HiddenFields_1_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_HiddenFields_1_spec.js
index 1bf397baeb0c..d75b0f4fc4b0 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_HiddenFields_1_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_HiddenFields_1_spec.js
@@ -89,7 +89,7 @@ function removeCustomField() {
 
 describe(
   "JSON Form Hidden fields",
-  { tags: ["@tag.Widget", "@tag.JSONForm"] },
+  { tags: ["@tag.Widget", "@tag.JSONForm", "@tag.Binding"] },
   () => {
     before(() => {
       agHelper.AddDsl("jsonFormDslWithSchema");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_HiddenFields_2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_HiddenFields_2_spec.js
index 2121d0d38b92..dba231477df1 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_HiddenFields_2_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_HiddenFields_2_spec.js
@@ -92,7 +92,7 @@ function removeCustomField() {
 
 describe(
   "JSON Form Hidden fields",
-  { tags: ["@tag.Widget", "@tag.JSONForm"] },
+  { tags: ["@tag.Widget", "@tag.JSONForm", "@tag.Binding"] },
   () => {
     before(() => {
       agHelper.AddDsl("jsonFormDslWithSchema");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_MultipleSourceData_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_MultipleSourceData_spec.js
index 8914b8920b94..d2be55c59316 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_MultipleSourceData_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_MultipleSourceData_spec.js
@@ -5,7 +5,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Verify syntax to create Datpicker field type",
-  { tags: ["@tag.Widget", "@tag.JSONForm"] },
+  { tags: ["@tag.Widget", "@tag.JSONForm", "@tag.Binding"] },
   () => {
     beforeEach(() => {
       _.agHelper.RestoreLocalStorageCache();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_RadioGroupField_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_RadioGroupField_spec.js
index f1f67a739480..aa641517d91b 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_RadioGroupField_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_RadioGroupField_spec.js
@@ -35,7 +35,7 @@ function clearOptionsProperty() {
 
 describe(
   "JSONForm RadioGroup Field",
-  { tags: ["@tag.Widget", "@tag.JSONForm"] },
+  { tags: ["@tag.Widget", "@tag.JSONForm", "@tag.Binding"] },
   () => {
     afterEach(() => {
       agHelper.SaveLocalStorageCache();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_Reset_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_Reset_spec.js
index e6a86ecbebc8..1b2572c51211 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_Reset_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_Reset_spec.js
@@ -3,144 +3,151 @@ import { ObjectsRegistry } from "../../../../../support/Objects/Registry";
 const locators = ObjectsRegistry.CommonLocators;
 const fieldPrefix = ".t--jsonformfield";
 
-describe("JSON Form reset", { tags: ["@tag.Widget", "@tag.JSONForm"] }, () => {
-  before(() => {
-    cy.addDsl(dslWithSchema);
-    cy.openPropertyPane("jsonformwidget");
-    cy.get(locators._jsToggle("sourcedata")).click({ force: true });
-  });
+describe(
+  "JSON Form reset",
+  { tags: ["@tag.Widget", "@tag.JSONForm", "@tag.Binding"] },
+  () => {
+    before(() => {
+      cy.addDsl(dslWithSchema);
+      cy.openPropertyPane("jsonformwidget");
+      cy.get(locators._jsToggle("sourcedata")).click({ force: true });
+    });
 
-  it("updates formData when field value changes", () => {
-    const initialFormData = {
-      age: 30,
-      dob: "10/12/1992",
-      migrant: false,
-      address: { street: "Koramangala", city: "Bangalore" },
-      hobbies: ["travelling", "swimming"],
-      education: [{ college: "MIT", year: "20/10/2014" }],
-      name: "John",
-    };
-    const updatedFormData = {
-      age: 40,
-      dob: "10/12/1992",
-      migrant: false,
-      address: { street: "Indranagar", city: "Bangalore" },
-      hobbies: ["travelling"],
-      education: [{ college: "IIT", year: "20/10/2014" }],
-      name: "Test",
-    };
+    it("updates formData when field value changes", () => {
+      const initialFormData = {
+        age: 30,
+        dob: "10/12/1992",
+        migrant: false,
+        address: { street: "Koramangala", city: "Bangalore" },
+        hobbies: ["travelling", "swimming"],
+        education: [{ college: "MIT", year: "20/10/2014" }],
+        name: "John",
+      };
+      const updatedFormData = {
+        age: 40,
+        dob: "10/12/1992",
+        migrant: false,
+        address: { street: "Indranagar", city: "Bangalore" },
+        hobbies: ["travelling"],
+        education: [{ college: "IIT", year: "20/10/2014" }],
+        name: "Test",
+      };
 
-    // Verify current field values
-    cy.get(`${fieldPrefix}-name input`).should(
-      "have.value",
-      initialFormData.name,
-    );
-    cy.get(`${fieldPrefix}-age input`).should(
-      "have.value",
-      initialFormData.age,
-    );
-    cy.get(`${fieldPrefix}-dob input`).should(
-      "have.value",
-      initialFormData.dob,
-    );
-    cy.get(`${fieldPrefix}-address-street input`).should(
-      "have.value",
-      initialFormData.address.street,
-    );
-    cy.get(`${fieldPrefix}-address-city input`).should(
-      "have.value",
-      initialFormData.address.city,
-    );
-    cy.get(`${fieldPrefix}-education-0--college input`).should(
-      "have.value",
-      initialFormData.education[0].college,
-    );
-    cy.get(`${fieldPrefix}-education-0--year input`).should(
-      "have.value",
-      initialFormData.education[0].year,
-    );
+      // Verify current field values
+      cy.get(`${fieldPrefix}-name input`).should(
+        "have.value",
+        initialFormData.name,
+      );
+      cy.get(`${fieldPrefix}-age input`).should(
+        "have.value",
+        initialFormData.age,
+      );
+      cy.get(`${fieldPrefix}-dob input`).should(
+        "have.value",
+        initialFormData.dob,
+      );
+      cy.get(`${fieldPrefix}-address-street input`).should(
+        "have.value",
+        initialFormData.address.street,
+      );
+      cy.get(`${fieldPrefix}-address-city input`).should(
+        "have.value",
+        initialFormData.address.city,
+      );
+      cy.get(`${fieldPrefix}-education-0--college input`).should(
+        "have.value",
+        initialFormData.education[0].college,
+      );
+      cy.get(`${fieldPrefix}-education-0--year input`).should(
+        "have.value",
+        initialFormData.education[0].year,
+      );
 
-    // Modify field values
-    cy.get(`${fieldPrefix}-name input`)
-      .clear({ force: true })
-      .type(updatedFormData.name);
-    cy.get(`${fieldPrefix}-age input`)
-      .clear({ force: true })
-      .clear({ force: true })
-      .type(updatedFormData.age);
-    cy.get(`${fieldPrefix}-address-street input`)
-      .clear({ force: true })
-      .type(updatedFormData.address.street);
-    cy.get(`${fieldPrefix}-hobbies .rc-select-selection-item`)
-      .contains("swimming")
-      .siblings(".rc-select-selection-item-remove")
-      .click({ force: true });
-    cy.get(`${fieldPrefix}-education-0--college input`)
-      .clear({ force: true })
-      .type(updatedFormData.education[0].college)
-      .wait(200);
+      // Modify field values
+      cy.get(`${fieldPrefix}-name input`)
+        .clear({ force: true })
+        .type(updatedFormData.name);
+      cy.get(`${fieldPrefix}-age input`)
+        .clear({ force: true })
+        .clear({ force: true })
+        .type(updatedFormData.age);
+      cy.get(`${fieldPrefix}-address-street input`)
+        .clear({ force: true })
+        .type(updatedFormData.address.street);
+      cy.get(`${fieldPrefix}-hobbies .rc-select-selection-item`)
+        .contains("swimming")
+        .siblings(".rc-select-selection-item-remove")
+        .click({ force: true });
+      cy.get(`${fieldPrefix}-education-0--college input`)
+        .clear({ force: true })
+        .type(updatedFormData.education[0].college)
+        .wait(200);
 
-    // Verify new field values
-    cy.get(`${fieldPrefix}-name input`).should(
-      "have.value",
-      updatedFormData.name,
-    );
-    cy.get(`${fieldPrefix}-age input`).should(
-      "have.value",
-      updatedFormData.age,
-    );
-    cy.get(`${fieldPrefix}-dob input`).should(
-      "have.value",
-      updatedFormData.dob,
-    );
-    cy.get(`${fieldPrefix}-address-street input`).should(
-      "have.value",
-      updatedFormData.address.street,
-    );
-    cy.get(`${fieldPrefix}-address-city input`).should(
-      "have.value",
-      updatedFormData.address.city,
-    );
-    cy.get(`${fieldPrefix}-education-0--college input`).should(
-      "have.value",
-      updatedFormData.education[0].college,
-    );
-    cy.get(`${fieldPrefix}-education-0--year input`).should(
-      "have.value",
-      updatedFormData.education[0].year,
-    );
+      // Verify new field values
+      cy.get(`${fieldPrefix}-name input`).should(
+        "have.value",
+        updatedFormData.name,
+      );
+      cy.get(`${fieldPrefix}-age input`).should(
+        "have.value",
+        updatedFormData.age,
+      );
+      cy.get(`${fieldPrefix}-dob input`).should(
+        "have.value",
+        updatedFormData.dob,
+      );
+      cy.get(`${fieldPrefix}-address-street input`).should(
+        "have.value",
+        updatedFormData.address.street,
+      );
+      cy.get(`${fieldPrefix}-address-city input`).should(
+        "have.value",
+        updatedFormData.address.city,
+      );
+      cy.get(`${fieldPrefix}-education-0--college input`).should(
+        "have.value",
+        updatedFormData.education[0].college,
+      );
+      cy.get(`${fieldPrefix}-education-0--year input`).should(
+        "have.value",
+        updatedFormData.education[0].year,
+      );
 
-    // Reset form
-    cy.get("button").contains("Reset").parent("button").click({ force: true });
+      // Reset form
+      cy.get("button")
+        .contains("Reset")
+        .parent("button")
+        .click({ force: true });
 
-    // Verify initial field values
-    cy.get(`${fieldPrefix}-name input`).should(
-      "have.value",
-      initialFormData.name,
-    );
-    cy.get(`${fieldPrefix}-age input`).should(
-      "have.value",
-      initialFormData.age,
-    );
-    cy.get(`${fieldPrefix}-dob input`).should(
-      "have.value",
-      initialFormData.dob,
-    );
-    cy.get(`${fieldPrefix}-address-street input`).should(
-      "have.value",
-      initialFormData.address.street,
-    );
-    cy.get(`${fieldPrefix}-address-city input`).should(
-      "have.value",
-      initialFormData.address.city,
-    );
-    cy.get(`${fieldPrefix}-education-0--college input`).should(
-      "have.value",
-      initialFormData.education[0].college,
-    );
-    cy.get(`${fieldPrefix}-education-0--year input`).should(
-      "have.value",
-      initialFormData.education[0].year,
-    );
-  });
-});
+      // Verify initial field values
+      cy.get(`${fieldPrefix}-name input`).should(
+        "have.value",
+        initialFormData.name,
+      );
+      cy.get(`${fieldPrefix}-age input`).should(
+        "have.value",
+        initialFormData.age,
+      );
+      cy.get(`${fieldPrefix}-dob input`).should(
+        "have.value",
+        initialFormData.dob,
+      );
+      cy.get(`${fieldPrefix}-address-street input`).should(
+        "have.value",
+        initialFormData.address.street,
+      );
+      cy.get(`${fieldPrefix}-address-city input`).should(
+        "have.value",
+        initialFormData.address.city,
+      );
+      cy.get(`${fieldPrefix}-education-0--college input`).should(
+        "have.value",
+        initialFormData.education[0].college,
+      );
+      cy.get(`${fieldPrefix}-education-0--year input`).should(
+        "have.value",
+        initialFormData.education[0].year,
+      );
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_UnicodeKeys_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_UnicodeKeys_spec.js
index e78e607008ae..b7c4bbb021d0 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_UnicodeKeys_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_UnicodeKeys_spec.js
@@ -11,7 +11,7 @@ const backBtn = "[data-testid='t--property-pane-back-btn']";
 
 describe(
   "JSON Form Widget Unicode keys",
-  { tags: ["@tag.Widget", "@tag.JSONForm"] },
+  { tags: ["@tag.Widget", "@tag.JSONForm", "@tag.Binding"] },
   () => {
     afterEach(() => {
       agHelper.SaveLocalStorageCache();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONFrom_Modal_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONFrom_Modal_spec.js
index 4580188bf7d5..3bc9292ec2d0 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONFrom_Modal_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONFrom_Modal_spec.js
@@ -34,7 +34,7 @@ const checkFormModalValues = (value) => {
 
 describe(
   "JSONForm in Modal",
-  { tags: ["@tag.Widget", "@tag.JSONForm"] },
+  { tags: ["@tag.Widget", "@tag.JSONForm", "@tag.Binding"] },
   () => {
     it("should show the JSONForm with default values from Table widget", () => {
       const tableData = [
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/List/List1_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/List/List1_spec.js
index 273c4052387d..29e4660a37dc 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/List/List1_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/List/List1_spec.js
@@ -3,7 +3,7 @@ const commonlocators = require("../../../../../locators/commonlocators.json");
 
 describe(
   "Binding the list widget with text widget",
-  { tags: ["@tag.Widget", "@tag.List"] },
+  { tags: ["@tag.Widget", "@tag.List", "@tag.Binding"] },
   function () {
     //const modifierKey = Cypress.platform === "darwin" ? "meta" : "ctrl";
     it("1. Validate delete widget action from side bar", function () {
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/List/List3_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/List/List3_spec.js
index 7dbb9c756367..59098d66d593 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/List/List3_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/List/List3_spec.js
@@ -2,7 +2,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Binding the list widget with text widget",
-  { tags: ["@tag.Widget", "@tag.List"] },
+  { tags: ["@tag.Widget", "@tag.List", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("listRegression3Dsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/List/List4_1_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/List/List4_1_spec.ts
index c57873a5791e..93acb177e8c7 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/List/List4_1_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/List/List4_1_spec.ts
@@ -16,7 +16,7 @@ const dsl = require("../../../../../fixtures/listdsl.json");
 
 describe(
   "List Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.List"] },
+  { tags: ["@tag.Widget", "@tag.List", "@tag.Binding"] },
   function () {
     const items = JSON.parse(dsl.dsl.children[0].listData);
 
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/List/List4_2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/List/List4_2_spec.js
index 145ca961b12b..0f2a29e663af 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/List/List4_2_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/List/List4_2_spec.js
@@ -11,7 +11,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Container Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.List"] },
+  { tags: ["@tag.Widget", "@tag.List", "@tag.Binding"] },
   function () {
     const items = JSON.parse(dsl.dsl.children[0].listData);
 
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/List/List5_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/List/List5_spec.js
index 3de11873fe20..555bda23fe83 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/List/List5_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/List/List5_spec.js
@@ -2,7 +2,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Binding - List widget to text widget",
-  { tags: ["@tag.Widget", "@tag.List"] },
+  { tags: ["@tag.Widget", "@tag.List", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("listRegression2Dsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/List/List6_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/List/List6_spec.js
index 72a468e14dc5..3f866e831aef 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/List/List6_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/List/List6_spec.js
@@ -6,7 +6,7 @@ import EditorNavigation, {
 
 describe(
   "Binding the list widget with text widget",
-  { tags: ["@tag.Widget", "@tag.List"] },
+  { tags: ["@tag.Widget", "@tag.List", "@tag.Binding"] },
   function () {
     //const modifierKey = Cypress.platform === "darwin" ? "meta" : "ctrl";
 
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/List/List7_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/List/List7_spec.js
index 88b9c7b6eff8..ecb6e79f8ae0 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/List/List7_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/List/List7_spec.js
@@ -3,7 +3,7 @@ const commonlocators = require("../../../../../locators/commonlocators.json");
 
 describe(
   "Binding the list widget with text widget",
-  { tags: ["@tag.Widget", "@tag.List"] },
+  { tags: ["@tag.Widget", "@tag.List", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("ListVulnerabilityDSL");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Childwigets/List_FilePicker_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Childwigets/List_FilePicker_spec.js
index 61ccaff0f728..ca4ba7300783 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Childwigets/List_FilePicker_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Childwigets/List_FilePicker_spec.js
@@ -14,7 +14,7 @@ const widgetSelector = (name) => `[data-widgetname-cy="${name}"]`;
 
 describe(
   " File Picker Widget",
-  { tags: ["@tag.Widget", "@tag.List"] },
+  { tags: ["@tag.Widget", "@tag.List", "@tag.Binding"] },
   function () {
     before(() => {
       agHelper.AddDsl("Listv2/simpleLargeListv2");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Childwigets/List_Inputs_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Childwigets/List_Inputs_spec.js
index f8eef27adcc1..f19c2ba93b78 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Childwigets/List_Inputs_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Childwigets/List_Inputs_spec.js
@@ -14,198 +14,208 @@ import EditorNavigation, {
 // TODO: Test for Reset functionality
 const items = JSON.parse(dsl.dsl.children[0].listData);
 
-describe("Input Widgets", { tags: ["@tag.Widget", "@tag.List"] }, function () {
-  before(() => {
-    agHelper.AddDsl("Listv2/simpleLargeListv2");
-  });
-
-  beforeEach(() => {
-    agHelper.RestoreLocalStorageCache();
-  });
-
-  afterEach(() => {
-    agHelper.SaveLocalStorageCache();
-  });
-
-  it("1. Input Widgets default value", function () {
-    entityExplorer.DragDropWidgetNVerify(draggableWidgets.TEXT, 500, 100); //for test #2
-    entityExplorer.DragDropWidgetNVerify(
-      draggableWidgets.CURRENCY_INPUT,
-      200,
-      100,
-    );
-    propPane.UpdatePropertyFieldValue("Default value", "{{currentItem.id}}");
-    propPane.TogglePropertyState("Required", "On");
-
-    entityExplorer.DragDropWidgetNVerify(draggableWidgets.TEXT, 500, 200); //for test #2
-    entityExplorer.DragDropWidgetNVerify(
-      draggableWidgets.PHONE_INPUT,
-      200,
-      200,
-    );
-    propPane.UpdatePropertyFieldValue(
-      "Default value",
-      "{{currentItem.phoneNumber}}",
-    );
-    propPane.TogglePropertyState("Required", "On");
-    propPane.TogglePropertyState("Enable formatting", "Off");
-
-    entityExplorer.DragDropWidgetNVerify(draggableWidgets.TEXT, 500, 300); //for test #2
-    entityExplorer.DragDropWidgetNVerify(draggableWidgets.INPUT_V2, 200, 300);
-    propPane.UpdatePropertyFieldValue("Default value", "{{currentItem.email}}");
-    propPane.TogglePropertyState("Required", "On");
-
-    agHelper.AssertText(
-      locators._widgetInCanvas(draggableWidgets.INPUT_V2) +
-        " " +
-        locators._inputField,
-      "val",
-      items[0].email,
-    );
-
-    agHelper.AssertText(
-      locators._widgetInCanvas(draggableWidgets.CURRENCY_INPUT) +
-        " " +
-        locators._inputField,
-      "val",
-      items[0].id.toString(),
-    );
-    agHelper.AssertText(
-      locators._widgetInCanvas(draggableWidgets.PHONE_INPUT) +
-        " " +
-        locators._inputField,
-      "val",
-      items[0].phoneNumber.toString(),
-    );
-  });
-
-  it("2. Input Widgets isValid", function () {
-    // Test for isValid === True
-    EditorNavigation.SelectEntityByName("Text1", EntityType.Widget);
-    propPane.RenameWidget("Text1", "Currency_Widget");
-    agHelper.Sleep();
-    propPane.UpdatePropertyFieldValue(
-      "Text",
-      "{{currentView.CurrencyInput1.isValid}}",
-    );
-    agHelper.AssertText(
-      propPane._widgetToVerifyText("Currency_Widget"),
-      "text",
-      "true",
-    );
-
-    EditorNavigation.SelectEntityByName("Text2", EntityType.Widget);
-    propPane.RenameWidget("Text2", "PhoneInput_Widget");
-    agHelper.Sleep();
-    propPane.UpdatePropertyFieldValue(
-      "Text",
-      "{{currentView.PhoneInput1.isValid}}",
-    );
-    agHelper.AssertText(
-      propPane._widgetToVerifyText("PhoneInput_Widget"),
-      "text",
-      "true",
-    );
-
-    EditorNavigation.SelectEntityByName("Text3", EntityType.Widget);
-    propPane.RenameWidget("Text3", "Input_Widget");
-    agHelper.Sleep();
-    propPane.UpdatePropertyFieldValue("Text", "{{currentView.Input1.isValid}}");
-    agHelper.AssertText(
-      propPane._widgetToVerifyText("Input_Widget"),
-      "text",
-      "true",
-    );
-
-    // Test for isValid === false
-    deployMode.DeployApp();
-    // cy.get(`${widgetSelectorByType("inputwidgetv2")} input`).clear({
-    //   force: true,
-    // });
-    agHelper.ClearTextField(
-      locators._widgetInDeployed(draggableWidgets.INPUT_V2) +
-        " " +
-        locators._inputField,
-      true,
-    );
-    agHelper.AssertText(
-      locators._widgetInDeployed(draggableWidgets.TEXT),
-      "text",
-      "false",
-      2,
-    );
-
-    agHelper.ClearTextField(
-      locators._widgetInDeployed(draggableWidgets.PHONE_INPUT) +
-        " " +
-        locators._inputField,
-      true,
-    );
-    agHelper.AssertText(
-      locators._widgetInDeployed(draggableWidgets.TEXT),
-      "text",
-      "false",
-      1,
-    );
-
-    agHelper.ClearTextField(
-      locators._widgetInDeployed(draggableWidgets.CURRENCY_INPUT) +
-        " " +
-        locators._inputField,
-      true,
-    );
-    agHelper.AssertText(
-      locators._widgetInDeployed(draggableWidgets.TEXT),
-      "text",
-      "false",
-    );
-    deployMode.NavigateBacktoEditor();
-  });
-
-  it("3. Currency widget default value is retained over page change", () => {
-    const value = "123456789";
-    const formattedText = "123,456,789";
-
-    cy.addDsl(dslWithCurrencyWidget);
-    cy.openPropertyPane("currencyinputwidget");
-    cy.updateCodeInput(".t--property-control-defaultvalue", value);
-
-    // Observe the value of 2nd item currency widget - formatted text
-    cy.get(".t--widget-currencyinputwidget")
-      .eq(1)
-      .find("input")
-      .should("have.value", formattedText);
-
-    // Find the 2nd item currency and click to focus
-    cy.get(".t--widget-currencyinputwidget")
-      .eq(1)
-      .find("input")
-      .click({ force: true });
-
-    // Observe the value of 2nd item currency widget - un-formatted text
-    cy.get(".t--widget-currencyinputwidget")
-      .eq(1)
-      .find("input")
-      .should("have.value", value);
-
-    // Change to page 2
-    cy.get(".rc-pagination-item")
-      .find("a")
-      .contains("2")
-      .click({ force: true })
-      .wait(500);
-
-    // Back to page 1
-    cy.get(".rc-pagination-item")
-      .find("a")
-      .contains("1")
-      .click({ force: true })
-      .wait(500);
-
-    // Observe the value of 2nd item currency widget - formatted text
-    cy.get(".t--widget-currencyinputwidget")
-      .eq(1)
-      .find("input")
-      .should("have.value", formattedText);
-  });
-});
+describe(
+  "Input Widgets",
+  { tags: ["@tag.Widget", "@tag.List", "@tag.Binding"] },
+  function () {
+    before(() => {
+      agHelper.AddDsl("Listv2/simpleLargeListv2");
+    });
+
+    beforeEach(() => {
+      agHelper.RestoreLocalStorageCache();
+    });
+
+    afterEach(() => {
+      agHelper.SaveLocalStorageCache();
+    });
+
+    it("1. Input Widgets default value", function () {
+      entityExplorer.DragDropWidgetNVerify(draggableWidgets.TEXT, 500, 100); //for test #2
+      entityExplorer.DragDropWidgetNVerify(
+        draggableWidgets.CURRENCY_INPUT,
+        200,
+        100,
+      );
+      propPane.UpdatePropertyFieldValue("Default value", "{{currentItem.id}}");
+      propPane.TogglePropertyState("Required", "On");
+
+      entityExplorer.DragDropWidgetNVerify(draggableWidgets.TEXT, 500, 200); //for test #2
+      entityExplorer.DragDropWidgetNVerify(
+        draggableWidgets.PHONE_INPUT,
+        200,
+        200,
+      );
+      propPane.UpdatePropertyFieldValue(
+        "Default value",
+        "{{currentItem.phoneNumber}}",
+      );
+      propPane.TogglePropertyState("Required", "On");
+      propPane.TogglePropertyState("Enable formatting", "Off");
+
+      entityExplorer.DragDropWidgetNVerify(draggableWidgets.TEXT, 500, 300); //for test #2
+      entityExplorer.DragDropWidgetNVerify(draggableWidgets.INPUT_V2, 200, 300);
+      propPane.UpdatePropertyFieldValue(
+        "Default value",
+        "{{currentItem.email}}",
+      );
+      propPane.TogglePropertyState("Required", "On");
+
+      agHelper.AssertText(
+        locators._widgetInCanvas(draggableWidgets.INPUT_V2) +
+          " " +
+          locators._inputField,
+        "val",
+        items[0].email,
+      );
+
+      agHelper.AssertText(
+        locators._widgetInCanvas(draggableWidgets.CURRENCY_INPUT) +
+          " " +
+          locators._inputField,
+        "val",
+        items[0].id.toString(),
+      );
+      agHelper.AssertText(
+        locators._widgetInCanvas(draggableWidgets.PHONE_INPUT) +
+          " " +
+          locators._inputField,
+        "val",
+        items[0].phoneNumber.toString(),
+      );
+    });
+
+    it("2. Input Widgets isValid", function () {
+      // Test for isValid === True
+      EditorNavigation.SelectEntityByName("Text1", EntityType.Widget);
+      propPane.RenameWidget("Text1", "Currency_Widget");
+      agHelper.Sleep();
+      propPane.UpdatePropertyFieldValue(
+        "Text",
+        "{{currentView.CurrencyInput1.isValid}}",
+      );
+      agHelper.AssertText(
+        propPane._widgetToVerifyText("Currency_Widget"),
+        "text",
+        "true",
+      );
+
+      EditorNavigation.SelectEntityByName("Text2", EntityType.Widget);
+      propPane.RenameWidget("Text2", "PhoneInput_Widget");
+      agHelper.Sleep();
+      propPane.UpdatePropertyFieldValue(
+        "Text",
+        "{{currentView.PhoneInput1.isValid}}",
+      );
+      agHelper.AssertText(
+        propPane._widgetToVerifyText("PhoneInput_Widget"),
+        "text",
+        "true",
+      );
+
+      EditorNavigation.SelectEntityByName("Text3", EntityType.Widget);
+      propPane.RenameWidget("Text3", "Input_Widget");
+      agHelper.Sleep();
+      propPane.UpdatePropertyFieldValue(
+        "Text",
+        "{{currentView.Input1.isValid}}",
+      );
+      agHelper.AssertText(
+        propPane._widgetToVerifyText("Input_Widget"),
+        "text",
+        "true",
+      );
+
+      // Test for isValid === false
+      deployMode.DeployApp();
+      // cy.get(`${widgetSelectorByType("inputwidgetv2")} input`).clear({
+      //   force: true,
+      // });
+      agHelper.ClearTextField(
+        locators._widgetInDeployed(draggableWidgets.INPUT_V2) +
+          " " +
+          locators._inputField,
+        true,
+      );
+      agHelper.AssertText(
+        locators._widgetInDeployed(draggableWidgets.TEXT),
+        "text",
+        "false",
+        2,
+      );
+
+      agHelper.ClearTextField(
+        locators._widgetInDeployed(draggableWidgets.PHONE_INPUT) +
+          " " +
+          locators._inputField,
+        true,
+      );
+      agHelper.AssertText(
+        locators._widgetInDeployed(draggableWidgets.TEXT),
+        "text",
+        "false",
+        1,
+      );
+
+      agHelper.ClearTextField(
+        locators._widgetInDeployed(draggableWidgets.CURRENCY_INPUT) +
+          " " +
+          locators._inputField,
+        true,
+      );
+      agHelper.AssertText(
+        locators._widgetInDeployed(draggableWidgets.TEXT),
+        "text",
+        "false",
+      );
+      deployMode.NavigateBacktoEditor();
+    });
+
+    it("3. Currency widget default value is retained over page change", () => {
+      const value = "123456789";
+      const formattedText = "123,456,789";
+
+      cy.addDsl(dslWithCurrencyWidget);
+      cy.openPropertyPane("currencyinputwidget");
+      cy.updateCodeInput(".t--property-control-defaultvalue", value);
+
+      // Observe the value of 2nd item currency widget - formatted text
+      cy.get(".t--widget-currencyinputwidget")
+        .eq(1)
+        .find("input")
+        .should("have.value", formattedText);
+
+      // Find the 2nd item currency and click to focus
+      cy.get(".t--widget-currencyinputwidget")
+        .eq(1)
+        .find("input")
+        .click({ force: true });
+
+      // Observe the value of 2nd item currency widget - un-formatted text
+      cy.get(".t--widget-currencyinputwidget")
+        .eq(1)
+        .find("input")
+        .should("have.value", value);
+
+      // Change to page 2
+      cy.get(".rc-pagination-item")
+        .find("a")
+        .contains("2")
+        .click({ force: true })
+        .wait(500);
+
+      // Back to page 1
+      cy.get(".rc-pagination-item")
+        .find("a")
+        .contains("1")
+        .click({ force: true })
+        .wait(500);
+
+      // Observe the value of 2nd item currency widget - formatted text
+      cy.get(".t--widget-currencyinputwidget")
+        .eq(1)
+        .find("input")
+        .should("have.value", formattedText);
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Childwigets/List_Modal_Stats_Check_Radio_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Childwigets/List_Modal_Stats_Check_Radio_spec.js
index 2e769772f506..5f5d27332c4f 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Childwigets/List_Modal_Stats_Check_Radio_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Childwigets/List_Modal_Stats_Check_Radio_spec.js
@@ -5,7 +5,7 @@ const widgetSelector = (name) => `[data-widgetname-cy="${name}"]`;
 
 describe(
   "Modal, Radio, Checkbox widget",
-  { tags: ["@tag.Widget", "@tag.List"] },
+  { tags: ["@tag.Widget", "@tag.List", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("Listv2/ListWithModalStatCheckboxAndRadio");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Childwigets/List_Select_Widgets_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Childwigets/List_Select_Widgets_spec.js
index d734b16281c0..9591f03a3979 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Childwigets/List_Select_Widgets_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Childwigets/List_Select_Widgets_spec.js
@@ -13,170 +13,180 @@ const items = JSON.parse(dsl.dsl.children[0].listData);
 const widgetSelector = (name) => `[data-widgetname-cy="${name}"]`;
 const widgetSelectorByType = (name) => `.t--widget-${name}`;
 
-describe("Select Widgets", { tags: ["@tag.Widget", "@tag.List"] }, function () {
-  before(() => {
-    _.agHelper.AddDsl("Listv2/simpleLargeListv2");
-  });
-
-  it("1. Select Widgets default value", function () {
-    _.entityExplorer.DragDropWidgetNVerify(_.draggableWidgets.TEXT, 500, 100); //for test #2
-    _.entityExplorer.DragDropWidgetNVerify(
-      _.draggableWidgets.MULTISELECT,
-      200,
-      150,
-    );
-
-    _.propPane.ToggleJSMode("sourcedata");
-
-    _.propPane.UpdatePropertyFieldValue(
-      "Source Data",
-      `{{[{
+describe(
+  "Select Widgets",
+  { tags: ["@tag.Widget", "@tag.List", "@tag.Binding"] },
+  function () {
+    before(() => {
+      _.agHelper.AddDsl("Listv2/simpleLargeListv2");
+    });
+
+    it("1. Select Widgets default value", function () {
+      _.entityExplorer.DragDropWidgetNVerify(_.draggableWidgets.TEXT, 500, 100); //for test #2
+      _.entityExplorer.DragDropWidgetNVerify(
+        _.draggableWidgets.MULTISELECT,
+        200,
+        150,
+      );
+
+      _.propPane.ToggleJSMode("sourcedata");
+
+      _.propPane.UpdatePropertyFieldValue(
+        "Source Data",
+        `{{[{
       label: currentItem.name,
       value: currentItem.id
   }]}}`,
-    );
-
-    _.propPane.ToggleJSMode("label key");
-    cy.updateCodeInput(
-      ".t--property-control-wrapper.t--property-control-labelkey",
-      `label`,
-    );
-
-    _.propPane.ToggleJSMode("value key");
-    cy.updateCodeInput(".t--property-control-valuekey", `value`);
-
-    _.propPane.UpdatePropertyFieldValue(
-      "Default selected values",
-      "{{currentItem.id}}",
-    );
-    _.propPane.TogglePropertyState("Required", "On");
-    _.propPane.EnterJSContext(
-      "onOptionChange",
-      "{{showAlert('Row ' + currentIndex + ' Option Changed')}}",
-    );
-
-    _.entityExplorer.DragDropWidgetNVerify(_.draggableWidgets.TEXT, 500, 300); //for test #2
-    _.entityExplorer.DragDropWidgetNVerify(_.draggableWidgets.SELECT, 200, 350);
-
-    _.propPane.ToggleJSMode("sourcedata");
-
-    _.propPane.UpdatePropertyFieldValue(
-      "Source Data",
-      `{{[{
+      );
+
+      _.propPane.ToggleJSMode("label key");
+      cy.updateCodeInput(
+        ".t--property-control-wrapper.t--property-control-labelkey",
+        `label`,
+      );
+
+      _.propPane.ToggleJSMode("value key");
+      cy.updateCodeInput(".t--property-control-valuekey", `value`);
+
+      _.propPane.UpdatePropertyFieldValue(
+        "Default selected values",
+        "{{currentItem.id}}",
+      );
+      _.propPane.TogglePropertyState("Required", "On");
+      _.propPane.EnterJSContext(
+        "onOptionChange",
+        "{{showAlert('Row ' + currentIndex + ' Option Changed')}}",
+      );
+
+      _.entityExplorer.DragDropWidgetNVerify(_.draggableWidgets.TEXT, 500, 300); //for test #2
+      _.entityExplorer.DragDropWidgetNVerify(
+        _.draggableWidgets.SELECT,
+        200,
+        350,
+      );
+
+      _.propPane.ToggleJSMode("sourcedata");
+
+      _.propPane.UpdatePropertyFieldValue(
+        "Source Data",
+        `{{[{
         label: currentItem.name,
         value: currentItem.id
     }]}}`,
-    );
-
-    _.propPane.ToggleJSMode("label key");
-    cy.updateCodeInput(
-      ".t--property-control-wrapper.t--property-control-labelkey",
-      `label`,
-    );
-
-    _.propPane.ToggleJSMode("value key");
-    cy.updateCodeInput(".t--property-control-valuekey", `value`);
-
-    _.propPane.UpdatePropertyFieldValue(
-      "Default selected value",
-      "{{currentItem.id}}",
-    );
-    _.propPane.TogglePropertyState("Required", "On");
-    _.propPane.EnterJSContext(
-      "onOptionChange",
-      "{{showAlert('Row ' + currentIndex + ' Option Changed')}}",
-    );
-
-    // Page 1
-    _.agHelper.ReadSelectedDropDownValue().then(($selectedValue) => {
-      expect($selectedValue).to.eq(items[0].name);
+      );
+
+      _.propPane.ToggleJSMode("label key");
+      cy.updateCodeInput(
+        ".t--property-control-wrapper.t--property-control-labelkey",
+        `label`,
+      );
+
+      _.propPane.ToggleJSMode("value key");
+      cy.updateCodeInput(".t--property-control-valuekey", `value`);
+
+      _.propPane.UpdatePropertyFieldValue(
+        "Default selected value",
+        "{{currentItem.id}}",
+      );
+      _.propPane.TogglePropertyState("Required", "On");
+      _.propPane.EnterJSContext(
+        "onOptionChange",
+        "{{showAlert('Row ' + currentIndex + ' Option Changed')}}",
+      );
+
+      // Page 1
+      _.agHelper.ReadSelectedDropDownValue().then(($selectedValue) => {
+        expect($selectedValue).to.eq(items[0].name);
+      });
+      cy.get(formWidgetsPage.multiselectwidgetv2)
+        .find(".rc-select-selection-item-content")
+        .first()
+        .should("have.text", items[0].name);
+
+      cy.get(commonlocators.listPaginateNextButton).click({
+        force: true,
+      });
+      _.agHelper.Sleep();
+
+      // Page 2
+      _.agHelper.ReadSelectedDropDownValue().then(($selectedValue) => {
+        expect($selectedValue).to.eq(items[1].name);
+      });
+
+      cy.get(`.rc-select-selection-item[title="${items[1].name}"]`).should(
+        "have.text",
+        items[1].name,
+      );
+
+      cy.get(commonlocators.listPaginatePrevButton).click({
+        force: true,
+      });
     });
-    cy.get(formWidgetsPage.multiselectwidgetv2)
-      .find(".rc-select-selection-item-content")
-      .first()
-      .should("have.text", items[0].name);
 
-    cy.get(commonlocators.listPaginateNextButton).click({
-      force: true,
+    it("2. Select Widgets isValid", function () {
+      // Test for isValid === True
+      EditorNavigation.SelectEntityByName("Text1", EntityType.Widget);
+      _.propPane.RenameWidget("Text1", "MultiSelect_Widget");
+      _.propPane.UpdatePropertyFieldValue(
+        "Text",
+        "{{`${currentView.MultiSelect1.selectedOptionLabels[0]}_${currentView.MultiSelect1.selectedOptionValues[0]}_${currentView.MultiSelect1.isDirty}_${currentView.MultiSelect1.isValid}`}}",
+      );
+      cy.get(
+        `${widgetSelector("MultiSelect_Widget")} ${commonlocators.bodyTextStyle}`,
+      )
+        .first()
+        .should("have.text", `${items[0].name}_${items[0].id}_false_true`);
+
+      EditorNavigation.SelectEntityByName("Text2", EntityType.Widget);
+      _.propPane.RenameWidget("Text2", "Select_Widget");
+      _.propPane.UpdatePropertyFieldValue(
+        "Text",
+        "{{`${currentView.Select1.selectedOptionLabel}_${currentView.Select1.selectedOptionValue}_${currentView.Select1.isDirty}_${currentView.Select1.isValid}`}}",
+      );
+      cy.get(
+        `${widgetSelector("Select_Widget")} ${commonlocators.bodyTextStyle}`,
+      )
+        .first()
+        .should("have.text", `${items[0].name}_${items[0].id}_false_true`);
+
+      // Test for isValid === false
+      EditorNavigation.SelectEntityByName("MultiSelect1", EntityType.Widget);
+      _.agHelper.SelectFromMultiSelect([`${items[0].name}`], 0, false);
+      cy.get(
+        `${widgetSelector("MultiSelect_Widget")} ${commonlocators.bodyTextStyle}`,
+      )
+        .first()
+        .should("have.text", `undefined_undefined_true_false`);
+
+      cy.get(_.locators._selectClearButton_dataTestId).should("not.exist");
     });
-    _.agHelper.Sleep();
-
-    // Page 2
-    _.agHelper.ReadSelectedDropDownValue().then(($selectedValue) => {
-      expect($selectedValue).to.eq(items[1].name);
-    });
-
-    cy.get(`.rc-select-selection-item[title="${items[1].name}"]`).should(
-      "have.text",
-      items[1].name,
-    );
 
-    cy.get(commonlocators.listPaginatePrevButton).click({
-      force: true,
+    it("3. Select Widgets onOptionChange", function () {
+      cy.get(formWidgetsPage.selectWidget)
+        .find(widgetLocators.dropdownSingleSelect)
+        .click({ force: true });
+      cy.get(commonlocators.singleSelectWidgetMenuItem)
+        .contains(items[0].name)
+        .click({ force: true });
+      cy.wait(200);
+
+      cy.get(formWidgetsPage.selectWidget).contains(items[0].name);
+      cy.validateToastMessage("Row 0 Option Changed");
+
+      cy.get(formWidgetsPage.multiselectwidgetv2)
+        .find(".rc-select-selection-search-input")
+        .first()
+        .focus({ force: true })
+        .type("{uparrow}", { force: true });
+
+      cy.get(".multi-select-dropdown")
+        .contains(items[0].name)
+        .click({ force: true });
+      cy.get(`.rc-select-selection-item[title="${items[0].name}"]`).should(
+        "have.text",
+        items[0].name,
+      );
+      cy.validateToastMessage("Row 0 Option Changed");
     });
-  });
-
-  it("2. Select Widgets isValid", function () {
-    // Test for isValid === True
-    EditorNavigation.SelectEntityByName("Text1", EntityType.Widget);
-    _.propPane.RenameWidget("Text1", "MultiSelect_Widget");
-    _.propPane.UpdatePropertyFieldValue(
-      "Text",
-      "{{`${currentView.MultiSelect1.selectedOptionLabels[0]}_${currentView.MultiSelect1.selectedOptionValues[0]}_${currentView.MultiSelect1.isDirty}_${currentView.MultiSelect1.isValid}`}}",
-    );
-    cy.get(
-      `${widgetSelector("MultiSelect_Widget")} ${commonlocators.bodyTextStyle}`,
-    )
-      .first()
-      .should("have.text", `${items[0].name}_${items[0].id}_false_true`);
-
-    EditorNavigation.SelectEntityByName("Text2", EntityType.Widget);
-    _.propPane.RenameWidget("Text2", "Select_Widget");
-    _.propPane.UpdatePropertyFieldValue(
-      "Text",
-      "{{`${currentView.Select1.selectedOptionLabel}_${currentView.Select1.selectedOptionValue}_${currentView.Select1.isDirty}_${currentView.Select1.isValid}`}}",
-    );
-    cy.get(`${widgetSelector("Select_Widget")} ${commonlocators.bodyTextStyle}`)
-      .first()
-      .should("have.text", `${items[0].name}_${items[0].id}_false_true`);
-
-    // Test for isValid === false
-    EditorNavigation.SelectEntityByName("MultiSelect1", EntityType.Widget);
-    _.agHelper.SelectFromMultiSelect([`${items[0].name}`], 0, false);
-    cy.get(
-      `${widgetSelector("MultiSelect_Widget")} ${commonlocators.bodyTextStyle}`,
-    )
-      .first()
-      .should("have.text", `undefined_undefined_true_false`);
-
-    cy.get(_.locators._selectClearButton_dataTestId).should("not.exist");
-  });
-
-  it("3. Select Widgets onOptionChange", function () {
-    cy.get(formWidgetsPage.selectWidget)
-      .find(widgetLocators.dropdownSingleSelect)
-      .click({ force: true });
-    cy.get(commonlocators.singleSelectWidgetMenuItem)
-      .contains(items[0].name)
-      .click({ force: true });
-    cy.wait(200);
-
-    cy.get(formWidgetsPage.selectWidget).contains(items[0].name);
-    cy.validateToastMessage("Row 0 Option Changed");
-
-    cy.get(formWidgetsPage.multiselectwidgetv2)
-      .find(".rc-select-selection-search-input")
-      .first()
-      .focus({ force: true })
-      .type("{uparrow}", { force: true });
-
-    cy.get(".multi-select-dropdown")
-      .contains(items[0].name)
-      .click({ force: true });
-    cy.get(`.rc-select-selection-item[title="${items[0].name}"]`).should(
-      "have.text",
-      items[0].name,
-    );
-    cy.validateToastMessage("Row 0 Option Changed");
-  });
-});
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Childwigets/List_Table_Widgets_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Childwigets/List_Table_Widgets_spec.js
index 82a46638727b..365b3e2d0485 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Childwigets/List_Table_Widgets_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Childwigets/List_Table_Widgets_spec.js
@@ -3,67 +3,71 @@ const containerWidgetSelector = `[type="CONTAINER_WIDGET"]`;
 
 const widgetSelector = (name) => `[data-widgetname-cy="${name}"]`;
 
-describe("Select Widgets", { tags: ["@tag.Widget", "@tag.List"] }, function () {
-  before(() => {
-    _.agHelper.AddDsl("Listv2/Listv2WithTablewidget");
-  });
-  it("a. Validate the Values in Table widget", function () {
-    cy.get(`${widgetSelector("List1")} ${containerWidgetSelector}`)
-      .eq(0)
-      .within(() => {
-        cy.readTableV2dataPublish("0", "1").then((tabData) => {
-          const tabValue = tabData;
-          expect(tabValue).to.be.equal("Blue");
-          cy.log("the value is" + tabValue);
-        });
+describe(
+  "Select Widgets",
+  { tags: ["@tag.Widget", "@tag.List", "@tag.Binding"] },
+  function () {
+    before(() => {
+      _.agHelper.AddDsl("Listv2/Listv2WithTablewidget");
+    });
+    it("a. Validate the Values in Table widget", function () {
+      cy.get(`${widgetSelector("List1")} ${containerWidgetSelector}`)
+        .eq(0)
+        .within(() => {
+          cy.readTableV2dataPublish("0", "1").then((tabData) => {
+            const tabValue = tabData;
+            expect(tabValue).to.be.equal("Blue");
+            cy.log("the value is" + tabValue);
+          });
 
-        cy.readTableV2dataPublish("3", "1").then((tabData) => {
-          const tabValue = tabData;
-          expect(tabValue).to.be.equal("White");
-          cy.log("the value is" + tabValue);
+          cy.readTableV2dataPublish("3", "1").then((tabData) => {
+            const tabValue = tabData;
+            expect(tabValue).to.be.equal("White");
+            cy.log("the value is" + tabValue);
+          });
         });
-      });
 
-    cy.get(`${widgetSelector("List1")} ${containerWidgetSelector}`)
-      .eq(1)
-      .within(() => {
-        cy.readTableV2dataPublish("0", "1").then((tabData) => {
-          const tabValue = tabData;
-          expect(tabValue).to.be.equal("Orange");
-        });
+      cy.get(`${widgetSelector("List1")} ${containerWidgetSelector}`)
+        .eq(1)
+        .within(() => {
+          cy.readTableV2dataPublish("0", "1").then((tabData) => {
+            const tabValue = tabData;
+            expect(tabValue).to.be.equal("Orange");
+          });
 
-        cy.readTableV2dataPublish("3", "1").then((tabData) => {
-          const tabValue = tabData;
-          expect(tabValue).to.be.equal("Mustard");
+          cy.readTableV2dataPublish("3", "1").then((tabData) => {
+            const tabValue = tabData;
+            expect(tabValue).to.be.equal("Mustard");
+          });
         });
-      });
 
-    cy.get(`${widgetSelector("List1")} ${containerWidgetSelector}`)
-      .eq(2)
-      .within(() => {
-        cy.readTableV2dataPublish("0", "1").then((tabData) => {
-          const tabValue = tabData;
-          expect(tabValue).to.be.equal("Teal");
-        });
+      cy.get(`${widgetSelector("List1")} ${containerWidgetSelector}`)
+        .eq(2)
+        .within(() => {
+          cy.readTableV2dataPublish("0", "1").then((tabData) => {
+            const tabValue = tabData;
+            expect(tabValue).to.be.equal("Teal");
+          });
 
-        cy.readTableV2dataPublish("3", "1").then((tabData) => {
-          const tabValue = tabData;
-          expect(tabValue).to.be.equal("Marine");
+          cy.readTableV2dataPublish("3", "1").then((tabData) => {
+            const tabValue = tabData;
+            expect(tabValue).to.be.equal("Marine");
+          });
         });
-      });
 
-    cy.get(`${widgetSelector("List1")} ${containerWidgetSelector}`)
-      .eq(3)
-      .within(() => {
-        cy.readTableV2dataPublish("0", "1").then((tabData) => {
-          const tabValue = tabData;
-          expect(tabValue).to.be.equal("Blue");
-        });
+      cy.get(`${widgetSelector("List1")} ${containerWidgetSelector}`)
+        .eq(3)
+        .within(() => {
+          cy.readTableV2dataPublish("0", "1").then((tabData) => {
+            const tabValue = tabData;
+            expect(tabValue).to.be.equal("Blue");
+          });
 
-        cy.readTableV2dataPublish("3", "1").then((tabData) => {
-          const tabValue = tabData;
-          expect(tabValue).to.be.equal("Lavender");
+          cy.readTableV2dataPublish("3", "1").then((tabData) => {
+            const tabValue = tabData;
+            expect(tabValue).to.be.equal("Lavender");
+          });
         });
-      });
-  });
-});
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Childwigets/Listv2_Button_Widget_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Childwigets/Listv2_Button_Widget_spec.ts
index 0455f933c894..0857ed1bf1a6 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Childwigets/Listv2_Button_Widget_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Childwigets/Listv2_Button_Widget_spec.ts
@@ -3,29 +3,33 @@ import EditorNavigation, {
   EntityType,
 } from "../../../../../../support/Pages/EditorNavigation";
 
-describe("List v2- Tabs Widget", { tags: ["@tag.Widget", "@tag.List"] }, () => {
-  before(() => {
-    _.agHelper.AddDsl("Listv2/simpleListWithInputAndButton");
-  });
+describe(
+  "List v2- Tabs Widget",
+  { tags: ["@tag.Widget", "@tag.List", "@tag.Binding"] },
+  () => {
+    before(() => {
+      _.agHelper.AddDsl("Listv2/simpleListWithInputAndButton");
+    });
 
-  it("1. should not throw error when on click event is changed No Action", () => {
-    EditorNavigation.SelectEntityByName("Button1", EntityType.Widget, {}, [
-      "List1",
-      "Container1",
-    ]);
-    _.propPane.EnterJSContext("onClick", "{{showAlert('Hello')}}");
-    _.agHelper.Sleep();
-    _.agHelper.ClickButton("Submit");
-    _.agHelper.ValidateToastMessage("Hello");
+    it("1. should not throw error when on click event is changed No Action", () => {
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget, {}, [
+        "List1",
+        "Container1",
+      ]);
+      _.propPane.EnterJSContext("onClick", "{{showAlert('Hello')}}");
+      _.agHelper.Sleep();
+      _.agHelper.ClickButton("Submit");
+      _.agHelper.ValidateToastMessage("Hello");
 
-    // Wait for toastmsg to close
-    _.agHelper.WaitUntilAllToastsDisappear();
+      // Wait for toastmsg to close
+      _.agHelper.WaitUntilAllToastsDisappear();
 
-    // Clear the event
-    _.propPane.UpdatePropertyFieldValue("onClick", "");
-    _.agHelper.Sleep();
-    _.agHelper.ClickButton("Submit");
+      // Clear the event
+      _.propPane.UpdatePropertyFieldValue("onClick", "");
+      _.agHelper.Sleep();
+      _.agHelper.ClickButton("Submit");
 
-    _.agHelper.AssertElementAbsence(_.locators._specificToast("Hello"));
-  });
-});
+      _.agHelper.AssertElementAbsence(_.locators._specificToast("Hello"));
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Childwigets/Listv2_Tabs_Widget_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Childwigets/Listv2_Tabs_Widget_spec.js
index 353528e41be4..48c06295e083 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Childwigets/Listv2_Tabs_Widget_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Childwigets/Listv2_Tabs_Widget_spec.js
@@ -1,29 +1,33 @@
 import * as _ from "../../../../../../support/Objects/ObjectsCore";
 const commonlocators = require("../../../../../../locators/commonlocators.json");
 
-describe("List v2- Tabs Widget", { tags: ["@tag.Widget", "@tag.List"] }, () => {
-  before(() => {
-    _.agHelper.AddDsl("Listv2/simpleListWithTabsWidget");
-  });
+describe(
+  "List v2- Tabs Widget",
+  { tags: ["@tag.Widget", "@tag.List", "@tag.Binding"] },
+  () => {
+    before(() => {
+      _.agHelper.AddDsl("Listv2/simpleListWithTabsWidget");
+    });
 
-  it("1. change in the properties of the tabs widget should retain the default selected tab", () => {
-    cy.openPropertyPaneByWidgetName("Tabs1", "tabswidget");
+    it("1. change in the properties of the tabs widget should retain the default selected tab", () => {
+      cy.openPropertyPaneByWidgetName("Tabs1", "tabswidget");
 
-    // Check if Tab1 selected
-    cy.get(".t--page-switch-tab.is-active").contains("Tab 1");
+      // Check if Tab1 selected
+      cy.get(".t--page-switch-tab.is-active").contains("Tab 1");
 
-    // Disable Scroll Content
-    _.agHelper.CheckUncheck(commonlocators.scrollView, false);
-    // Check if disabled
-    cy.get(commonlocators.scrollView).parent().should("not.be.checked");
-    // Check if Tab 1 still selected
-    cy.get(".t--page-switch-tab.is-active").contains("Tab 1");
+      // Disable Scroll Content
+      _.agHelper.CheckUncheck(commonlocators.scrollView, false);
+      // Check if disabled
+      cy.get(commonlocators.scrollView).parent().should("not.be.checked");
+      // Check if Tab 1 still selected
+      cy.get(".t--page-switch-tab.is-active").contains("Tab 1");
 
-    // Enable Scroll Content
-    _.agHelper.CheckUncheck(commonlocators.scrollView);
-    // Check if enabled
-    cy.get(commonlocators.scrollView).should("be.checked");
-    // Check if Tab 1 still selected
-    cy.get(".t--page-switch-tab.is-active").contains("Tab 1");
-  });
-});
+      // Enable Scroll Content
+      _.agHelper.CheckUncheck(commonlocators.scrollView);
+      // Check if enabled
+      cy.get(commonlocators.scrollView).should("be.checked");
+      // Check if Tab 1 still selected
+      cy.get(".t--page-switch-tab.is-active").contains("Tab 1");
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/DataIdentifierProperty_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/DataIdentifierProperty_spec.ts
index 661a206c0afc..05b0bf8d9a18 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/DataIdentifierProperty_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/DataIdentifierProperty_spec.ts
@@ -12,7 +12,7 @@ import EditorNavigation, {
 
 describe(
   "List v2 - Data Identifier property",
-  { tags: ["@tag.Widget", "@tag.List"] },
+  { tags: ["@tag.Widget", "@tag.List", "@tag.Binding"] },
   () => {
     beforeEach(() => {
       agHelper.RestoreLocalStorageCache();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/DataIdentifier_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/DataIdentifier_spec.ts
index 0b1f970d36cf..8faae3ee37d6 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/DataIdentifier_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/DataIdentifier_spec.ts
@@ -34,7 +34,7 @@ const data = [
 
 describe(
   "List v2 - Data Identifier property",
-  { tags: ["@tag.Widget", "@tag.List"] },
+  { tags: ["@tag.Widget", "@tag.List", "@tag.Binding"] },
   () => {
     before(() => {
       agHelper.AddDsl("Listv2/ListV2WithNullPrimaryKey");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/DefaultSelectItem_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/DefaultSelectItem_spec.ts
index 6ab02041d745..33f947692405 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/DefaultSelectItem_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/DefaultSelectItem_spec.ts
@@ -54,7 +54,7 @@ function setUpDataSource() {
 
 describe(
   "List widget v2 defaultSelectedItem",
-  { tags: ["@tag.Widget", "@tag.List"] },
+  { tags: ["@tag.Widget", "@tag.List", "@tag.Binding"] },
   () => {
     before(() => {
       agHelper.AddDsl("Listv2/ListV2_Reset_dsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Event_Bindings_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Event_Bindings_spec.ts
index 0d7b56550a29..f463e306a830 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Event_Bindings_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Event_Bindings_spec.ts
@@ -10,7 +10,7 @@ import EditorNavigation, {
 
 describe(
   "Listv2 - Event bindings spec",
-  { tags: ["@tag.Widget", "@tag.List"] },
+  { tags: ["@tag.Widget", "@tag.List", "@tag.Binding"] },
   () => {
     it("1. nested list - inner widget should have access to currentItem, currentIndex, currentView and level_1", () => {
       agHelper.AddDsl("Listv2/nestedList");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/ListV2_NestedList_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/ListV2_NestedList_spec.ts
index 594f05b44743..9516f37bc733 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/ListV2_NestedList_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/ListV2_NestedList_spec.ts
@@ -13,7 +13,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Nested List widget V2 ",
-  { tags: ["@tag.Widget", "@tag.List"] },
+  { tags: ["@tag.Widget", "@tag.List", "@tag.Binding"] },
   () => {
     before(() => {
       agHelper.AddDsl("listV2NestedDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/ListV2_PageNo_PageSize_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/ListV2_PageNo_PageSize_spec.js
index 00e3059cd5ab..2d5cc6eb0d93 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/ListV2_PageNo_PageSize_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/ListV2_PageNo_PageSize_spec.js
@@ -88,7 +88,7 @@ const listData = [
 
 describe(
   "List widget V2 page number and page size",
-  { tags: ["@tag.Widget", "@tag.List", "@tag.Sanity"] },
+  { tags: ["@tag.Widget", "@tag.List", "@tag.Sanity", "@tag.Binding"] },
   () => {
     before(() => {
       _.agHelper.AddDsl("listv2PaginationDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/ListV2_SerververSide_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/ListV2_SerververSide_spec.js
index 061e83a4c9e0..dbb9727591cd 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/ListV2_SerververSide_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/ListV2_SerververSide_spec.js
@@ -15,7 +15,7 @@ const widgetSelector = (name) => `[data-widgetname-cy="${name}"]`;
 
 describe(
   "List widget V2 Serverside Pagination",
-  { tags: ["@tag.Widget", "@tag.List", "@tag.Sanity"] },
+  { tags: ["@tag.Widget", "@tag.List", "@tag.Sanity", "@tag.Binding"] },
   () => {
     before(() => {
       agHelper.AddDsl("Listv2/Listv2JSObjects");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/ListV2_WithOtherWidget_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/ListV2_WithOtherWidget_spec.ts
index 9670243a0143..ca90e9d4afe2 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/ListV2_WithOtherWidget_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/ListV2_WithOtherWidget_spec.ts
@@ -10,7 +10,7 @@ import EditorNavigation, {
 
 describe(
   "List widget V2 functionality with audio and video widgets",
-  { tags: ["@tag.Widget", "@tag.List"] },
+  { tags: ["@tag.Widget", "@tag.List", "@tag.Binding"] },
   () => {
     before(() => {
       agHelper.AddDsl("listV2AudioVideoDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/ListV2_nested_List_widget_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/ListV2_nested_List_widget_spec.js
index 0aafd27f8e58..2ca9fe4720f8 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/ListV2_nested_List_widget_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/ListV2_nested_List_widget_spec.js
@@ -27,7 +27,7 @@ function checkAutosuggestion(label, type) {
 }
 describe(
   " Nested List Widgets ",
-  { tags: ["@tag.Widget", "@tag.List", "@tag.Sanity"] },
+  { tags: ["@tag.Widget", "@tag.List", "@tag.Sanity", "@tag.Binding"] },
   function () {
     const modifierKey = Cypress.platform === "darwin" ? "meta" : "ctrl";
     beforeEach(() => {
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_BasicChildWidgetInteraction_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_BasicChildWidgetInteraction_spec.js
index 1bdbef59b944..97814dc5b463 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_BasicChildWidgetInteraction_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_BasicChildWidgetInteraction_spec.js
@@ -51,7 +51,7 @@ function checkSelectedRadioValue(selector, value) {
 
 describe(
   "List widget v2 - Basic Child Widget Interaction",
-  { tags: ["@tag.Widget", "@tag.List", "@tag.Sanity"] },
+  { tags: ["@tag.Widget", "@tag.List", "@tag.Sanity", "@tag.Binding"] },
   () => {
     before(() => {
       _.agHelper.AddDsl("Listv2/emptyList");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_BasicClientSideData_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_BasicClientSideData_spec.js
index c762a36fc84a..0728fa37cc7f 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_BasicClientSideData_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_BasicClientSideData_spec.js
@@ -26,7 +26,7 @@ const simpleListData1 = [
 
 describe(
   "List widget v2 - Basic client side data tests",
-  { tags: ["@tag.Widget", "@tag.List", "@tag.Sanity"] },
+  { tags: ["@tag.Widget", "@tag.List", "@tag.Sanity", "@tag.Binding"] },
   () => {
     beforeEach(() => {
       _.agHelper.RestoreLocalStorageCache();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_BasicServerSideData_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_BasicServerSideData_spec.js
index 03475cbff385..fde5879d85cd 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_BasicServerSideData_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_BasicServerSideData_spec.js
@@ -10,7 +10,7 @@ const toggleJSButton = (name) => `.t--property-control-${name} .t--js-toggle`;
 
 describe(
   "List widget v2 - Basic server side data tests",
-  { tags: ["@tag.Widget", "@tag.List"] },
+  { tags: ["@tag.Widget", "@tag.List", "@tag.Binding"] },
   () => {
     before(() => {
       _.agHelper.AddDsl("Listv2/listWithServerSideData");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_Copy_Paste_Delete_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_Copy_Paste_Delete_spec.js
index 1a242fc7de27..6923bbcd0e3a 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_Copy_Paste_Delete_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_Copy_Paste_Delete_spec.js
@@ -4,7 +4,7 @@ const modifierKey = Cypress.platform === "darwin" ? "meta" : "ctrl";
 
 describe(
   "List widget v2 Copy and Paste",
-  { tags: ["@tag.Widget", "@tag.List"] },
+  { tags: ["@tag.Widget", "@tag.List", "@tag.Binding"] },
   () => {
     it("1. Validate Copy paste action", () => {
       cy.dragAndDropToCanvas("listwidgetv2", {
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_EvaluatedPopup_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_EvaluatedPopup_spec.js
index 25f27987ab7a..3f5b3d5d9939 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_EvaluatedPopup_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_EvaluatedPopup_spec.js
@@ -1,6 +1,6 @@
 describe(
   "List widget v2 Evaluated Popup",
-  { tags: ["@tag.Widget", "@tag.List"] },
+  { tags: ["@tag.Widget", "@tag.List", "@tag.Binding"] },
   () => {
     it("1. List widget V2 with currentItem", () => {
       cy.dragAndDropToCanvas("listwidgetv2", {
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_Meta_Hydration_ClientSide_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_Meta_Hydration_ClientSide_spec.js
index 51f901f0d9dd..589d2ef0e358 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_Meta_Hydration_ClientSide_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_Meta_Hydration_ClientSide_spec.js
@@ -60,7 +60,7 @@ function verifyValueOfWidget(widgetType, value, index) {
 
 describe(
   "List widget v2 - meta hydration tests",
-  { tags: ["@tag.Widget", "@tag.List"] },
+  { tags: ["@tag.Widget", "@tag.List", "@tag.Binding"] },
   () => {
     before(() => {
       _.agHelper.AddDsl("Listv2/MetaHydrationDSL");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_Meta_Hydration_ServerSide_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_Meta_Hydration_ServerSide_spec.js
index 7ed4c5744468..4d6d51783557 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_Meta_Hydration_ServerSide_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_Meta_Hydration_ServerSide_spec.js
@@ -75,7 +75,7 @@ function testJsontextClear(endp) {
 
 describe(
   "List widget v2 - meta hydration tests",
-  { tags: ["@tag.Widget", "@tag.List"] },
+  { tags: ["@tag.Widget", "@tag.List", "@tag.Binding"] },
   () => {
     before(() => {
       _.agHelper.AddDsl("Listv2/MetaHydrationDSL");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_Nested_EventBindings_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_Nested_EventBindings_spec.js
index 344b4116035f..1518bd7c3ff8 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_Nested_EventBindings_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_Nested_EventBindings_spec.js
@@ -6,7 +6,7 @@ const widgetSelector = (name) => `[data-widgetname-cy="${name}"]`;
 
 describe(
   "Listv2 - Event bindings spec",
-  { tags: ["@tag.Widget", "@tag.List", "@tag.Sanity"] },
+  { tags: ["@tag.Widget", "@tag.List", "@tag.Sanity", "@tag.Binding"] },
   () => {
     it("1. nested list - inner widget should have access to currentItem, currentIndex, currentView and level_1", () => {
       cy.addDsl(nestedListDSL);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_WithButtonGroupIconWidget_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_WithButtonGroupIconWidget_spec.ts
index fbe7a15d34b0..b545b0f4a687 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_WithButtonGroupIconWidget_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_WithButtonGroupIconWidget_spec.ts
@@ -12,7 +12,7 @@ import EditorNavigation, {
 
 describe(
   "List widget V2 functionality with button, button group and icon button widgets",
-  { tags: ["@tag.Widget", "@tag.List"] },
+  { tags: ["@tag.Widget", "@tag.List", "@tag.Binding"] },
   () => {
     before(() => {
       agHelper.AddDsl("listV2ButtonsDsl", locators._buttonByText("Submit"));
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_autocomplete_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_autocomplete_spec.js
index 60ed01e6f9f7..c7d9d1997ce6 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_autocomplete_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_autocomplete_spec.js
@@ -12,7 +12,7 @@ function checkAutosuggestion(label, type) {
 
 describe(
   "List v2 - Property autocomplete",
-  { tags: ["@tag.Widget", "@tag.List"] },
+  { tags: ["@tag.Widget", "@tag.List", "@tag.Binding"] },
   () => {
     before(() => {
       cy.addDsl(level3NestedList);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_container_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_container_spec.js
index a1739330308c..704d88d8ef4d 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_container_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_container_spec.js
@@ -3,7 +3,7 @@ const commonlocators = require("../../../../../locators/commonlocators.json");
 
 describe(
   "Listv2 - Container widget",
-  { tags: ["@tag.Widget", "@tag.List"] },
+  { tags: ["@tag.Widget", "@tag.List", "@tag.Binding"] },
   () => {
     before(() => {
       cy.addDsl(simpleListDSL);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_onItemClick_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_onItemClick_spec.js
index 7d3e5f1d4e92..62c4d75957a6 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_onItemClick_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_onItemClick_spec.js
@@ -30,7 +30,7 @@ function deleteAllWidgetsInContainer() {
 
 describe(
   "List widget v2 onItemClick",
-  { tags: ["@tag.Widget", "@tag.List", "@tag.Sanity"] },
+  { tags: ["@tag.Widget", "@tag.List", "@tag.Sanity", "@tag.Binding"] },
   () => {
     it("1. List widget V2 with onItemClick", () => {
       cy.dragAndDropToCanvas("listwidgetv2", {
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_regression_fix_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_regression_fix_spec.js
index f9173928d479..91a35c8be8fe 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_regression_fix_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_regression_fix_spec.js
@@ -4,7 +4,7 @@ const widgetSelector = (name) => `[data-widgetname-cy="${name}"]`;
 
 describe(
   "List widget v2 Regression",
-  { tags: ["@tag.Widget", "@tag.List"] },
+  { tags: ["@tag.Widget", "@tag.List", "@tag.Binding"] },
   () => {
     it("1. List widget V2 with invisible widgets", () => {
       cy.dragAndDropToCanvas("listwidgetv2", {
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_spec.js
index 81c6e5ad3c8d..4fd89cd231cb 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_spec.js
@@ -12,7 +12,7 @@ import {
 
 describe(
   "List Widget V2 Functionality",
-  { tags: ["@tag.Widget", "@tag.List"] },
+  { tags: ["@tag.Widget", "@tag.List", "@tag.Binding"] },
   function () {
     before(() => {
       agHelper.AddDsl("Listv2/simpleLargeListv2");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_vulnerability_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_vulnerability_spec.js
index 77af980174e4..6e4325de8bbb 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_vulnerability_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_vulnerability_spec.js
@@ -3,7 +3,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Binding the list widget with text widget",
-  { tags: ["@tag.Widget", "@tag.List"] },
+  { tags: ["@tag.Widget", "@tag.List", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("Listv2/simpleListVulnerability");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/PropertyPane_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/PropertyPane_spec.ts
index 504f60b99216..6433daf8351c 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/PropertyPane_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/PropertyPane_spec.ts
@@ -12,7 +12,7 @@ import EditorNavigation, {
 
 describe(
   "List widget V2 PropertyPane",
-  { tags: ["@tag.Widget", "@tag.List"] },
+  { tags: ["@tag.Widget", "@tag.List", "@tag.Binding"] },
   () => {
     it("1. Validate isVisible", () => {
       entityExplorer.DragDropWidgetNVerify("listwidgetv2", 300, 300);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Migration_Spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Migration_Spec.js
index f9958c77a292..ff32b90e833b 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Migration_Spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Migration_Spec.js
@@ -12,304 +12,308 @@ import {
   table,
 } from "../../../../support/Objects/ObjectsCore";
 
-describe("Migration Validate", { tags: ["@tag.ImportExport"] }, function () {
-  it("1. Import application and Validate Migration on pageload", function () {
-    // import application
-    homePageHelpers.NavigateToHome();
-    agHelper.GetNClick(homePage.createNew, 0);
-    cy.get(homePage.workspaceImportAppOption).click({ force: true });
-    cy.get(homePage.workspaceImportAppModal).should("be.visible");
-    cy.xpath(homePage.uploadLogo)
-      .selectFile("cypress/fixtures/TableMigrationAppExported.json", {
-        force: true,
-      })
-      .wait(500);
-    cy.get(homePage.workspaceImportAppModal).should("not.exist");
-
-    cy.wait("@importNewApplication").then(() => {
-      cy.get(homePage.toastMessage).should(
-        "contain",
-        Cypress.env("MESSAGES").IMPORT_APP_SUCCESSFUL(),
-      );
-
-      //Renaming imported app!
-      const uuid = () => Cypress._.random(0, 1e4);
-      const name = uuid();
-      homePageHelpers.RenameApplication(`app${name}`);
-      cy.wrap(`app${name}`).as("appname");
-
-      // Validating data binding for the imported application - Page1
-
-      //Validating order of header row!
-      cy.xpath(
-        "//div[@class='tableWrap']//div[@class='thead']//div[@class='tr'][1]",
-      )
-        .invoke("text")
-        .then((x) => {
-          expect(x).to.eq(
-            "Card NumberidNameاسمaddress住所PhoneemailCompanyjobimagessnPin CodeCreditLimitOutstandingStateAvailable LimitCard TypeChange Credit limitimageURLlatitudelongitude",
-          );
-          cy.log("header set is:" + x);
-        });
-
-      //Validating Latitude & Longitude are hidden columns:
-      cy.xpath(
-        "//div[@class='tableWrap']//div[@class='thead']//div[@class='tr'][1]//div[@role='columnheader']//span[text()='latitude']/parent::div/parent::div/parent::div",
-      )
-        .invoke("attr", "class")
-        .then((classes) => {
-          cy.log("classes are:" + classes);
-          expect(classes).includes("hidden-header");
-        });
-
-      cy.xpath(
-        "//div[@class='tableWrap']//div[@class='thead']//div[@class='tr'][1]//div[@role='columnheader']//span[text()='longitude']/parent::div/parent::div/parent::div",
-      )
-        .invoke("attr", "class")
-        .then((classes) => {
-          cy.log("classes are:" + classes);
-          expect(classes).includes("hidden-header");
-        });
-
-      //Validating Id column sorting happens as Datatype is Number in app!
-      cy.xpath(
-        "//div[@class='tableWrap']//div[@class='thead']//div[@class='tr'][1]//div[@role='columnheader']//span[text()='id']",
-      )
-        .click()
-        .wait(2000);
-
-      cy.readTabledataPublish("0", "1").then((cellData) => {
-        expect(cellData).to.be.equal("100");
-      });
-
-      cy.readTabledataPublish("1", "1").then((cellData) => {
-        expect(cellData).to.be.equal("99");
-      });
-
-      cy.readTabledataPublish("2", "1").then((cellData) => {
-        expect(cellData).to.be.equal("98");
-      });
+describe(
+  "Migration Validate",
+  { tags: ["@tag.ImportExport", "@tag.Git"] },
+  function () {
+    it("1. Import application and Validate Migration on pageload", function () {
+      // import application
+      homePageHelpers.NavigateToHome();
+      agHelper.GetNClick(homePage.createNew, 0);
+      cy.get(homePage.workspaceImportAppOption).click({ force: true });
+      cy.get(homePage.workspaceImportAppModal).should("be.visible");
+      cy.xpath(homePage.uploadLogo)
+        .selectFile("cypress/fixtures/TableMigrationAppExported.json", {
+          force: true,
+        })
+        .wait(500);
+      cy.get(homePage.workspaceImportAppModal).should("not.exist");
 
-      //Revert the Id column sorting!
-      cy.xpath(
-        "//div[@class='tableWrap']//div[@class='thead']//div[@class='tr'][1]//div[@role='columnheader']//span[text()='id']",
-      )
-        .click()
-        .wait(2000);
+      cy.wait("@importNewApplication").then(() => {
+        cy.get(homePage.toastMessage).should(
+          "contain",
+          Cypress.env("MESSAGES").IMPORT_APP_SUCCESSFUL(),
+        );
 
-      cy.readTabledataPublish("0", "1").then((cellData) => {
-        expect(cellData).to.be.equal("1");
-      });
+        //Renaming imported app!
+        const uuid = () => Cypress._.random(0, 1e4);
+        const name = uuid();
+        homePageHelpers.RenameApplication(`app${name}`);
+        cy.wrap(`app${name}`).as("appname");
 
-      cy.readTabledataPublish("1", "1").then((cellData) => {
-        expect(cellData).to.be.equal("2");
-      });
+        // Validating data binding for the imported application - Page1
 
-      cy.readTabledataPublish("2", "1").then((cellData) => {
-        expect(cellData).to.be.equal("3");
-      });
+        //Validating order of header row!
+        cy.xpath(
+          "//div[@class='tableWrap']//div[@class='thead']//div[@class='tr'][1]",
+        )
+          .invoke("text")
+          .then((x) => {
+            expect(x).to.eq(
+              "Card NumberidNameاسمaddress住所PhoneemailCompanyjobimagessnPin CodeCreditLimitOutstandingStateAvailable LimitCard TypeChange Credit limitimageURLlatitudelongitude",
+            );
+            cy.log("header set is:" + x);
+          });
 
-      //Validating image column is present:
-      cy.getTableDataSelector("0", "10").then((selector) => {
-        cy.get(selector + " div")
+        //Validating Latitude & Longitude are hidden columns:
+        cy.xpath(
+          "//div[@class='tableWrap']//div[@class='thead']//div[@class='tr'][1]//div[@role='columnheader']//span[text()='latitude']/parent::div/parent::div/parent::div",
+        )
           .invoke("attr", "class")
           .then((classes) => {
             cy.log("classes are:" + classes);
-            expect(classes).to.eq("image-cell");
-          });
-      });
-
-      //Card Number mapping to text widget!
-      table.SelectTableRow(2);
-      cy.wait(2500); //time for table row select to reflect!
-      cy.readTabledataPublish("2", "0").then((cardNumber) => {
-        cy.xpath("//div[contains(@class, ' t--widget-textwidget')][1]")
-          .eq(1)
-          .invoke("text")
-          .then((cardNo) => {
-            var format = /^\d{4}-\d{4}-\d{4}(-\d{4})?$/;
-            expect(cardNumber).match(format);
-            expect(cardNumber).to.be.equal(cardNo);
+            expect(classes).includes("hidden-header");
           });
-      });
-
-      //Address mapping to text widget!
-      cy.readTabledataPublish("2", "4").then((address) => {
-        cy.xpath("//div[contains(@class, ' t--widget-textwidget')][2]")
-          .eq(1)
-          .invoke("text")
-          .then((addr) => {
-            expect(address.replace(/\r?\n|\r/, "")).to.eq(addr);
-          });
-      });
 
-      //Validating Available limit column computation maintained!
-      cy.readTabledataPublish("2", "16").then((availLimit) => {
-        cy.readTabledataPublish("2", "13").then((creditLimit) => {
-          cy.readTabledataPublish("2", "14").then((outstanding) => {
-            expect(Number(availLimit)).to.eq(creditLimit - outstanding);
+        cy.xpath(
+          "//div[@class='tableWrap']//div[@class='thead']//div[@class='tr'][1]//div[@role='columnheader']//span[text()='longitude']/parent::div/parent::div/parent::div",
+        )
+          .invoke("attr", "class")
+          .then((classes) => {
+            cy.log("classes are:" + classes);
+            expect(classes).includes("hidden-header");
           });
-        });
-      });
 
-      //Validating State button click & binding & text widget mapping!
-      cy.getTableDataSelector("2", "15").then((selector) => {
-        cy.get(selector + " button.bp3-button")
+        //Validating Id column sorting happens as Datatype is Number in app!
+        cy.xpath(
+          "//div[@class='tableWrap']//div[@class='thead']//div[@class='tr'][1]//div[@role='columnheader']//span[text()='id']",
+        )
           .click()
-          .wait(3000);
-
-        cy.waitUntil(
-          () =>
-            cy
-              .xpath("//div[contains(@class, ' t--widget-textwidget')][1]")
-              .eq(0)
-              .contains("State:", { timeout: 30000 })
-              .should("exist"),
-          {
-            errorMsg: "Execute call did not complete evn after 10 secs",
-            timeout: 20000,
-            interval: 1000,
-          },
-        ).then(() => cy.wait(500));
-
-        cy.get(selector + " button span")
-          .invoke("text")
-          .then((statetxt) => {
-            cy.xpath("//div[contains(@class, ' t--widget-textwidget')][1]")
-              .eq(0)
-              .invoke("text")
-              .then((txtWidtxt) => {
-                cy.log("statetxt is:" + statetxt);
-                let text =
-                  statetxt == "Activate" ? "State:Inactive" : "State:Active";
-                expect(text).to.eq(txtWidtxt);
-              });
-          });
-      });
+          .wait(2000);
 
-      //Validating Image URL click & navigation!
-      cy.getTableDataSelector("2", "19").then((selector) => {
-        cy.window().then((win) => {
-          // Stub `window.open` to prevent new tabs
-          cy.stub(win, "open").as("windowOpenStub");
-          cy.get(selector + " span").then(($link) => {
-            cy.wrap($link).click();
-            cy.get("@windowOpenStub").should("have.been.called");
-          });
+        cy.readTabledataPublish("0", "1").then((cellData) => {
+          expect(cellData).to.be.equal("100");
         });
-      });
-
-      cy.wait("@getWorkspace");
 
-      cy.waitUntil(() => cy.get("div.tableWrap").should("be.visible"), {
-        errorMsg: "Page is not loaded evn after 10 secs",
-        timeout: 30000,
-        interval: 2000,
-      }).then(() => cy.wait(1000)); //wait for page load!
+        cy.readTabledataPublish("1", "1").then((cellData) => {
+          expect(cellData).to.be.equal("99");
+        });
 
-      table.SelectTableRow(2);
-      cy.getTableDataSelector("2", "18").then((selector) => {
-        cy.get(selector + " button")
-          .click()
-          .wait(1000);
+        cy.readTabledataPublish("2", "1").then((cellData) => {
+          expect(cellData).to.be.equal("98");
+        });
 
+        //Revert the Id column sorting!
         cy.xpath(
-          "//div//a[contains(@class, 'bp3-menu-item')]/div[text()='AddcreditLimit']/parent::a",
+          "//div[@class='tableWrap']//div[@class='thead']//div[@class='tr'][1]//div[@role='columnheader']//span[text()='id']",
         )
           .click()
           .wait(2000);
 
-        cy.waitUntil(
-          () =>
-            cy
-              .xpath("//div[contains(@class, ' t--widget-textwidget')][2]", {
-                timeout: 50000,
-              })
-              .eq(0)
-              .contains("CreditLimit:", { timeout: 30000 })
-              .should("exist"),
-          {
-            errorMsg: "Execute call did not complete evn after 10 secs",
-            timeout: 20000,
-            interval: 1000,
-          },
-        ).then(() => cy.wait(500)); //allow time for n/w to finish
-
-        cy.xpath("//div[contains(@class, ' t--widget-textwidget')][2]", {
-          timeout: 30000,
-        })
-          .eq(0)
-          .invoke("text")
-          .then((addreduce) => {
-            expect(addreduce).to.eq("CreditLimit:Add");
+        cy.readTabledataPublish("0", "1").then((cellData) => {
+          expect(cellData).to.be.equal("1");
+        });
+
+        cy.readTabledataPublish("1", "1").then((cellData) => {
+          expect(cellData).to.be.equal("2");
+        });
+
+        cy.readTabledataPublish("2", "1").then((cellData) => {
+          expect(cellData).to.be.equal("3");
+        });
+
+        //Validating image column is present:
+        cy.getTableDataSelector("0", "10").then((selector) => {
+          cy.get(selector + " div")
+            .invoke("attr", "class")
+            .then((classes) => {
+              cy.log("classes are:" + classes);
+              expect(classes).to.eq("image-cell");
+            });
+        });
+
+        //Card Number mapping to text widget!
+        table.SelectTableRow(2);
+        cy.wait(2500); //time for table row select to reflect!
+        cy.readTabledataPublish("2", "0").then((cardNumber) => {
+          cy.xpath("//div[contains(@class, ' t--widget-textwidget')][1]")
+            .eq(1)
+            .invoke("text")
+            .then((cardNo) => {
+              var format = /^\d{4}-\d{4}-\d{4}(-\d{4})?$/;
+              expect(cardNumber).match(format);
+              expect(cardNumber).to.be.equal(cardNo);
+            });
+        });
+
+        //Address mapping to text widget!
+        cy.readTabledataPublish("2", "4").then((address) => {
+          cy.xpath("//div[contains(@class, ' t--widget-textwidget')][2]")
+            .eq(1)
+            .invoke("text")
+            .then((addr) => {
+              expect(address.replace(/\r?\n|\r/, "")).to.eq(addr);
+            });
+        });
+
+        //Validating Available limit column computation maintained!
+        cy.readTabledataPublish("2", "16").then((availLimit) => {
+          cy.readTabledataPublish("2", "13").then((creditLimit) => {
+            cy.readTabledataPublish("2", "14").then((outstanding) => {
+              expect(Number(availLimit)).to.eq(creditLimit - outstanding);
+            });
           });
-      });
+        });
 
-      //Manu Btn validation: - 2nd menu item
-      cy.getTableDataSelector("2", "18").then((selector) => {
-        cy.get(selector + " button")
-          .click()
-          .wait(1000);
+        //Validating State button click & binding & text widget mapping!
+        cy.getTableDataSelector("2", "15").then((selector) => {
+          cy.get(selector + " button.bp3-button")
+            .click()
+            .wait(3000);
+
+          cy.waitUntil(
+            () =>
+              cy
+                .xpath("//div[contains(@class, ' t--widget-textwidget')][1]")
+                .eq(0)
+                .contains("State:", { timeout: 30000 })
+                .should("exist"),
+            {
+              errorMsg: "Execute call did not complete evn after 10 secs",
+              timeout: 20000,
+              interval: 1000,
+            },
+          ).then(() => cy.wait(500));
+
+          cy.get(selector + " button span")
+            .invoke("text")
+            .then((statetxt) => {
+              cy.xpath("//div[contains(@class, ' t--widget-textwidget')][1]")
+                .eq(0)
+                .invoke("text")
+                .then((txtWidtxt) => {
+                  cy.log("statetxt is:" + statetxt);
+                  let text =
+                    statetxt == "Activate" ? "State:Inactive" : "State:Active";
+                  expect(text).to.eq(txtWidtxt);
+                });
+            });
+        });
 
-        cy.xpath(
-          "//div//a[contains(@class, 'bp3-menu-item')]/div[text()='Reducecreditlimit']/parent::a",
-        )
-          .click()
-          .wait(2000);
+        //Validating Image URL click & navigation!
+        cy.getTableDataSelector("2", "19").then((selector) => {
+          cy.window().then((win) => {
+            // Stub `window.open` to prevent new tabs
+            cy.stub(win, "open").as("windowOpenStub");
+            cy.get(selector + " span").then(($link) => {
+              cy.wrap($link).click();
+              cy.get("@windowOpenStub").should("have.been.called");
+            });
+          });
+        });
 
-        cy.waitUntil(
-          () =>
-            cy
-              .xpath("//div[contains(@class, ' t--widget-textwidget')][2]", {
-                timeout: 50000,
-              })
-              .eq(0)
-              .contains("CreditLimit:", { timeout: 30000 })
-              .should("exist"),
-          {
-            errorMsg: "Execute call did not complete evn after 10 secs",
-            timeout: 20000,
-            interval: 1000,
-          },
-        ).then(() => cy.wait(500)); //allow time for n/w to finish
-
-        cy.xpath("//div[contains(@class, ' t--widget-textwidget')][2]", {
+        cy.wait("@getWorkspace");
+
+        cy.waitUntil(() => cy.get("div.tableWrap").should("be.visible"), {
+          errorMsg: "Page is not loaded evn after 10 secs",
           timeout: 30000,
-        })
-          .eq(0)
-          .invoke("text")
-          .then((addreduce) => {
-            expect(addreduce).to.eq("CreditLimit:Reduce");
-          });
+          interval: 2000,
+        }).then(() => cy.wait(1000)); //wait for page load!
+
+        table.SelectTableRow(2);
+        cy.getTableDataSelector("2", "18").then((selector) => {
+          cy.get(selector + " button")
+            .click()
+            .wait(1000);
+
+          cy.xpath(
+            "//div//a[contains(@class, 'bp3-menu-item')]/div[text()='AddcreditLimit']/parent::a",
+          )
+            .click()
+            .wait(2000);
+
+          cy.waitUntil(
+            () =>
+              cy
+                .xpath("//div[contains(@class, ' t--widget-textwidget')][2]", {
+                  timeout: 50000,
+                })
+                .eq(0)
+                .contains("CreditLimit:", { timeout: 30000 })
+                .should("exist"),
+            {
+              errorMsg: "Execute call did not complete evn after 10 secs",
+              timeout: 20000,
+              interval: 1000,
+            },
+          ).then(() => cy.wait(500)); //allow time for n/w to finish
+
+          cy.xpath("//div[contains(@class, ' t--widget-textwidget')][2]", {
+            timeout: 30000,
+          })
+            .eq(0)
+            .invoke("text")
+            .then((addreduce) => {
+              expect(addreduce).to.eq("CreditLimit:Add");
+            });
+        });
+
+        //Manu Btn validation: - 2nd menu item
+        cy.getTableDataSelector("2", "18").then((selector) => {
+          cy.get(selector + " button")
+            .click()
+            .wait(1000);
+
+          cy.xpath(
+            "//div//a[contains(@class, 'bp3-menu-item')]/div[text()='Reducecreditlimit']/parent::a",
+          )
+            .click()
+            .wait(2000);
+
+          cy.waitUntil(
+            () =>
+              cy
+                .xpath("//div[contains(@class, ' t--widget-textwidget')][2]", {
+                  timeout: 50000,
+                })
+                .eq(0)
+                .contains("CreditLimit:", { timeout: 30000 })
+                .should("exist"),
+            {
+              errorMsg: "Execute call did not complete evn after 10 secs",
+              timeout: 20000,
+              interval: 1000,
+            },
+          ).then(() => cy.wait(500)); //allow time for n/w to finish
+
+          cy.xpath("//div[contains(@class, ' t--widget-textwidget')][2]", {
+            timeout: 30000,
+          })
+            .eq(0)
+            .invoke("text")
+            .then((addreduce) => {
+              expect(addreduce).to.eq("CreditLimit:Reduce");
+            });
+        });
       });
-    });
 
-    //Page 2 Validations:
-    EditorNavigation.SelectEntityByName(
-      "Change color and font",
-      EntityType.Page,
-    );
-    EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
-
-    cy.get(widgetsPage.bold)
-      .invoke("attr", "data-selected")
-      .then((sel) => expect(Boolean(sel)).to.be.true);
-    cy.xpath(widgetsPage.textCenterAlign)
-      .eq(0)
-      .invoke("attr", "data-selected")
-      .then((sel) => expect(Boolean(sel)).to.be.true); //Text align
-    cy.xpath(widgetsPage.textCenterAlign)
-      .eq(1)
-      .invoke("attr", "data-selected")
-      .then((sel) => expect(Boolean(sel)).to.be.true); //Vertical align
-    cy.get(widgetsPage.textColor)
-      .first()
-      .invoke("attr", "value")
-      .should("contain", "#2E3D49");
-    cy.get(`${widgetsPage.cellBackground_tablev1} input`)
-      .first()
-      .invoke("attr", "value")
-      .should("contain", "#FFC13D");
-    cy.validateCodeEditorContent(".t--property-control-textsize", "1.5rem");
-  });
-});
+      //Page 2 Validations:
+      EditorNavigation.SelectEntityByName(
+        "Change color and font",
+        EntityType.Page,
+      );
+      EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
+
+      cy.get(widgetsPage.bold)
+        .invoke("attr", "data-selected")
+        .then((sel) => expect(Boolean(sel)).to.be.true);
+      cy.xpath(widgetsPage.textCenterAlign)
+        .eq(0)
+        .invoke("attr", "data-selected")
+        .then((sel) => expect(Boolean(sel)).to.be.true); //Text align
+      cy.xpath(widgetsPage.textCenterAlign)
+        .eq(1)
+        .invoke("attr", "data-selected")
+        .then((sel) => expect(Boolean(sel)).to.be.true); //Vertical align
+      cy.get(widgetsPage.textColor)
+        .first()
+        .invoke("attr", "value")
+        .should("contain", "#2E3D49");
+      cy.get(`${widgetsPage.cellBackground_tablev1} input`)
+        .first()
+        .invoke("attr", "value")
+        .should("contain", "#FFC13D");
+      cy.validateCodeEditorContent(".t--property-control-textsize", "1.5rem");
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Modal/Modal_On_Table_Filter_Pane_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Modal/Modal_On_Table_Filter_Pane_spec.ts
index bc08dc34d61e..02a3804f1d9b 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Modal/Modal_On_Table_Filter_Pane_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Modal/Modal_On_Table_Filter_Pane_spec.ts
@@ -3,7 +3,7 @@ const widgets = require("../../../../../locators/Widgets.json");
 
 describe(
   "Modal Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Modal"] },
+  { tags: ["@tag.Widget", "@tag.Modal", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("modalOnTableFilterPaneDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Modal/Modal_Widget_With_Button_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Modal/Modal_Widget_With_Button_spec.ts
index 58ca9bb19eb4..8eda0ff4a5b0 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Modal/Modal_Widget_With_Button_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Modal/Modal_Widget_With_Button_spec.ts
@@ -2,7 +2,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Modal Widget with auto-layout usecases",
-  { tags: ["@tag.Widget", "@tag.Modal"] },
+  { tags: ["@tag.Widget", "@tag.Modal", "@tag.Binding"] },
   function () {
     it("1. Add new Modal widget with other widgets and validate with auto-layout", () => {
       _.autoLayout.ConvertToAutoLayoutAndVerify(false);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Modal/Modal_background_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Modal/Modal_background_spec.ts
index 1e748bfcf12d..5c8933c7161b 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Modal/Modal_background_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Modal/Modal_background_spec.ts
@@ -6,7 +6,7 @@ import {
 
 describe(
   "Modal Widget background color spec",
-  { tags: ["@tag.Widget", "@tag.Modal"] },
+  { tags: ["@tag.Widget", "@tag.Modal", "@tag.Binding"] },
   () => {
     before(() => {
       agHelper.AddDsl("modalWidgetBGcolorDSL");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Modal/Modal_focus_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Modal/Modal_focus_spec.js
index 8d774a60f021..594a04581709 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Modal/Modal_focus_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Modal/Modal_focus_spec.js
@@ -6,86 +6,90 @@ import EditorNavigation, {
 const widgets = require("../../../../../locators/Widgets.json");
 import * as _ from "../../../../../support/Objects/ObjectsCore";
 
-describe("Modal focus", { tags: ["@tag.Widget", "@tag.Modal"] }, function () {
-  const someInputText = "some text";
+describe(
+  "Modal focus",
+  { tags: ["@tag.Widget", "@tag.Modal", "@tag.Binding"] },
+  function () {
+    const someInputText = "some text";
 
-  function setupModalWithInputWidget() {
-    //drag a button to open modal
-    cy.dragAndDropToCanvas("buttonwidget", { x: 400, y: 550 });
-    cy.openPropertyPane("buttonwidget");
-    cy.get(widgets.toggleOnClick).click();
+    function setupModalWithInputWidget() {
+      //drag a button to open modal
+      cy.dragAndDropToCanvas("buttonwidget", { x: 400, y: 550 });
+      cy.openPropertyPane("buttonwidget");
+      cy.get(widgets.toggleOnClick).click();
 
-    cy.updateCodeInput(
-      ".t--property-control-onclick",
-      `{{showModal(Modal1.name)}}`,
-    );
-    //add modal
-    EditorNavigation.SelectEntityByName("Modal1", EntityType.Widget);
-    cy.get(widgets.modalWidget).should("exist");
+      cy.updateCodeInput(
+        ".t--property-control-onclick",
+        `{{showModal(Modal1.name)}}`,
+      );
+      //add modal
+      EditorNavigation.SelectEntityByName("Modal1", EntityType.Widget);
+      cy.get(widgets.modalWidget).should("exist");
 
-    PageLeftPane.switchToAddNew();
+      PageLeftPane.switchToAddNew();
 
-    cy.wait(500);
-    //drag input field into modal
-    cy.get(".t--widget-card-draggable-inputwidgetv2")
-      .first()
-      .trigger("dragstart", {
-        force: true,
-      });
+      cy.wait(500);
+      //drag input field into modal
+      cy.get(".t--widget-card-draggable-inputwidgetv2")
+        .first()
+        .trigger("dragstart", {
+          force: true,
+        });
 
-    cy.get(widgets.modalWidget)
-      .scrollIntoView()
-      .trigger("mousemove", 50, 100, { eventConstructor: "MouseEvent" })
-      .trigger("mousemove", 50, 100, { eventConstructor: "MouseEvent" })
-      .trigger("mouseup", 50, 100, { eventConstructor: "MouseEvent" });
-  }
+      cy.get(widgets.modalWidget)
+        .scrollIntoView()
+        .trigger("mousemove", 50, 100, { eventConstructor: "MouseEvent" })
+        .trigger("mousemove", 50, 100, { eventConstructor: "MouseEvent" })
+        .trigger("mouseup", 50, 100, { eventConstructor: "MouseEvent" });
+    }
 
-  after(() => {
-    _.agHelper.SaveLocalStorageCache();
-  });
+    after(() => {
+      _.agHelper.SaveLocalStorageCache();
+    });
 
-  before(() => {
-    _.agHelper.RestoreLocalStorageCache();
-    _.agHelper.AddDsl("ModalDsl");
-  });
+    before(() => {
+      _.agHelper.RestoreLocalStorageCache();
+      _.agHelper.AddDsl("ModalDsl");
+    });
 
-  it("1. Should focus on the input field when autofocus for the input field is enabled", () => {
-    setupModalWithInputWidget();
-    cy.openPropertyPaneFromModal("inputwidgetv2");
+    it("1. Should focus on the input field when autofocus for the input field is enabled", () => {
+      setupModalWithInputWidget();
+      cy.openPropertyPaneFromModal("inputwidgetv2");
 
-    // autofocus for input field is enabled
-    cy.get(".t--property-control-autofocus")
-      .find(".ads-v2-switch")
-      .click({ force: true });
-    //enter some text to the input field
-    cy.get(`${widgets.modalWidget} .t--widget-inputwidgetv2 input`)
-      .click()
-      .type(someInputText);
+      // autofocus for input field is enabled
+      cy.get(".t--property-control-autofocus")
+        .find(".ads-v2-switch")
+        .click({ force: true });
+      //enter some text to the input field
+      cy.get(`${widgets.modalWidget} .t--widget-inputwidgetv2 input`)
+        .click()
+        .type(someInputText);
 
-    //close Modal
-    cy.get(widgets.modalCloseButton).click({ force: true });
-    cy.get(widgets.modalCloseButton).should("not.be.visible");
+      //close Modal
+      cy.get(widgets.modalCloseButton).click({ force: true });
+      cy.get(widgets.modalCloseButton).should("not.be.visible");
 
-    cy.wait(1500);
-    //open the modal
-    cy.get(widgets.widgetBtn).contains("Submit").click({ force: true });
-    //check if the focus is on the input field
-    cy.focused().should("have.value", someInputText);
-  });
-  it("2. Should not focus on the input field if autofocus is disabled", () => {
-    cy.openPropertyPaneFromModal("inputwidgetv2");
-    // autofocus for input field is disabled
-    cy.get(".t--property-control-autofocus")
-      .find(".ads-v2-switch")
-      .click({ force: true });
-    //close Modal
-    cy.get(widgets.modalCloseButton).click({ force: true });
-    cy.get(widgets.modalCloseButton).should("not.be.visible");
+      cy.wait(1500);
+      //open the modal
+      cy.get(widgets.widgetBtn).contains("Submit").click({ force: true });
+      //check if the focus is on the input field
+      cy.focused().should("have.value", someInputText);
+    });
+    it("2. Should not focus on the input field if autofocus is disabled", () => {
+      cy.openPropertyPaneFromModal("inputwidgetv2");
+      // autofocus for input field is disabled
+      cy.get(".t--property-control-autofocus")
+        .find(".ads-v2-switch")
+        .click({ force: true });
+      //close Modal
+      cy.get(widgets.modalCloseButton).click({ force: true });
+      cy.get(widgets.modalCloseButton).should("not.be.visible");
 
-    //open the modal
-    cy.get(widgets.modalWidget).should("not.exist");
-    cy.get(widgets.widgetBtn).contains("Submit").click({ force: true });
-    //check if the focus is not on the input field
-    cy.focused().should("not.have.value", someInputText);
-  });
-});
+      //open the modal
+      cy.get(widgets.modalWidget).should("not.exist");
+      cy.get(widgets.widgetBtn).contains("Submit").click({ force: true });
+      //check if the focus is not on the input field
+      cy.focused().should("not.have.value", someInputText);
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Modal/Modal_functionaliy_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Modal/Modal_functionaliy_spec.js
index eb63818e2acf..55c3bc8adbe0 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Modal/Modal_functionaliy_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Modal/Modal_functionaliy_spec.js
@@ -10,7 +10,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Modal Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Modal"] },
+  { tags: ["@tag.Widget", "@tag.Modal", "@tag.Binding"] },
   function () {
     afterEach(() => {
       _.agHelper.SaveLocalStorageCache();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Modal/Modal_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Modal/Modal_spec.ts
index 86cad0ac3623..de830dd41369 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Modal/Modal_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Modal/Modal_spec.ts
@@ -15,12 +15,12 @@ import EditorNavigation, {
 
 describe(
   "Modal Widget test cases",
-  { tags: ["@tag.Widget", "@tag.Modal"] },
+  { tags: ["@tag.Widget", "@tag.Modal", "@tag.Binding"] },
   function () {
     const image = (src: string) => 'img[src="' + src + '"]';
-    const jpgImg = "https://jpeg.org/images/jpegsystems-home.jpg";
-    const gifImg =
-      "https://mir-s3-cdn-cf.behance.net/project_modules/max_1200/5eeea355389655.59822ff824b72.gif";
+    const jpgImg =
+      "https://community.appsmith.com/sites/default/files/styles/small_thumbnail/public/2024-03/aws-logo.jpg";
+    const gifImg = "https://docs.appsmith.com/img/multi-update-sql.gif";
 
     it("1. Modal widget functionality", () => {
       entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Multiselect/MultiSelect1_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Multiselect/MultiSelect1_spec.js
index 90dce2f693ba..ac125df73900 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Multiselect/MultiSelect1_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Multiselect/MultiSelect1_spec.js
@@ -3,7 +3,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "MultiSelect Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Multiselect", "@tag.Sanity"] },
+  { tags: ["@tag.Widget", "@tag.Multiselect", "@tag.Sanity", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("emptyDSL");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Multiselect/MultiSelect2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Multiselect/MultiSelect2_spec.js
index ed1a0968ba9b..56c708217258 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Multiselect/MultiSelect2_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Multiselect/MultiSelect2_spec.js
@@ -14,7 +14,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "MultiSelect Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Multiselect"] },
+  { tags: ["@tag.Widget", "@tag.Multiselect", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("multiSelectDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Multiselect/MultiSelect4_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Multiselect/MultiSelect4_spec.js
index f27136699c9b..57e3884b2a69 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Multiselect/MultiSelect4_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Multiselect/MultiSelect4_spec.js
@@ -20,7 +20,7 @@ const defaultValue = `[
 
 describe(
   "MultiSelect Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Multiselect"] },
+  { tags: ["@tag.Widget", "@tag.Multiselect", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("emptyDSL");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Multiselect/MultiSelect5_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Multiselect/MultiSelect5_spec.ts
index d5d1f62a1aac..acad6e559f0e 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Multiselect/MultiSelect5_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Multiselect/MultiSelect5_spec.ts
@@ -12,7 +12,7 @@ import EditorNavigation, {
 
 describe(
   "Multi Select widget Tests",
-  { tags: ["@tag.Widget", "@tag.Multiselect"] },
+  { tags: ["@tag.Widget", "@tag.Multiselect", "@tag.Binding"] },
   function () {
     before(() => {
       entityExplorer.DragDropWidgetNVerify("multiselectwidgetv2", 550, 100);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Multiselect/MultiTreeSelect_2_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Multiselect/MultiTreeSelect_2_spec.ts
index 0d0437231cf1..19759c3c7dda 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Multiselect/MultiTreeSelect_2_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Multiselect/MultiTreeSelect_2_spec.ts
@@ -12,7 +12,7 @@ import EditorNavigation, {
 
 describe(
   "Multi Select widget Tests",
-  { tags: ["@tag.Widget", "@tag.Multiselect"] },
+  { tags: ["@tag.Widget", "@tag.Multiselect", "@tag.Binding"] },
   function () {
     before(() => {
       agHelper.AddDsl("multiTreeSelectDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Multiselect/MultiTreeSelect_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Multiselect/MultiTreeSelect_spec.js
index f8be47ba867e..b510970f2b9a 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Multiselect/MultiTreeSelect_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Multiselect/MultiTreeSelect_spec.js
@@ -2,7 +2,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Multi Tree Select Widget",
-  { tags: ["@tag.Widget", "@tag.Multiselect"] },
+  { tags: ["@tag.Widget", "@tag.Multiselect", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("emptyDSL");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Multiselect/Multi_Select_Tree_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Multiselect/Multi_Select_Tree_spec.js
index 8b051bbab9ce..b614134f52e7 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Multiselect/Multi_Select_Tree_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Multiselect/Multi_Select_Tree_spec.js
@@ -6,7 +6,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "MultiSelectTree Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Multiselect"] },
+  { tags: ["@tag.Widget", "@tag.Multiselect", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("TreeSelectDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/Camera_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/Camera_spec.js
index 051b21b774a4..3b8f4e7cf7d6 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/Camera_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/Camera_spec.js
@@ -1,47 +1,51 @@
 import * as _ from "../../../../../support/Objects/ObjectsCore";
 
-describe("Camera Widget", { tags: ["@tag.Widget", "@tag.Image"] }, () => {
-  before(() => {
-    _.agHelper.AddDsl("CameraDsl");
-  });
-
-  beforeEach(() => {
-    cy.openPropertyPane("camerawidget");
-  });
-
-  it("1. Check isDirty, onImageSave, imageBlobURL, imageDataURL", () => {
-    const mainControlSelector =
-      "//div[contains(@class, 't--widget-camerawidget')]//button";
-
-    cy.get(".t--property-control-onimagecapture .t--js-toggle").click();
-
-    cy.testJsontext("onimagecapture", "{{showAlert('captured','success')}}");
-
-    cy.openPropertyPane("textwidget");
-    cy.updateCodeInput(
-      ".t--property-control-text",
-      `{{Camera1.isDirty}}:{{Camera1.imageDataURL}}:{{Camera1.imageBlobURL}}`,
-    );
-    // Initial value of isDirty should be false
-    cy.get(".t--widget-textwidget").should(
-      "contain",
-      "false:undefined:undefined",
-    );
-    // Take photo
-    cy.xpath(mainControlSelector).eq(2).click(); //taking photo
-    cy.wait(2000);
-    // Save photo
-    cy.xpath(mainControlSelector).eq(2).click(); //saving it
-
-    // Assert: should trigger onImageSave action
-    cy.validateToastMessage("captured");
-
-    // Check if isDirty is set to true
-    cy.get(".t--widget-textwidget")
-      .invoke("text")
-      .should(
-        "match",
-        /true:blob:[a-z0-9-]*\?type=Base64:blob:https?:\/\/[^/]*\/[a-z0-9-]*/,
+describe(
+  "Camera Widget",
+  { tags: ["@tag.Widget", "@tag.Image", "@tag.Binding"] },
+  () => {
+    before(() => {
+      _.agHelper.AddDsl("CameraDsl");
+    });
+
+    beforeEach(() => {
+      cy.openPropertyPane("camerawidget");
+    });
+
+    it("1. Check isDirty, onImageSave, imageBlobURL, imageDataURL", () => {
+      const mainControlSelector =
+        "//div[contains(@class, 't--widget-camerawidget')]//button";
+
+      cy.get(".t--property-control-onimagecapture .t--js-toggle").click();
+
+      cy.testJsontext("onimagecapture", "{{showAlert('captured','success')}}");
+
+      cy.openPropertyPane("textwidget");
+      cy.updateCodeInput(
+        ".t--property-control-text",
+        `{{Camera1.isDirty}}:{{Camera1.imageDataURL}}:{{Camera1.imageBlobURL}}`,
       );
-  });
-});
+      // Initial value of isDirty should be false
+      cy.get(".t--widget-textwidget").should(
+        "contain",
+        "false:undefined:undefined",
+      );
+      // Take photo
+      cy.xpath(mainControlSelector).eq(2).click(); //taking photo
+      cy.wait(2000);
+      // Save photo
+      cy.xpath(mainControlSelector).eq(2).click(); //saving it
+
+      // Assert: should trigger onImageSave action
+      cy.validateToastMessage("captured");
+
+      // Check if isDirty is set to true
+      cy.get(".t--widget-textwidget")
+        .invoke("text")
+        .should(
+          "match",
+          /true:blob:[a-z0-9-]*\?type=Base64:blob:https?:\/\/[^/]*\/[a-z0-9-]*/,
+        );
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/Canvas_scrolling_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/Canvas_scrolling_spec.js
index 0c91fd6ff79d..2ce858f511dc 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/Canvas_scrolling_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/Canvas_scrolling_spec.js
@@ -2,7 +2,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Modal Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Modal"] },
+  { tags: ["@tag.Widget", "@tag.Modal", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("modalScroll");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/Divider_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/Divider_spec.js
index 991af1ffedfd..29d28219653b 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/Divider_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/Divider_spec.js
@@ -5,7 +5,7 @@ import EditorNavigation, {
 
 describe(
   "Divider Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Divider"] },
+  { tags: ["@tag.Widget", "@tag.Divider", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("DividerDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/IconButton_2_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/IconButton_2_spec.ts
index 3df7914335f7..24d9b4b8d115 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/IconButton_2_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/IconButton_2_spec.ts
@@ -13,7 +13,7 @@ import EditorNavigation, {
 
 describe(
   "Icon Button widget Tests",
-  { tags: ["@tag.Widget", "@tag.IconButton"] },
+  { tags: ["@tag.Widget", "@tag.IconButton", "@tag.Binding"] },
   function () {
     before(() => {
       entityExplorer.DragDropWidgetNVerify(draggableWidgets.ICONBUTTON);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/IconButton_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/IconButton_spec.js
index 454444d6dcc1..ff0a6d1b7cb4 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/IconButton_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/IconButton_spec.js
@@ -9,7 +9,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Icon button Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.IconButton"] },
+  { tags: ["@tag.Widget", "@tag.IconButton", "@tag.Binding"] },
   function () {
     before(() => {
       _.entityExplorer.DragDropWidgetNVerify(_.draggableWidgets.ICONBUTTON);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/MapChart_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/MapChart_Spec.ts
index d08455c47be4..e7d14151cecb 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/MapChart_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/MapChart_Spec.ts
@@ -18,7 +18,7 @@ const _mapChartPlot = (text: string) =>
 
 describe(
   "Map Chart Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Maps", "@tag.Visual"] },
+  { tags: ["@tag.Widget", "@tag.Maps", "@tag.Visual", "@tag.Binding"] },
   function () {
     it("1. Drag and drop a Map Chart widget and verify", function () {
       entityExplorer.DragDropWidgetNVerify(draggableWidgets.MAPCHART, 200, 200);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/MapWidget_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/MapWidget_Spec.ts
index 96a6cb701f9d..68bbeafc5a69 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/MapWidget_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/MapWidget_Spec.ts
@@ -31,7 +31,7 @@ const location = [
 
 describe(
   "Map Widget",
-  { tags: ["@tag.Widget", "@tag.Maps", "@tag.Visual"] },
+  { tags: ["@tag.Widget", "@tag.Maps", "@tag.Visual", "@tag.Binding"] },
   function () {
     it("1.Drag Map Widget and Verify the Map Widget with Initial Location", () => {
       //Add map and verify
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/MapWidget_loading_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/MapWidget_loading_Spec.ts
index e3e56ddefc87..7d905e38eedd 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/MapWidget_loading_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/MapWidget_loading_Spec.ts
@@ -7,7 +7,7 @@ import {
 
 describe(
   "Map chart Widget",
-  { tags: ["@tag.Widget", "@tag.Maps"] },
+  { tags: ["@tag.Widget", "@tag.Maps", "@tag.Binding"] },
   function () {
     it("1.Drag two Map Widget and Verify the Map Widget is loading", () => {
       //Add map and verify
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/MenuButton_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/MenuButton_spec.js
index 7e4b34e83832..f94c0bc06f24 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/MenuButton_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/MenuButton_spec.js
@@ -5,7 +5,7 @@ const { modifierKey } = require("../../../../../support/Constants");
 
 describe(
   "Menu button Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.MenuButton"] },
+  { tags: ["@tag.Widget", "@tag.MenuButton", "@tag.Binding"] },
   () => {
     before(() => {
       _.agHelper.AddDsl("menuButtonDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/OthersAutocomplete_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/OthersAutocomplete_spec.js
index 090bd656d0c4..d40ec14ca1d6 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/OthersAutocomplete_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/OthersAutocomplete_spec.js
@@ -7,7 +7,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Autocomplete using slash command and mustache tests",
-  { tags: ["@tag.JS"] },
+  { tags: ["@tag.JS", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("slashcommandDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/Progress_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/Progress_spec.js
index 5451ff9bbf41..085bfc389993 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/Progress_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/Progress_spec.js
@@ -11,7 +11,7 @@ import { progressWidgetProgress } from "../../../../../locators/WidgetLocators";
 
 describe(
   "Progress Widget",
-  { tags: ["@tag.Widget", "@tag.Progress"] },
+  { tags: ["@tag.Widget", "@tag.Progress", "@tag.Binding"] },
   function () {
     before(() => {
       entityExplorer.DragDropWidgetNVerify(draggableWidgets.PROGRESS);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/StatBox_DragAndDrop_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/StatBox_DragAndDrop_spec.js
index 11b7e4937140..181e0f491f6d 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/StatBox_DragAndDrop_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/StatBox_DragAndDrop_spec.js
@@ -10,7 +10,7 @@ import {
 
 describe(
   "Statbox Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Statbox"] },
+  { tags: ["@tag.Widget", "@tag.Statbox", "@tag.Binding"] },
   function () {
     before(() => {
       agHelper.AddDsl("dynamicHeightStatboxdsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/StatboxDsl_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/StatboxDsl_spec.js
index 36ff5136ab3a..f48f179d6e6e 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/StatboxDsl_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/StatboxDsl_spec.js
@@ -12,7 +12,7 @@ import {
 
 describe(
   "Statbox Widget",
-  { tags: ["@tag.Widget", "@tag.Statbox"] },
+  { tags: ["@tag.Widget", "@tag.Statbox", "@tag.Binding"] },
   function () {
     before(() => {
       agHelper.AddDsl("StatboxDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/PhoneInput/PhoneInputDynamicValue_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/PhoneInput/PhoneInputDynamicValue_spec.js
index 78631547f355..b5e60b77840f 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/PhoneInput/PhoneInputDynamicValue_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/PhoneInput/PhoneInputDynamicValue_spec.js
@@ -12,7 +12,7 @@ const widgetName = "phoneinputwidget";
 
 describe(
   "Phone input widget - ",
-  { tags: ["@tag.Widget", "@tag.PhoneInput"] },
+  { tags: ["@tag.Widget", "@tag.PhoneInput", "@tag.Binding"] },
   () => {
     before(() => {
       agHelper.AddDsl("PhoneInputDynamic");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/PhoneInput/PhoneInput_Part2_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/PhoneInput/PhoneInput_Part2_spec.ts
index 9eede0aa2b78..6c8cd50ae65d 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/PhoneInput/PhoneInput_Part2_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/PhoneInput/PhoneInput_Part2_spec.ts
@@ -12,7 +12,7 @@ import EditorNavigation, {
 
 describe(
   "Phone Input widget Tests",
-  { tags: ["@tag.Widget", "@tag.PhoneInput"] },
+  { tags: ["@tag.Widget", "@tag.PhoneInput", "@tag.Binding"] },
   function () {
     before(() => {
       entityExplorer.DragDropWidgetNVerify("phoneinputwidget", 550, 100);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/PhoneInput/Phone_input_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/PhoneInput/Phone_input_spec.js
index d3806f52ec07..a539adac574c 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/PhoneInput/Phone_input_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/PhoneInput/Phone_input_spec.js
@@ -15,7 +15,7 @@ const searchAndSelectOption = (optionValue) => {
 };
 describe(
   "Phone input widget - ",
-  { tags: ["@tag.Widget", "@tag.PhoneInput"] },
+  { tags: ["@tag.Widget", "@tag.PhoneInput", "@tag.Binding"] },
   () => {
     before(() => {
       _.agHelper.AddDsl("emptyDSL");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/RTE/RichTextEditor3_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/RTE/RichTextEditor3_spec.ts
index b99358500d53..7fa1bc92ebb5 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/RTE/RichTextEditor3_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/RTE/RichTextEditor3_spec.ts
@@ -10,7 +10,7 @@ import EditorNavigation, {
 
 describe(
   "Rich Text Editor widget Tests",
-  { tags: ["@tag.Widget", "@tag.TextEditor"] },
+  { tags: ["@tag.Widget", "@tag.TextEditor", "@tag.Binding"] },
   function () {
     before(() => {
       agHelper.AddDsl("richTextEditorDsl");
@@ -49,7 +49,7 @@ describe(
     });
 
     it("3. Verify applying style in one line should be observed in next line", function () {
-      agHelper.GetNClick(locators._richText_Text_Color);
+      agHelper.GetNClick(locators._richText_Text_Color("Black"));
       agHelper.GetNClick(locators._richText_color("Red"));
       agHelper
         .GetElement(
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/RTE/RichTextEditor_1_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/RTE/RichTextEditor_1_spec.js
index 65829529af73..de2b53e0032e 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/RTE/RichTextEditor_1_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/RTE/RichTextEditor_1_spec.js
@@ -8,7 +8,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "RichTextEditor Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.TextEditor"] },
+  { tags: ["@tag.Widget", "@tag.TextEditor", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("formdsl1");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/RTE/RichTextEditor_2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/RTE/RichTextEditor_2_spec.js
index 3b9042c8baf6..1ca9207fd7f6 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/RTE/RichTextEditor_2_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/RTE/RichTextEditor_2_spec.js
@@ -36,7 +36,7 @@ const testCursorPoistion = (textValueLen, tinyMceId) => {
 
 describe(
   "RichTextEditor Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.TextEditor"] },
+  { tags: ["@tag.Widget", "@tag.TextEditor", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("formdsl1");
@@ -137,18 +137,18 @@ describe(
       cy.get('[aria-label="Underline"]').should("exist");
 
       //Check if button for Background Color is rendered only once within the Toolbar of RTE widget
-      cy.get('[data-mce-name="backcolor"]').should("have.length", 1);
+      cy.get('[aria-label="Background color Black"]').should("have.length", 1);
 
       //Check if button for Text Color is rendered only once within the Toolbar of RTE widget
-      cy.get('[data-mce-name="forecolor"]').should("have.length", 1);
+      cy.get('[aria-label="Text color Black"]').should("have.length", 1);
     });
 
     it("6. Check if able to add an emoji through toolbar", () => {
-      cy.get('[data-mce-name="overflow-button"]').click({ force: true });
-      cy.wait(500);
-      cy.get('[data-mce-name="emoticons"]').click({ force: true });
-      cy.wait(500);
-      cy.get('[data-mce-tooltip="grinning"]').click({ force: true });
+      cy.get('[aria-label="Reveal or hide additional toolbar items"]').click({
+        force: true,
+      });
+      cy.get('[aria-label="Emojis"]').click({ force: true });
+      cy.get('[aria-label="grinning"]').click({ force: true });
       const getEditorContent = (win) => {
         const tinyMceId = "rte-component-vw4zehojqt";
         const editor = win.tinymce.EditorManager.get(tinyMceId);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/RTE/RichTextEditor_Validation_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/RTE/RichTextEditor_Validation_spec.js
index 850e1709fe6d..547164629aef 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/RTE/RichTextEditor_Validation_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/RTE/RichTextEditor_Validation_spec.js
@@ -6,7 +6,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "RichTextEditor Widget Validation",
-  { tags: ["@tag.Widget", "@tag.TextEditor"] },
+  { tags: ["@tag.Widget", "@tag.TextEditor", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("formdsl1");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Radio/Radio2_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Radio/Radio2_spec.ts
index f8fb3832b059..b01f39c2ac92 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Radio/Radio2_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Radio/Radio2_spec.ts
@@ -16,7 +16,7 @@ import EditorNavigation, {
 
 describe(
   "Radio Widget test cases",
-  { tags: ["@tag.Widget", "@tag.Radio"] },
+  { tags: ["@tag.Widget", "@tag.Radio", "@tag.Binding"] },
   function () {
     it("1. Validate radio widget bindings", () => {
       //JS Object
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Radio/RadioGroup1_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Radio/RadioGroup1_spec.js
index 76754f740d02..088ca5013d4c 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Radio/RadioGroup1_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Radio/RadioGroup1_spec.js
@@ -2,7 +2,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Radiogroup Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Radio"] },
+  { tags: ["@tag.Widget", "@tag.Radio", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("emptyDSL");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Radio/RadioGroup2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Radio/RadioGroup2_spec.js
index dd47f2387eb2..751138e75adb 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Radio/RadioGroup2_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Radio/RadioGroup2_spec.js
@@ -1,25 +1,32 @@
 const widgetName = "radiogroupwidget";
 
-describe("Radio Group Widget", { tags: ["@tag.Widget", "@tag.Radio"] }, () => {
-  it("Drag & drop Radio group & Text widgets", () => {
-    cy.dragAndDropToCanvas(widgetName, { x: 300, y: 300 });
-    cy.get(`.t--widget-${widgetName}`).should("exist");
-    cy.dragAndDropToCanvas("textwidget", { x: 300, y: 500 });
-    cy.openPropertyPane("textwidget");
-    cy.updateCodeInput(".t--property-control-text", `{{RadioGroup1.isDirty}}`);
-  });
+describe(
+  "Radio Group Widget",
+  { tags: ["@tag.Widget", "@tag.Radio", "@tag.Binding"] },
+  () => {
+    it("Drag & drop Radio group & Text widgets", () => {
+      cy.dragAndDropToCanvas(widgetName, { x: 300, y: 300 });
+      cy.get(`.t--widget-${widgetName}`).should("exist");
+      cy.dragAndDropToCanvas("textwidget", { x: 300, y: 500 });
+      cy.openPropertyPane("textwidget");
+      cy.updateCodeInput(
+        ".t--property-control-text",
+        `{{RadioGroup1.isDirty}}`,
+      );
+    });
 
-  it("Check isDirty meta property", function () {
-    // Check if initial value of isDirty is false
-    cy.get(".t--widget-textwidget").should("contain", "false");
-    // Interact with UI
-    cy.get(".t--widget-radiogroupwidget .bp3-radio").last().click();
-    // Check if isDirty is set to true
-    cy.get(".t--widget-textwidget").should("contain", "true");
-    // Change defaultOptionValue
-    cy.openPropertyPane(widgetName);
-    cy.updateCodeInput(".t--property-control-defaultselectedvalue", "N");
-    // Check if isDirty is reset to false
-    cy.get(".t--widget-textwidget").should("contain", "false");
-  });
-});
+    it("Check isDirty meta property", function () {
+      // Check if initial value of isDirty is false
+      cy.get(".t--widget-textwidget").should("contain", "false");
+      // Interact with UI
+      cy.get(".t--widget-radiogroupwidget .bp3-radio").last().click();
+      // Check if isDirty is set to true
+      cy.get(".t--widget-textwidget").should("contain", "true");
+      // Change defaultOptionValue
+      cy.openPropertyPane(widgetName);
+      cy.updateCodeInput(".t--property-control-defaultselectedvalue", "N");
+      // Check if isDirty is reset to false
+      cy.get(".t--widget-textwidget").should("contain", "false");
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Radio/RadioGroup_Int_Value_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Radio/RadioGroup_Int_Value_spec.js
index f3cd3befa00b..2b067d93d6bd 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Radio/RadioGroup_Int_Value_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Radio/RadioGroup_Int_Value_spec.js
@@ -12,7 +12,7 @@ function checkSelectedRadioValue(selector, value) {
 
 describe(
   "RadioGroup widget testing",
-  { tags: ["@tag.Widget", "@tag.Radio"] },
+  { tags: ["@tag.Widget", "@tag.Radio", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("radioGroup_int_value_dsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Radio/Radio_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Radio/Radio_spec.js
index 1b1810efa3c9..52bcf63014a3 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Radio/Radio_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Radio/Radio_spec.js
@@ -15,7 +15,7 @@ import {
 
 describe(
   "Radio Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Radio"] },
+  { tags: ["@tag.Widget", "@tag.Radio", "@tag.Binding"] },
   function () {
     before(() => {
       agHelper.AddDsl("newFormDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Rating/Rating_Widget_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Rating/Rating_Widget_spec.ts
index f06811d548bf..d0278d6b6307 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Rating/Rating_Widget_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Rating/Rating_Widget_spec.ts
@@ -12,7 +12,7 @@ import {
 
 describe(
   "Rating widet testcases",
-  { tags: ["@tag.Widget", "@tag.Rating"] },
+  { tags: ["@tag.Widget", "@tag.Rating", "@tag.Binding"] },
   () => {
     before(() => {
       entityExplorer.DragDropWidgetNVerify(draggableWidgets.RATING);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/Select2_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/Select2_Spec.ts
index 30f1a3f108df..4f91c5c0c9f1 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/Select2_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/Select2_Spec.ts
@@ -15,7 +15,7 @@ import EditorNavigation, {
 
 describe(
   "Select widget tests",
-  { tags: ["@tag.Widget", "@tag.Select"] },
+  { tags: ["@tag.Widget", "@tag.Select", "@tag.Binding"] },
   function () {
     before(() => {
       entityExplorer.DragDropWidgetNVerify(draggableWidgets.SELECT);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/Select3_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/Select3_Spec.ts
index 7394090d06cf..e7af98c41846 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/Select3_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/Select3_Spec.ts
@@ -14,7 +14,7 @@ import EditorNavigation, {
 
 describe(
   "Select widget tests",
-  { tags: ["@tag.Widget", "@tag.Select"] },
+  { tags: ["@tag.Widget", "@tag.Select", "@tag.Binding"] },
   function () {
     before(() => {
       entityExplorer.DragDropWidgetNVerify(draggableWidgets.SELECT);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/Select_TreeSelect_MultiSelect_OnFocus_OnBlur_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/Select_TreeSelect_MultiSelect_OnFocus_OnBlur_spec.js
index 75b0802bcdf9..714fd662dd4a 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/Select_TreeSelect_MultiSelect_OnFocus_OnBlur_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/Select_TreeSelect_MultiSelect_OnFocus_OnBlur_spec.js
@@ -3,7 +3,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Select, MultiSelect, Tree Select and Multi Tree Select Widget Property tests onFocus and onBlur",
-  { tags: ["@tag.Widget", "@tag.Select"] },
+  { tags: ["@tag.Widget", "@tag.Select", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("selectMultiSelectTreeSelectWidgetDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/Select_Validation_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/Select_Validation_spec.js
index 7924ea4e9ecd..51a05b009445 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/Select_Validation_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/Select_Validation_spec.js
@@ -8,7 +8,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Select Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Select", "@tag.Sanity"] },
+  { tags: ["@tag.Widget", "@tag.Select", "@tag.Sanity", "@tag.Binding"] },
   function () {
     before(() => {
       _.entityExplorer.DragDropWidgetNVerify(_.draggableWidgets.SELECT);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/Select_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/Select_spec.js
index 059d27c6ca20..2583741fc9be 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/Select_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/Select_spec.js
@@ -19,122 +19,128 @@ const { OneClickBinding } = require("../../OneClickBinding/spec_utility");
 
 const oneClickBinding = new OneClickBinding();
 
-describe("Select widget", { tags: ["@tag.Widget", "@tag.Select"] }, () => {
-  it("1. Drag and drop Select/Text widgets", () => {
-    cy.dragAndDropToCanvas("selectwidget", { x: 300, y: 300 });
-    cy.get(formWidgetsPage.selectWidget).should("exist");
-  });
-
-  it("2. Check isDirty meta property", () => {
-    cy.dragAndDropToCanvas("textwidget", { x: 300, y: 500 });
-    cy.updateCodeInput(".t--property-control-text", `{{Select1.isDirty}}`);
-    // Check if initial value of isDirty is false
-    cy.get(".t--widget-textwidget").should("contain", "false");
-    // Interact with UI
-    cy.get(formWidgetsPage.selectWidget)
-      .find(widgetLocators.dropdownSingleSelect)
-      .click({ force: true });
-    cy.get(commonlocators.singleSelectWidgetMenuItem)
-      .contains("Blue")
-      .click({ force: true });
-    // Check if isDirty is set to true
-    cy.get(".t--widget-textwidget").should("contain", "true");
-    // Change defaultOptionValue property
-    cy.updateCodeInput(".t--property-control-defaultselectedvalue", "RED");
-    // Check if isDirty is reset to false
-    cy.get(".t--widget-textwidget").should("contain", "false");
-  });
-
-  it("3. Clears the search field when widget is closed and serverSideFiltering is off", () => {
-    // open the select widget
-    cy.get(formWidgetsPage.selectWidget)
-      .find(widgetLocators.dropdownSingleSelect)
-      .click({ force: true });
-    // search for option Red in the search input
-    cy.get(commonlocators.selectInputSearch).type("Red");
-    // Select the Red option from dropdown list
-    cy.get(commonlocators.singleSelectWidgetMenuItem)
-      .contains("Red")
-      .click({ force: true });
-    cy.wait(200);
-    // Assert if the select widget has Red as the selected value
-    cy.get(formWidgetsPage.selectWidget).contains("Red");
-    // Open the select widget again
-    cy.get(formWidgetsPage.selectWidget)
-      .find(widgetLocators.dropdownSingleSelect)
-      .click({ force: true });
-    // Assert if the search input is empty now
-    cy.get(commonlocators.selectInputSearch).invoke("val").should("be.empty");
-  });
-
-  it("4. Does not clear the search field when widget is closed and serverSideFiltering is on", () => {
-    // toggle the serversidefiltering option on
-    agHelper.CheckUncheck(widgetLocators.serversideFilteringInput);
-    // search for option Red in the search input
-    cy.get(commonlocators.selectInputSearch).type("Red");
-    // Select the Red option from dropdown list
-    cy.get(commonlocators.singleSelectWidgetMenuItem)
-      .contains("Red")
-      .click({ force: true });
-    cy.wait(200);
-    // Open the select widget again
-    cy.get(formWidgetsPage.selectWidget)
-      .find(widgetLocators.dropdownSingleSelect)
-      .click({ force: true });
-    // Assert if the search input is not empty
-    cy.get(commonlocators.selectInputSearch)
-      .invoke("val")
-      .should("not.be.empty");
-  });
-
-  it("5. Select widget selection is not cleared when the widget is server side filtered", () => {
-    dataSources.CreateDataSource("Postgres");
-
-    cy.get("@dsName").then((dsName) => {
-      EditorNavigation.SelectEntityByName("Select1", EntityType.Widget);
-      propPane.ToggleJSMode("sourcedata", false);
-
-      oneClickBinding.ChooseAndAssertForm(
-        `${dsName}`,
-        dsName,
-        "public.employees",
-        {
-          label: "first_name",
-          value: "last_name",
-        },
-      );
+describe(
+  "Select widget",
+  { tags: ["@tag.Widget", "@tag.Select", "@tag.Binding"] },
+  () => {
+    it("1. Drag and drop Select/Text widgets", () => {
+      cy.dragAndDropToCanvas("selectwidget", { x: 300, y: 300 });
+      cy.get(formWidgetsPage.selectWidget).should("exist");
+    });
+
+    it("2. Check isDirty meta property", () => {
+      cy.dragAndDropToCanvas("textwidget", { x: 300, y: 500 });
+      cy.updateCodeInput(".t--property-control-text", `{{Select1.isDirty}}`);
+      // Check if initial value of isDirty is false
+      cy.get(".t--widget-textwidget").should("contain", "false");
+      // Interact with UI
+      cy.get(formWidgetsPage.selectWidget)
+        .find(widgetLocators.dropdownSingleSelect)
+        .click({ force: true });
+      cy.get(commonlocators.singleSelectWidgetMenuItem)
+        .contains("Blue")
+        .click({ force: true });
+      // Check if isDirty is set to true
+      cy.get(".t--widget-textwidget").should("contain", "true");
+      // Change defaultOptionValue property
+      cy.updateCodeInput(".t--property-control-defaultselectedvalue", "RED");
+      // Check if isDirty is reset to false
+      cy.get(".t--widget-textwidget").should("contain", "false");
+    });
+
+    it("3. Clears the search field when widget is closed and serverSideFiltering is off", () => {
+      // open the select widget
+      cy.get(formWidgetsPage.selectWidget)
+        .find(widgetLocators.dropdownSingleSelect)
+        .click({ force: true });
+      // search for option Red in the search input
+      cy.get(commonlocators.selectInputSearch).type("Red");
+      // Select the Red option from dropdown list
+      cy.get(commonlocators.singleSelectWidgetMenuItem)
+        .contains("Red")
+        .click({ force: true });
+      cy.wait(200);
+      // Assert if the select widget has Red as the selected value
+      cy.get(formWidgetsPage.selectWidget).contains("Red");
+      // Open the select widget again
+      cy.get(formWidgetsPage.selectWidget)
+        .find(widgetLocators.dropdownSingleSelect)
+        .click({ force: true });
+      // Assert if the search input is empty now
+      cy.get(commonlocators.selectInputSearch).invoke("val").should("be.empty");
+    });
+
+    it("4. Does not clear the search field when widget is closed and serverSideFiltering is on", () => {
+      // toggle the serversidefiltering option on
+      agHelper.CheckUncheck(widgetLocators.serversideFilteringInput);
+      // search for option Red in the search input
+      cy.get(commonlocators.selectInputSearch).type("Red");
+      // Select the Red option from dropdown list
+      cy.get(commonlocators.singleSelectWidgetMenuItem)
+        .contains("Red")
+        .click({ force: true });
+      cy.wait(200);
+      // Open the select widget again
+      cy.get(formWidgetsPage.selectWidget)
+        .find(widgetLocators.dropdownSingleSelect)
+        .click({ force: true });
+      // Assert if the search input is not empty
+      cy.get(commonlocators.selectInputSearch)
+        .invoke("val")
+        .should("not.be.empty");
     });
 
-    agHelper.GetNClick(OneClickBindingLocator.connectData);
+    it("5. Select widget selection is not cleared when the widget is server side filtered", () => {
+      dataSources.CreateDataSource("Postgres");
 
-    assertHelper.AssertNetworkStatus("@postExecute");
+      cy.get("@dsName").then((dsName) => {
+        EditorNavigation.SelectEntityByName("Select1", EntityType.Widget);
+        propPane.ToggleJSMode("sourcedata", false);
 
-    cy.get(formWidgetsPage.selectWidget)
-      .find(widgetLocators.dropdownSingleSelect)
-      .click({ force: true });
+        oneClickBinding.ChooseAndAssertForm(
+          `${dsName}`,
+          dsName,
+          "public.employees",
+          {
+            label: "first_name",
+            value: "last_name",
+          },
+        );
+      });
 
-    cy.get(commonlocators.selectInputSearch).clear().type("Janet");
+      agHelper.GetNClick(OneClickBindingLocator.connectData);
 
-    cy.get(commonlocators.singleSelectWidgetMenuItem)
-      .contains("Janet")
-      .click({ force: true });
+      assertHelper.AssertNetworkStatus("@postExecute");
 
-    cy.get(formWidgetsPage.selectWidget)
-      .find(widgetLocators.dropdownSingleSelect)
-      .click({ force: true });
+      cy.get(formWidgetsPage.selectWidget)
+        .find(widgetLocators.dropdownSingleSelect)
+        .click({ force: true });
 
-    cy.get(commonlocators.selectInputSearch).clear().type("Steven");
+      cy.get(commonlocators.selectInputSearch).clear().type("Janet");
 
-    assertHelper.AssertNetworkStatus("@postExecute");
+      cy.get(commonlocators.singleSelectWidgetMenuItem)
+        .contains("Janet")
+        .click({ force: true });
 
-    cy.get(".select-button").should("contain", "Janet");
-  });
+      cy.get(formWidgetsPage.selectWidget)
+        .find(widgetLocators.dropdownSingleSelect)
+        .click({ force: true });
 
-  it("6. Select tooltip renders if tooltip prop is not empty", () => {
-    cy.openPropertyPane("selectwidget");
-    // enter tooltip in property pan
-    cy.get(widgetsPage.inputTooltipControl).type("Helpful text for tooltip !");
-    // tooltip help icon shows
-    cy.get(".select-tooltip").scrollIntoView().should("be.visible");
-  });
-});
+      cy.get(commonlocators.selectInputSearch).clear().type("Steven");
+
+      assertHelper.AssertNetworkStatus("@postExecute");
+
+      cy.get(".select-button").should("contain", "Janet");
+    });
+
+    it("6. Select tooltip renders if tooltip prop is not empty", () => {
+      cy.openPropertyPane("selectwidget");
+      // enter tooltip in property pan
+      cy.get(widgetsPage.inputTooltipControl).type(
+        "Helpful text for tooltip !",
+      );
+      // tooltip help icon shows
+      cy.get(".select-tooltip").scrollIntoView().should("be.visible");
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/Select_widget1_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/Select_widget1_spec.js
index 4dc40ede6cfb..73fd969d1947 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/Select_widget1_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/Select_widget1_spec.js
@@ -9,7 +9,7 @@ const defaultValue = `
 
 describe(
   "Select Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Select", "@tag.Sanity"] },
+  { tags: ["@tag.Widget", "@tag.Select", "@tag.Sanity", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("emptyDSL");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/select_Widget_Bug_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/select_Widget_Bug_spec.js
index 1f674e6d2e1f..dd931962d4b7 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/select_Widget_Bug_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/select_Widget_Bug_spec.js
@@ -6,7 +6,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Select Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Select"] },
+  { tags: ["@tag.Widget", "@tag.Select", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("formSelectDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Sliders/CategorySlider_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Sliders/CategorySlider_spec.ts
index 41bd965b2ee7..9b7ab1312679 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Sliders/CategorySlider_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Sliders/CategorySlider_spec.ts
@@ -17,7 +17,7 @@ import EditorNavigation, {
 
 describe(
   "Category Slider spec",
-  { tags: ["@tag.Widget", "@tag.Slider"] },
+  { tags: ["@tag.Widget", "@tag.Slider", "@tag.Binding"] },
   () => {
     const options = `[
     {
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Sliders/NumberSlider_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Sliders/NumberSlider_spec.ts
index 51643b41556f..df056b74fc31 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Sliders/NumberSlider_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Sliders/NumberSlider_spec.ts
@@ -13,519 +13,537 @@ import EditorNavigation, {
   PagePaneSegment,
 } from "../../../../../support/Pages/EditorNavigation";
 
-describe("Number Slider spec", { tags: ["@tag.Widget", "@tag.Slider"] }, () => {
-  before(() => {
-    entityExplorer.DragDropWidgetNVerify("numbersliderwidget", 550, 100);
-    entityExplorer.DragDropWidgetNVerify("textwidget", 300, 300);
-    EditorNavigation.SelectEntityByName("Text1", EntityType.Widget);
-    propPane.UpdatePropertyFieldValue("Text", "{{NumberSlider1.value}}");
-  });
-
-  it("1. Verify property visibility and default values", () => {
-    const dataSectionProperties = [
-      "min\\.value",
-      "max\\.value",
-      "stepsize",
-      "defaultvalue",
-    ];
-    const generalProperties = [
-      "showmarks",
-      "marks",
-      "visible",
-      "disabled",
-      "animateloading",
-      "showvaluealways",
-    ];
-    const eventsProperties = ["onchange"];
-
-    EditorNavigation.SelectEntityByName("NumberSlider1", EntityType.Widget);
-    // Data Section properties
-    dataSectionProperties.forEach((dataSectionProperty) => {
-      agHelper.AssertElementVisibility(
-        propPane._propertyPanePropertyControl("data", `${dataSectionProperty}`),
-      );
+describe(
+  "Number Slider spec",
+  { tags: ["@tag.Widget", "@tag.Slider", "@tag.Binding"] },
+  () => {
+    before(() => {
+      entityExplorer.DragDropWidgetNVerify("numbersliderwidget", 550, 100);
+      entityExplorer.DragDropWidgetNVerify("textwidget", 300, 300);
+      EditorNavigation.SelectEntityByName("Text1", EntityType.Widget);
+      propPane.UpdatePropertyFieldValue("Text", "{{NumberSlider1.value}}");
     });
-    // General Section Properties
-    generalProperties.forEach((generalProperty) => {
+
+    it("1. Verify property visibility and default values", () => {
+      const dataSectionProperties = [
+        "min\\.value",
+        "max\\.value",
+        "stepsize",
+        "defaultvalue",
+      ];
+      const generalProperties = [
+        "showmarks",
+        "marks",
+        "visible",
+        "disabled",
+        "animateloading",
+        "showvaluealways",
+      ];
+      const eventsProperties = ["onchange"];
+
+      EditorNavigation.SelectEntityByName("NumberSlider1", EntityType.Widget);
+      // Data Section properties
+      dataSectionProperties.forEach((dataSectionProperty) => {
+        agHelper.AssertElementVisibility(
+          propPane._propertyPanePropertyControl(
+            "data",
+            `${dataSectionProperty}`,
+          ),
+        );
+      });
+      // General Section Properties
+      generalProperties.forEach((generalProperty) => {
+        agHelper.AssertElementVisibility(
+          propPane._propertyPanePropertyControl(
+            "general",
+            `${generalProperty}`,
+          ),
+        );
+      });
+      // Events Section properties
+      eventsProperties.forEach((eventsProperty) => {
+        agHelper.AssertElementVisibility(
+          propPane._propertyPanePropertyControl("events", `${eventsProperty}`),
+        );
+      });
+      //Style Section properties
+      propPane.MoveToTab("Style");
+      agHelper.AssertElementVisibility(propPane._propertyControl("size"));
       agHelper.AssertElementVisibility(
-        propPane._propertyPanePropertyControl("general", `${generalProperty}`),
+        propPane._propertyPanePropertyControl("color", "fillcolor"),
       );
+
+      propPane.MoveToTab("Content");
+      // Verify default value
+      propPane
+        .EvaluateExistingPropertyFieldValue("Min. value")
+        .then((val: any) => {
+          expect(val).to.eq("0");
+        });
+      propPane
+        .EvaluateExistingPropertyFieldValue("Max. value")
+        .then((val: any) => {
+          expect(val).to.eq("100");
+        });
+      propPane
+        .EvaluateExistingPropertyFieldValue("Step size")
+        .then((val: any) => {
+          expect(val).to.eq("1");
+        });
+      propPane
+        .EvaluateExistingPropertyFieldValue("Default value")
+        .then((val: any) => {
+          expect(val).to.eq("10");
+        });
     });
-    // Events Section properties
-    eventsProperties.forEach((eventsProperty) => {
-      agHelper.AssertElementVisibility(
-        propPane._propertyPanePropertyControl("events", `${eventsProperty}`),
+
+    it("2. Validates accepted and unaccepted 'Min. value' values", () => {
+      propPane.UpdatePropertyFieldValue("Min. value", "110");
+
+      agHelper.VerifyEvaluatedErrorMessage(
+        "This value must be less than max value",
       );
-    });
-    //Style Section properties
-    propPane.MoveToTab("Style");
-    agHelper.AssertElementVisibility(propPane._propertyControl("size"));
-    agHelper.AssertElementVisibility(
-      propPane._propertyPanePropertyControl("color", "fillcolor"),
-    );
-
-    propPane.MoveToTab("Content");
-    // Verify default value
-    propPane
-      .EvaluateExistingPropertyFieldValue("Min. value")
-      .then((val: any) => {
-        expect(val).to.eq("0");
-      });
-    propPane
-      .EvaluateExistingPropertyFieldValue("Max. value")
-      .then((val: any) => {
-        expect(val).to.eq("100");
-      });
-    propPane
-      .EvaluateExistingPropertyFieldValue("Step size")
-      .then((val: any) => {
-        expect(val).to.eq("1");
-      });
-    propPane
-      .EvaluateExistingPropertyFieldValue("Default value")
-      .then((val: any) => {
-        expect(val).to.eq("10");
-      });
-  });
 
-  it("2. Validates accepted and unaccepted 'Min. value' values", () => {
-    propPane.UpdatePropertyFieldValue("Min. value", "110");
+      propPane.UpdatePropertyFieldValue("Min. value", "");
 
-    agHelper.VerifyEvaluatedErrorMessage(
-      "This value must be less than max value",
-    );
+      agHelper.VerifyEvaluatedErrorMessage("This value is required");
 
-    propPane.UpdatePropertyFieldValue("Min. value", "");
+      propPane.UpdatePropertyFieldValue("Min. value", "zero");
 
-    agHelper.VerifyEvaluatedErrorMessage("This value is required");
+      agHelper.VerifyEvaluatedErrorMessage("This value must be a number");
 
-    propPane.UpdatePropertyFieldValue("Min. value", "zero");
+      // Allows negative value and validate
+      propPane.UpdatePropertyFieldValue("Min. value", "-10");
+      propPane.UpdatePropertyFieldValue("Step size", "10");
 
-    agHelper.VerifyEvaluatedErrorMessage("This value must be a number");
+      // Verify in Preview mode negative value
+      agHelper.GetNClick(locators._enterPreviewMode);
+      agHelper
+        .GetElement(locators._sliderThumb)
+        .focus()
+        .type("{leftArrow}")
+        .type("{leftArrow}");
+      agHelper.Sleep(2000);
+      agHelper
+        .GetText(getWidgetSelector(draggableWidgets.TEXT), "text")
+        .then(($label) => {
+          expect($label).to.eq("-10");
+        });
+      agHelper.GetNClick(locators._exitPreviewMode);
 
-    // Allows negative value and validate
-    propPane.UpdatePropertyFieldValue("Min. value", "-10");
-    propPane.UpdatePropertyFieldValue("Step size", "10");
+      // Verify in Deploy mode negative value
+      deployMode.DeployApp();
+      agHelper
+        .GetElement(locators._sliderThumb)
+        .focus()
+        .type("{leftArrow}{leftArrow}");
+      agHelper.Sleep(2000);
+      agHelper
+        .GetText(getWidgetSelector(draggableWidgets.TEXT), "text")
+        .then(($label) => {
+          expect($label).to.eq("-10");
+        });
+      deployMode.NavigateBacktoEditor();
 
-    // Verify in Preview mode negative value
-    agHelper.GetNClick(locators._enterPreviewMode);
-    agHelper
-      .GetElement(locators._sliderThumb)
-      .focus()
-      .type("{leftArrow}")
-      .type("{leftArrow}");
-    agHelper.Sleep(2000);
-    agHelper
-      .GetText(getWidgetSelector(draggableWidgets.TEXT), "text")
-      .then(($label) => {
-        expect($label).to.eq("-10");
-      });
-    agHelper.GetNClick(locators._exitPreviewMode);
-
-    // Verify in Deploy mode negative value
-    deployMode.DeployApp();
-    agHelper
-      .GetElement(locators._sliderThumb)
-      .focus()
-      .type("{leftArrow}{leftArrow}");
-    agHelper.Sleep(2000);
-    agHelper
-      .GetText(getWidgetSelector(draggableWidgets.TEXT), "text")
-      .then(($label) => {
-        expect($label).to.eq("-10");
-      });
-    deployMode.NavigateBacktoEditor();
-
-    // Allows decimal value
-    EditorNavigation.SelectEntityByName("NumberSlider1", EntityType.Widget);
-    propPane.UpdatePropertyFieldValue("Min. value", "10.5");
-
-    // Verify Decimal value
-    agHelper.GetElement(locators._sliderThumb).focus().type("{leftArrow}");
-    agHelper.Sleep(2000);
-    agHelper
-      .GetText(getWidgetSelector(draggableWidgets.TEXT), "text")
-      .then(($label) => {
-        expect($label).to.eq("10.5");
-      });
-  });
+      // Allows decimal value
+      EditorNavigation.SelectEntityByName("NumberSlider1", EntityType.Widget);
+      propPane.UpdatePropertyFieldValue("Min. value", "10.5");
 
-  it("3. Validate accepted and unaccepted 'Max. value' values", () => {
-    propPane.UpdatePropertyFieldValue("Max. value", "0");
+      // Verify Decimal value
+      agHelper.GetElement(locators._sliderThumb).focus().type("{leftArrow}");
+      agHelper.Sleep(2000);
+      agHelper
+        .GetText(getWidgetSelector(draggableWidgets.TEXT), "text")
+        .then(($label) => {
+          expect($label).to.eq("10.5");
+        });
+    });
 
-    agHelper.VerifyEvaluatedErrorMessage(
-      "This value must be greater than min value",
-    );
+    it("3. Validate accepted and unaccepted 'Max. value' values", () => {
+      propPane.UpdatePropertyFieldValue("Max. value", "0");
 
-    propPane.UpdatePropertyFieldValue("Max. value", "");
+      agHelper.VerifyEvaluatedErrorMessage(
+        "This value must be greater than min value",
+      );
 
-    agHelper.VerifyEvaluatedErrorMessage("This value is required");
+      propPane.UpdatePropertyFieldValue("Max. value", "");
 
-    propPane.UpdatePropertyFieldValue("Max. value", "asd");
+      agHelper.VerifyEvaluatedErrorMessage("This value is required");
 
-    agHelper.VerifyEvaluatedErrorMessage("This value must be a number");
+      propPane.UpdatePropertyFieldValue("Max. value", "asd");
 
-    // Allows decimal value
-    propPane.UpdatePropertyFieldValue("Max. value", "100.5");
-    propPane.UpdatePropertyFieldValue("Step size", "90");
-    // Verify decimal value
-    agHelper.GetElement(locators._sliderThumb).focus().type("{rightArrow}");
-    agHelper.Sleep(2000);
-    agHelper
-      .GetText(getWidgetSelector(draggableWidgets.TEXT), "text")
-      .then(($label) => {
-        expect($label).to.eq("100.5");
-      });
+      agHelper.VerifyEvaluatedErrorMessage("This value must be a number");
 
-    // Accepts negative value
-    propPane.UpdatePropertyFieldValue("Min. value", "-50");
-    propPane.UpdatePropertyFieldValue("Max. value", "-30");
+      // Allows decimal value
+      propPane.UpdatePropertyFieldValue("Max. value", "100.5");
+      propPane.UpdatePropertyFieldValue("Step size", "90");
+      // Verify decimal value
+      agHelper.GetElement(locators._sliderThumb).focus().type("{rightArrow}");
+      agHelper.Sleep(2000);
+      agHelper
+        .GetText(getWidgetSelector(draggableWidgets.TEXT), "text")
+        .then(($label) => {
+          expect($label).to.eq("100.5");
+        });
 
-    agHelper.GetElement(locators._sliderThumb).focus().type("{rightArrow}");
-    agHelper.Sleep(2000);
-    agHelper
-      .GetText(getWidgetSelector(draggableWidgets.TEXT), "text")
-      .then(($label) => {
-        expect($label).to.eq("-30");
-      });
+      // Accepts negative value
+      propPane.UpdatePropertyFieldValue("Min. value", "-50");
+      propPane.UpdatePropertyFieldValue("Max. value", "-30");
 
-    // Verify in Preview mode negative value
-    agHelper.GetNClick(locators._enterPreviewMode);
-    agHelper.GetElement(locators._sliderThumb).focus().type("{rightArrow}");
-    agHelper.Sleep(2000);
-    agHelper
-      .GetText(getWidgetSelector(draggableWidgets.TEXT), "text")
-      .then(($label) => {
-        expect($label).to.eq("-30");
-      });
-    agHelper.GetNClick(locators._exitPreviewMode);
-
-    // Verify in Deploy mode negative value
-    deployMode.DeployApp();
-    agHelper.GetElement(locators._sliderThumb).focus().type("{rightArrow}");
-    agHelper.Sleep(2000);
-    agHelper
-      .GetText(getWidgetSelector(draggableWidgets.TEXT), "text", 0)
-      .then(($label) => {
-        expect($label).to.eq("-30");
-      });
-    deployMode.NavigateBacktoEditor();
-  });
+      agHelper.GetElement(locators._sliderThumb).focus().type("{rightArrow}");
+      agHelper.Sleep(2000);
+      agHelper
+        .GetText(getWidgetSelector(draggableWidgets.TEXT), "text")
+        .then(($label) => {
+          expect($label).to.eq("-30");
+        });
 
-  it("4. Validate accepted and unaccepted 'Step Value' values", () => {
-    EditorNavigation.SelectEntityByName("NumberSlider1", EntityType.Widget);
+      // Verify in Preview mode negative value
+      agHelper.GetNClick(locators._enterPreviewMode);
+      agHelper.GetElement(locators._sliderThumb).focus().type("{rightArrow}");
+      agHelper.Sleep(2000);
+      agHelper
+        .GetText(getWidgetSelector(draggableWidgets.TEXT), "text")
+        .then(($label) => {
+          expect($label).to.eq("-30");
+        });
+      agHelper.GetNClick(locators._exitPreviewMode);
 
-    propPane.UpdatePropertyFieldValue("Step size", "-10");
+      // Verify in Deploy mode negative value
+      deployMode.DeployApp();
+      agHelper.GetElement(locators._sliderThumb).focus().type("{rightArrow}");
+      agHelper.Sleep(2000);
+      agHelper
+        .GetText(getWidgetSelector(draggableWidgets.TEXT), "text", 0)
+        .then(($label) => {
+          expect($label).to.eq("-30");
+        });
+      deployMode.NavigateBacktoEditor();
+    });
 
-    agHelper.VerifyEvaluatedErrorMessage("This value must be greater than 0.1");
+    it("4. Validate accepted and unaccepted 'Step Value' values", () => {
+      EditorNavigation.SelectEntityByName("NumberSlider1", EntityType.Widget);
 
-    propPane.UpdatePropertyFieldValue("Step size", "110");
+      propPane.UpdatePropertyFieldValue("Step size", "-10");
 
-    agHelper.VerifyEvaluatedErrorMessage("This value must be less than 20");
+      agHelper.VerifyEvaluatedErrorMessage(
+        "This value must be greater than 0.1",
+      );
 
-    propPane.UpdatePropertyFieldValue("Step size", "asd");
+      propPane.UpdatePropertyFieldValue("Step size", "110");
 
-    agHelper.VerifyEvaluatedErrorMessage("This value must be a number");
+      agHelper.VerifyEvaluatedErrorMessage("This value must be less than 20");
 
-    propPane.UpdatePropertyFieldValue("Step size", "10");
-    agHelper.AssertElementAbsence(locators._evaluatedErrorMessage);
-  });
+      propPane.UpdatePropertyFieldValue("Step size", "asd");
 
-  it("5. Validates accepted and unaccepted 'Default Value' values", () => {
-    propPane.UpdatePropertyFieldValue("Max. value", "100");
-    propPane.UpdatePropertyFieldValue("Min. value", "10");
-    propPane.UpdatePropertyFieldValue("Default value", "-10");
+      agHelper.VerifyEvaluatedErrorMessage("This value must be a number");
 
-    agHelper.VerifyEvaluatedErrorMessage(
-      "This value must be greater than or equal to the min value",
-    );
+      propPane.UpdatePropertyFieldValue("Step size", "10");
+      agHelper.AssertElementAbsence(locators._evaluatedErrorMessage);
+    });
 
-    propPane.UpdatePropertyFieldValue("Default value", "110");
+    it("5. Validates accepted and unaccepted 'Default Value' values", () => {
+      propPane.UpdatePropertyFieldValue("Max. value", "100");
+      propPane.UpdatePropertyFieldValue("Min. value", "10");
+      propPane.UpdatePropertyFieldValue("Default value", "-10");
 
-    agHelper.VerifyEvaluatedErrorMessage(
-      "This value must be less than or equal to the max value",
-    );
+      agHelper.VerifyEvaluatedErrorMessage(
+        "This value must be greater than or equal to the min value",
+      );
 
-    propPane.UpdatePropertyFieldValue("Default value", "asd");
+      propPane.UpdatePropertyFieldValue("Default value", "110");
 
-    agHelper.VerifyEvaluatedErrorMessage("This value must be a number");
+      agHelper.VerifyEvaluatedErrorMessage(
+        "This value must be less than or equal to the max value",
+      );
 
-    propPane.UpdatePropertyFieldValue("Default value", "10");
-    agHelper.AssertElementAbsence(locators._evaluatedErrorMessage);
-  });
+      propPane.UpdatePropertyFieldValue("Default value", "asd");
 
-  it("6. Change Step size and check if value changes", () => {
-    // Assert Text widget has value 10
-    agHelper
-      .GetText(getWidgetSelector(draggableWidgets.TEXT))
-      .then(($label) => {
-        expect($label).to.eq("10");
-      });
+      agHelper.VerifyEvaluatedErrorMessage("This value must be a number");
 
-    // Change the slider value
-    agHelper
-      .GetElement(locators._sliderThumb)
-      .focus()
-      .type("{rightArrow}")
-      .wait(500);
+      propPane.UpdatePropertyFieldValue("Default value", "10");
+      agHelper.AssertElementAbsence(locators._evaluatedErrorMessage);
+    });
 
-    agHelper.Sleep(2000); //for the changes to reflect in text widget
+    it("6. Change Step size and check if value changes", () => {
+      // Assert Text widget has value 10
+      agHelper
+        .GetText(getWidgetSelector(draggableWidgets.TEXT))
+        .then(($label) => {
+          expect($label).to.eq("10");
+        });
 
-    // Assert the Text widget has value 20
-    agHelper
-      .GetText(getWidgetSelector(draggableWidgets.TEXT))
-      .then(($label) => {
-        expect($label).to.eq("20");
-      });
+      // Change the slider value
+      agHelper
+        .GetElement(locators._sliderThumb)
+        .focus()
+        .type("{rightArrow}")
+        .wait(500);
 
-    // Change the slider value
-    agHelper.GetElement(locators._sliderThumb).focus().type("{leftArrow}");
+      agHelper.Sleep(2000); //for the changes to reflect in text widget
 
-    agHelper.Sleep(2000); //for the changes to reflect in text widget
-    // Assert the Text widget has value 0
-    agHelper
-      .GetText(getWidgetSelector(draggableWidgets.TEXT))
-      .then(($label) => {
-        expect($label).to.eq("10");
-      });
-  });
-
-  it("7. Verify Range slider visibility in explorer", () => {
-    PageLeftPane.switchSegment(PagePaneSegment.UI);
-    PageLeftPane.switchToAddNew();
-    agHelper.ClearTextField(locators._entityExplorersearch);
-    agHelper.TypeText(locators._entityExplorersearch, "Number");
-    agHelper.AssertElementExist(locators._widgetPageIcon("numbersliderwidget"));
-    agHelper.ClearTextField(locators._entityExplorersearch);
-    agHelper.TypeText(locators._entityExplorersearch, "slider");
-    agHelper.AssertElementExist(locators._widgetPageIcon("numbersliderwidget"));
-  });
-
-  it("8. Validate 'show marks', 'visible' and 'disable' toggle", () => {
-    EditorNavigation.SelectEntityByName("NumberSlider1", EntityType.Widget);
-
-    // Verify Show marks toggle
-    agHelper.AssertContains("50%", "be.visible", "p");
-    propPane.TogglePropertyState("showmarks", "Off");
-    agHelper.AssertContains("50%", "not.exist", "p");
-    // Verify Disabled toggle
-    propPane.TogglePropertyState("disabled", "On");
-    agHelper.AssertAttribute(locators._sliderThumb, "disabled", "disabled");
-    propPane.TogglePropertyState("disabled", "Off");
-    // Verify Visible toggle
-    propPane.TogglePropertyState("visible", "Off");
-    agHelper.AssertExistingToggleState("visible", "false");
-    propPane.TogglePropertyState("visible", "On");
-    agHelper.AssertExistingToggleState("visible", "true");
-  });
-
-  it("9. Validate Events section onChange tests", () => {
-    // Verify Events onChange
-    propPane.SelectPlatformFunction("onChange", "Show alert");
-    agHelper.TypeText(
-      propPane._actionSelectorFieldByLabel("Message"),
-      "Value Changed",
-    );
-    agHelper.GetNClick(propPane._actionSelectorPopupClose);
-    // Change the slider value
-    agHelper.GetElement(locators._sliderThumb).focus().type("{rightArrow}");
-    agHelper.ValidateToastMessage("Value Changed");
-
-    // Verify in Preview mode
-    agHelper.GetNClick(locators._enterPreviewMode);
-    agHelper.GetElement(locators._sliderThumb).focus().type("{rightArrow}");
-    agHelper.ValidateToastMessage("Value Changed");
-    agHelper.GetNClick(locators._exitPreviewMode);
-
-    // Verifying onChange in Deploy mode
-    deployMode.DeployApp();
-    agHelper.GetElement(locators._sliderThumb).focus().type("{rightArrow}");
-    agHelper.ValidateToastMessage("Value Changed");
-    deployMode.NavigateBacktoEditor();
-  });
-
-  it("10.  Verify size change and color change", () => {
-    EditorNavigation.SelectEntityByName("NumberSlider1", EntityType.Widget);
-    propPane.MoveToTab("Style");
-    // Verify Size
-    agHelper.GetWidgetCSSHeight(locators._sliderThumb).then((initialHeight) => {
-      agHelper.GetNClick(propPane._styleSize("s"));
+      // Assert the Text widget has value 20
+      agHelper
+        .GetText(getWidgetSelector(draggableWidgets.TEXT))
+        .then(($label) => {
+          expect($label).to.eq("20");
+        });
+
+      // Change the slider value
+      agHelper.GetElement(locators._sliderThumb).focus().type("{leftArrow}");
+
+      agHelper.Sleep(2000); //for the changes to reflect in text widget
+      // Assert the Text widget has value 0
+      agHelper
+        .GetText(getWidgetSelector(draggableWidgets.TEXT))
+        .then(($label) => {
+          expect($label).to.eq("10");
+        });
+    });
+
+    it("7. Verify Range slider visibility in explorer", () => {
+      PageLeftPane.switchSegment(PagePaneSegment.UI);
+      PageLeftPane.switchToAddNew();
+      agHelper.ClearTextField(locators._entityExplorersearch);
+      agHelper.TypeText(locators._entityExplorersearch, "Number");
+      agHelper.AssertElementExist(
+        locators._widgetPageIcon("numbersliderwidget"),
+      );
+      agHelper.ClearTextField(locators._entityExplorersearch);
+      agHelper.TypeText(locators._entityExplorersearch, "slider");
+      agHelper.AssertElementExist(
+        locators._widgetPageIcon("numbersliderwidget"),
+      );
+    });
+
+    it("8. Validate 'show marks', 'visible' and 'disable' toggle", () => {
+      EditorNavigation.SelectEntityByName("NumberSlider1", EntityType.Widget);
+
+      // Verify Show marks toggle
+      agHelper.AssertContains("50%", "be.visible", "p");
+      propPane.TogglePropertyState("showmarks", "Off");
+      agHelper.AssertContains("50%", "not.exist", "p");
+      // Verify Disabled toggle
+      propPane.TogglePropertyState("disabled", "On");
+      agHelper.AssertAttribute(locators._sliderThumb, "disabled", "disabled");
+      propPane.TogglePropertyState("disabled", "Off");
+      // Verify Visible toggle
+      propPane.TogglePropertyState("visible", "Off");
+      agHelper.AssertExistingToggleState("visible", "false");
+      propPane.TogglePropertyState("visible", "On");
+      agHelper.AssertExistingToggleState("visible", "true");
+    });
+
+    it("9. Validate Events section onChange tests", () => {
+      // Verify Events onChange
+      propPane.SelectPlatformFunction("onChange", "Show alert");
+      agHelper.TypeText(
+        propPane._actionSelectorFieldByLabel("Message"),
+        "Value Changed",
+      );
+      agHelper.GetNClick(propPane._actionSelectorPopupClose);
+      // Change the slider value
+      agHelper.GetElement(locators._sliderThumb).focus().type("{rightArrow}");
+      agHelper.ValidateToastMessage("Value Changed");
+
+      // Verify in Preview mode
+      agHelper.GetNClick(locators._enterPreviewMode);
+      agHelper.GetElement(locators._sliderThumb).focus().type("{rightArrow}");
+      agHelper.ValidateToastMessage("Value Changed");
+      agHelper.GetNClick(locators._exitPreviewMode);
+
+      // Verifying onChange in Deploy mode
+      deployMode.DeployApp();
+      agHelper.GetElement(locators._sliderThumb).focus().type("{rightArrow}");
+      agHelper.ValidateToastMessage("Value Changed");
+      deployMode.NavigateBacktoEditor();
+    });
+
+    it("10.  Verify size change and color change", () => {
+      EditorNavigation.SelectEntityByName("NumberSlider1", EntityType.Widget);
+      propPane.MoveToTab("Style");
+      // Verify Size
       agHelper
         .GetWidgetCSSHeight(locators._sliderThumb)
-        .then((currentHeight) => {
-          expect(initialHeight).to.not.eq(currentHeight);
+        .then((initialHeight) => {
+          agHelper.GetNClick(propPane._styleSize("s"));
+          agHelper
+            .GetWidgetCSSHeight(locators._sliderThumb)
+            .then((currentHeight) => {
+              expect(initialHeight).to.not.eq(currentHeight);
+            });
+        });
+
+      // Verify Color
+      agHelper
+        .GetWidgetCSSFrAttribute(locators._sliderThumb, "background-color")
+        .then((sliderColor) => {
+          agHelper.GetNClick(
+            propPane._propertyPanePropertyControl("color", "fillcolor"),
+          );
+          agHelper
+            .GetWidgetCSSFrAttribute(propPane._themeColor, "background-color")
+            .then((themeColor) => {
+              expect(sliderColor).to.eq(themeColor);
+            });
+        });
+
+      // Select color and verify
+      propPane.SelectColorFromColorPicker("fillcolor", 10);
+      agHelper
+        .GetWidgetCSSFrAttribute(locators._sliderThumb, "background-color")
+        .then((sliderColor) => {
+          agHelper
+            .GetWidgetCSSFrAttribute(
+              `${propPane._propertyControlSelectedColorButton("fillcolor")}`,
+              "background-color",
+            )
+            .then((newColor) => {
+              expect(sliderColor).to.eq(newColor);
+            });
         });
     });
 
-    // Verify Color
-    agHelper
-      .GetWidgetCSSFrAttribute(locators._sliderThumb, "background-color")
-      .then((sliderColor) => {
-        agHelper.GetNClick(
-          propPane._propertyPanePropertyControl("color", "fillcolor"),
-        );
-        agHelper
-          .GetWidgetCSSFrAttribute(propPane._themeColor, "background-color")
-          .then((themeColor) => {
-            expect(sliderColor).to.eq(themeColor);
-          });
-      });
+    it("11. Verify Slider value change using left, right, up and down arrows", () => {
+      // Verify in Preview mode
+      // Verify slides right with right and up arrow
+      agHelper.GetNClick(locators._enterPreviewMode);
+      agHelper
+        .GetElement(locators._sliderThumb)
+        .focus()
+        .type("{rightArrow}")
+        .type("{upArrow}");
 
-    // Select color and verify
-    propPane.SelectColorFromColorPicker("fillcolor", 10);
-    agHelper
-      .GetWidgetCSSFrAttribute(locators._sliderThumb, "background-color")
-      .then((sliderColor) => {
-        agHelper
-          .GetWidgetCSSFrAttribute(
-            `${propPane._propertyControlSelectedColorButton("fillcolor")}`,
-            "background-color",
-          )
-          .then((newColor) => {
-            expect(sliderColor).to.eq(newColor);
-          });
-      });
-  });
-
-  it("11. Verify Slider value change using left, right, up and down arrows", () => {
-    // Verify in Preview mode
-    // Verify slides right with right and up arrow
-    agHelper.GetNClick(locators._enterPreviewMode);
-    agHelper
-      .GetElement(locators._sliderThumb)
-      .focus()
-      .type("{rightArrow}")
-      .type("{upArrow}");
-
-    agHelper.Sleep(200);
-
-    agHelper
-      .GetText(getWidgetSelector(draggableWidgets.TEXT))
-      .then(($label) => {
-        expect($label).to.eq("30");
-      });
+      agHelper.Sleep(200);
 
-    // Verify slides left with left and down arrow
-    agHelper
-      .GetElement(locators._sliderThumb)
-      .focus()
-      .type("{leftArrow}")
-      .type("{downArrow}");
+      agHelper
+        .GetText(getWidgetSelector(draggableWidgets.TEXT))
+        .then(($label) => {
+          expect($label).to.eq("30");
+        });
 
-    agHelper.Sleep(200);
+      // Verify slides left with left and down arrow
+      agHelper
+        .GetElement(locators._sliderThumb)
+        .focus()
+        .type("{leftArrow}")
+        .type("{downArrow}");
 
-    agHelper
-      .GetText(getWidgetSelector(draggableWidgets.TEXT))
-      .then(($label) => {
-        expect($label).to.eq("10");
-      });
+      agHelper.Sleep(200);
 
-    agHelper.GetNClick(locators._exitPreviewMode);
+      agHelper
+        .GetText(getWidgetSelector(draggableWidgets.TEXT))
+        .then(($label) => {
+          expect($label).to.eq("10");
+        });
 
-    //Verify in Deploy mode
-    deployMode.DeployApp();
+      agHelper.GetNClick(locators._exitPreviewMode);
 
-    // Verify slides right with right and up arrow
-    agHelper
-      .GetElement(locators._sliderThumb)
-      .focus()
-      .type("{rightArrow}")
-      .type("{upArrow}");
+      //Verify in Deploy mode
+      deployMode.DeployApp();
 
-    agHelper.Sleep();
+      // Verify slides right with right and up arrow
+      agHelper
+        .GetElement(locators._sliderThumb)
+        .focus()
+        .type("{rightArrow}")
+        .type("{upArrow}");
 
-    agHelper
-      .GetText(getWidgetSelector(draggableWidgets.TEXT))
-      .then(($label) => {
-        expect($label).to.eq("30");
-      });
+      agHelper.Sleep();
 
-    // Verify slides left with left and down arrow
-    agHelper
-      .GetElement(locators._sliderThumb)
-      .focus()
-      .type("{leftArrow}")
-      .type("{downArrow}");
+      agHelper
+        .GetText(getWidgetSelector(draggableWidgets.TEXT))
+        .then(($label) => {
+          expect($label).to.eq("30");
+        });
 
-    agHelper.Sleep(1000);
+      // Verify slides left with left and down arrow
+      agHelper
+        .GetElement(locators._sliderThumb)
+        .focus()
+        .type("{leftArrow}")
+        .type("{downArrow}");
 
-    agHelper
-      .GetText(getWidgetSelector(draggableWidgets.TEXT))
-      .then(($label) => {
-        expect($label).to.eq("10");
-      });
+      agHelper.Sleep(1000);
 
-    deployMode.NavigateBacktoEditor();
-  });
-
-  it("12. Verify various modes", () => {
-    // Verify in Preview mode
-    // Verify slides right with right and up arrow
-    agHelper.GetNClick(locators._enterPreviewMode);
-    agHelper
-      .GetElement(locators._sliderThumb)
-      .focus()
-      .type("{rightArrow}")
-      .type("{upArrow}");
-
-    agHelper.Sleep(1000);
-
-    agHelper
-      .GetText(getWidgetSelector(draggableWidgets.TEXT))
-      .then(($label) => {
-        expect($label).to.eq("30");
-      });
+      agHelper
+        .GetText(getWidgetSelector(draggableWidgets.TEXT))
+        .then(($label) => {
+          expect($label).to.eq("10");
+        });
 
-    // Verify slides left with left and down arrow
-    agHelper
-      .GetElement(locators._sliderThumb)
-      .focus()
-      .type("{leftArrow}")
-      .type("{downArrow}");
+      deployMode.NavigateBacktoEditor();
+    });
 
-    agHelper.Sleep(1000);
+    it("12. Verify various modes", () => {
+      // Verify in Preview mode
+      // Verify slides right with right and up arrow
+      agHelper.GetNClick(locators._enterPreviewMode);
+      agHelper
+        .GetElement(locators._sliderThumb)
+        .focus()
+        .type("{rightArrow}")
+        .type("{upArrow}");
 
-    agHelper
-      .GetText(getWidgetSelector(draggableWidgets.TEXT))
-      .then(($label) => {
-        expect($label).to.eq("10");
-      });
+      agHelper.Sleep(1000);
+
+      agHelper
+        .GetText(getWidgetSelector(draggableWidgets.TEXT))
+        .then(($label) => {
+          expect($label).to.eq("30");
+        });
 
-    agHelper.GetNClick(locators._exitPreviewMode);
+      // Verify slides left with left and down arrow
+      agHelper
+        .GetElement(locators._sliderThumb)
+        .focus()
+        .type("{leftArrow}")
+        .type("{downArrow}");
 
-    // Verify in Deploy mode
-    deployMode.DeployApp();
+      agHelper.Sleep(1000);
 
-    // Verify slides right with right and up arrow
-    agHelper
-      .GetElement(locators._sliderThumb)
-      .focus()
-      .type("{rightArrow}")
-      .type("{upArrow}");
+      agHelper
+        .GetText(getWidgetSelector(draggableWidgets.TEXT))
+        .then(($label) => {
+          expect($label).to.eq("10");
+        });
 
-    agHelper.Sleep(1000);
+      agHelper.GetNClick(locators._exitPreviewMode);
 
-    agHelper
-      .GetText(getWidgetSelector(draggableWidgets.TEXT))
-      .then(($label) => {
-        expect($label).to.eq("30");
-      });
+      // Verify in Deploy mode
+      deployMode.DeployApp();
 
-    // Verify slides left with left and down arrow
-    agHelper
-      .GetElement(locators._sliderThumb)
-      .focus()
-      .type("{leftArrow}")
-      .type("{downArrow}");
+      // Verify slides right with right and up arrow
+      agHelper
+        .GetElement(locators._sliderThumb)
+        .focus()
+        .type("{rightArrow}")
+        .type("{upArrow}");
 
-    agHelper.Sleep(1000);
+      agHelper.Sleep(1000);
 
-    agHelper
-      .GetText(getWidgetSelector(draggableWidgets.TEXT))
-      .then(($label) => {
-        expect($label).to.eq("10");
-      });
+      agHelper
+        .GetText(getWidgetSelector(draggableWidgets.TEXT))
+        .then(($label) => {
+          expect($label).to.eq("30");
+        });
 
-    deployMode.NavigateBacktoEditor();
-  });
-});
+      // Verify slides left with left and down arrow
+      agHelper
+        .GetElement(locators._sliderThumb)
+        .focus()
+        .type("{leftArrow}")
+        .type("{downArrow}");
+
+      agHelper.Sleep(1000);
+
+      agHelper
+        .GetText(getWidgetSelector(draggableWidgets.TEXT))
+        .then(($label) => {
+          expect($label).to.eq("10");
+        });
+
+      deployMode.NavigateBacktoEditor();
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Sliders/RangeSlider_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Sliders/RangeSlider_spec.ts
index 9e91e87030ff..25353e17e6d2 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Sliders/RangeSlider_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Sliders/RangeSlider_spec.ts
@@ -13,416 +13,438 @@ import EditorNavigation, {
   PagePaneSegment,
 } from "../../../../../support/Pages/EditorNavigation";
 
-describe("Range Slider spec", { tags: ["@tag.Widget", "@tag.Slider"] }, () => {
-  before(() => {
-    entityExplorer.DragDropWidgetNVerify("rangesliderwidget", 550, 100);
-    entityExplorer.DragDropWidgetNVerify("textwidget", 300, 300);
-    entityExplorer.DragDropWidgetNVerify("textwidget", 600, 300);
-    EditorNavigation.SelectEntityByName("Text1", EntityType.Widget);
-    propPane.UpdatePropertyFieldValue("Text", "{{RangeSlider1.end}}");
-    EditorNavigation.SelectEntityByName("Text2", EntityType.Widget);
-    propPane.UpdatePropertyFieldValue("Text", "{{RangeSlider1.start}}");
-  });
-
-  it("1. Verify property visibility and default values", () => {
-    const dataSectionProperties = [
-      "min\\.value",
-      "max\\.value",
-      "stepsize",
-      "min\\.range",
-      "defaultstartvalue",
-      "defaultendvalue",
-    ];
-    const generalProperties = [
-      "showmarks",
-      "marks",
-      "visible",
-      "disabled",
-      "animateloading",
-      "showvaluealways",
-    ];
-    const eventsProperties = ["onstartvaluechange", "onendvaluechange"];
-
-    EditorNavigation.SelectEntityByName("RangeSlider1", EntityType.Widget);
-    // Data Section properties
-    dataSectionProperties.forEach((dataSectionProperty) => {
-      agHelper.AssertElementVisibility(
-        propPane._propertyPanePropertyControl("data", `${dataSectionProperty}`),
-      );
-    });
-    // General Section Properties
-    generalProperties.forEach((generalProperty) => {
-      agHelper.AssertElementVisibility(
-        propPane._propertyPanePropertyControl("general", `${generalProperty}`),
-      );
-    });
-    // Events Section properties
-    eventsProperties.forEach((eventsProperty) => {
-      agHelper.AssertElementVisibility(
-        propPane._propertyPanePropertyControl("events", `${eventsProperty}`),
-      );
+describe(
+  "Range Slider spec",
+  { tags: ["@tag.Widget", "@tag.Slider", "@tag.Binding"] },
+  () => {
+    before(() => {
+      entityExplorer.DragDropWidgetNVerify("rangesliderwidget", 550, 100);
+      entityExplorer.DragDropWidgetNVerify("textwidget", 300, 300);
+      entityExplorer.DragDropWidgetNVerify("textwidget", 600, 300);
+      EditorNavigation.SelectEntityByName("Text1", EntityType.Widget);
+      propPane.UpdatePropertyFieldValue("Text", "{{RangeSlider1.end}}");
+      EditorNavigation.SelectEntityByName("Text2", EntityType.Widget);
+      propPane.UpdatePropertyFieldValue("Text", "{{RangeSlider1.start}}");
     });
-    // Style Section properties
-    propPane.MoveToTab("Style");
-    propPane._propertyControl("size");
-    agHelper.AssertElementVisibility(
-      propPane._propertyPanePropertyControl("color", "fillcolor"),
-    );
-
-    propPane.MoveToTab("Content");
-    // Verify default value
-    propPane
-      .EvaluateExistingPropertyFieldValue("Min. value")
-      .then((val: any) => {
-        expect(val).to.eq("0");
-      });
-    propPane
-      .EvaluateExistingPropertyFieldValue("Max. value")
-      .then((val: any) => {
-        expect(val).to.eq("100");
-      });
-    propPane
-      .EvaluateExistingPropertyFieldValue("Step size")
-      .then((val: any) => {
-        expect(val).to.eq("1");
-      });
-    propPane
-      .EvaluateExistingPropertyFieldValue("Min. range")
-      .then((val: any) => {
-        expect(val).to.eq("5");
-      });
-  });
-
-  it("2. Validate accepted and unaccepted 'Min. value' values", () => {
-    propPane.UpdatePropertyFieldValue("Min. value", "110");
-
-    agHelper.VerifyEvaluatedErrorMessage(
-      "This value must be less than max value",
-    );
-
-    propPane.UpdatePropertyFieldValue("Min. value", "");
-
-    agHelper.VerifyEvaluatedErrorMessage("This value is required");
-
-    propPane.UpdatePropertyFieldValue("Min. value", "zero");
-
-    agHelper.VerifyEvaluatedErrorMessage("This value must be a number");
-
-    propPane.UpdatePropertyFieldValue("Min. range", "10");
-    propPane.UpdatePropertyFieldValue("Step size", "10");
-    propPane.UpdatePropertyFieldValue("Min. value", "-10");
-    agHelper.AssertElementAbsence(locators._evaluatedErrorMessage);
-
-    // Verify in Preview mode negative value
-    agHelper.GetNClick(locators._enterPreviewMode);
-    agHelper
-      .GetElement(locators._sliderThumb)
-      .eq(0)
-      .focus()
-      .type("{leftArrow}")
-      .type("{leftArrow}")
-      .type("{leftArrow}");
-    agHelper.Sleep(3000);
-    agHelper
-      .GetText(getWidgetSelector(draggableWidgets.TEXT), "text", 1)
-      .then(($label) => {
-        expect($label).to.eq("-10");
-      });
-    agHelper.GetNClick(locators._exitPreviewMode);
-
-    // Verify in Deploy mode negative value
-    deployMode.DeployApp();
-    agHelper
-      .GetElement(locators._sliderThumb)
-      .eq(0)
-      .focus()
-      .type("{leftArrow}")
-      .type("{leftArrow}");
-    agHelper.Sleep(3000);
-    agHelper
-      .GetText(getWidgetSelector(draggableWidgets.TEXT), "text", 1)
-      .then(($label) => {
-        expect($label).to.eq("-10");
+
+    it("1. Verify property visibility and default values", () => {
+      const dataSectionProperties = [
+        "min\\.value",
+        "max\\.value",
+        "stepsize",
+        "min\\.range",
+        "defaultstartvalue",
+        "defaultendvalue",
+      ];
+      const generalProperties = [
+        "showmarks",
+        "marks",
+        "visible",
+        "disabled",
+        "animateloading",
+        "showvaluealways",
+      ];
+      const eventsProperties = ["onstartvaluechange", "onendvaluechange"];
+
+      EditorNavigation.SelectEntityByName("RangeSlider1", EntityType.Widget);
+      // Data Section properties
+      dataSectionProperties.forEach((dataSectionProperty) => {
+        agHelper.AssertElementVisibility(
+          propPane._propertyPanePropertyControl(
+            "data",
+            `${dataSectionProperty}`,
+          ),
+        );
       });
-    deployMode.NavigateBacktoEditor();
-
-    // Allows decimal value
-    EditorNavigation.SelectEntityByName("RangeSlider1", EntityType.Widget);
-    propPane.UpdatePropertyFieldValue("Min. value", "10.5");
-
-    // Verify Decimal value
-    agHelper
-      .GetElement(locators._sliderThumb)
-      .eq(0)
-      .focus()
-      .type("{leftArrow}");
-    agHelper.Sleep(3000);
-    agHelper
-      .GetText(getWidgetSelector(draggableWidgets.TEXT), "text", 1)
-      .then(($label) => {
-        expect($label).to.eq("10.5");
+      // General Section Properties
+      generalProperties.forEach((generalProperty) => {
+        agHelper.AssertElementVisibility(
+          propPane._propertyPanePropertyControl(
+            "general",
+            `${generalProperty}`,
+          ),
+        );
       });
-    // Does not allow value greater than Max value
-    propPane.UpdatePropertyFieldValue("Min. value", "110");
-    agHelper.VerifyEvaluatedErrorMessage(
-      "This value must be less than max value",
-    );
-    // Updating to allowed value
-    propPane.UpdatePropertyFieldValue("Min. value", "10");
-    agHelper.AssertElementAbsence(locators._evaluatedErrorMessage);
-  });
-
-  it("3. Validate accepted and unaccepted 'Max. value' values", () => {
-    propPane.UpdatePropertyFieldValue("Max. value", "0");
-
-    agHelper.VerifyEvaluatedErrorMessage(
-      "This value must be greater than min value",
-    );
-
-    propPane.UpdatePropertyFieldValue("Max. value", "");
-
-    agHelper.VerifyEvaluatedErrorMessage("This value is required");
-
-    propPane.UpdatePropertyFieldValue("Max. value", "asd");
-
-    agHelper.VerifyEvaluatedErrorMessage("This value must be a number");
-
-    // Allows decimal value
-    propPane.UpdatePropertyFieldValue("Max. value", "100.5");
-    // Updating step size to verify Max value
-    propPane.UpdatePropertyFieldValue("Step size", "90");
-    // Verify decimal value
-    agHelper
-      .GetElement(locators._sliderThumb)
-      .eq(1)
-      .focus()
-      .type("{rightArrow}");
-    agHelper.Sleep(3000);
-    agHelper
-      .GetText(getWidgetSelector(draggableWidgets.TEXT), "text", 0)
-      .then(($label) => {
-        expect($label).to.eq("100.5");
+      // Events Section properties
+      eventsProperties.forEach((eventsProperty) => {
+        agHelper.AssertElementVisibility(
+          propPane._propertyPanePropertyControl("events", `${eventsProperty}`),
+        );
       });
+      // Style Section properties
+      propPane.MoveToTab("Style");
+      propPane._propertyControl("size");
+      agHelper.AssertElementVisibility(
+        propPane._propertyPanePropertyControl("color", "fillcolor"),
+      );
 
-    // Does not allow value less than min value
-    propPane.UpdatePropertyFieldValue("Max. value", "-20");
-    agHelper.VerifyEvaluatedErrorMessage(
-      "This value must be greater than min value",
-    );
-
-    // Accepts negative value
-    propPane.UpdatePropertyFieldValue("Min. value", "-50");
-    agHelper.AssertElementAbsence(locators._evaluatedErrorMessage);
-    propPane.UpdatePropertyFieldValue("Max. value", "-30");
-    agHelper.AssertElementAbsence(locators._evaluatedErrorMessage);
-
-    agHelper
-      .GetElement(locators._sliderThumb)
-      .eq(1)
-      .focus()
-      .type("{rightArrow}{rightArrow}{rightArrow}");
-    agHelper
-      .GetText(getWidgetSelector(draggableWidgets.TEXT), "text", 0)
-      .then(($label) => {
-        expect($label).to.eq("-30");
-      });
+      propPane.MoveToTab("Content");
+      // Verify default value
+      propPane
+        .EvaluateExistingPropertyFieldValue("Min. value")
+        .then((val: any) => {
+          expect(val).to.eq("0");
+        });
+      propPane
+        .EvaluateExistingPropertyFieldValue("Max. value")
+        .then((val: any) => {
+          expect(val).to.eq("100");
+        });
+      propPane
+        .EvaluateExistingPropertyFieldValue("Step size")
+        .then((val: any) => {
+          expect(val).to.eq("1");
+        });
+      propPane
+        .EvaluateExistingPropertyFieldValue("Min. range")
+        .then((val: any) => {
+          expect(val).to.eq("5");
+        });
+    });
 
-    // Verify in Preview mode negative value
-    agHelper.GetNClick(locators._enterPreviewMode);
-    agHelper
-      .GetElement(locators._sliderThumb)
-      .eq(1)
-      .focus()
-      .type("{rightArrow}");
-    agHelper.Sleep(2000);
-    agHelper
-      .GetText(getWidgetSelector(draggableWidgets.TEXT), "text", 0)
-      .then(($label) => {
-        expect($label).to.eq("-30");
-      });
-    agHelper.GetNClick(locators._exitPreviewMode);
-
-    // Verify in Deploy mode negative value
-    deployMode.DeployApp();
-    agHelper
-      .GetElement(locators._sliderThumb)
-      .eq(1)
-      .focus()
-      .type("{rightArrow}");
-    agHelper.Sleep(3000);
-    agHelper
-      .GetText(getWidgetSelector(draggableWidgets.TEXT), "text", 0)
-      .then(($label) => {
-        expect($label).to.eq("-30");
-      });
-    deployMode.NavigateBacktoEditor();
-  });
+    it("2. Validate accepted and unaccepted 'Min. value' values", () => {
+      propPane.UpdatePropertyFieldValue("Min. value", "110");
+
+      agHelper.VerifyEvaluatedErrorMessage(
+        "This value must be less than max value",
+      );
 
-  it("4. Validate accepted and unaccepted 'Step size' values", () => {
-    EditorNavigation.SelectEntityByName("RangeSlider1", EntityType.Widget);
-    propPane.UpdatePropertyFieldValue("Min. range", "5");
-    propPane.UpdatePropertyFieldValue("Step size", "10");
+      propPane.UpdatePropertyFieldValue("Min. value", "");
+
+      agHelper.VerifyEvaluatedErrorMessage("This value is required");
+
+      propPane.UpdatePropertyFieldValue("Min. value", "zero");
+
+      agHelper.VerifyEvaluatedErrorMessage("This value must be a number");
+
+      propPane.UpdatePropertyFieldValue("Min. range", "10");
+      propPane.UpdatePropertyFieldValue("Step size", "10");
+      propPane.UpdatePropertyFieldValue("Min. value", "-10");
+      agHelper.AssertElementAbsence(locators._evaluatedErrorMessage);
+
+      // Verify in Preview mode negative value
+      agHelper.GetNClick(locators._enterPreviewMode);
+      agHelper
+        .GetElement(locators._sliderThumb)
+        .eq(0)
+        .focus()
+        .type("{leftArrow}")
+        .type("{leftArrow}")
+        .type("{leftArrow}");
+      agHelper.Sleep(3000);
+      agHelper
+        .GetText(getWidgetSelector(draggableWidgets.TEXT), "text", 1)
+        .then(($label) => {
+          expect($label).to.eq("-10");
+        });
+      agHelper.GetNClick(locators._exitPreviewMode);
+
+      // Verify in Deploy mode negative value
+      deployMode.DeployApp();
+      agHelper
+        .GetElement(locators._sliderThumb)
+        .eq(0)
+        .focus()
+        .type("{leftArrow}")
+        .type("{leftArrow}");
+      agHelper.Sleep(3000);
+      agHelper
+        .GetText(getWidgetSelector(draggableWidgets.TEXT), "text", 1)
+        .then(($label) => {
+          expect($label).to.eq("-10");
+        });
+      deployMode.NavigateBacktoEditor();
+
+      // Allows decimal value
+      EditorNavigation.SelectEntityByName("RangeSlider1", EntityType.Widget);
+      propPane.UpdatePropertyFieldValue("Min. value", "10.5");
+
+      // Verify Decimal value
+      agHelper
+        .GetElement(locators._sliderThumb)
+        .eq(0)
+        .focus()
+        .type("{leftArrow}");
+      agHelper.Sleep(3000);
+      agHelper
+        .GetText(getWidgetSelector(draggableWidgets.TEXT), "text", 1)
+        .then(($label) => {
+          expect($label).to.eq("10.5");
+        });
+      // Does not allow value greater than Max value
+      propPane.UpdatePropertyFieldValue("Min. value", "110");
+      agHelper.VerifyEvaluatedErrorMessage(
+        "This value must be less than max value",
+      );
+      // Updating to allowed value
+      propPane.UpdatePropertyFieldValue("Min. value", "10");
+      agHelper.AssertElementAbsence(locators._evaluatedErrorMessage);
+    });
 
-    agHelper.VerifyEvaluatedErrorMessage(
-      "This value must be less than or equal to minRange",
-    );
+    it("3. Validate accepted and unaccepted 'Max. value' values", () => {
+      propPane.UpdatePropertyFieldValue("Max. value", "0");
 
-    propPane.UpdatePropertyFieldValue("Step size", "");
+      agHelper.VerifyEvaluatedErrorMessage(
+        "This value must be greater than min value",
+      );
 
-    agHelper.VerifyEvaluatedErrorMessage("This value is required");
+      propPane.UpdatePropertyFieldValue("Max. value", "");
+
+      agHelper.VerifyEvaluatedErrorMessage("This value is required");
+
+      propPane.UpdatePropertyFieldValue("Max. value", "asd");
+
+      agHelper.VerifyEvaluatedErrorMessage("This value must be a number");
+
+      // Allows decimal value
+      propPane.UpdatePropertyFieldValue("Max. value", "100.5");
+      // Updating step size to verify Max value
+      propPane.UpdatePropertyFieldValue("Step size", "90");
+      // Verify decimal value
+      agHelper
+        .GetElement(locators._sliderThumb)
+        .eq(1)
+        .focus()
+        .type("{rightArrow}");
+      agHelper.Sleep(3000);
+      agHelper
+        .GetText(getWidgetSelector(draggableWidgets.TEXT), "text", 0)
+        .then(($label) => {
+          expect($label).to.eq("100.5");
+        });
+
+      // Does not allow value less than min value
+      propPane.UpdatePropertyFieldValue("Max. value", "-20");
+      agHelper.VerifyEvaluatedErrorMessage(
+        "This value must be greater than min value",
+      );
 
-    propPane.UpdatePropertyFieldValue("Step size", "asd");
+      // Accepts negative value
+      propPane.UpdatePropertyFieldValue("Min. value", "-50");
+      agHelper.AssertElementAbsence(locators._evaluatedErrorMessage);
+      propPane.UpdatePropertyFieldValue("Max. value", "-30");
+      agHelper.AssertElementAbsence(locators._evaluatedErrorMessage);
+
+      agHelper
+        .GetElement(locators._sliderThumb)
+        .eq(1)
+        .focus()
+        .type("{rightArrow}{rightArrow}{rightArrow}");
+      agHelper
+        .GetText(getWidgetSelector(draggableWidgets.TEXT), "text", 0)
+        .then(($label) => {
+          expect($label).to.eq("-30");
+        });
+
+      // Verify in Preview mode negative value
+      agHelper.GetNClick(locators._enterPreviewMode);
+      agHelper
+        .GetElement(locators._sliderThumb)
+        .eq(1)
+        .focus()
+        .type("{rightArrow}");
+      agHelper.Sleep(2000);
+      agHelper
+        .GetText(getWidgetSelector(draggableWidgets.TEXT), "text", 0)
+        .then(($label) => {
+          expect($label).to.eq("-30");
+        });
+      agHelper.GetNClick(locators._exitPreviewMode);
+
+      // Verify in Deploy mode negative value
+      deployMode.DeployApp();
+      agHelper
+        .GetElement(locators._sliderThumb)
+        .eq(1)
+        .focus()
+        .type("{rightArrow}");
+      agHelper.Sleep(3000);
+      agHelper
+        .GetText(getWidgetSelector(draggableWidgets.TEXT), "text", 0)
+        .then(($label) => {
+          expect($label).to.eq("-30");
+        });
+      deployMode.NavigateBacktoEditor();
+    });
 
-    agHelper.VerifyEvaluatedErrorMessage("This value must be a number");
+    it("4. Validate accepted and unaccepted 'Step size' values", () => {
+      EditorNavigation.SelectEntityByName("RangeSlider1", EntityType.Widget);
+      propPane.UpdatePropertyFieldValue("Min. range", "5");
+      propPane.UpdatePropertyFieldValue("Step size", "10");
 
-    // Does not allow value less than 0.1
-    EditorNavigation.SelectEntityByName("RangeSlider1", EntityType.Widget);
-    propPane.UpdatePropertyFieldValue("Step size", "0");
-    agHelper.VerifyEvaluatedErrorMessage("This value must be greater than 0.1");
-    // Does not allow negative value
-    propPane.UpdatePropertyFieldValue("Step size", "-10");
-    agHelper.VerifyEvaluatedErrorMessage("This value must be greater than 0.1");
-    propPane.UpdatePropertyFieldValue("Step size", "5");
-    // Does not allow value greater than max value
-    propPane.UpdatePropertyFieldValue("Max. value", "100");
-    agHelper.AssertElementAbsence(locators._evaluatedErrorMessage);
-    propPane.UpdatePropertyFieldValue("Min. value", "10");
-    agHelper.AssertElementAbsence(locators._evaluatedErrorMessage);
-    propPane.UpdatePropertyFieldValue("Step size", "110");
-    agHelper.VerifyEvaluatedErrorMessage("This value must be less than 90");
+      agHelper.VerifyEvaluatedErrorMessage(
+        "This value must be less than or equal to minRange",
+      );
 
-    // Updating to allowed value
-    propPane.UpdatePropertyFieldValue("Step size", "5");
-    agHelper.AssertElementAbsence(locators._evaluatedErrorMessage);
-  });
+      propPane.UpdatePropertyFieldValue("Step size", "");
 
-  it("5. Validate accepted and unaccepted 'Min Range' values", () => {
-    propPane.UpdatePropertyFieldValue("Min. range", "0");
+      agHelper.VerifyEvaluatedErrorMessage("This value is required");
 
-    agHelper.VerifyEvaluatedErrorMessage("This value must be greater than 0.1");
+      propPane.UpdatePropertyFieldValue("Step size", "asd");
 
-    propPane.UpdatePropertyFieldValue("Min. range", "-10");
+      agHelper.VerifyEvaluatedErrorMessage("This value must be a number");
 
-    agHelper.VerifyEvaluatedErrorMessage("This value must be greater than 0.1");
+      // Does not allow value less than 0.1
+      EditorNavigation.SelectEntityByName("RangeSlider1", EntityType.Widget);
+      propPane.UpdatePropertyFieldValue("Step size", "0");
+      agHelper.VerifyEvaluatedErrorMessage(
+        "This value must be greater than 0.1",
+      );
+      // Does not allow negative value
+      propPane.UpdatePropertyFieldValue("Step size", "-10");
+      agHelper.VerifyEvaluatedErrorMessage(
+        "This value must be greater than 0.1",
+      );
+      propPane.UpdatePropertyFieldValue("Step size", "5");
+      // Does not allow value greater than max value
+      propPane.UpdatePropertyFieldValue("Max. value", "100");
+      agHelper.AssertElementAbsence(locators._evaluatedErrorMessage);
+      propPane.UpdatePropertyFieldValue("Min. value", "10");
+      agHelper.AssertElementAbsence(locators._evaluatedErrorMessage);
+      propPane.UpdatePropertyFieldValue("Step size", "110");
+      agHelper.VerifyEvaluatedErrorMessage("This value must be less than 90");
+
+      // Updating to allowed value
+      propPane.UpdatePropertyFieldValue("Step size", "5");
+      agHelper.AssertElementAbsence(locators._evaluatedErrorMessage);
+    });
 
-    propPane.UpdatePropertyFieldValue("Min. range", "asd");
+    it("5. Validate accepted and unaccepted 'Min Range' values", () => {
+      propPane.UpdatePropertyFieldValue("Min. range", "0");
 
-    agHelper.VerifyEvaluatedErrorMessage("This value must be a number");
+      agHelper.VerifyEvaluatedErrorMessage(
+        "This value must be greater than 0.1",
+      );
 
-    propPane.UpdatePropertyFieldValue("Min. range", "110");
+      propPane.UpdatePropertyFieldValue("Min. range", "-10");
 
-    agHelper.VerifyEvaluatedErrorMessage("This value must be less than 90");
+      agHelper.VerifyEvaluatedErrorMessage(
+        "This value must be greater than 0.1",
+      );
 
-    // Does not accept value less than step size
-    propPane.UpdatePropertyFieldValue("Min. range", "2");
-    agHelper.VerifyEvaluatedErrorMessage(
-      "This value must be greater than or equal to step size",
-    );
+      propPane.UpdatePropertyFieldValue("Min. range", "asd");
 
-    // Updating to allowed value
-    propPane.UpdatePropertyFieldValue("Min. range", "5");
-    agHelper.AssertElementAbsence(locators._evaluatedErrorMessage);
-  });
+      agHelper.VerifyEvaluatedErrorMessage("This value must be a number");
 
-  it("6. Validate accepted and unaccepted 'Default start' value", () => {
-    propPane.UpdatePropertyFieldValue("Default start value", "-100");
+      propPane.UpdatePropertyFieldValue("Min. range", "110");
 
-    agHelper.VerifyEvaluatedErrorMessage(
-      "This value must be greater than or equal to the min value",
-    );
+      agHelper.VerifyEvaluatedErrorMessage("This value must be less than 90");
 
-    propPane.UpdatePropertyFieldValue("Default end value", "100");
-    propPane.UpdatePropertyFieldValue("Default start value", "110");
+      // Does not accept value less than step size
+      propPane.UpdatePropertyFieldValue("Min. range", "2");
+      agHelper.VerifyEvaluatedErrorMessage(
+        "This value must be greater than or equal to step size",
+      );
 
-    agHelper.VerifyEvaluatedErrorMessage(
-      "This value must be less than defaultEnd value",
-    );
+      // Updating to allowed value
+      propPane.UpdatePropertyFieldValue("Min. range", "5");
+      agHelper.AssertElementAbsence(locators._evaluatedErrorMessage);
+    });
 
-    propPane.UpdatePropertyFieldValue("Default start value", "asd");
+    it("6. Validate accepted and unaccepted 'Default start' value", () => {
+      propPane.UpdatePropertyFieldValue("Default start value", "-100");
 
-    agHelper.VerifyEvaluatedErrorMessage("This value must be a number");
+      agHelper.VerifyEvaluatedErrorMessage(
+        "This value must be greater than or equal to the min value",
+      );
 
-    propPane.UpdatePropertyFieldValue("Default start value", "10");
-    agHelper.AssertElementAbsence(locators._evaluatedErrorMessage);
+      propPane.UpdatePropertyFieldValue("Default end value", "100");
+      propPane.UpdatePropertyFieldValue("Default start value", "110");
 
-    //Validate accepted and unaccepted 'Default end' value
-    propPane.UpdatePropertyFieldValue("Default end value", "-10");
+      agHelper.VerifyEvaluatedErrorMessage(
+        "This value must be less than defaultEnd value",
+      );
 
-    agHelper.VerifyEvaluatedErrorMessage(
-      "This value must be greater than defaultStart value",
-    );
+      propPane.UpdatePropertyFieldValue("Default start value", "asd");
 
-    propPane.UpdatePropertyFieldValue("Default end value", "110");
+      agHelper.VerifyEvaluatedErrorMessage("This value must be a number");
 
-    agHelper.VerifyEvaluatedErrorMessage(
-      "This value must be less than or equal to the max value",
-    );
+      propPane.UpdatePropertyFieldValue("Default start value", "10");
+      agHelper.AssertElementAbsence(locators._evaluatedErrorMessage);
 
-    propPane.UpdatePropertyFieldValue("Default end value", "asd");
+      //Validate accepted and unaccepted 'Default end' value
+      propPane.UpdatePropertyFieldValue("Default end value", "-10");
 
-    agHelper.VerifyEvaluatedErrorMessage("This value must be a number");
+      agHelper.VerifyEvaluatedErrorMessage(
+        "This value must be greater than defaultStart value",
+      );
 
-    propPane.UpdatePropertyFieldValue("Default end value", "100");
-    agHelper.AssertElementAbsence(locators._evaluatedErrorMessage);
-  });
+      propPane.UpdatePropertyFieldValue("Default end value", "110");
 
-  it("7. Change Step size and check if binding value changes", () => {
-    // Assert Text widget has value 10
-    agHelper
-      .GetText(getWidgetSelector(draggableWidgets.TEXT), "text", 1)
-      .then(($label) => {
-        expect($label).to.eq("10");
-      });
+      agHelper.VerifyEvaluatedErrorMessage(
+        "This value must be less than or equal to the max value",
+      );
 
-    agHelper
-      .GetText(getWidgetSelector(draggableWidgets.TEXT), "text", 0)
-      .then(($label) => {
-        expect($label).to.eq("100");
-      });
+      propPane.UpdatePropertyFieldValue("Default end value", "asd");
 
-    // Change the Step size to 10
-    propPane.UpdatePropertyFieldValue("Min. range", "10", true, false);
-    propPane.UpdatePropertyFieldValue("Step size", "10", true, false);
-
-    agHelper
-      .GetElement(locators._sliderThumb)
-      .eq(0)
-      .focus()
-      .type("{rightArrow}")
-      .wait(2000);
-
-    // Assert the Text widget has value 20
-    agHelper
-      .GetText(getWidgetSelector(draggableWidgets.TEXT), "text", 1)
-      .then(($label) => {
-        expect($label).to.eq("20");
-      });
+      agHelper.VerifyEvaluatedErrorMessage("This value must be a number");
 
-    // Change the slider value
-    agHelper
-      .GetElement(locators._sliderThumb)
-      .eq(1)
-      .focus()
-      .type("{leftArrow}")
-      .type("{leftArrow}");
+      propPane.UpdatePropertyFieldValue("Default end value", "100");
+      agHelper.AssertElementAbsence(locators._evaluatedErrorMessage);
+    });
 
-    agHelper.Sleep(2000);
+    it("7. Change Step size and check if binding value changes", () => {
+      // Assert Text widget has value 10
+      agHelper
+        .GetText(getWidgetSelector(draggableWidgets.TEXT), "text", 1)
+        .then(($label) => {
+          expect($label).to.eq("10");
+        });
+
+      agHelper
+        .GetText(getWidgetSelector(draggableWidgets.TEXT), "text", 0)
+        .then(($label) => {
+          expect($label).to.eq("100");
+        });
+
+      // Change the Step size to 10
+      propPane.UpdatePropertyFieldValue("Min. range", "10", true, false);
+      propPane.UpdatePropertyFieldValue("Step size", "10", true, false);
+
+      agHelper
+        .GetElement(locators._sliderThumb)
+        .eq(0)
+        .focus()
+        .type("{rightArrow}")
+        .wait(2000);
+
+      // Assert the Text widget has value 20
+      agHelper
+        .GetText(getWidgetSelector(draggableWidgets.TEXT), "text", 1)
+        .then(($label) => {
+          expect($label).to.eq("20");
+        });
+
+      // Change the slider value
+      agHelper
+        .GetElement(locators._sliderThumb)
+        .eq(1)
+        .focus()
+        .type("{leftArrow}")
+        .type("{leftArrow}");
+
+      agHelper.Sleep(2000);
+
+      agHelper
+        .GetText(getWidgetSelector(draggableWidgets.TEXT), "text", 0)
+        .then(($label) => {
+          expect($label).to.eq("80");
+        });
+    });
 
-    agHelper
-      .GetText(getWidgetSelector(draggableWidgets.TEXT), "text", 0)
-      .then(($label) => {
-        expect($label).to.eq("80");
-      });
-  });
-
-  it("8. Verify Range slider visibility in explorer", () => {
-    PageLeftPane.switchSegment(PagePaneSegment.UI);
-    PageLeftPane.switchToAddNew();
-    agHelper.ClearTextField(locators._entityExplorersearch);
-    agHelper.TypeText(locators._entityExplorersearch, "Range");
-    agHelper.AssertElementExist(locators._widgetPageIcon("rangesliderwidget"));
-    agHelper.ClearTextField(locators._entityExplorersearch);
-    agHelper.TypeText(locators._entityExplorersearch, "slider");
-    agHelper.AssertElementExist(locators._widgetPageIcon("rangesliderwidget"));
-  });
-});
+    it("8. Verify Range slider visibility in explorer", () => {
+      PageLeftPane.switchSegment(PagePaneSegment.UI);
+      PageLeftPane.switchToAddNew();
+      agHelper.ClearTextField(locators._entityExplorersearch);
+      agHelper.TypeText(locators._entityExplorersearch, "Range");
+      agHelper.AssertElementExist(
+        locators._widgetPageIcon("rangesliderwidget"),
+      );
+      agHelper.ClearTextField(locators._entityExplorersearch);
+      agHelper.TypeText(locators._entityExplorersearch, "slider");
+      agHelper.AssertElementExist(
+        locators._widgetPageIcon("rangesliderwidget"),
+      );
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Statbox/Statbox_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Statbox/Statbox_spec.ts
index 03046026784f..29b2902542bf 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Statbox/Statbox_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Statbox/Statbox_spec.ts
@@ -12,140 +12,148 @@ import EditorNavigation, {
   PagePaneSegment,
 } from "../../../../../support/Pages/EditorNavigation";
 
-describe("Statbox spec", { tags: ["@tag.Widget", "@tag.Statbox"] }, () => {
-  before(() => {
-    /**
-     * On the canvas we have a Statbox Widget
-     */
-    entityExplorer.DragDropWidgetNVerify(draggableWidgets.STATBOX, 329, 124);
-  });
+describe(
+  "Statbox spec",
+  { tags: ["@tag.Widget", "@tag.Statbox", "@tag.Binding"] },
+  () => {
+    before(() => {
+      /**
+       * On the canvas we have a Statbox Widget
+       */
+      entityExplorer.DragDropWidgetNVerify(draggableWidgets.STATBOX, 329, 124);
+    });
 
-  it("1. Validate all the respective properties are present on the Content and Style sections in the property pane", () => {
-    const generalProperties = ["visible", "animateloading", "height"];
+    it("1. Validate all the respective properties are present on the Content and Style sections in the property pane", () => {
+      const generalProperties = ["visible", "animateloading", "height"];
 
-    generalProperties.forEach((generalSectionProperty) => {
-      agHelper.AssertElementVisibility(
-        propPane._propertyPanePropertyControl(
-          "general",
-          `${generalSectionProperty}`,
-        ),
-      );
-    });
+      generalProperties.forEach((generalSectionProperty) => {
+        agHelper.AssertElementVisibility(
+          propPane._propertyPanePropertyControl(
+            "general",
+            `${generalSectionProperty}`,
+          ),
+        );
+      });
+
+      // Switch to the Style Tab
+      propPane.MoveToTab("Style");
 
-    // Switch to the Style Tab
-    propPane.MoveToTab("Style");
+      const colorProperties = ["backgroundcolor", "bordercolor"];
+      colorProperties.forEach((labelStyleSectionProperty) => {
+        agHelper.AssertElementVisibility(
+          propPane._propertyPanePropertyControl(
+            "color",
+            `${labelStyleSectionProperty}`,
+          ),
+        );
+      });
 
-    const colorProperties = ["backgroundcolor", "bordercolor"];
-    colorProperties.forEach((labelStyleSectionProperty) => {
+      const borderShadows = ["borderwidth", "borderradius", "boxshadow"];
+      borderShadows.forEach((borderShadowSectionProperty) => {
+        agHelper.AssertElementVisibility(
+          propPane._propertyPanePropertyControl(
+            "borderandshadow",
+            `${borderShadowSectionProperty}`,
+          ),
+        );
+      });
+    });
+    it("2. Validate if the default widgets are present inside the statbox", () => {
+      PageLeftPane.switchSegment(PagePaneSegment.UI);
+      PageLeftPane.assertPresence("Statbox1");
+      PageLeftPane.expandCollapseItem("Statbox1");
+      PageLeftPane.assertPresence("Text1");
+      PageLeftPane.assertPresence("Text2");
+      PageLeftPane.assertPresence("IconButton1");
+      PageLeftPane.assertPresence("Text3");
+    });
+    it("3. Validate visibility", () => {
+      EditorNavigation.SelectEntityByName("Statbox1", EntityType.Widget);
+      propPane.MoveToTab("Content");
+      propPane.TogglePropertyState("Visible", "Off");
+      // Ensure that the widget isnt visible once deployed
+      deployMode.DeployApp();
+      agHelper.AssertElementAbsence(locators._widgetInDeployed("statbox1"));
+      deployMode.NavigateBacktoEditor();
+      //Ensure that the widget is not visible in preview mode
+      agHelper.GetNClick(locators._enterPreviewMode);
+      agHelper.AssertElementAbsence(locators._widgetInDeployed("statbox1"));
+      agHelper.GetNClick(locators._exitPreviewMode);
+      EditorNavigation.SelectEntityByName("Statbox1", EntityType.Widget);
+      propPane.TogglePropertyState("Visible", "On");
+      //Ensure that the widget is visible once deployed
+      deployMode.DeployApp();
+      agHelper.AssertElementVisibility(
+        locators._widgetInDeployed("statbox1"),
+        true,
+      );
+      deployMode.NavigateBacktoEditor();
+      //Ensure that the widget is visible in preview mode
+      agHelper.GetNClick(locators._enterPreviewMode);
       agHelper.AssertElementVisibility(
-        propPane._propertyPanePropertyControl(
-          "color",
-          `${labelStyleSectionProperty}`,
-        ),
+        locators._widgetInDeployed("statbox1"),
+        true,
       );
+      agHelper.GetNClick(locators._exitPreviewMode);
     });
 
-    const borderShadows = ["borderwidth", "borderradius", "boxshadow"];
-    borderShadows.forEach((borderShadowSectionProperty) => {
+    it("4. Validate if widgets can be D&D inside the Statbox widget", () => {
+      PageLeftPane.switchSegment(PagePaneSegment.UI);
+      PageLeftPane.expandCollapseItem("Statbox1");
+      propPane.DeleteWidgetFromPropertyPane("IconButton1");
+      entityExplorer.DragDropWidgetNVerify(
+        draggableWidgets.ICONBUTTON,
+        260,
+        189,
+      );
+      //Verifying if the dropped widget exists in the container
+      PageLeftPane.switchSegment(PagePaneSegment.UI);
+      PageLeftPane.expandCollapseItem("Statbox1");
+      PageLeftPane.assertPresence("IconButton1");
+      //Verifying if the dropped widget exists once deployed
+      deployMode.DeployApp();
+      agHelper.AssertElementVisibility(
+        locators._widgetInDeployed("iconbutton1"),
+        true,
+      );
+      deployMode.NavigateBacktoEditor();
+      //Verifying if the dropped widget exists in preview mode
+      agHelper.GetNClick(locators._enterPreviewMode);
       agHelper.AssertElementVisibility(
-        propPane._propertyPanePropertyControl(
-          "borderandshadow",
-          `${borderShadowSectionProperty}`,
-        ),
+        locators._widgetInDeployed("iconbutton1"),
+        true,
       );
+      agHelper.GetNClick(locators._exitPreviewMode);
     });
-  });
-  it("2. Validate if the default widgets are present inside the statbox", () => {
-    PageLeftPane.switchSegment(PagePaneSegment.UI);
-    PageLeftPane.assertPresence("Statbox1");
-    PageLeftPane.expandCollapseItem("Statbox1");
-    PageLeftPane.assertPresence("Text1");
-    PageLeftPane.assertPresence("Text2");
-    PageLeftPane.assertPresence("IconButton1");
-    PageLeftPane.assertPresence("Text3");
-  });
-  it("3. Validate visibility", () => {
-    EditorNavigation.SelectEntityByName("Statbox1", EntityType.Widget);
-    propPane.MoveToTab("Content");
-    propPane.TogglePropertyState("Visible", "Off");
-    // Ensure that the widget isnt visible once deployed
-    deployMode.DeployApp();
-    agHelper.AssertElementAbsence(locators._widgetInDeployed("statbox1"));
-    deployMode.NavigateBacktoEditor();
-    //Ensure that the widget is not visible in preview mode
-    agHelper.GetNClick(locators._enterPreviewMode);
-    agHelper.AssertElementAbsence(locators._widgetInDeployed("statbox1"));
-    agHelper.GetNClick(locators._exitPreviewMode);
-    EditorNavigation.SelectEntityByName("Statbox1", EntityType.Widget);
-    propPane.TogglePropertyState("Visible", "On");
-    //Ensure that the widget is visible once deployed
-    deployMode.DeployApp();
-    agHelper.AssertElementVisibility(
-      locators._widgetInDeployed("statbox1"),
-      true,
-    );
-    deployMode.NavigateBacktoEditor();
-    //Ensure that the widget is visible in preview mode
-    agHelper.GetNClick(locators._enterPreviewMode);
-    agHelper.AssertElementVisibility(
-      locators._widgetInDeployed("statbox1"),
-      true,
-    );
-    agHelper.GetNClick(locators._exitPreviewMode);
-  });
-
-  it("4. Validate if widgets can be D&D inside the Statbox widget", () => {
-    PageLeftPane.switchSegment(PagePaneSegment.UI);
-    PageLeftPane.expandCollapseItem("Statbox1");
-    propPane.DeleteWidgetFromPropertyPane("IconButton1");
-    entityExplorer.DragDropWidgetNVerify(draggableWidgets.ICONBUTTON, 260, 189);
-    //Verifying if the dropped widget exists in the container
-    PageLeftPane.switchSegment(PagePaneSegment.UI);
-    PageLeftPane.expandCollapseItem("Statbox1");
-    PageLeftPane.assertPresence("IconButton1");
-    //Verifying if the dropped widget exists once deployed
-    deployMode.DeployApp();
-    agHelper.AssertElementVisibility(
-      locators._widgetInDeployed("iconbutton1"),
-      true,
-    );
-    deployMode.NavigateBacktoEditor();
-    //Verifying if the dropped widget exists in preview mode
-    agHelper.GetNClick(locators._enterPreviewMode);
-    agHelper.AssertElementVisibility(
-      locators._widgetInDeployed("iconbutton1"),
-      true,
-    );
-    agHelper.GetNClick(locators._exitPreviewMode);
-  });
 
-  it("5: Verify statbox widget styles", () => {
-    EditorNavigation.SelectEntityByName("Statbox1", EntityType.Widget);
-    //Switch to Style tab
-    propPane.MoveToTab("Style");
-    propPane.EnterJSContext("Background color", "#f3e8ff");
-    propPane.EnterJSContext("Border color", "#be185d");
-    // Click on Deploy and ensure it is deployed appropriately
-    deployMode.DeployApp();
-    // Ensure the Background Color is applied
-    agHelper.AssertCSS(
-      locators._statboxWidget,
-      "background-color",
-      "rgb(243, 232, 255)",
-    );
-    //Ensure that the border colour is applied
-    agHelper.AssertCSS(
-      locators._statboxWidget,
-      "border-color",
-      "rgb(205, 213, 223)",
-    );
-    deployMode.NavigateBacktoEditor();
-  });
+    it("5: Verify statbox widget styles", () => {
+      EditorNavigation.SelectEntityByName("Statbox1", EntityType.Widget);
+      //Switch to Style tab
+      propPane.MoveToTab("Style");
+      propPane.EnterJSContext("Background color", "#f3e8ff");
+      propPane.EnterJSContext("Border color", "#be185d");
+      // Click on Deploy and ensure it is deployed appropriately
+      deployMode.DeployApp();
+      // Ensure the Background Color is applied
+      agHelper.AssertCSS(
+        locators._statboxWidget,
+        "background-color",
+        "rgb(243, 232, 255)",
+      );
+      //Ensure that the border colour is applied
+      agHelper.AssertCSS(
+        locators._statboxWidget,
+        "border-color",
+        "rgb(205, 213, 223)",
+      );
+      deployMode.NavigateBacktoEditor();
+    });
 
-  it("6. Rename, copy-paste and delete the widget", () => {
-    EditorNavigation.SelectEntityByName("Statbox1", EntityType.Widget);
-    entityExplorer.RenameEntityFromExplorer("Statbox1", "Stats", true);
-    propPane.CopyPasteWidgetFromPropertyPane("Stats");
-    entityExplorer.DeleteWidgetFromEntityExplorer("Stats");
-  });
-});
+    it("6. Rename, copy-paste and delete the widget", () => {
+      EditorNavigation.SelectEntityByName("Statbox1", EntityType.Widget);
+      entityExplorer.RenameEntityFromExplorer("Statbox1", "Stats", true);
+      propPane.CopyPasteWidgetFromPropertyPane("Stats");
+      entityExplorer.DeleteWidgetFromEntityExplorer("Stats");
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Switch/Switch2_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Switch/Switch2_spec.ts
index 8effb0f12ed6..50429c7df6c7 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Switch/Switch2_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Switch/Switch2_spec.ts
@@ -16,7 +16,7 @@ import EditorNavigation, {
 
 describe(
   "Switch widget testcases",
-  { tags: ["@tag.Widget", "@tag.Switch"] },
+  { tags: ["@tag.Widget", "@tag.Switch", "@tag.Binding"] },
   () => {
     const jsonData = `[
         {
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Switch/SwitchGroup1_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Switch/SwitchGroup1_spec.ts
index 2e965258b01f..c1304c05669a 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Switch/SwitchGroup1_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Switch/SwitchGroup1_spec.ts
@@ -21,7 +21,7 @@ import EditorNavigation, {
 
 describe(
   "Switchgroup Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Switch"] },
+  { tags: ["@tag.Widget", "@tag.Switch", "@tag.Binding"] },
   function () {
     /**
      * Adding switch group, checkbox group and text widgets
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Switch/SwitchGroup2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Switch/SwitchGroup2_spec.js
index 0d8c730d46b4..8cb895a36377 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Switch/SwitchGroup2_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Switch/SwitchGroup2_spec.js
@@ -4,7 +4,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Switch Group Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Switch"] },
+  { tags: ["@tag.Widget", "@tag.Switch", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("SwitchGroupWidgetDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Switch/Switch_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Switch/Switch_spec.js
index e15d11407d2d..30b890e77051 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Switch/Switch_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Switch/Switch_spec.js
@@ -6,7 +6,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Switch Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Switch"] },
+  { tags: ["@tag.Widget", "@tag.Switch", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("newFormDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Tab/Tab_Duplicate_TabName_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Tab/Tab_Duplicate_TabName_spec.js
index 658dfb75c7aa..6aa3a264bf08 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Tab/Tab_Duplicate_TabName_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Tab/Tab_Duplicate_TabName_spec.js
@@ -2,7 +2,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Tab widget test duplicate tab name validation",
-  { tags: ["@tag.Widget", "@tag.Tab"] },
+  { tags: ["@tag.Widget", "@tag.Tab", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("tabsWidgetDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Tab/Tab_OnEvent_Navigation_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Tab/Tab_OnEvent_Navigation_spec.js
index 62412658e7ba..5ebdfc168845 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Tab/Tab_OnEvent_Navigation_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Tab/Tab_OnEvent_Navigation_spec.js
@@ -2,7 +2,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Tabs widget on change of selection navigation usecases",
-  { tags: ["@tag.Widget", "@tag.Tab"] },
+  { tags: ["@tag.Widget", "@tag.Tab", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("tabsWidgetReset");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Tab/Tab_new_scenario_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Tab/Tab_new_scenario_spec.js
index 0518c7bd9485..f67c636c4059 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Tab/Tab_new_scenario_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Tab/Tab_new_scenario_spec.js
@@ -3,34 +3,38 @@ const publish = require("../../../../../locators/publishWidgetspage.json");
 const widgetsPage = require("../../../../../locators/Widgets.json");
 import * as _ from "../../../../../support/Objects/ObjectsCore";
 
-describe("Tab widget test", { tags: ["@tag.Widget", "@tag.Tab"] }, function () {
-  before(() => {
-    _.agHelper.AddDsl("tabsWithWidgetDsl");
-  });
-  it("Tab Widget Functionality Test with Modal on change of selected tab", function () {
-    cy.openPropertyPane("tabswidget");
-    cy.widgetText("tab", Layoutpage.tabWidget, widgetsPage.widgetNameSpan);
-    cy.AddActionWithModal();
-    cy.get(".t--draggable-buttonwidget:contains('Close')").click({
-      force: true,
+describe(
+  "Tab widget test",
+  { tags: ["@tag.Widget", "@tag.Tab", "@tag.Binding"] },
+  function () {
+    before(() => {
+      _.agHelper.AddDsl("tabsWithWidgetDsl");
+    });
+    it("Tab Widget Functionality Test with Modal on change of selected tab", function () {
+      cy.openPropertyPane("tabswidget");
+      cy.widgetText("tab", Layoutpage.tabWidget, widgetsPage.widgetNameSpan);
+      cy.AddActionWithModal();
+      cy.get(".t--draggable-buttonwidget:contains('Close')").click({
+        force: true,
+      });
     });
-  });
 
-  it("Publish the app and validate the widgets displayed under each tab", function () {
-    _.deployMode.DeployApp();
-    cy.get(publish.buttonWidget).should("be.visible");
-    cy.get(publish.textWidget).should("be.visible");
-    cy.get(publish.datePickerNew).should("be.visible");
-    cy.wait(3000);
-    cy.get(publish.tab).contains("Tab 2").click({ force: true });
-    cy.get(publish.checkboxWidget).should("be.visible");
-    cy.get(publish.radioWidget).should("be.visible");
+    it("Publish the app and validate the widgets displayed under each tab", function () {
+      _.deployMode.DeployApp();
+      cy.get(publish.buttonWidget).should("be.visible");
+      cy.get(publish.textWidget).should("be.visible");
+      cy.get(publish.datePickerNew).should("be.visible");
+      cy.wait(3000);
+      cy.get(publish.tab).contains("Tab 2").click({ force: true });
+      cy.get(publish.checkboxWidget).should("be.visible");
+      cy.get(publish.radioWidget).should("be.visible");
 
-    cy.get(publish.buttonWidget).contains("Confirm").click({
-      force: true,
+      cy.get(publish.buttonWidget).contains("Confirm").click({
+        force: true,
+      });
     });
-  });
-});
+  },
+);
 afterEach(() => {
   // put your clean up code if any
 });
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Tab/Tabs_2_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Tab/Tabs_2_spec.ts
index 583a205e54dc..ae871b77beb0 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Tab/Tabs_2_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Tab/Tabs_2_spec.ts
@@ -15,7 +15,7 @@ import EditorNavigation, {
 
 describe(
   "Tabs widget Tests",
-  { tags: ["@tag.Widget", "@tag.Tab"] },
+  { tags: ["@tag.Widget", "@tag.Tab", "@tag.Binding"] },
   function () {
     before(() => {
       agHelper.AddDsl("tabsDsl");
@@ -189,7 +189,7 @@ describe(
     });
 
     // to work on redesign of the test, commenting for now
-    it.skip("7. Verify colors, borders and shadows", () => {
+    it("7. Verify colors, borders and shadows", () => {
       // Verify font color picker opens up
       propPane.MoveToTab("Style");
       agHelper.GetNClick(propPane._propertyControlColorPicker("accentcolor"));
@@ -220,11 +220,16 @@ describe(
       // Border Color
       propPane.SelectColorFromColorPicker("bordercolor", 13);
       assertHelper.AssertNetworkStatus("@updateLayout");
-      agHelper.AssertCSS(
-        tabs._tabsWidgetStyle,
-        "border-color",
-        "rgb(185, 28, 28)",
-      );
+
+      agHelper
+        .GetWidgetCSSFrAttribute(propPane._borderColorCursor, "color")
+        .then((color) => {
+          agHelper
+            .GetWidgetCSSFrAttribute(locators._widgetBorder, "color", 1)
+            .then((bgcolor) => {
+              expect(color).to.eq(bgcolor);
+            });
+        });
 
       agHelper.AssertAttribute(propPane._colorPickerInput, "type", "text", 2);
       propPane.TogglePropertyState("bordercolor", "On", "");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Tab/Widget_Tab_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Tab/Widget_Tab_spec.js
index 3e3b5104e5ea..4a500f29d214 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Tab/Widget_Tab_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Tab/Widget_Tab_spec.js
@@ -8,99 +8,102 @@ import {
   propPane,
 } from "../../../../../support/Objects/ObjectsCore";
 
-describe("Tab widget test", { tags: ["@tag.Widget", "@tag.Tab"] }, function () {
-  before(() => {
-    agHelper.AddDsl("layoutdsl");
-  });
-  it("1. Tab Widget Functionality Test", function () {
-    cy.openPropertyPane("tabswidget");
-    /**
-     * @param{Text} Random Text
-     * @param{TabWidget}Mouseover
-     * @param{TabPre Css} Assertion
-     */
-    cy.widgetText("tab", Layoutpage.tabWidget, widgetsPage.widgetNameSpan);
-    /**
-     * @param{IndexValue} Provide input Index Value
-     * @param{Text} Provide Index Text Value
-     */
-    cy.tabVerify(0, "Aditya");
-    cy.tabVerify(1, "test");
-    //Default  tab selection and validation
-    cy.testJsontext("defaulttab", "test");
-    cy.get(Layoutpage.tabWidget)
-      .contains("test")
-      .click({ force: true })
-      .should("be.visible");
-    cy.get(Layoutpage.tabButton).last().click({ force: true });
-    // eslint-disable-next-line cypress/no-unnecessary-waiting
-    cy.tabVerify(1, "Day");
-    cy.xpath(Layoutpage.deleteTab.replace("tabName", "Day")).click({
-      force: true,
+describe(
+  "Tab widget test",
+  { tags: ["@tag.Widget", "@tag.Tab", "@tag.Binding"] },
+  function () {
+    before(() => {
+      agHelper.AddDsl("layoutdsl");
+    });
+    it("1. Tab Widget Functionality Test", function () {
+      cy.openPropertyPane("tabswidget");
+      /**
+       * @param{Text} Random Text
+       * @param{TabWidget}Mouseover
+       * @param{TabPre Css} Assertion
+       */
+      cy.widgetText("tab", Layoutpage.tabWidget, widgetsPage.widgetNameSpan);
+      /**
+       * @param{IndexValue} Provide input Index Value
+       * @param{Text} Provide Index Text Value
+       */
+      cy.tabVerify(0, "Aditya");
+      cy.tabVerify(1, "test");
+      //Default  tab selection and validation
+      cy.testJsontext("defaulttab", "test");
+      cy.get(Layoutpage.tabWidget)
+        .contains("test")
+        .click({ force: true })
+        .should("be.visible");
+      cy.get(Layoutpage.tabButton).last().click({ force: true });
+      // eslint-disable-next-line cypress/no-unnecessary-waiting
+      cy.tabVerify(1, "Day");
+      cy.xpath(Layoutpage.deleteTab.replace("tabName", "Day")).click({
+        force: true,
+      });
+      cy.get(Layoutpage.tabWidget).contains("Day").should("not.exist");
+      // eslint-disable-next-line cypress/no-unnecessary-waiting
+      cy.wait(500);
+      /**
+       * @param{toggleButton Css} Assert to be checked
+       */
+      agHelper.CheckUncheck(widgetsPage.Scrollbutton);
+      cy.get(Layoutpage.tabContainer)
+        .scrollIntoView({ easing: "linear" })
+        .should("be.visible");
+      agHelper.AssertAutoSave();
+      deployMode.DeployApp();
     });
-    cy.get(Layoutpage.tabWidget).contains("Day").should("not.exist");
-    // eslint-disable-next-line cypress/no-unnecessary-waiting
-    cy.wait(500);
-    /**
-     * @param{toggleButton Css} Assert to be checked
-     */
-    agHelper.CheckUncheck(widgetsPage.Scrollbutton);
-    cy.get(Layoutpage.tabContainer)
-      .scrollIntoView({ easing: "linear" })
-      .should("be.visible");
-    agHelper.AssertAutoSave();
-    deployMode.DeployApp();
-  });
 
-  it("2. Tab Widget Functionality To Select Tabs", function () {
-    cy.get(publish.tabWidget)
-      .contains(this.dataSet.tabName)
-      .last()
-      .click({ force: true })
-      .should("have.class", "is-selected");
-    deployMode.NavigateBacktoEditor();
-  });
+    it("2. Tab Widget Functionality To Select Tabs", function () {
+      cy.get(publish.tabWidget)
+        .contains(this.dataSet.tabName)
+        .last()
+        .click({ force: true })
+        .should("have.class", "is-selected");
+      deployMode.NavigateBacktoEditor();
+    });
 
-  it("3. Tab Widget Functionality To Unchecked Visible Widget", function () {
-    cy.openPropertyPane("tabswidget");
-    agHelper.CheckUncheck(commonlocators.visibleCheckbox, false);
-    deployMode.DeployApp();
-    cy.get(publish.tabWidget).should("not.exist");
-    deployMode.NavigateBacktoEditor();
-  });
+    it("3. Tab Widget Functionality To Unchecked Visible Widget", function () {
+      cy.openPropertyPane("tabswidget");
+      agHelper.CheckUncheck(commonlocators.visibleCheckbox, false);
+      deployMode.DeployApp();
+      cy.get(publish.tabWidget).should("not.exist");
+      deployMode.NavigateBacktoEditor();
+    });
 
-  it("4. Tab Widget Functionality To Check Visible Widget", function () {
-    cy.openPropertyPane("tabswidget");
-    agHelper.CheckUncheck(commonlocators.visibleCheckbox);
-    deployMode.DeployApp();
-    cy.get(publish.tabWidget).should("be.visible");
-    deployMode.NavigateBacktoEditor();
-  });
+    it("4. Tab Widget Functionality To Check Visible Widget", function () {
+      cy.openPropertyPane("tabswidget");
+      agHelper.CheckUncheck(commonlocators.visibleCheckbox);
+      deployMode.DeployApp();
+      cy.get(publish.tabWidget).should("be.visible");
+      deployMode.NavigateBacktoEditor();
+    });
 
-  it("5. Tab Widget Functionality To Check tab invisiblity", function () {
-    cy.openPropertyPane("tabswidget");
-    cy.xpath(Layoutpage.tabEdit.replace("tabName", "Tab 1")).click({
-      force: true,
+    it("5. Tab Widget Functionality To Check tab invisiblity", function () {
+      cy.openPropertyPane("tabswidget");
+      cy.xpath(Layoutpage.tabEdit.replace("tabName", "Tab 1")).click({
+        force: true,
+      });
+      cy.get(Layoutpage.tabVisibility).first().click({ force: true });
+      cy.get(Layoutpage.tabWidget).contains("Tab 1").should("not.exist");
+      deployMode.DeployApp();
+      cy.get(publish.tabWidget).contains("Tab 1").should("not.exist");
+      deployMode.NavigateBacktoEditor();
     });
-    cy.get(Layoutpage.tabVisibility).first().click({ force: true });
-    cy.get(Layoutpage.tabWidget).contains("Tab 1").should("not.exist");
-    deployMode.DeployApp();
-    cy.get(publish.tabWidget).contains("Tab 1").should("not.exist");
-    deployMode.NavigateBacktoEditor();
-  });
 
-  it("6. Tab Widget Functionality To Check tab visibility", function () {
-    cy.openPropertyPane("tabswidget");
-    cy.xpath(Layoutpage.tabEdit.replace("tabName", "Tab 1")).click({
-      force: true,
+    it("6. Tab Widget Functionality To Check tab visibility", function () {
+      cy.openPropertyPane("tabswidget");
+      cy.xpath(Layoutpage.tabEdit.replace("tabName", "Tab 1")).click({
+        force: true,
+      });
+      cy.get(Layoutpage.tabVisibility).first().click({ force: true });
+      cy.get(Layoutpage.tabWidget).contains("Tab 1").should("be.visible");
+      deployMode.DeployApp();
+      cy.get(publish.tabWidget).contains("Tab 1").should("be.visible");
+      deployMode.NavigateBacktoEditor();
     });
-    cy.get(Layoutpage.tabVisibility).first().click({ force: true });
-    cy.get(Layoutpage.tabWidget).contains("Tab 1").should("be.visible");
-    deployMode.DeployApp();
-    cy.get(publish.tabWidget).contains("Tab 1").should("be.visible");
-    deployMode.NavigateBacktoEditor();
-  });
-  /* Test to be revisted as the undo action is inconsistent in automation
+    /* Test to be revisted as the undo action is inconsistent in automation
   it("7. Tab Widget Functionality To Check undo action after delete", function() {
     cy.openPropertyPane("tabswidget");
     cy.get(Layoutpage.tabDelete)
@@ -125,58 +128,59 @@ describe("Tab widget test", { tags: ["@tag.Widget", "@tag.Tab"] }, function () {
       .should("be.visible");
   });
   */
-  it("7. Tabs widget should have navigation arrows if tabs don't fit", function () {
-    const rightNavButtonSelector =
-      Layoutpage.tabWidget + " .scroll-nav-right-button";
-    const leftNavButtonSelector =
-      Layoutpage.tabWidget + " .scroll-nav-left-button";
+    it("7. Tabs widget should have navigation arrows if tabs don't fit", function () {
+      const rightNavButtonSelector =
+        Layoutpage.tabWidget + " .scroll-nav-right-button";
+      const leftNavButtonSelector =
+        Layoutpage.tabWidget + " .scroll-nav-left-button";
 
-    cy.openPropertyPane("tabswidget");
-    // Add a new tab
-    agHelper.ClickButton("Add tab");
-    agHelper.ClickButton("Add tab");
-    cy.tabVerify(3, "Tab3-for-testing-scroll-navigation-controls");
-    // Should show off right navigation arrow
-    cy.get(leftNavButtonSelector).should("exist");
-    // Click on the right navigation arrow
-    cy.get(leftNavButtonSelector).click({ force: true });
-    // Should show off left navigation arrow
-    cy.get(rightNavButtonSelector).should("exist");
-  });
+      cy.openPropertyPane("tabswidget");
+      // Add a new tab
+      agHelper.ClickButton("Add tab");
+      agHelper.ClickButton("Add tab");
+      cy.tabVerify(3, "Tab3-for-testing-scroll-navigation-controls");
+      // Should show off right navigation arrow
+      cy.get(leftNavButtonSelector).should("exist");
+      // Click on the right navigation arrow
+      cy.get(leftNavButtonSelector).click({ force: true });
+      // Should show off left navigation arrow
+      cy.get(rightNavButtonSelector).should("exist");
+    });
 
-  it("8. Tab Widget Functionality To Check Default Tab selected After Selected Tab Delete", function () {
-    propPane.UpdatePropertyFieldValue("Default tab", "Tab 1");
-    cy.tabVerify(3, "Tab3-for-testing-scroll-navigation-controls");
-    cy.get(Layoutpage.tabWidget)
-      .contains("Tab3-for-testing-scroll-navigation-controls")
-      .should("have.class", "is-selected");
-    cy.xpath(
-      Layoutpage.deleteTab.replace(
-        "tabName",
-        "Tab3-for-testing-scroll-navigation-controls",
-      ),
-    ).click({ force: true });
-    cy.get(Layoutpage.tabWidget)
-      .contains("Tab 1")
-      .should("have.class", "is-selected");
-  });
+    it("8. Tab Widget Functionality To Check Default Tab selected After Selected Tab Delete", function () {
+      propPane.UpdatePropertyFieldValue("Default tab", "Tab 1");
+      cy.tabVerify(3, "Tab3-for-testing-scroll-navigation-controls");
+      cy.get(Layoutpage.tabWidget)
+        .contains("Tab3-for-testing-scroll-navigation-controls")
+        .should("have.class", "is-selected");
+      cy.xpath(
+        Layoutpage.deleteTab.replace(
+          "tabName",
+          "Tab3-for-testing-scroll-navigation-controls",
+        ),
+      ).click({ force: true });
+      cy.get(Layoutpage.tabWidget)
+        .contains("Tab 1")
+        .should("have.class", "is-selected");
+    });
 
-  it("9. Tab Widget Functionality To Check First Tab Selected After Selected Tab(Default one) Delete", function () {
-    cy.get(Layoutpage.tabDelete).eq(1).click({ force: true });
-    cy.wait(1000);
-    cy.get(Layoutpage.tabWidget)
-      .contains("Aditya")
-      .should("have.class", "is-selected");
-    // Validates Total Number Of Tabs Displayed In The Property Pane
-    cy.get(Layoutpage.tabNumber).should("have.text", "2");
-    // Validates Total Number Of Tabs Displayed In The Property Pane After Adding A Tab
-    agHelper.ClickButton("Add tab");
-    cy.get(Layoutpage.tabNumber).should("have.text", "3");
-    //Validates Total Number Of Tabs Displayed In The Property Pane After Deleting A Tab
-    cy.get(Layoutpage.tabDelete).eq(1).click({ force: true });
-    cy.get(Layoutpage.tabNumber).should("have.text", "2");
-  });
-});
+    it("9. Tab Widget Functionality To Check First Tab Selected After Selected Tab(Default one) Delete", function () {
+      cy.get(Layoutpage.tabDelete).eq(1).click({ force: true });
+      cy.wait(1000);
+      cy.get(Layoutpage.tabWidget)
+        .contains("Aditya")
+        .should("have.class", "is-selected");
+      // Validates Total Number Of Tabs Displayed In The Property Pane
+      cy.get(Layoutpage.tabNumber).should("have.text", "2");
+      // Validates Total Number Of Tabs Displayed In The Property Pane After Adding A Tab
+      agHelper.ClickButton("Add tab");
+      cy.get(Layoutpage.tabNumber).should("have.text", "3");
+      //Validates Total Number Of Tabs Displayed In The Property Pane After Deleting A Tab
+      cy.get(Layoutpage.tabDelete).eq(1).click({ force: true });
+      cy.get(Layoutpage.tabNumber).should("have.text", "2");
+    });
+  },
+);
 
 afterEach(() => {
   // put your clean up code if any
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Tab_reset_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Tab_reset_spec.js
index 14114f1e447d..67e23d35d1e7 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Tab_reset_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Tab_reset_spec.js
@@ -4,7 +4,7 @@ import * as _ from "../../../../support/Objects/ObjectsCore";
 
 describe(
   "Tabs widget resetting",
-  { tags: ["@tag.Widget", "@tag.Tab"] },
+  { tags: ["@tag.Widget", "@tag.Tab", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("tabsWidgetReset");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/TableBugs_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/TableBugs_Spec.ts
index 89f9b2db4140..37b6c2e9081f 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/TableBugs_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/TableBugs_Spec.ts
@@ -5,7 +5,7 @@ import EditorNavigation, {
 
 describe(
   "Verify various Table property bugs",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("tablev1NewDsl");
@@ -30,33 +30,31 @@ describe(
       _.deployMode.DeployApp();
 
       //_.table.SelectTableRow(1)
-
       _.table.ReadTableRowColumnData(0, 0).then(($cellData) => {
-        expect($cellData).to.eq("1376499.jpg");
+        expect($cellData).contains("cube-logo_S50__hLNq.jpeg");
       });
 
       _.table.ReadTableRowColumnData(1, 0).then(($cellData) => {
-        expect($cellData).to.eq("https://wallpaperaccess.com/full/1688623.jpg");
+        expect($cellData).to.eq(
+          "https://docs.appsmith.com/img/Appsmith-Login-Screen-Shows-SAML.jpg",
+        );
       });
 
       _.table.ReadTableRowColumnData(2, 0).then(($cellData) => {
-        expect($cellData).to.eq("2117775.jpg");
+        expect($cellData).contains("zapier-logo_odZ9wZQ3vY.jpeg");
       });
 
       _.table.ReadTableRowColumnData(3, 0).then(($cellData) => {
-        expect($cellData).to.eq("https://wallpaperaccess.com/full/812632.jpg");
+        expect($cellData).to.eq(
+          "https://docs.appsmith.com/img/replyto-logo_6yaZHFIeU.jpeg",
+        );
       });
 
       _.table.AssertURLColumnNavigation(
         0,
         0,
-        "https://wallpaperaccess.com/full/1376499.jpg",
+        "https://docs.appsmith.com/img/cube-logo_S50__hLNq.jpeg",
       );
-      // _.table.AssertURLColumnNavigation(
-      //   3,
-      //   0,
-      //   "https://wallpaperaccess.com/full/812632.jpg",
-      // );
 
       _.deployMode.NavigateBacktoEditor();
     });
@@ -73,31 +71,30 @@ describe(
       _.deployMode.DeployApp();
 
       _.table.ReadTableRowColumnData(0, 0).then(($cellData) => {
-        expect($cellData).to.eq("1376499.jpg");
+        expect($cellData).contains("cube-logo_S50__hLNq.jpeg");
       });
 
       _.table.ReadTableRowColumnData(1, 0).then(($cellData) => {
-        expect($cellData).to.eq("https://wallpaperaccess.com/full/1688623.jpg");
+        expect($cellData).to.eq(
+          "https://docs.appsmith.com/img/Appsmith-Login-Screen-Shows-SAML.jpg",
+        );
       });
 
       _.table.ReadTableRowColumnData(2, 0).then(($cellData) => {
-        expect($cellData).to.eq("2117775.jpg");
+        expect($cellData).contains("zapier-logo_odZ9wZQ3vY.jpeg");
       });
 
       _.table.ReadTableRowColumnData(3, 0).then(($cellData) => {
-        expect($cellData).to.eq("https://wallpaperaccess.com/full/812632.jpg");
+        expect($cellData).to.eq(
+          "https://docs.appsmith.com/img/replyto-logo_6yaZHFIeU.jpeg",
+        );
       });
 
       _.table.AssertURLColumnNavigation(
         1,
         0,
-        "https://wallpaperaccess.com/full/1688623.jpg",
+        "https://docs.appsmith.com/img/Appsmith-Login-Screen-Shows-SAML.jpg",
       );
-      // _.table.AssertURLColumnNavigation(
-      //   2,
-      //   0,
-      //   "https://wallpaperaccess.com/full/2117775.jpg",
-      // );
 
       _.deployMode.NavigateBacktoEditor();
     });
@@ -114,31 +111,30 @@ describe(
       _.deployMode.DeployApp();
 
       _.table.ReadTableRowColumnData(0, 0).then(($cellData) => {
-        expect($cellData).to.eq("1376499.jpg");
+        expect($cellData).contains("cube-logo_S50__hLNq.jpeg");
       });
 
       _.table.ReadTableRowColumnData(1, 0).then(($cellData) => {
-        expect($cellData).to.eq("https://wallpaperaccess.com/full/1688623.jpg");
+        expect($cellData).to.eq(
+          "https://docs.appsmith.com/img/Appsmith-Login-Screen-Shows-SAML.jpg",
+        );
       });
 
       _.table.ReadTableRowColumnData(2, 0).then(($cellData) => {
-        expect($cellData).to.eq("2117775.jpg");
+        expect($cellData).contains("zapier-logo_odZ9wZQ3vY.jpeg");
       });
 
       _.table.ReadTableRowColumnData(3, 0).then(($cellData) => {
-        expect($cellData).to.eq("https://wallpaperaccess.com/full/812632.jpg");
+        expect($cellData).to.eq(
+          "https://docs.appsmith.com/img/replyto-logo_6yaZHFIeU.jpeg",
+        );
       });
 
       _.table.AssertURLColumnNavigation(
         0,
         0,
-        "https://wallpaperaccess.com/full/1376499.jpg",
+        "https://docs.appsmith.com/img/cube-logo_S50__hLNq.jpeg",
       );
-      // _.table.AssertURLColumnNavigation(
-      //   3,
-      //   0,
-      //   "https://wallpaperaccess.com/full/812632.jpg",
-      // );
 
       _.deployMode.NavigateBacktoEditor();
     });
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/TableFilter1_1_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/TableFilter1_1_Spec.ts
index a71a25fcf9fd..6c31e1130c47 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/TableFilter1_1_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/TableFilter1_1_Spec.ts
@@ -5,7 +5,7 @@ import EditorNavigation, {
 
 describe(
   "Verify various Table_Filter combinations",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("tablev1NewDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/TableFilter1_2_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/TableFilter1_2_Spec.ts
index 94025e4ccc2f..45d0400c73aa 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/TableFilter1_2_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/TableFilter1_2_Spec.ts
@@ -5,7 +5,7 @@ import EditorNavigation, {
 
 describe(
   "Verify various Table_Filter combinations",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("tablev1NewDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/TableFilter2_1_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/TableFilter2_1_Spec.ts
index c42b8718bc8c..3d56cdaa62ed 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/TableFilter2_1_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/TableFilter2_1_Spec.ts
@@ -5,7 +5,7 @@ import EditorNavigation, {
 
 describe(
   "Verify various Table_Filter combinations",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("tablev1NewDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/TableFilter2_2_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/TableFilter2_2_Spec.ts
index 877b346348ee..3b281a846e46 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/TableFilter2_2_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/TableFilter2_2_Spec.ts
@@ -5,7 +5,7 @@ import EditorNavigation, {
 
 describe(
   "Verify various Table_Filter combinations",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("tablev1NewDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Button_Icon_validation_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Button_Icon_validation_spec.js
index e42974f76d31..e222542518fc 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Button_Icon_validation_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Button_Icon_validation_spec.js
@@ -6,7 +6,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Table Widget property pane feature validation",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("tableNewDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Color_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Color_spec.js
index b32233f6c609..5d16abf07734 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Color_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Color_spec.js
@@ -3,7 +3,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Table Widget property pane feature validation",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("tableNewDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Column_Resize_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Column_Resize_spec.js
index b3f62881bc2c..4bae6884bf66 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Column_Resize_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Column_Resize_spec.js
@@ -3,7 +3,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Table Widget Functionality with Hidden and Resized Columns",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("tableResizedColumnsDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Derived_Column_Data_validation_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Derived_Column_Data_validation_spec.js
index 263a55a102d2..8ca5779f33ba 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Derived_Column_Data_validation_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Derived_Column_Data_validation_spec.js
@@ -13,7 +13,7 @@ import {
 
 describe(
   "Test Create Api and Bind to Table widget",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       agHelper.AddDsl("tableTextPaginationDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_EmptyRow_Color_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_EmptyRow_Color_spec.js
index 380e7b6b4da0..4e618fee9009 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_EmptyRow_Color_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_EmptyRow_Color_spec.js
@@ -3,7 +3,7 @@ const commonlocators = require("../../../../../locators/commonlocators.json");
 
 describe(
   "Table Widget empty row color validation",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("tableNewDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_FilteredTableData_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_FilteredTableData_spec.js
index 4c4a94024e68..6d5898c59c7c 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_FilteredTableData_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_FilteredTableData_spec.js
@@ -10,7 +10,7 @@ const dsl = require("../../../../../fixtures/tableAndTextDsl.json");
 
 describe(
   "Table Widget Filtered Table data in autocomplete",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("tableAndTextDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_GeneralProperty_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_GeneralProperty_spec.js
index 092bed9b509c..c12a994ef63e 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_GeneralProperty_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_GeneralProperty_spec.js
@@ -7,7 +7,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Table Widget property pane feature validation",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("tableNewDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_MultiRowSelect_dataUpdation_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_MultiRowSelect_dataUpdation_spec.js
index 9bf78ecefb39..2515463b6c58 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_MultiRowSelect_dataUpdation_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_MultiRowSelect_dataUpdation_spec.js
@@ -17,7 +17,7 @@ if the primary column value isn't updated.
 */
 describe(
   "Table Widget row multi select validation",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       agHelper.AddDsl("multiSelectedRowUpdationDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_MultiRowSelect_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_MultiRowSelect_spec.js
index f97940352cb1..ba640223c233 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_MultiRowSelect_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_MultiRowSelect_spec.js
@@ -4,7 +4,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Table Widget row multi select validation",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("tableNewDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Number_column_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Number_column_spec.js
index 74722e5c1019..05da815adf2c 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Number_column_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Number_column_spec.js
@@ -3,7 +3,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Validate Table Widget Table data",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("basicNumberDataTableDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_PropertyPane_1_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_PropertyPane_1_spec.js
index b0bf0d75d33d..444225153534 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_PropertyPane_1_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_PropertyPane_1_spec.js
@@ -5,7 +5,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Table Widget property pane feature validation",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("tableNewDslWithPagination");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_PropertyPane_2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_PropertyPane_2_spec.js
index 3baf77db5d8a..30f565309753 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_PropertyPane_2_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_PropertyPane_2_spec.js
@@ -9,7 +9,7 @@ import {
 
 describe(
   "Table Widget property pane feature validation",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       agHelper.AddDsl("tableNewDslWithPagination");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_PropertyPane_IconName_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_PropertyPane_IconName_spec.js
index 0d4b64f35108..d8297951f0fe 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_PropertyPane_IconName_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_PropertyPane_IconName_spec.js
@@ -3,7 +3,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Table Widget property pane feature validation",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("tableNewDslWithPagination");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Property_JsonUpdate_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Property_JsonUpdate_spec.js
index fcf836a308c3..e20ef0227328 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Property_JsonUpdate_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Property_JsonUpdate_spec.js
@@ -7,7 +7,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Test Create Api and Bind to Table widget",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("tableTextPaginationDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Switch_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Switch_spec.js
index 6e5a05019f43..c76445ff7f1c 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Switch_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Switch_spec.js
@@ -3,7 +3,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Table Widget and Switch binding Functionality",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("swtchTableDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Widget_Add_button_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Widget_Add_button_spec.js
index c182f1b9d64c..ad7030e17bd5 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Widget_Add_button_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Widget_Add_button_spec.js
@@ -5,7 +5,7 @@ const testdata = require("../../../../../fixtures/testdata.json");
 
 describe(
   "Table Widget property pane feature validation",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       agHelper.AddDsl("tableNewDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Widget_Copy_Paste_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Widget_Copy_Paste_spec.js
index 687d25133b9b..eb520e19fb6f 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Widget_Copy_Paste_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Widget_Copy_Paste_spec.js
@@ -13,7 +13,7 @@ import {
 
 describe(
   "Test Suite to validate copy/paste table Widget",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       agHelper.AddDsl("tableNewDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Widget_Default_Row_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Widget_Default_Row_spec.js
index 6fa76ba2f1fe..7a73959022fa 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Widget_Default_Row_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Widget_Default_Row_spec.js
@@ -5,7 +5,7 @@ import EditorNavigation, {
 
 describe(
   "Table Widget property pane deafult feature validation",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("defaultTableDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Widget_Derived_Column_Computed_value_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Widget_Derived_Column_Computed_value_spec.js
index dd23e314ebcb..6bc2f08ebf7a 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Widget_Derived_Column_Computed_value_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Widget_Derived_Column_Computed_value_spec.js
@@ -3,7 +3,7 @@ const testdata = require("../../../../../fixtures/testdata.json");
 
 describe(
   "Table Widget property pane feature validation",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("tableNewDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Widget_Selected_row_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Widget_Selected_row_spec.js
index def8bfdd59c9..8d3c2ccc5d3f 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Widget_Selected_row_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_Widget_Selected_row_spec.js
@@ -2,7 +2,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Table Widget property pane feature validation",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("tableAndTextDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_spec.js
index ea0fa9163df8..3ecac68fe13f 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_spec.js
@@ -5,7 +5,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Table Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("tableWidgetDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_tabledata_schema_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_tabledata_schema_spec.js
index 8ed30919dfb7..f91d34a5317f 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_tabledata_schema_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_tabledata_schema_spec.js
@@ -5,47 +5,51 @@ import {
 
 import * as _ from "../../../../../support/Objects/ObjectsCore";
 
-describe("Table Widget", { tags: ["@tag.Widget", "@tag.Table"] }, function () {
-  before(() => {
-    _.agHelper.AddDsl("tableNewDsl");
-  });
-  it("1. Table Widget Functionality To Check with changing schema of tabledata", () => {
-    let jsContext = `{{Switch1.isSwitchedOn?[{name: "joe"}]:[{employee_name: "john"}];}}`;
-    cy.wait(5000);
-    cy.dragAndDropToCanvas("switchwidget", { x: 200, y: 200 });
-    cy.wait(2000);
-    cy.openPropertyPane("tablewidget");
-    cy.get(".t--property-control-tabledata").then(($el) => {
-      cy.updateCodeInput($el, jsContext);
+describe(
+  "Table Widget",
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
+  function () {
+    before(() => {
+      _.agHelper.AddDsl("tableNewDsl");
     });
-    _.deployMode.DeployApp();
-    cy.getTableDataSelector("0", "0").then((element) => {
-      cy.get(element).should("be.visible");
+    it("1. Table Widget Functionality To Check with changing schema of tabledata", () => {
+      let jsContext = `{{Switch1.isSwitchedOn?[{name: "joe"}]:[{employee_name: "john"}];}}`;
+      cy.wait(5000);
+      cy.dragAndDropToCanvas("switchwidget", { x: 200, y: 200 });
+      cy.wait(2000);
+      cy.openPropertyPane("tablewidget");
+      cy.get(".t--property-control-tabledata").then(($el) => {
+        cy.updateCodeInput($el, jsContext);
+      });
+      _.deployMode.DeployApp();
+      cy.getTableDataSelector("0", "0").then((element) => {
+        cy.get(element).should("be.visible");
+      });
+      cy.readTabledataPublish("0", "0").then((value) => {
+        expect(value).to.be.equal("joe");
+      });
+      cy.get(".t--switch-widget-active").first().click();
+      cy.get(".t--widget-tablewidget").scrollIntoView();
+      cy.wait(1000);
+      cy.getTableDataSelector("0", "0").then((element) => {
+        cy.get(element).should("be.visible");
+      });
+      cy.readTabledataPublish("0", "0").then((value) => {
+        expect(value).to.be.equal("john");
+      });
+      cy.get(".t--switch-widget-inactive").first().click();
+      cy.wait(1000);
+      cy.get(".t--widget-tablewidget").scrollIntoView();
+      cy.getTableDataSelector("0", "0").then((element) => {
+        cy.get(element).should("be.visible");
+      });
+      cy.readTabledataPublish("0", "0").then((value) => {
+        expect(value).to.be.equal("joe");
+      });
+      _.deployMode.NavigateBacktoEditor();
+      PageLeftPane.switchSegment(PagePaneSegment.UI);
+      _.entityExplorer.DeleteWidgetFromEntityExplorer("Switch1");
+      _.entityExplorer.DeleteWidgetFromEntityExplorer("Table1");
     });
-    cy.readTabledataPublish("0", "0").then((value) => {
-      expect(value).to.be.equal("joe");
-    });
-    cy.get(".t--switch-widget-active").first().click();
-    cy.get(".t--widget-tablewidget").scrollIntoView();
-    cy.wait(1000);
-    cy.getTableDataSelector("0", "0").then((element) => {
-      cy.get(element).should("be.visible");
-    });
-    cy.readTabledataPublish("0", "0").then((value) => {
-      expect(value).to.be.equal("john");
-    });
-    cy.get(".t--switch-widget-inactive").first().click();
-    cy.wait(1000);
-    cy.get(".t--widget-tablewidget").scrollIntoView();
-    cy.getTableDataSelector("0", "0").then((element) => {
-      cy.get(element).should("be.visible");
-    });
-    cy.readTabledataPublish("0", "0").then((value) => {
-      expect(value).to.be.equal("joe");
-    });
-    _.deployMode.NavigateBacktoEditor();
-    PageLeftPane.switchSegment(PagePaneSegment.UI);
-    _.entityExplorer.DeleteWidgetFromEntityExplorer("Switch1");
-    _.entityExplorer.DeleteWidgetFromEntityExplorer("Table1");
-  });
-});
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/table_with_text_no_2dArray_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/table_with_text_no_2dArray_spec.js
index 374631ebe8cd..67c03653ff71 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/table_with_text_no_2dArray_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/table_with_text_no_2dArray_spec.js
@@ -4,7 +4,7 @@ import { seconds, testTimeout } from "../../../../../support/timeout";
 
 describe(
   "Table widget edge case scenario testing",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("tableWithTextWidgetDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/table_with_text_selRowIndices_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/table_with_text_selRowIndices_spec.js
index c7f153bd5be1..f79c2e83490f 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/table_with_text_selRowIndices_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/table_with_text_selRowIndices_spec.js
@@ -4,7 +4,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Table widget edge case scenario testing",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("tableWithTextWidgetDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/AddNewRow1_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/AddNewRow1_spec.js
index d3e05b789db0..ac1fb9c58557 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/AddNewRow1_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/AddNewRow1_spec.js
@@ -3,11 +3,14 @@ import {
   propPane,
   table,
 } from "../../../../../support/Objects/ObjectsCore";
+import EditorNavigation, {
+  EntityType,
+} from "../../../../../support/Pages/EditorNavigation";
 const commonlocators = require("../../../../../locators/commonlocators.json");
 
 describe(
   "Basic flow ",
-  { tags: ["@tag.Widget", "@tag.Table", "@tag.Sanity"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Sanity", "@tag.Binding"] },
   () => {
     before(() => {
       agHelper.RestoreLocalStorageCache();
@@ -16,6 +19,7 @@ describe(
 
     it("1.1. should test that allow Add new row property is present", () => {
       cy.openPropertyPane("tablewidgetv2");
+      propPane.ExpandIfCollapsedSection("addingarow");
       cy.get(".t--property-control-allowaddingarow").should("exist");
       cy.get(".t--property-control-allowaddingarow input").should("exist");
       cy.get(".t--add-new-row").should("not.exist");
@@ -150,7 +154,12 @@ describe(
 
     it("1.7. should not hide the header section when add new row button is enabled and another header element is disabled", () => {
       cy.get(".t--discard-new-row").click({ force: true });
+      EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
       //disable all header widgets for the table
+      propPane.ExpandIfCollapsedSection("general");
+      propPane.ExpandIfCollapsedSection("addingarow");
+      propPane.ExpandIfCollapsedSection("search\\&filters");
+      propPane.ExpandIfCollapsedSection("pagination");
       [
         "Show pagination",
         "Allow searching",
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/AddNewRow2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/AddNewRow2_spec.js
index 23508651c00a..e6e3e81ac3d9 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/AddNewRow2_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/AddNewRow2_spec.js
@@ -3,7 +3,7 @@ const commonlocators = require("../../../../../locators/commonlocators.json");
 
 describe(
   "Validation flow",
-  { tags: ["@tag.Widget", "@tag.Table", "@tag.Sanity"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Sanity", "@tag.Binding"] },
   () => {
     before(() => {
       cy.startServerAndRoutes();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/AddNewRow3_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/AddNewRow3_spec.js
index e6a161c1bb28..2a55cf9a3ea7 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/AddNewRow3_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/AddNewRow3_spec.js
@@ -3,7 +3,7 @@ const widgetsPage = require("../../../../../locators/Widgets.json");
 
 describe(
   "Actions flow (save, discard)",
-  { tags: ["@tag.Widget", "@tag.Table", "@tag.Sanity"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Sanity", "@tag.Binding"] },
   () => {
     before(() => {
       cy.startServerAndRoutes();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Custom_column_alias_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Custom_column_alias_spec.js
index f7e579b36499..1fb746c0d469 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Custom_column_alias_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Custom_column_alias_spec.js
@@ -14,7 +14,7 @@ const data = [
 
 describe(
   "Custom column alias functionality",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   () => {
     before(() => {
       _.agHelper.AddDsl("tableV2NewDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Date_column_editing_1_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Date_column_editing_1_spec.ts
index 3a0614e7db0d..243e4282ff07 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Date_column_editing_1_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Date_column_editing_1_spec.ts
@@ -11,7 +11,7 @@ import EditorNavigation, {
 
 describe(
   "Table widget date column inline editing functionality",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   () => {
     before(() => {
       agHelper.AddDsl("Table/DateCellEditingDSL");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Date_column_editing_2_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Date_column_editing_2_spec.ts
index 50728d23c913..87a0578ba434 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Date_column_editing_2_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Date_column_editing_2_spec.ts
@@ -13,7 +13,7 @@ import EditorNavigation, {
 
 describe(
   "Table widget date column inline editing functionality",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   () => {
     before(() => {
       agHelper.AddDsl("Table/DateCellEditingDSL");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Date_column_types_validation_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Date_column_types_validation_spec.ts
index 0ce8bc321a35..312ebb7c946e 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Date_column_types_validation_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Date_column_types_validation_spec.ts
@@ -43,17 +43,16 @@ describe(
       // Click unix cell edit
       table.ClickOnEditIcon(row, column);
 
-      // Click on specific date within
+      // Click on a specific date within the view port of the date picker
+      // Date picker opens in september 2024 due to the Table data set
       agHelper.GetNClick(
-        `${table._dateInputPopover} [aria-label='${table.getFormattedTomorrowDates().verboseFormat}']`,
+        `${table._dateInputPopover} [aria-label='Thu Sep 26 2024']`,
       );
 
-      // Check that date is set in column
+      // Check that the date is set in column
       table
         .ReadTableRowColumnData(row, column, "v2")
-        .then((val) =>
-          expect(val).to.equal(table.getFormattedTomorrowDates().isoFormat),
-        );
+        .then((val) => expect(val).to.equal("2024-09-26"));
     };
 
     it("1. should allow inline editing of Unix Timestamp in seconds (unix/s)", () => {
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Edge_case_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Edge_case_spec.js
index 7a5d288e3b4c..36b3cdf7713b 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Edge_case_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Edge_case_spec.js
@@ -6,14 +6,13 @@ const widgetsPage = require("../../../../../locators/Widgets.json");
 const commonlocators = require("../../../../../locators/commonlocators.json");
 import {
   agHelper,
-  entityExplorer,
   propPane,
   table,
 } from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Table widget v2 edge case scenario testing",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     afterEach(() => {
       agHelper.SaveLocalStorageCache();
@@ -26,6 +25,7 @@ describe(
 
     it("1. Check if the selectedRowIndices does not contain 2d array", function () {
       EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
+      propPane.ExpandIfCollapsedSection("rowselection");
       propPane.TogglePropertyState("Enable multi-row selection", "On"); //Enable Multi row select
 
       propPane.UpdatePropertyFieldValue("Default selected rows", "[1]"); //Change the value of default selected row
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Image_resize_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Image_resize_spec.js
index 12684c40e2bd..76b20ebdd7fe 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Image_resize_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Image_resize_spec.js
@@ -2,7 +2,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Table Widget Image Resize feature validation",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("Table/ImageResizeDSL");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_1_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_1_spec.js
index 42cd834ce6ed..08caa2414af7 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_1_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_1_spec.js
@@ -3,7 +3,7 @@ import { agHelper, table } from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Table widget inline editing functionality",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   () => {
     afterEach(() => {
       agHelper.SaveLocalStorageCache();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_2_spec.js
index 6336b7f58b0e..fd2d3c3c7492 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_2_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_2_spec.js
@@ -15,7 +15,7 @@ const publish = require("../../../../../locators/publishWidgetspage.json");
 
 describe(
   "Table widget inline editing functionality",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   () => {
     afterEach(() => {
       agHelper.SaveLocalStorageCache();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_3_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_3_spec.js
index 40da3f138e35..e0051272f930 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_3_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_3_spec.js
@@ -4,12 +4,13 @@ import {
   agHelper,
   table as tableHelper,
   propPane,
+  locators,
 } from "../../../../../support/Objects/ObjectsCore";
 import { PROPERTY_SELECTOR } from "../../../../../locators/WidgetLocators";
 
 describe(
   "Table widget inline editing functionality",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   () => {
     afterEach(() => {
       agHelper.SaveLocalStorageCache();
@@ -148,10 +149,16 @@ describe(
       cy.editTableCell(0, 0);
       cy.enterTableCellValue(0, 0, "newValue");
       cy.saveTableCellValue(0, 0);
-      cy.get(".t--widget-textwidget .bp3-ui-text").should(
-        "contain",
-        `[  {    "index": 0,    "updatedFields": {      "step": "newValue"    },    "allFields": {      "step": "newValue",      "task": "Drop a table",      "status": "✅"    }  }]`,
-      );
+      const exected = [
+        {
+          index: 0,
+          updatedFields: { step: "newValue" },
+          allFields: { step: "newValue", task: "Drop a table", status: "✅" },
+        },
+      ];
+      agHelper
+        .GetText(locators._textWidget, "text")
+        .should((text) => expect(JSON.parse(text)).to.deep.equal(exected));
       cy.openPropertyPane("textwidget");
       cy.updateCodeInput(
         ".t--property-control-text",
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Pagesize_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Pagesize_spec.ts
index d29b6575889a..e446d5e6196e 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Pagesize_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Pagesize_spec.ts
@@ -4,7 +4,7 @@ import PageList from "../../../../../support/Pages/PageList";
 
 describe(
   "Table widget v2",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     it("1. should test that pageSize is computed properly for all the row sizes", function () {
       PageList.AddNewPage();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter1_1_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter1_1_Spec.ts
index 142401c067c9..c2048dbf6cd8 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter1_1_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter1_1_Spec.ts
@@ -1,14 +1,13 @@
 import { demoTableDataForSelect } from "../../../../../fixtures/Table/DemoTableData";
-import { featureFlagIntercept } from "../../../../../support/Objects/FeatureFlags";
 import {
+  agHelper,
+  assertHelper,
+  deployMode,
+  draggableWidgets,
   entityExplorer,
+  locators,
   propPane,
-  deployMode,
   table,
-  assertHelper,
-  locators,
-  draggableWidgets,
-  agHelper,
 } from "../../../../../support/Objects/ObjectsCore";
 import EditorNavigation, {
   EntityType,
@@ -16,12 +15,13 @@ import EditorNavigation, {
 
 describe(
   "Verify various Table_Filter combinations",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     it("1. Adding Data to Table Widget", function () {
       entityExplorer.DragDropWidgetNVerify("tablewidgetv2", 650, 250);
       //propPane.EnterJSContext("Table data", JSON.stringify(this.dataSet.TableInput));
       // turn on filtering for the table - it is disabled by default in this PR(#34593)
+      propPane.ExpandIfCollapsedSection("search\\&filters");
       agHelper.GetNClick(".t--property-control-allowfiltering input");
       table.AddSampleTableData();
       //propPane.EnterJSContext("Table Data", JSON.stringify(this.dataSet.TableInput));
@@ -144,9 +144,6 @@ describe(
 
     it("11. Verify table search includes label and value for table with select column type", () => {
       deployMode.NavigateBacktoEditor();
-      // This flag is turned on to allow the label show in the table select cell content
-      // when this feature is turned on fully, this flag will be removed
-      featureFlagIntercept({ release_table_cell_label_value_enabled: true });
       EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
       propPane.EnterJSContext("Table data", demoTableDataForSelect);
 
@@ -174,13 +171,16 @@ describe(
         expect(afterSearch).to.eq("Software Engineer");
       });
       table.RemoveSearchTextNVerify("1", "v2");
+    });
 
-      // Search for a value in the table
-      table.SearchTable("20");
-      table.ReadTableRowColumnData(0, 2, "v2").then((afterSearch) => {
-        expect(afterSearch).to.eq("Product Manager");
+    it("12. Verify table filter for select column type", function () {
+      table.OpenNFilterTable("role", "is exactly", "Product Manager");
+      table.ReadTableRowColumnData(0, 2, "v2").then(($cellData) => {
+        expect($cellData).to.eq("Product Manager");
+      });
+      table.ReadTableRowColumnData(1, 2, "v2").then(($cellData) => {
+        expect($cellData).to.eq("Product Manager");
       });
-      table.RemoveSearchTextNVerify("1", "v2");
     });
   },
 );
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter1_2_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter1_2_Spec.ts
index c9a9ea98b721..6832cb146a55 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter1_2_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter1_2_Spec.ts
@@ -11,11 +11,12 @@ import {
 
 describe(
   "Verify various Table_Filter combinations",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     it("1. Verify Table Filter for 'empty'", function () {
       entityExplorer.DragDropWidgetNVerify("tablewidgetv2", 650, 250);
       // turn on filtering for the table - it is disabled by default in this PR(#34593)
+      propPane.ExpandIfCollapsedSection("search\\&filters");
       agHelper.GetNClick(".t--property-control-allowfiltering input");
       table.AddSampleTableData();
       propPane.UpdatePropertyFieldValue(
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter2_1_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter2_1_Spec.ts
index 1c733733fd7e..4d0d311580c7 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter2_1_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter2_1_Spec.ts
@@ -11,12 +11,13 @@ import {
 
 describe(
   "Verify various Table_Filter combinations",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     it("1. Adding Data to Table Widget", function () {
       entityExplorer.DragDropWidgetNVerify("tablewidgetv2", 650, 250);
       //propPane.EnterJSContext("Table data", JSON.stringify(this.dataSet.TableInput));
       // turn on filtering for the table - it is disabled by default in this PR(#34593)
+      propPane.ExpandIfCollapsedSection("search\\&filters");
       agHelper.GetNClick(".t--property-control-allowfiltering input");
       table.AddSampleTableData();
       //propPane.EnterJSContext("Table Data", JSON.stringify(this.dataSet.TableInput));
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter2_2_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter2_2_Spec.ts
index c431157de632..d6290210bf01 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter2_2_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter2_2_Spec.ts
@@ -12,11 +12,12 @@ import {
 
 describe(
   "Verify various Table_Filter combinations",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     it("1. Verify Full table data - download csv and download Excel", function () {
       entityExplorer.DragDropWidgetNVerify("tablewidgetv2", 650, 250);
       // turn on filtering for the table - it is disabled by default in this PR(#34593)
+      propPane.ExpandIfCollapsedSection("search\\&filters");
       agHelper.GetNClick(".t--property-control-allowfiltering input");
       table.AddSampleTableData();
       propPane.UpdatePropertyFieldValue(
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Button_Icon_validation_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Button_Icon_validation_spec.js
index 67dc52209533..c97520738f5a 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Button_Icon_validation_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Button_Icon_validation_spec.js
@@ -6,7 +6,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Table Widget V2 property pane feature validation",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("tableV2NewDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Color_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Color_spec.js
index 17bcc5fab18e..104d1313653a 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Color_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Color_spec.js
@@ -3,7 +3,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Table Widget V2 property pane feature validation",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     beforeEach(() => {
       _.agHelper.RestoreLocalStorageCache();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Column_Order_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Column_Order_spec.js
index 9f783de0e87a..d1a25264f1e5 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Column_Order_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Column_Order_spec.js
@@ -3,7 +3,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Table Widget V2 column order maintained on column change validation",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("tableV2ColumnOrderDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Column_Resize_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Column_Resize_spec.js
index d36e05be8566..ead4a3dead09 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Column_Resize_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Column_Resize_spec.js
@@ -3,7 +3,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Table Widget V2 Functionality with Hidden and Resized Columns",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("tableV2ResizedColumnsDsl");
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 82d2f3a93e4a..0a56162c813a 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
@@ -13,7 +13,7 @@ import {
 
 describe(
   "Test Create Api and Bind to Table widget",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       agHelper.AddDsl("tableV2TextPaginationDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_DisplayText_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_DisplayText_spec.ts
index 4bd11a80cd2e..9b51a872dd23 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_DisplayText_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_DisplayText_spec.ts
@@ -23,11 +23,12 @@ const data = [
 
 describe(
   "Table V2 sort & filter using display text functionality",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   () => {
     before(() => {
       entityExplorer.DragDropWidgetNVerify("tablewidgetv2", 650, 250);
       // turn on filtering for the table - it is disabled by default in this PR(#34593)
+      propPane.ExpandIfCollapsedSection("search\\&filters");
       agHelper.GetNClick(".t--property-control-allowfiltering input");
       propPane.EnterJSContext("Table data", JSON.stringify(data));
       assertHelper.AssertNetworkStatus("@updateLayout");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_FilteredTableData_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_FilteredTableData_spec.ts
index 8a0a2cdaba04..79969e09ae52 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_FilteredTableData_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_FilteredTableData_spec.ts
@@ -19,7 +19,7 @@ import {
 
 describe(
   "Table Widget V2 Filtered Table data in autocomplete",
-  { tags: ["@tag.Widget", "@tag.Table", "@tag.Sanity"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Sanity", "@tag.Binding"] },
   function () {
     before("Table Widget V2 Functionality", () => {
       agHelper.AddDsl("tableV2AndTextDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_GeneralProperty_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_GeneralProperty_spec.js
index ea9ad97ea212..7e5df3cf0ad9 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_GeneralProperty_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_GeneralProperty_spec.js
@@ -11,7 +11,7 @@ import {
 
 describe(
   "Table Widget property pane feature validation",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       agHelper.AddDsl("tableV2NewDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_MultiRowSelect_dataUpdation_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_MultiRowSelect_dataUpdation_spec.js
index 6056b97cb510..63c40532cc9d 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_MultiRowSelect_dataUpdation_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_MultiRowSelect_dataUpdation_spec.js
@@ -7,7 +7,7 @@ if the primary column value isn't updated.
 */
 describe(
   "Table Widget V2 row multi select validation",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("multiSelectedRowUpdationTableV2Dsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_MultiRowSelect_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_MultiRowSelect_spec.js
index a0ae9da141d5..ac3e84f41c62 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_MultiRowSelect_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_MultiRowSelect_spec.js
@@ -4,7 +4,7 @@ const commonlocators = require("../../../../../locators/commonlocators.json");
 
 describe(
   "Table Widget V2 row multi select validation",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("tableV2NewDsl");
@@ -12,6 +12,7 @@ describe(
 
     it("1. Test multi select column shows when enable Multirowselection is true", function () {
       cy.openPropertyPane("tablewidgetv2");
+      _.propPane.ExpandIfCollapsedSection("rowselection");
       cy.get(widgetsPage.toggleEnableMultirowselection)
         .first()
         .click({ force: true });
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_PropertyPane_1_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_PropertyPane_1_spec.js
index 8711ea6bf077..39ee101dd4a2 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_PropertyPane_1_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_PropertyPane_1_spec.js
@@ -17,7 +17,7 @@ const emptyTableColumnNameData = require("../../../../../fixtures/TableWidgetDat
 
 describe(
   "Table Widget V2 property pane feature validation",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       agHelper.AddDsl("tableV2NewDslWithPagination");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_PropertyPane_2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_PropertyPane_2_spec.js
index 0c73fae21be2..0adedc400137 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_PropertyPane_2_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_PropertyPane_2_spec.js
@@ -10,7 +10,7 @@ const widgetsPage = require("../../../../../locators/Widgets.json");
 
 describe(
   "Table Widget V2 property pane feature validation",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       agHelper.AddDsl("tableV2NewDslWithPagination");
@@ -62,6 +62,7 @@ describe(
       cy.moveToContentTab();
       // Chage deat search text value to "data"
       cy.backFromPropertyPanel();
+      propPane.ExpandIfCollapsedSection("search\\&filters");
       cy.testJsontext("defaultsearchtext", "data");
       deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.TABLE));
       table.WaitForTableEmpty("v2");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_PropertyPane_IconName_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_PropertyPane_IconName_spec.js
index 872098e63a5d..1931c0875985 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_PropertyPane_IconName_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_PropertyPane_IconName_spec.js
@@ -3,7 +3,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Table Widget property pane feature validation",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("tableV2NewDslWithPagination");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Property_JsonUpdate_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Property_JsonUpdate_spec.js
index 1ca0b4bcc39b..21a4d635bd11 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Property_JsonUpdate_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Property_JsonUpdate_spec.js
@@ -8,7 +8,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Test Create Api and Bind to Table widget V2",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   () => {
     before("Create an API and Execute the API and bind with Table V", () => {
       _.agHelper.AddDsl("tableV2TextPaginationDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Sorting_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Sorting_spec.js
index facb855e7968..00875ea51c2b 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Sorting_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Sorting_spec.js
@@ -1,8 +1,7 @@
-import { featureFlagIntercept } from "../../../../../support/Objects/FeatureFlags";
 import * as _ from "../../../../../support/Objects/ObjectsCore";
+import PageList from "../../../../../support/Pages/PageList";
 const testdata = require("../../../../../fixtures/testdata.json");
 const commonlocators = require("../../../../../locators/commonlocators.json");
-import PageList from "../../../../../support/Pages/PageList";
 
 const demoTableData = `
 {{
@@ -53,7 +52,7 @@ const demoTableData = `
 
 describe(
   "Table Widget V2 Sorting",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     beforeEach(() => {
       PageList.AddNewPage();
@@ -117,9 +116,6 @@ describe(
     });
 
     it("2. Verifies that default sorting works for a select column using the value property", function () {
-      // This flag is turned on to allow the label show in the table select cell content
-      // when this feature is turned on fully, this flag will be removed
-      featureFlagIntercept({ release_table_cell_label_value_enabled: true });
       cy.dragAndDropToCanvas("tablewidgetv2", { x: 350, y: 500 });
       _.propPane.EnterJSContext("Table data", demoTableData);
 
@@ -169,9 +165,6 @@ describe(
     });
 
     it("3. Verifies that sorting works for the select column type when sortBy is set to label", function () {
-      // This flag is turned on to allow the label show in the table select cell content
-      // when this feature is turned on fully, this flag will be removed
-      featureFlagIntercept({ release_table_cell_label_value_enabled: true });
       cy.dragAndDropToCanvas("tablewidgetv2", { x: 350, y: 500 });
       _.propPane.EnterJSContext("Table data", demoTableData);
 
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Switch_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Switch_spec.js
index 9feab8eeb3ea..dfbdb4f4e520 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Switch_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Switch_spec.js
@@ -3,7 +3,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Table Widget V2 and Switch binding Functionality",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("swtchTableV2Dsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Url_Column_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Url_Column_spec.ts
index 86497769e65b..e906d531598b 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Url_Column_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Url_Column_spec.ts
@@ -6,7 +6,7 @@ import {
 
 describe(
   "16108 - Verify Table URL column bugs",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       agHelper.AddDsl("tableV2WithUrlColumnDsl");
@@ -20,18 +20,23 @@ describe(
       table.ReadTableRowColumnData(3, 0, "v2").then(($cellData) => {
         expect($cellData).to.eq("Profile pic");
       });
-      table.AssertURLColumnNavigation(
-        0,
-        0,
-        "https://randomuser.me/api/portraits/med/women/39.jpg",
-        "v2",
-      );
-      table.AssertURLColumnNavigation(
-        3,
-        0,
-        "https://randomuser.me/api/portraits/med/men/52.jpg",
-        "v2",
-      );
+
+      agHelper
+        .GetElement(`${table._tableRowColumnData(0, 0, "v2")} a`)
+        .should(
+          "have.attr",
+          "href",
+          "https://randomuser.me/api/portraits/med/women/39.jpg",
+        )
+        .should("have.attr", "target", "_blank");
+      agHelper
+        .GetElement(`${table._tableRowColumnData(3, 0, "v2")} a`)
+        .should(
+          "have.attr",
+          "href",
+          "https://randomuser.me/api/portraits/med/men/52.jpg",
+        )
+        .should("have.attr", "target", "_blank");
     });
   },
 );
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Widget_Add_button_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Widget_Add_button_spec.js
index e33a1a4d8bff..80c7f0a1cd06 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Widget_Add_button_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Widget_Add_button_spec.js
@@ -14,7 +14,7 @@ import {
 
 describe(
   "Table Widget V2 property pane feature validation",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       agHelper.AddDsl("tableV2NewDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Widget_Copy_Paste_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Widget_Copy_Paste_spec.js
index 8f453239bc97..e141b38b994d 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Widget_Copy_Paste_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Widget_Copy_Paste_spec.js
@@ -14,7 +14,7 @@ import {
 
 describe(
   "Test Suite to validate copy/paste table Widget V2",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       agHelper.AddDsl("tableV2NewDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Widget_Default_Row_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Widget_Default_Row_spec.js
index 6215d66eec07..458ecb8adba1 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Widget_Default_Row_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Widget_Default_Row_spec.js
@@ -10,7 +10,7 @@ import {
 
 describe(
   "Table Widget V2 property pane deafult feature validation",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       agHelper.AddDsl("defaultTableV2Dsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Widget_Derived_Column_Computed_value_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Widget_Derived_Column_Computed_value_spec.js
index b550c866a880..5115c6fcce77 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Widget_Derived_Column_Computed_value_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Widget_Derived_Column_Computed_value_spec.js
@@ -3,7 +3,7 @@ const testdata = require("../../../../../fixtures/testdata.json");
 
 describe(
   "Table Widget V2 property pane feature validation",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("tableV2NewDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Widget_Selected_row_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Widget_Selected_row_spec.js
index f1c5cca4be96..dfb8e6554424 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Widget_Selected_row_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Widget_Selected_row_spec.js
@@ -8,7 +8,7 @@ import EditorNavigation, {
 
 describe(
   "Table Widget v2 property pane feature validation",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       agHelper.AddDsl("tableV2AndTextDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_header_menu_visibility_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_header_menu_visibility_spec.ts
index 7056f91557ee..3b32f35c0eff 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_header_menu_visibility_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_header_menu_visibility_spec.ts
@@ -10,7 +10,7 @@ import { TABLE_DATA_STATIC } from "../../../../../support/Constants";
 
 describe(
   "Table widget v2",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     it("1. Bug id #24005: should test that header menu should be hidden when sorting and freezing is disabled", function () {
       entityExplorer.DragDropWidgetNVerify(draggableWidgets.TABLE, 500, 300);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_pagination_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_pagination_spec.js
index d55d58c2124f..8c0bfacbafb0 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_pagination_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_pagination_spec.js
@@ -3,7 +3,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Table Widget property pane feature validation",
-  { tags: ["@tag.Widget", "@tag.Table", "@tag.Sanity"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Sanity", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("tableV2NewDslWithPagination");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_spec.js
index 3e58e093fa52..19ecf513d671 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_spec.js
@@ -5,7 +5,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Table Widget V2 Functionality",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("tableV2WidgetDsl");
@@ -53,6 +53,8 @@ describe(
       cy.get(commonlocators.editPropBackButton).click();
       cy.openPropertyPane("tablewidgetv2");
       // Confirm if isSortable is true
+      _.propPane.ExpandIfCollapsedSection("sorting");
+
       cy.get(commonlocators.isSortable).should("be.checked");
       // Publish App
       _.deployMode.DeployApp();
@@ -124,6 +126,7 @@ describe(
         "Table data",
         `{{[{step: 1, task: 1}]}}`,
       );
+      _.propPane.ExpandIfCollapsedSection("search\\&filters");
       cy.get(".t--property-control-allowfiltering input").click();
       cy.editColumn("step");
       cy.get(".t--table-filter-toggle-btn").click();
@@ -237,6 +240,7 @@ describe(
     it("7. should check that adding cyclic dependency in the table doesn't crash the app", () => {
       //_.deployMode.NavigateBacktoEditor();
       cy.openPropertyPane("tablewidgetv2");
+      _.propPane.ExpandIfCollapsedSection("rowselection");
 
       cy.updateCodeInput(
         ".t--property-control-defaultselectedrow",
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_tabledata_schema_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_tabledata_schema_spec.js
index 3a2c2a8974bd..30ccde329913 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_tabledata_schema_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_tabledata_schema_spec.js
@@ -6,50 +6,54 @@ import {
 import homePage from "../../../../../locators/HomePage";
 import * as _ from "../../../../../support/Objects/ObjectsCore";
 
-describe("Table Widget", { tags: ["@tag.Widget", "@tag.Table"] }, function () {
-  it("1. Table Widget Functionality To Check with changing schema of tabledata", () => {
-    let jsContext = `{{Switch1.isSwitchedOn?[{name: "joe"}]:[{employee_name: "john"}];}}`;
-    _.homePage.NavigateToHome();
-    _.homePage.CreateNewApplication();
-    cy.wait("@createNewApplication").should(
-      "have.nested.property",
-      "response.body.responseMeta.status",
-      201,
-    );
-    cy.dragAndDropToCanvas("switchwidget", { x: 200, y: 200 });
-    cy.dragAndDropToCanvas("tablewidgetv2", { x: 200, y: 300 });
-    _.propPane.EnterJSContext("Table data", jsContext);
-    _.deployMode.DeployApp();
-    cy.wait(5000);
-    cy.getTableV2DataSelector("0", "0").then((element) => {
-      cy.get(element).should("be.visible");
-    });
-    cy.wait(2000);
-    cy.readTableV2dataPublish("0", "0").then((value) => {
-      expect(value).to.be.equal("joe");
-    });
-    cy.get(".t--switch-widget-active").first().click();
-    cy.wait(3000);
-    cy.getTableV2DataSelector("0", "0").then((element) => {
-      cy.get(element).should("be.visible");
-    });
-    cy.readTableV2dataPublish("0", "0").then((value) => {
-      expect(value).to.be.equal("john");
-    });
-    cy.get(".t--switch-widget-inactive").first().click();
-    cy.wait(1000);
-    cy.getTableV2DataSelector("0", "0").then((element) => {
-      cy.get(element).should("be.visible");
-    });
-    cy.readTableV2dataPublish("0", "0").then((value) => {
-      expect(value).to.be.equal("joe");
-    });
+describe(
+  "Table Widget",
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
+  function () {
+    it("1. Table Widget Functionality To Check with changing schema of tabledata", () => {
+      let jsContext = `{{Switch1.isSwitchedOn?[{name: "joe"}]:[{employee_name: "john"}];}}`;
+      _.homePage.NavigateToHome();
+      _.homePage.CreateNewApplication();
+      cy.wait("@createNewApplication").should(
+        "have.nested.property",
+        "response.body.responseMeta.status",
+        201,
+      );
+      cy.dragAndDropToCanvas("switchwidget", { x: 200, y: 200 });
+      cy.dragAndDropToCanvas("tablewidgetv2", { x: 200, y: 300 });
+      _.propPane.EnterJSContext("Table data", jsContext);
+      _.deployMode.DeployApp();
+      cy.wait(5000);
+      cy.getTableV2DataSelector("0", "0").then((element) => {
+        cy.get(element).should("be.visible");
+      });
+      cy.wait(2000);
+      cy.readTableV2dataPublish("0", "0").then((value) => {
+        expect(value).to.be.equal("joe");
+      });
+      cy.get(".t--switch-widget-active").first().click();
+      cy.wait(3000);
+      cy.getTableV2DataSelector("0", "0").then((element) => {
+        cy.get(element).should("be.visible");
+      });
+      cy.readTableV2dataPublish("0", "0").then((value) => {
+        expect(value).to.be.equal("john");
+      });
+      cy.get(".t--switch-widget-inactive").first().click();
+      cy.wait(1000);
+      cy.getTableV2DataSelector("0", "0").then((element) => {
+        cy.get(element).should("be.visible");
+      });
+      cy.readTableV2dataPublish("0", "0").then((value) => {
+        expect(value).to.be.equal("joe");
+      });
 
-    _.deployMode.NavigateBacktoEditor();
-    cy.wait(5000);
-    PageLeftPane.switchSegment(PagePaneSegment.UI);
+      _.deployMode.NavigateBacktoEditor();
+      cy.wait(5000);
+      PageLeftPane.switchSegment(PagePaneSegment.UI);
 
-    _.entityExplorer.DeleteWidgetFromEntityExplorer("Switch1");
-    _.entityExplorer.DeleteWidgetFromEntityExplorer("Table1");
-  });
-});
+      _.entityExplorer.DeleteWidgetFromEntityExplorer("Switch1");
+      _.entityExplorer.DeleteWidgetFromEntityExplorer("Table1");
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Text_wrapping_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Text_wrapping_spec.js
index fb0e037a8dfb..a1735c561ec2 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Text_wrapping_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Text_wrapping_spec.js
@@ -3,7 +3,7 @@ import { agHelper, propPane } from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Table Widget text wrapping functionality",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     afterEach(() => {
       agHelper.SaveLocalStorageCache();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/VirtualRow_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/VirtualRow_spec.js
index b860bb831c9d..727044b2208d 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/VirtualRow_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/VirtualRow_spec.js
@@ -8,7 +8,7 @@ const totalRows = 100;
 
 describe(
   "Table Widget Virtualized Row",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       cy.dragAndDropToCanvas("tablewidgetv2", { x: 300, y: 600 });
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/ColumnTypeMenubutton_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/ColumnTypeMenubutton_spec.js
index cc97da7aca93..32375135802c 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/ColumnTypeMenubutton_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/ColumnTypeMenubutton_spec.js
@@ -2,7 +2,7 @@ import * as _ from "../../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Custom column alias functionality",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   () => {
     before(() => {
       cy.dragAndDropToCanvas("tablewidgetv2", { x: 150, y: 300 });
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/ColumnTypesSelect2_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/ColumnTypesSelect2_spec.ts
index 00c63976e1fe..4b2618adf07c 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/ColumnTypesSelect2_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/ColumnTypesSelect2_spec.ts
@@ -8,7 +8,7 @@ import {
 
 describe(
   "Table widget v2: select column type test",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       entityExplorer.DragDropWidgetNVerify(draggableWidgets.TABLE, 300, 100);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/Select1_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/Select1_spec.ts
index dd77c5338ad3..4d7d7036575a 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/Select1_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/Select1_spec.ts
@@ -1,15 +1,14 @@
+import * as _ from "../../../../../../support/Objects/ObjectsCore";
 import {
   PageLeftPane,
   PagePaneSegment,
 } from "../../../../../../support/Pages/EditorNavigation";
 
 const commonlocators = require("../../../../../../locators/commonlocators.json");
-import * as _ from "../../../../../../support/Objects/ObjectsCore";
-import { featureFlagIntercept } from "../../../../../../support/Objects/FeatureFlags";
 
 describe(
   "Table widget - Select column type functionality",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   () => {
     before(() => {
       cy.dragAndDropToCanvas("tablewidgetv2", { x: 350, y: 500 });
@@ -206,7 +205,6 @@ describe(
 
     it("7. should check that on option select is working", () => {
       _.agHelper.CheckForPageSaveError();
-      featureFlagIntercept({ release_table_cell_label_value_enabled: true });
       cy.openPropertyPane("tablewidgetv2");
       cy.editColumn("step");
       cy.get(".t--property-control-onoptionchange .t--js-toggle").click();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/checkboxCell_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/checkboxCell_spec.js
index 252617d0ab5a..f73ac9eb8fb6 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/checkboxCell_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/checkboxCell_spec.js
@@ -30,11 +30,12 @@ const tableData = `[
 const checkboxSelector = " .bp3-checkbox input[type='checkbox']";
 describe(
   "Checkbox column type funtionality test",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   () => {
     before(() => {
       _.entityExplorer.DragDropWidgetNVerify(_.draggableWidgets.TABLE);
       // turn on filtering for the table - it is disabled by default in this PR(#34593)
+      _.propPane.ExpandIfCollapsedSection("search\\&filters");
       _.agHelper.GetNClick(".t--property-control-allowfiltering input");
       _.propPane.EnterJSContext("Table data", tableData);
       cy.editColumn("completed");
@@ -144,6 +145,7 @@ describe(
           .contains("This is a test message")
           .should("be.visible");
       });
+      _.agHelper.ClickButton("Discard", { index: 0 }); // discard changes
     });
 
     it("4. Verify filter condition", () => {
@@ -158,7 +160,17 @@ describe(
 
       // filter and verify checked rows
       cy.getTableV2DataSelector("0", "4").then((selector) => {
-        cy.get(selector + checkboxSelector).should("be.checked");
+        _.agHelper.AssertExistingCheckedState(
+          selector + checkboxSelector,
+          "true",
+        );
+      });
+
+      cy.getTableV2DataSelector("1", "4").then((selector) => {
+        _.agHelper.AssertExistingCheckedState(
+          selector + checkboxSelector,
+          "true",
+        );
       });
 
       // Filter and verify unchecked rows
@@ -169,10 +181,10 @@ describe(
       cy.get(publishPage.applyFiltersBtn).click();
 
       cy.getTableV2DataSelector("0", "4").then((selector) => {
-        cy.get(selector + checkboxSelector).should("not.be.checked");
-      });
-      cy.getTableV2DataSelector("1", "4").then((selector) => {
-        cy.get(selector + checkboxSelector).should("not.be.checked");
+        _.agHelper.AssertExistingCheckedState(
+          selector + checkboxSelector,
+          "false",
+        );
       });
     });
 
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/currency_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/currency_spec.ts
index bdfc5b46a931..535dcecec813 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/currency_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/currency_spec.ts
@@ -13,113 +13,122 @@ function updateCellValue(value) {
   _.agHelper.Sleep(500);
 }
 
-describe("Currency column", { tags: ["@tag.Widget", "@tag.Table"] }, () => {
-  before(() => {
-    _.entityExplorer.DragDropWidgetNVerify(_.draggableWidgets.TEXT, 300, 400);
-    _.propPane.UpdatePropertyFieldValue(
-      "Text",
-      `{{Table1.editableCell.value}}|{{Table1.editableCell.inputValue}}|{{typeof Table1.editableCell.value}}|{{typeof Table1.editableCell.inputValue}}`,
-    );
-
-    _.entityExplorer.DragDropWidgetNVerify(_.draggableWidgets.TABLE);
-    _.propPane.EnterJSContext("Table data", tableData);
-    _.table.toggleColumnEditableViaColSettingsPane("amount", "v2", true, true);
-  });
-
-  it("1. should test that currency column is available", () => {
-    cy.editColumn("amount");
-    cy.changeColumnType("Currency");
-    cy.get(".t--property-control-currency").should("exist");
-  });
-
-  it("2. should test that currency column properties are displayed and working", () => {
-    cy.get(".t--property-control-currency").should("exist");
-
-    cy.get(".t--property-control-decimalsallowed").should("exist");
-
-    cy.get(".t--property-control-notation").should("exist");
-
-    cy.get(".t--property-control-thousandseparator").should("exist");
-  });
-
-  it("3. should test that currency column is formatted correctly", () => {
-    cy.readTableV2data(0, 0).then((val) => {
-      expect(val).to.equal("$ 10,000");
+describe(
+  "Currency column",
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
+  () => {
+    before(() => {
+      _.entityExplorer.DragDropWidgetNVerify(_.draggableWidgets.TEXT, 300, 400);
+      _.propPane.UpdatePropertyFieldValue(
+        "Text",
+        `{{Table1.editableCell.value}}|{{Table1.editableCell.inputValue}}|{{typeof Table1.editableCell.value}}|{{typeof Table1.editableCell.inputValue}}`,
+      );
+
+      _.entityExplorer.DragDropWidgetNVerify(_.draggableWidgets.TABLE);
+      _.propPane.EnterJSContext("Table data", tableData);
+      _.table.toggleColumnEditableViaColSettingsPane(
+        "amount",
+        "v2",
+        true,
+        true,
+      );
     });
 
-    _.propPane.ToggleJSMode("Currency", true);
+    it("1. should test that currency column is available", () => {
+      cy.editColumn("amount");
+      cy.changeColumnType("Currency");
+      cy.get(".t--property-control-currency").should("exist");
+    });
 
-    _.propPane.EnterJSContext("Currency", "INR");
+    it("2. should test that currency column properties are displayed and working", () => {
+      cy.get(".t--property-control-currency").should("exist");
 
-    cy.readTableV2data(0, 0).then((val) => {
-      expect(val).to.equal("₹ 10,000");
-    });
+      cy.get(".t--property-control-decimalsallowed").should("exist");
 
-    _.propPane.SelectPropertiesDropDown("Decimals allowed", "1");
+      cy.get(".t--property-control-notation").should("exist");
 
-    cy.readTableV2data(0, 0).then((val) => {
-      expect(val).to.equal("₹ 10,000.0");
+      cy.get(".t--property-control-thousandseparator").should("exist");
     });
 
-    _.propPane.SelectPropertiesDropDown("Decimals allowed", "2");
+    it("3. should test that currency column is formatted correctly", () => {
+      cy.readTableV2data(0, 0).then((val) => {
+        expect(val).to.equal("$ 10,000");
+      });
 
-    cy.readTableV2data(0, 0).then((val) => {
-      expect(val).to.equal("₹ 10,000.01");
-    });
+      _.propPane.ToggleJSMode("Currency", true);
 
-    _.propPane.TogglePropertyState("Thousand separator", false);
+      _.propPane.EnterJSContext("Currency", "INR");
 
-    cy.readTableV2data(0, 0).then((val) => {
-      expect(val).to.equal("₹ 10000.01");
-    });
+      cy.readTableV2data(0, 0).then((val) => {
+        expect(val).to.equal("₹ 10,000");
+      });
 
-    _.propPane.SelectPropertiesDropDown("Notation", "Compact");
+      _.propPane.SelectPropertiesDropDown("Decimals allowed", "1");
 
-    cy.readTableV2data(0, 0).then((val) => {
-      expect(val).to.equal("₹ 10.00K");
-    });
+      cy.readTableV2data(0, 0).then((val) => {
+        expect(val).to.equal("₹ 10,000.0");
+      });
 
-    _.propPane.SelectPropertiesDropDown("Decimals allowed", "0");
+      _.propPane.SelectPropertiesDropDown("Decimals allowed", "2");
 
-    cy.readTableV2data(0, 0).then((val) => {
-      expect(val).to.equal("₹ 10K");
-    });
-  });
+      cy.readTableV2data(0, 0).then((val) => {
+        expect(val).to.equal("₹ 10,000.01");
+      });
 
-  it("4. shoudl test that currency column is editable", () => {
-    _.propPane.SelectPropertiesDropDown("Notation", "Standard");
+      _.propPane.TogglePropertyState("Thousand separator", false);
 
-    updateCellValue("1,234.23");
+      cy.readTableV2data(0, 0).then((val) => {
+        expect(val).to.equal("₹ 10000.01");
+      });
 
-    cy.readTableV2data(0, 0).then((val) => {
-      expect(val).to.equal("₹ 123423");
-    });
+      _.propPane.SelectPropertiesDropDown("Notation", "Compact");
 
-    _.propPane.SelectPropertiesDropDown("Decimals allowed", "1");
+      cy.readTableV2data(0, 0).then((val) => {
+        expect(val).to.equal("₹ 10.00K");
+      });
 
-    updateCellValue("4321.23");
+      _.propPane.SelectPropertiesDropDown("Decimals allowed", "0");
 
-    cy.readTableV2data(0, 0).then((val) => {
-      expect(val).to.equal("₹ 4321.2");
+      cy.readTableV2data(0, 0).then((val) => {
+        expect(val).to.equal("₹ 10K");
+      });
     });
 
-    _.propPane.SelectPropertiesDropDown("Decimals allowed", "2");
+    it("4. shoudl test that currency column is editable", () => {
+      _.propPane.SelectPropertiesDropDown("Notation", "Standard");
 
-    updateCellValue("1234.23");
+      updateCellValue("1,234.23");
 
-    cy.readTableV2data(0, 0).then((val) => {
-      expect(val).to.equal("₹ 1234.23");
-    });
+      cy.readTableV2data(0, 0).then((val) => {
+        expect(val).to.equal("₹ 123423");
+      });
 
-    cy.editTableCell(0, 0);
+      _.propPane.SelectPropertiesDropDown("Decimals allowed", "1");
 
-    cy.enterTableCellValue(0, 0, 6543.23);
+      updateCellValue("4321.23");
 
-    cy.get(".t--widget-textwidget .t--text-widget-container").should(
-      "have.text",
-      "6543.23|6543.23|number|string",
-    );
+      cy.readTableV2data(0, 0).then((val) => {
+        expect(val).to.equal("₹ 4321.2");
+      });
 
-    cy.saveTableCellValue(0, 0);
-  });
-});
+      _.propPane.SelectPropertiesDropDown("Decimals allowed", "2");
+
+      updateCellValue("1234.23");
+
+      cy.readTableV2data(0, 0).then((val) => {
+        expect(val).to.equal("₹ 1234.23");
+      });
+
+      cy.editTableCell(0, 0);
+
+      cy.enterTableCellValue(0, 0, 6543.23);
+
+      cy.get(".t--widget-textwidget .t--text-widget-container").should(
+        "have.text",
+        "6543.23|6543.23|number|string",
+      );
+
+      cy.saveTableCellValue(0, 0);
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/switchCell_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/switchCell_spec.js
index 56a0f6cf12e9..8625c8898478 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/switchCell_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/switchCell_spec.js
@@ -36,11 +36,12 @@ const tableData = `[
 const switchSelector = " .bp3-switch input[type='checkbox']";
 describe(
   "Switch column type funtionality test",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   () => {
     before(() => {
       entityExplorer.DragDropWidgetNVerify(draggableWidgets.TABLE);
       // turn on filtering for the table - it is disabled by default in this PR(#34593)
+      propPane.ExpandIfCollapsedSection("search\\&filters");
       agHelper.GetNClick(".t--property-control-allowfiltering input");
       propPane.EnterJSContext("Table data", tableData);
       cy.editColumn("completed");
@@ -136,6 +137,7 @@ describe(
         cy.wait(100);
         agHelper.ValidateToastMessage("This is a test message");
       });
+      agHelper.ClickButton("Discard", { index: 0 }); // discard changes
     });
 
     it("4. Verify filter condition", () => {
@@ -150,7 +152,11 @@ describe(
 
       // filter and verify checked rows
       cy.getTableV2DataSelector("0", "4").then((selector) => {
-        cy.get(selector + switchSelector).should("be.checked");
+        agHelper.AssertExistingCheckedState(selector + switchSelector, "true");
+      });
+
+      cy.getTableV2DataSelector("1", "4").then((selector) => {
+        agHelper.AssertExistingCheckedState(selector + switchSelector, "true");
       });
 
       // Filter and verify unchecked rows
@@ -161,10 +167,7 @@ describe(
       cy.get(publishPage.applyFiltersBtn).click();
 
       cy.getTableV2DataSelector("0", "4").then((selector) => {
-        cy.get(selector + switchSelector).should("not.be.checked");
-      });
-      cy.getTableV2DataSelector("1", "4").then((selector) => {
-        cy.get(selector + switchSelector).should("not.be.checked");
+        agHelper.AssertExistingCheckedState(selector + switchSelector, "false");
       });
     });
 
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/freeze_column1_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/freeze_column1_spec.js
index bf7400a4e57b..59311ee00d5f 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/freeze_column1_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/freeze_column1_spec.js
@@ -9,7 +9,7 @@ const commonlocators = require("../../../../../locators/commonlocators.json");
 
 describe(
   "Column freeze & unfreeze in canavs mode",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   () => {
     before(() => {
       cy.dragAndDropToCanvas(_.draggableWidgets.TABLE, { x: 200, y: 200 });
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/freeze_column2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/freeze_column2_spec.js
index ce0337d57bda..2df209b3fd31 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/freeze_column2_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/freeze_column2_spec.js
@@ -2,7 +2,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Column freeze & unfreeze in page mode",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   () => {
     before(() => {
       cy.dragAndDropToCanvas(_.draggableWidgets.TABLE, { x: 200, y: 200 });
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/freeze_column3_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/freeze_column3_spec.js
index ef9855b27f3d..93c778a7d746 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/freeze_column3_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/freeze_column3_spec.js
@@ -5,7 +5,7 @@ const commonlocators = require("../../../../../locators/commonlocators.json");
 
 describe(
   "Server-side pagination when turned on test of re-ordering columns",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   () => {
     before(() => {
       cy.dragAndDropToCanvas(_.draggableWidgets.TABLE, { x: 500, y: 200 });
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/freeze_column_query_change_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/freeze_column_query_change_spec.js
index 03de7702f9c9..e606409aebce 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/freeze_column_query_change_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/freeze_column_query_change_spec.js
@@ -12,7 +12,7 @@ const widgetsPage = require("../../../../../locators/Widgets.json");
 
 describe(
   "1. Check frozen common and/or custom columns retain position on query change",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   () => {
     before(() => {
       cy.dragAndDropToCanvas(WIDGET.TABLE, { x: 600, y: 200 });
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/inline_editing_validations_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/inline_editing_validations_spec.js
index 5330643d0a78..cb25d3b66670 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/inline_editing_validations_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/inline_editing_validations_spec.js
@@ -4,7 +4,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Table widget inline editing validation functionality",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   () => {
     afterEach(() => {
       _.agHelper.SaveLocalStorageCache();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/non_ascii_column_name_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/non_ascii_column_name_spec.js
index dd913d961659..e7340e94016f 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/non_ascii_column_name_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/non_ascii_column_name_spec.js
@@ -13,7 +13,7 @@ const data = [
 
 describe(
   "Non ASCII character functionality",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   () => {
     before(() => {
       _.agHelper.AddDsl("tableV2NewDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/scrollbar_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/scrollbar_spec.ts
index 46ea5ab0227f..daafb18945ec 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/scrollbar_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/scrollbar_spec.ts
@@ -10,7 +10,7 @@ import {
 
 describe(
   "Table widget v2: tableData change test",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       agHelper.AddDsl("Table/ScrollbarDSL");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/server_side_filtering_spec_1.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/server_side_filtering_spec_1.ts
index 674f56e06e32..1d4f6fad6166 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/server_side_filtering_spec_1.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/server_side_filtering_spec_1.ts
@@ -35,6 +35,7 @@ describe(
       entityExplorer.DragDropWidgetNVerify(draggableWidgets.TABLE, 300, 300);
 
       // turn on filtering for the table - it is disabled by default in this PR(#34593)
+      propPane.ExpandIfCollapsedSection("search\\&filters");
       agHelper.GetNClick(".t--property-control-allowfiltering input");
 
       // Create SQL data-source
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/table_data_change_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/table_data_change_spec.ts
index 4433da97b726..e8b145a2a9da 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/table_data_change_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/table_data_change_spec.ts
@@ -62,7 +62,7 @@ const TABLE_DATA_2 = `[
       "name": "Barty Crouch",
       "status": "APPROVED",
       "gender": "",
-      "avatar": "https://robohash.org/sednecessitatibuset.png?size=100x100&set=set1",
+      "avatar": "http://host.docker.internal:4200/clouddefaultImage.png",
       "email": "barty.crouch@gmail.com",
       "address": "St Petersberg #911 4th main",
       "createdAt": "2020-03-16T18:00:05.000Z",
@@ -73,7 +73,7 @@ const TABLE_DATA_2 = `[
       "name": "Jenelle Kibbys",
       "status": "APPROVED",
       "gender": "Female",
-      "avatar": "https://robohash.org/quiaasperiorespariatur.bmp?size=100x100&set=set1",
+      "avatar": "http://host.docker.internal:4200/453-200x300.jpg",
       "email": "jkibby1@hp.com",
       "address": "85 Tennessee Plaza",
       "createdAt": "2019-10-04T03:22:23.000Z",
@@ -84,7 +84,7 @@ const TABLE_DATA_2 = `[
       "name": "Demetre",
       "status": "APPROVED",
       "gender": "Male",
-      "avatar": "https://robohash.org/iustooptiocum.jpg?size=100x100&set=set1",
+      "avatar": "http://host.docker.internal:4200/clouddefaultImage.png",
       "email": "aaaa@bbb.com",
       "address": "262 Saint Paul Park",
       "createdAt": "2020-05-01T17:30:50.000Z",
@@ -95,7 +95,7 @@ const TABLE_DATA_2 = `[
       "name": "Tobin Shellibeer",
       "status": "APPROVED",
       "gender": "Male",
-      "avatar": "https://robohash.org/odioeumdolores.png?size=100x100&set=set1",
+      "avatar": "http://host.docker.internal:4200/453-200x300.jpg",
       "email": "tshellibeer9@ihg.com",
       "address": "4 Ridgeway Lane",
       "createdAt": "2019-11-27T06:09:41.000Z",
@@ -104,7 +104,7 @@ const TABLE_DATA_2 = `[
 
 describe(
   "Table widget v2: tableData change test",
-  { tags: ["@tag.Widget", "@tag.Table"] },
+  { tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
   function () {
     before(() => {
       agHelper.ClearLocalStorageCache();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Text/Text2_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Text/Text2_Spec.ts
index 436e421c4099..c233ee887494 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Text/Text2_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Text/Text2_Spec.ts
@@ -14,7 +14,7 @@ import EditorNavigation, {
 
 describe(
   "Text widget tests",
-  { tags: ["@tag.Widget", "@tag.Text"] },
+  { tags: ["@tag.Widget", "@tag.Text", "@tag.Binding"] },
   function () {
     before(() => {
       entityExplorer.DragDropWidgetNVerify(draggableWidgets.TEXT);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Text/TextWidget_BgColor_TextSize_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Text/TextWidget_BgColor_TextSize_spec.js
index e57ec52c35f9..51b20499aa3d 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Text/TextWidget_BgColor_TextSize_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Text/TextWidget_BgColor_TextSize_spec.js
@@ -4,7 +4,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Text Widget Cell Background and Text Size Validation",
-  { tags: ["@tag.Widget", "@tag.Text"] },
+  { tags: ["@tag.Widget", "@tag.Text", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("textWidgetDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Text/TextWidget_LintErrorValidation_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Text/TextWidget_LintErrorValidation_spec.js
index b473a01b24d6..d0966f4692a1 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Text/TextWidget_LintErrorValidation_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Text/TextWidget_LintErrorValidation_spec.js
@@ -3,7 +3,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Linting warning validation with text widget",
-  { tags: ["@tag.Widget", "@tag.Text"] },
+  { tags: ["@tag.Widget", "@tag.Text", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("textLintErrorDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Text/Text_new_feature_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Text/Text_new_feature_spec.js
index 1f2cabcf57e3..f082695a557f 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Text/Text_new_feature_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Text/Text_new_feature_spec.js
@@ -8,7 +8,7 @@ import {
 
 describe(
   "Text Widget color/font/alignment Functionality",
-  { tags: ["@tag.Widget", "@tag.Text"] },
+  { tags: ["@tag.Widget", "@tag.Text", "@tag.Binding"] },
   function () {
     before(() => {
       agHelper.AddDsl("textDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Text/Text_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Text/Text_spec.js
index 4078aaeaa144..7ec3c3819f04 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Text/Text_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Text/Text_spec.js
@@ -4,7 +4,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Text Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Text"] },
+  { tags: ["@tag.Widget", "@tag.Text", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("displayWidgetDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Text/Text_truncate_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Text/Text_truncate_spec.js
index 6ed7cd0cfe21..f9e0943f4bab 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Text/Text_truncate_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Text/Text_truncate_spec.js
@@ -3,7 +3,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Text Widget Truncate Functionality",
-  { tags: ["@tag.Widget", "@tag.Text"] },
+  { tags: ["@tag.Widget", "@tag.Text", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("textNewDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TreeSelect/Select_TreeSelect_MultiSelect_Empty_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TreeSelect/Select_TreeSelect_MultiSelect_Empty_spec.ts
index 31ace1c9d8b6..6b8e2ae88c9e 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TreeSelect/Select_TreeSelect_MultiSelect_Empty_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TreeSelect/Select_TreeSelect_MultiSelect_Empty_spec.ts
@@ -2,7 +2,7 @@ import formWidgetsPage from "../../../../../locators/FormWidgets.json";
 import * as _ from "../../../../../support/Objects/ObjectsCore";
 describe(
   "MultiSelect, Tree Select and Multi Tree Select Widget Empty Options Functionality",
-  { tags: ["@tag.Widget", "@tag.Select"] },
+  { tags: ["@tag.Widget", "@tag.Select", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("SelectDslWithEmptyOptions");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TreeSelect/Single_Select_Tree_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TreeSelect/Single_Select_Tree_spec.ts
index 8969c96e44ab..a6e2f3131e17 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TreeSelect/Single_Select_Tree_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TreeSelect/Single_Select_Tree_spec.ts
@@ -13,7 +13,7 @@ const toggleJSButton = (name) => `.t--property-control-${name} .t--js-toggle`;
 
 describe(
   "Single Select Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Select"] },
+  { tags: ["@tag.Widget", "@tag.Select", "@tag.Binding"] },
   function () {
     before(() => {
       agHelper.AddDsl("TreeSelectDsl");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TreeSelect/Tree_Select_2_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TreeSelect/Tree_Select_2_spec.ts
index 2814f31c2ac4..2a8b761d3a00 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TreeSelect/Tree_Select_2_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TreeSelect/Tree_Select_2_spec.ts
@@ -15,7 +15,7 @@ import EditorNavigation, {
 
 describe(
   "Tree Select widget Tests",
-  { tags: ["@tag.Widget", "@tag.Select"] },
+  { tags: ["@tag.Widget", "@tag.Select", "@tag.Binding"] },
   function () {
     before(() => {
       entityExplorer.DragDropWidgetNVerify("formwidget", 500, 100);
@@ -170,7 +170,9 @@ describe(
     });
 
     it("5. Verify Api binding", () => {
-      apiPage.CreateAndFillApi("https://mock-api.appsmith.com/users");
+      apiPage.CreateAndFillApi(
+        "http://host.docker.internal:5001/v1/dynamicrecords/getrecordsArray",
+      );
       apiPage.RunAPI();
       EditorNavigation.SelectEntityByName(
         "TreeSelect1",
@@ -181,7 +183,7 @@ describe(
       propPane.MoveToTab("Content");
       propPane.UpdatePropertyFieldValue(
         "Options",
-        `{{Api1.data.users.map((s)=>{return{"label":s.name,"value":s.name}})}}`,
+        `{{JSON.parse(Api1.data).map((item) => {return {"label":item.value, "value":item.abbr};})}}`,
       );
       agHelper.GetNClick(
         `${locators._widgetInDeployed("singleselecttreewidget")}`,
@@ -308,7 +310,7 @@ describe(
       propPane.ToggleJSMode("onOptionChange", true);
       propPane.UpdatePropertyFieldValue(
         "onOptionChange",
-        `{{download('http://host.docker.internal:4200/kiwi.svg', 'kiwi.svg', 'image/svg+xml').then(() => {
+        `{{download('http://host.docker.internal:4200/photo-1503469432756-4aae2e18d881.jpeg', 'flower.svg', 'image/svg+xml').then(() => {
             showAlert('Download Success', '');
           });}}`,
       );
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TreeSelect/Tree_Select_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TreeSelect/Tree_Select_spec.ts
index 7573dbcbffbe..8e1f95fff086 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TreeSelect/Tree_Select_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TreeSelect/Tree_Select_spec.ts
@@ -5,7 +5,7 @@ import commonlocators from "../../../../../locators/commonlocators.json";
 
 describe(
   "Tree Select Widget",
-  { tags: ["@tag.Widget", "@tag.Select"] },
+  { tags: ["@tag.Widget", "@tag.Select", "@tag.Binding"] },
   function () {
     before(() => {
       _.agHelper.AddDsl("emptyDSL");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Video/Video2_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Video/Video2_Spec.ts
index ad7e177f8ecd..1179888d2025 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Video/Video2_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Video/Video2_Spec.ts
@@ -16,7 +16,7 @@ import EditorNavigation, {
 
 describe(
   "Video widget tests",
-  { tags: ["@tag.Widget", "@tag.Video"] },
+  { tags: ["@tag.Widget", "@tag.Video", "@tag.Binding"] },
   function () {
     before(() => {
       homePage.NavigateToHome();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Video/Video_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Video/Video_spec.ts
index 4cec636c401a..78d0fc8d2a27 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Video/Video_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Video/Video_spec.ts
@@ -9,7 +9,7 @@ import {
 
 describe(
   "Video Widget Functionality",
-  { tags: ["@tag.Widget", "@tag.Video"] },
+  { tags: ["@tag.Widget", "@tag.Video", "@tag.Binding"] },
   function () {
     before(() => {
       entityExplorer.DragDropWidgetNVerify(draggableWidgets.VIDEO);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/WidgetCopyPaste_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/WidgetCopyPaste_spec.js
index a00829489b70..04f5e84b09a6 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/WidgetCopyPaste_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/WidgetCopyPaste_spec.js
@@ -10,159 +10,163 @@ import * as _ from "../../../../support/Objects/ObjectsCore";
 import PageList from "../../../../support/Pages/PageList";
 
 const widgetSelector = (name) => `[data-widgetname-cy="${name}"]`;
-describe("Widget Copy paste", { tags: ["@tag.Widget"] }, function () {
-  const modifierKey = Cypress.platform === "darwin" ? "meta" : "ctrl";
-  before(() => {
-    _.agHelper.AddDsl("WidgetCopyPaste");
-  });
-
-  it("1. When non Layout widget is selected, it should place below the widget selected", function () {
-    // Selection
-    cy.get(`#${dsl.dsl.children[1].widgetId}`).click({
-      ctrlKey: true,
+describe(
+  "Widget Copy paste",
+  { tags: ["@tag.Widget", "@tag.Binding"] },
+  function () {
+    const modifierKey = Cypress.platform === "darwin" ? "meta" : "ctrl";
+    before(() => {
+      _.agHelper.AddDsl("WidgetCopyPaste");
     });
-    cy.get(`div[data-testid='t--selected']`).should("have.length", 1);
-
-    //copy
-    cy.get("body").type(`{${modifierKey}}{c}`);
-    cy.get(commonLocators.toastmsg).contains("Copied");
-
-    //paste
-    cy.get("body").type(`{${modifierKey}}{v}`);
-    cy.get(widgetsPage.chartWidget).should("have.length", 2);
-
-    // verify the position
-    cy.get(widgetsPage.chartWidget)
-      .eq(0)
-      .then((element) => {
-        const elementTop = parseFloat(element.css("top"));
-        const elementHeight = parseFloat(element.css("height"));
-        const pastedWidgetTop =
-          (elementTop + elementHeight + 10).toString() + "px";
-        cy.get(widgetsPage.chartWidget)
-          .eq(1)
-          .invoke("attr", "style")
-          .should("contain", `left: ${element.css("left")}`)
-          .should("contain", `top: ${pastedWidgetTop}`);
+
+    it("1. When non Layout widget is selected, it should place below the widget selected", function () {
+      // Selection
+      cy.get(`#${dsl.dsl.children[1].widgetId}`).click({
+        ctrlKey: true,
+      });
+      cy.get(`div[data-testid='t--selected']`).should("have.length", 1);
+
+      //copy
+      cy.get("body").type(`{${modifierKey}}{c}`);
+      cy.get(commonLocators.toastmsg).contains("Copied");
+
+      //paste
+      cy.get("body").type(`{${modifierKey}}{v}`);
+      cy.get(widgetsPage.chartWidget).should("have.length", 2);
+
+      // verify the position
+      cy.get(widgetsPage.chartWidget)
+        .eq(0)
+        .then((element) => {
+          const elementTop = parseFloat(element.css("top"));
+          const elementHeight = parseFloat(element.css("height"));
+          const pastedWidgetTop =
+            (elementTop + elementHeight + 10).toString() + "px";
+          cy.get(widgetsPage.chartWidget)
+            .eq(1)
+            .invoke("attr", "style")
+            .should("contain", `left: ${element.css("left")}`)
+            .should("contain", `top: ${pastedWidgetTop}`);
+        });
+    });
+
+    it("2. When Layout widget is selected, it should place it inside the layout widget", function () {
+      cy.get(`#div-selection-0`).click({
+        force: true,
+      });
+
+      // Selection
+      cy.get(`#${dsl.dsl.children[0].widgetId}`).click({
+        ctrlKey: true,
       });
-  });
+      cy.get(`div[data-testid='t--selected']`).should("have.length", 1);
+
+      //paste
+      cy.get("body").type(`{${modifierKey}}{v}`);
 
-  it("2. When Layout widget is selected, it should place it inside the layout widget", function () {
-    cy.get(`#div-selection-0`).click({
-      force: true,
+      cy.get(`#${dsl.dsl.children[0].widgetId}`)
+        .find(widgetsPage.chartWidget)
+        .should("have.length", 1);
     });
 
-    // Selection
-    cy.get(`#${dsl.dsl.children[0].widgetId}`).click({
-      ctrlKey: true,
+    it("3. When widget inside the layout widget is selected, then it should paste inside the layout widget below the selected widget", function () {
+      cy.get(`#div-selection-0`).click({
+        force: true,
+      });
+
+      // Selection
+      cy.get(`#${dsl.dsl.children[0].widgetId}`)
+        .find(widgetsPage.chartWidget)
+        .click({
+          ctrlKey: true,
+        });
+      cy.get(`div[data-testid='t--selected']`).should("have.length", 1);
+
+      //paste
+      cy.get("body").type(`{${modifierKey}}{v}`);
+      cy.get(`#${dsl.dsl.children[0].widgetId}`)
+        .find(widgetsPage.chartWidget)
+        .should("have.length", 2);
     });
-    cy.get(`div[data-testid='t--selected']`).should("have.length", 1);
 
-    //paste
-    cy.get("body").type(`{${modifierKey}}{v}`);
+    it("4. When modal is open, it should paste inside the modal", () => {
+      //add modal widget
+      cy.dragAndDropToCanvas("modalwidget", { x: 300, y: 700 });
+      cy.get(".t--modal-widget").should("exist");
 
-    cy.get(`#${dsl.dsl.children[0].widgetId}`)
-      .find(widgetsPage.chartWidget)
-      .should("have.length", 1);
-  });
+      //paste
+      cy.get("body").type(`{${modifierKey}}{v}`);
+      cy.get(".t--modal-widget")
+        .find(widgetsPage.chartWidget)
+        .should("have.length", 1);
+    });
 
-  it("3. When widget inside the layout widget is selected, then it should paste inside the layout widget below the selected widget", function () {
-    cy.get(`#div-selection-0`).click({
-      force: true,
+    it("5. When widget Inside a modal is selected, it should paste inside the modal", () => {
+      //verify modal and selected widget
+      cy.get(".t--modal-widget").should("exist");
+      cy.get(".t--modal-widget")
+        .find(`div[data-testid='t--selected']`)
+        .should("have.length", 1);
+
+      //paste
+      cy.get("body").type(`{${modifierKey}}{v}`);
+      // cy.get(explorer.entityModal).click();
+      cy.get(".t--modal-widget")
+        .find(widgetsPage.chartWidget)
+        .should("have.length", 2);
     });
 
-    // Selection
-    cy.get(`#${dsl.dsl.children[0].widgetId}`)
-      .find(widgetsPage.chartWidget)
-      .click({
-        ctrlKey: true,
-      });
-    cy.get(`div[data-testid='t--selected']`).should("have.length", 1);
-
-    //paste
-    cy.get("body").type(`{${modifierKey}}{v}`);
-    cy.get(`#${dsl.dsl.children[0].widgetId}`)
-      .find(widgetsPage.chartWidget)
-      .should("have.length", 2);
-  });
-
-  it("4. When modal is open, it should paste inside the modal", () => {
-    //add modal widget
-    cy.dragAndDropToCanvas("modalwidget", { x: 300, y: 700 });
-    cy.get(".t--modal-widget").should("exist");
-
-    //paste
-    cy.get("body").type(`{${modifierKey}}{v}`);
-    cy.get(".t--modal-widget")
-      .find(widgetsPage.chartWidget)
-      .should("have.length", 1);
-  });
-
-  it("5. When widget Inside a modal is selected, it should paste inside the modal", () => {
-    //verify modal and selected widget
-    cy.get(".t--modal-widget").should("exist");
-    cy.get(".t--modal-widget")
-      .find(`div[data-testid='t--selected']`)
-      .should("have.length", 1);
-
-    //paste
-    cy.get("body").type(`{${modifierKey}}{v}`);
-    // cy.get(explorer.entityModal).click();
-    cy.get(".t--modal-widget")
-      .find(widgetsPage.chartWidget)
-      .should("have.length", 2);
-  });
-
-  it("6. Should be able to paste list widget inside another list widget", function () {
-    //clean up
-    PageList.AddNewPage("New blank page");
-
-    //add list widget
-    PageLeftPane.switchToAddNew();
-    cy.dragAndDropToCanvas("listwidgetv2", { x: 500, y: 700 });
-    cy.get(`div[data-testid='t--selected']`).should("have.length", 1);
-
-    //copy
-    cy.get("body").type(`{${modifierKey}}{c}`);
-
-    //paste
-    cy.get(`${widgetSelector("List1")} [type="CONTAINER_WIDGET"]`)
-      .first()
-      .type(`{${modifierKey}}{v}`);
-    cy.get(widgetsPage.listWidgetv2).should("have.length", 4);
-    cy.get(`${widgetSelector("List1")} [type="CONTAINER_WIDGET"]`)
-      .first()
-      .find(widgetsPage.listWidgetv2)
-      .should("have.length", 1);
-  });
-
-  it("7. Should be able to paste widget on the initial generate Page", function () {
-    cy.Createpage("NewPage", false);
-
-    //paste
-    cy.get("body").type(`{${modifierKey}}{v}`);
-
-    //verify a pasted list widget
-    cy.get(widgetsPage.listWidgetv2).should("have.length", 1);
-  });
-
-  it("8. Should not be able to copy/cut canvas widgets (i.e. Individual Tabs) of tabs widget", function () {
-    PageList.AddNewPage("New blank page");
-
-    _.entityExplorer.DragDropWidgetNVerify(_.draggableWidgets.TAB, 400, 200);
-
-    EditorNavigation.SelectEntityByName("Tab 1", EntityType.Widget, {}, [
-      "Tabs1",
-    ]);
-
-    cy.get("body").type(`{${modifierKey}}{c}`);
-
-    _.agHelper.ValidateToastMessage("This selected widget cannot be copied.");
-
-    _.agHelper.WaitUntilAllToastsDisappear();
-
-    cy.get("body").type(`{${modifierKey}}{x}`);
-
-    _.agHelper.ValidateToastMessage("This selected widget cannot be cut.");
-  });
-});
+    it("6. Should be able to paste list widget inside another list widget", function () {
+      //clean up
+      PageList.AddNewPage("New blank page");
+
+      //add list widget
+      PageLeftPane.switchToAddNew();
+      cy.dragAndDropToCanvas("listwidgetv2", { x: 500, y: 700 });
+      cy.get(`div[data-testid='t--selected']`).should("have.length", 1);
+
+      //copy
+      cy.get("body").type(`{${modifierKey}}{c}`);
+
+      //paste
+      cy.get(`${widgetSelector("List1")} [type="CONTAINER_WIDGET"]`)
+        .first()
+        .type(`{${modifierKey}}{v}`);
+      cy.get(widgetsPage.listWidgetv2).should("have.length", 4);
+      cy.get(`${widgetSelector("List1")} [type="CONTAINER_WIDGET"]`)
+        .first()
+        .find(widgetsPage.listWidgetv2)
+        .should("have.length", 1);
+    });
+
+    it("7. Should be able to paste widget on the initial generate Page", function () {
+      cy.Createpage("NewPage", false);
+
+      //paste
+      cy.get("body").type(`{${modifierKey}}{v}`);
+
+      //verify a pasted list widget
+      cy.get(widgetsPage.listWidgetv2).should("have.length", 1);
+    });
+
+    it("8. Should not be able to copy/cut canvas widgets (i.e. Individual Tabs) of tabs widget", function () {
+      PageList.AddNewPage("New blank page");
+
+      _.entityExplorer.DragDropWidgetNVerify(_.draggableWidgets.TAB, 400, 200);
+
+      EditorNavigation.SelectEntityByName("Tab 1", EntityType.Widget, {}, [
+        "Tabs1",
+      ]);
+
+      cy.get("body").type(`{${modifierKey}}{c}`);
+
+      _.agHelper.ValidateToastMessage("This selected widget cannot be copied.");
+
+      _.agHelper.WaitUntilAllToastsDisappear();
+
+      cy.get("body").type(`{${modifierKey}}{x}`);
+
+      _.agHelper.ValidateToastMessage("This selected widget cannot be cut.");
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/WidgetGrouping_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/WidgetGrouping_spec.js
index 63d71bf3d03a..e54e3031acb7 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/WidgetGrouping_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/WidgetGrouping_spec.js
@@ -1,48 +1,52 @@
 const dsl = require("../../../../fixtures/widgetSelection.json");
 import * as _ from "../../../../support/Objects/ObjectsCore";
 
-describe("Widget Grouping", { tags: ["@tag.Widget"] }, function () {
-  before(() => {
-    _.agHelper.AddDsl("widgetSelection");
-  });
-
-  it("Select widgets using cmd + click and group using cmd + G", function () {
-    // Selection
-    cy.get(`#${dsl.dsl.children[2].widgetId}`).click({
-      ctrlKey: true,
-    });
-    cy.get(`#${dsl.dsl.children[3].widgetId}`).click({
-      ctrlKey: true,
+describe(
+  "Widget Grouping",
+  { tags: ["@tag.Widget", "@tag.Binding"] },
+  function () {
+    before(() => {
+      _.agHelper.AddDsl("widgetSelection");
     });
-    cy.get(`div[data-testid='t--selected']`).should("have.length", 2);
-    cy.get(`.t--multi-selection-box`).should("have.length", 1);
-    const isMac = Cypress.platform === "darwin";
-    // Grouping
-    if (isMac) {
-      cy.get("body").type("{cmd}{g}");
-    } else {
-      cy.get("body").type("{ctrl}{g}");
-    }
-    cy.wait(2000);
-    cy.get(`div[data-testid='t--selected']`)
-      .should("have.length", 1)
-      .as("group");
-    cy.get("body").click();
-    cy.get(`@group`)
-      .find(`[data-testid="test-widget"]`)
-      .should("have.length", 2);
-    cy.get(`@group`).find(`.t--draggable-buttonwidget`);
-    cy.get(`@group`).find(`.t--draggable-imagewidget`);
 
-    // verify the position so that the camera widget is still below the newly grouped container
-    cy.get(`.t--widget-containerwidget`)
-      .eq(1)
-      .then((element) => {
-        const elementTop = parseFloat(element.css("top"));
-        cy.get(`.t--widget-camerawidget`).then((element2) => {
-          const containerTop = parseFloat(element2.css("top"));
-          expect(containerTop).to.be.greaterThan(elementTop);
-        });
+    it("Select widgets using cmd + click and group using cmd + G", function () {
+      // Selection
+      cy.get(`#${dsl.dsl.children[2].widgetId}`).click({
+        ctrlKey: true,
+      });
+      cy.get(`#${dsl.dsl.children[3].widgetId}`).click({
+        ctrlKey: true,
       });
-  });
-});
+      cy.get(`div[data-testid='t--selected']`).should("have.length", 2);
+      cy.get(`.t--multi-selection-box`).should("have.length", 1);
+      const isMac = Cypress.platform === "darwin";
+      // Grouping
+      if (isMac) {
+        cy.get("body").type("{cmd}{g}");
+      } else {
+        cy.get("body").type("{ctrl}{g}");
+      }
+      cy.wait(2000);
+      cy.get(`div[data-testid='t--selected']`)
+        .should("have.length", 1)
+        .as("group");
+      cy.get("body").click();
+      cy.get(`@group`)
+        .find(`[data-testid="test-widget"]`)
+        .should("have.length", 2);
+      cy.get(`@group`).find(`.t--draggable-buttonwidget`);
+      cy.get(`@group`).find(`.t--draggable-imagewidget`);
+
+      // verify the position so that the camera widget is still below the newly grouped container
+      cy.get(`.t--widget-containerwidget`)
+        .eq(1)
+        .then((element) => {
+          const elementTop = parseFloat(element.css("top"));
+          cy.get(`.t--widget-camerawidget`).then((element2) => {
+            const containerTop = parseFloat(element2.css("top"));
+            expect(containerTop).to.be.greaterThan(elementTop);
+          });
+        });
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/WidgetSelection_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/WidgetSelection_spec.js
index 85e75b0b90fb..fad3c44d4356 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/WidgetSelection_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/WidgetSelection_spec.js
@@ -8,62 +8,66 @@ import {
 const dsl = require("../../../../fixtures/widgetSelection.json");
 import * as _ from "../../../../support/Objects/ObjectsCore";
 
-describe("Widget Selection", { tags: ["@tag.Widget"] }, function () {
-  before(() => {
-    _.agHelper.AddDsl("widgetSelection");
-  });
-
-  it("1. Multi Select widgets using cmd + click", function () {
-    cy.get(`#${dsl.dsl.children[0].widgetId}`).click({
-      ctrlKey: true,
-    });
-    cy.get(`#${dsl.dsl.children[1].widgetId}`).click({
-      ctrlKey: true,
-    });
-    cy.get(`div[data-testid='t--selected']`).should("have.length", 2);
-    cy.get(`#${dsl.dsl.children[2].widgetId}`).click({
-      ctrlKey: true,
+describe(
+  "Widget Selection",
+  { tags: ["@tag.Widget", "@tag.Binding"] },
+  function () {
+    before(() => {
+      _.agHelper.AddDsl("widgetSelection");
     });
-    cy.get(`div[data-testid='t--selected']`).should("have.length", 3);
-    cy.get(`#${dsl.dsl.children[0].widgetId}`).click({
-      ctrlKey: true,
-    });
-    cy.get(`div[data-testid='t--selected']`).should("have.length", 2);
 
-    cy.get(`.t--multi-selection-box`).should("have.length", 1);
-  });
+    it("1. Multi Select widgets using cmd + click", function () {
+      cy.get(`#${dsl.dsl.children[0].widgetId}`).click({
+        ctrlKey: true,
+      });
+      cy.get(`#${dsl.dsl.children[1].widgetId}`).click({
+        ctrlKey: true,
+      });
+      cy.get(`div[data-testid='t--selected']`).should("have.length", 2);
+      cy.get(`#${dsl.dsl.children[2].widgetId}`).click({
+        ctrlKey: true,
+      });
+      cy.get(`div[data-testid='t--selected']`).should("have.length", 3);
+      cy.get(`#${dsl.dsl.children[0].widgetId}`).click({
+        ctrlKey: true,
+      });
+      cy.get(`div[data-testid='t--selected']`).should("have.length", 2);
 
-  it("2. Select widgets using cmd + click and open property pane by clicking on the widget from right side panel", function () {
-    // Selection
-    cy.get(`#${dsl.dsl.children[0].widgetId}`).click({
-      ctrlKey: true,
-    });
-    cy.get(`#${dsl.dsl.children[2].widgetId}`).click({
-      ctrlKey: true,
+      cy.get(`.t--multi-selection-box`).should("have.length", 1);
     });
-    cy.get(`div[data-testid='t--selected']`).should("have.length", 2);
-    cy.get(`.t--multi-selection-box`).should("have.length", 1);
 
-    //select on one of the widgets from the right side panel
-    cy.get(`.t-multi-widget-property-pane`).should("have.length", 1);
-    cy.get(`#${dsl.dsl.children[2].widgetId}`).should("have.length", 1);
-    cy.get(`#widget_name_${dsl.dsl.children[2].widgetId}`).click({
-      force: true,
-    });
+    it("2. Select widgets using cmd + click and open property pane by clicking on the widget from right side panel", function () {
+      // Selection
+      cy.get(`#${dsl.dsl.children[0].widgetId}`).click({
+        ctrlKey: true,
+      });
+      cy.get(`#${dsl.dsl.children[2].widgetId}`).click({
+        ctrlKey: true,
+      });
+      cy.get(`div[data-testid='t--selected']`).should("have.length", 2);
+      cy.get(`.t--multi-selection-box`).should("have.length", 1);
+
+      //select on one of the widgets from the right side panel
+      cy.get(`.t-multi-widget-property-pane`).should("have.length", 1);
+      cy.get(`#${dsl.dsl.children[2].widgetId}`).should("have.length", 1);
+      cy.get(`#widget_name_${dsl.dsl.children[2].widgetId}`).click({
+        force: true,
+      });
 
-    //should open property pane
-    cy.get(`.t--property-pane-view`).should("have.length", 1);
-  });
+      //should open property pane
+      cy.get(`.t--property-pane-view`).should("have.length", 1);
+    });
 
-  it("3. Should not select widgets if we hit CTRL + A on other Pages", function () {
-    // Click to create a New Data Source
-    _.dataSources.NavigateToDSCreateNew();
-    // Hit CTRL +A
-    cy.get("body").type("{ctrl}{a}");
-    // Switch to the Canvas
-    AppSidebar.navigate(AppSidebarButton.Editor);
-    PageLeftPane.switchSegment(PagePaneSegment.UI);
-    // Widgets should not be selected
-    cy.get(".t--multi-selection-box").should("not.exist");
-  });
-});
+    it("3. Should not select widgets if we hit CTRL + A on other Pages", function () {
+      // Click to create a New Data Source
+      _.dataSources.NavigateToDSCreateNew();
+      // Hit CTRL +A
+      cy.get("body").type("{ctrl}{a}");
+      // Switch to the Canvas
+      AppSidebar.navigate(AppSidebarButton.Editor);
+      PageLeftPane.switchSegment(PagePaneSegment.UI);
+      // Widgets should not be selected
+      cy.get(".t--multi-selection-box").should("not.exist");
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Widgets_Labels_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Widgets_Labels_spec.js
index 5fa084c1be3b..81328b3a81a0 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Widgets_Labels_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Widgets_Labels_spec.js
@@ -1,6 +1,6 @@
 let COLUMN_SPACE = 0;
 
-describe("Label feature", { tags: ["@tag.Widget"] }, () => {
+describe("Label feature", { tags: ["@tag.Widget", "@tag.Binding"] }, () => {
   before(() => {
     cy.get("#canvas-viewport").invoke("width", `640px`);
     // 72 - gutter width
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/deprecatedWidgets_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/deprecatedWidgets_spec.js
index f3532f72d336..c18f1524543c 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/deprecatedWidgets_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/deprecatedWidgets_spec.js
@@ -1,28 +1,35 @@
 const dsl = require("../../../../fixtures/deprecatedWidgets.json");
 import * as _ from "../../../../support/Objects/ObjectsCore";
 
-describe("Deprecation warning feature", { tags: ["@tag.Widget"] }, function () {
-  before(() => {
-    _.agHelper.AddDsl("deprecatedWidgets");
-  });
-
-  it("should have deprecation warning on all the deprecated widgets", function () {
-    cy.get(`#div-selection-0`).click({
-      force: true,
+describe(
+  "Deprecation warning feature",
+  { tags: ["@tag.Widget", "@tag.Binding"] },
+  function () {
+    before(() => {
+      _.agHelper.AddDsl("deprecatedWidgets");
     });
 
-    for (const widgets of dsl.dsl.children) {
+    it("should have deprecation warning on all the deprecated widgets", function () {
       cy.get(`#div-selection-0`).click({
         force: true,
       });
 
-      cy.get(`#${widgets.widgetId}`).click({
-        ctrlKey: true,
-      });
+      for (const widgets of dsl.dsl.children) {
+        cy.get(`#div-selection-0`).click({
+          force: true,
+        });
 
-      cy.get(`div[data-testid='t--selected']`).should("have.length", 1);
+        cy.get(`#${widgets.widgetId}`).click({
+          ctrlKey: true,
+        });
 
-      cy.get(`[data-testid='t--deprecation-warning']`).should("have.length", 1);
-    }
-  });
-});
+        cy.get(`div[data-testid='t--selected']`).should("have.length", 1);
+
+        cy.get(`[data-testid='t--deprecation-warning']`).should(
+          "have.length",
+          1,
+        );
+      }
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Workspace/CreateAppWithSameNameInWorkspace_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Workspace/CreateAppWithSameNameInWorkspace_spec.js
index 53a40823ec35..578a482c4167 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Workspace/CreateAppWithSameNameInWorkspace_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Workspace/CreateAppWithSameNameInWorkspace_spec.js
@@ -7,7 +7,7 @@ import { featureFlagIntercept } from "../../../../support/Objects/FeatureFlags";
 
 describe(
   "Create workspace and a new app / delete and recreate app",
-  { tags: ["@tag.Workspace"] },
+  { tags: ["@tag.Workspace", "@tag.AccessControl"] },
   function () {
     let workspaceId;
     let appid;
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Workspace/CreateSameAppInDiffWorkspace_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Workspace/CreateSameAppInDiffWorkspace_spec.js
index 0f7441e383c9..4cfb7b0032fc 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Workspace/CreateSameAppInDiffWorkspace_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Workspace/CreateSameAppInDiffWorkspace_spec.js
@@ -6,7 +6,7 @@ import * as _ from "../../../../support/Objects/ObjectsCore";
 
 describe(
   "Create app same name in different workspace",
-  { tags: ["@tag.Workspace"] },
+  { tags: ["@tag.Workspace", "@tag.AccessControl"] },
   function () {
     let workspaceId;
     let appid;
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Workspace/DeleteWorkspace_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Workspace/DeleteWorkspace_spec.ts
index ba1a8ebf24e9..34acb3ad1f87 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Workspace/DeleteWorkspace_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Workspace/DeleteWorkspace_spec.ts
@@ -10,7 +10,7 @@ import {
 
 describe(
   "Delete workspace test spec",
-  { tags: ["@tag.Workspace"] },
+  { tags: ["@tag.Workspace", "@tag.AccessControl"] },
   function () {
     let newWorkspaceName: any;
 
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Workspace/LeaveWorkspaceTest_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Workspace/LeaveWorkspaceTest_spec.js
index dfa129f097ed..a22854042b47 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Workspace/LeaveWorkspaceTest_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Workspace/LeaveWorkspaceTest_spec.js
@@ -9,7 +9,7 @@ import { REPO, CURRENT_REPO } from "../../../../fixtures/REPO";
 
 describe(
   "Leave workspace test spec",
-  { tags: ["@tag.Workspace"] },
+  { tags: ["@tag.Workspace", "@tag.AccessControl"] },
   function () {
     let newWorkspaceName;
 
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Workspace/LoginFromUIApp_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Workspace/LoginFromUIApp_spec.js
index 397d25274795..4b35e95cc5de 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Workspace/LoginFromUIApp_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Workspace/LoginFromUIApp_spec.js
@@ -8,7 +8,7 @@ import EditorNavigation, {
 
 describe(
   "Create page & delete page from UI",
-  { tags: ["@tag.Workspace"] },
+  { tags: ["@tag.Workspace", "@tag.AccessControl"] },
   function () {
     let pageid;
     it("1. Create page & delete page from UI", function () {
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Workspace/MemberRoles_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Workspace/MemberRoles_Spec.ts
index f747ffc96d27..85fab4226730 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Workspace/MemberRoles_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Workspace/MemberRoles_Spec.ts
@@ -5,7 +5,7 @@ let workspaceId: any, appid: any;
 
 describe(
   "Create new workspace and invite user & validate all roles",
-  { tags: ["@tag.Workspace", "@tag.Sanity"] },
+  { tags: ["@tag.Workspace", "@tag.Sanity", "@tag.AccessControl"] },
   () => {
     it("1. Create new Workspace, Share with a user from UI & verify", () => {
       if (CURRENT_REPO === REPO.EE) _.adminSettings.EnableGAC(true, false);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Workspace/ShareAppTests_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Workspace/ShareAppTests_Spec.ts
index 54ea1884ee16..94cc7ba412fd 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Workspace/ShareAppTests_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Workspace/ShareAppTests_Spec.ts
@@ -13,7 +13,7 @@ const appNavigationLocators = require("../../../../locators/AppNavigation.json")
 
 describe(
   "Create new workspace and share with a user",
-  { tags: ["@tag.Workspace", "@tag.Sanity"] },
+  { tags: ["@tag.Workspace", "@tag.Sanity", "@tag.AccessControl"] },
   function () {
     let workspaceId: string, appid: string, currentUrl: any;
 
@@ -113,6 +113,7 @@ describe(
       agHelper.AssertElementExist(homePage._appEditIcon);
       agHelper.GetNClick(homePage._appEditIcon, 0, true);
       agHelper.AssertElementAbsence(locators._loading);
+      assertHelper.AssertNetworkStatus("@getConsolidatedData", 200, true);
       agHelper.GetNClick(inviteModal.locators._shareButton, 0, true);
       agHelper.GetNClick(homePage._sharePublicToggle, 0, true);
       agHelper.GetNClick(locators._dialogCloseButton, 0, true);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Workspace/UpdateWorkspaceTests_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Workspace/UpdateWorkspaceTests_spec.js
index aa3f46cad051..1f52daa85e54 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Workspace/UpdateWorkspaceTests_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Workspace/UpdateWorkspaceTests_spec.js
@@ -1,92 +1,96 @@
 import homePage from "../../../../locators/HomePage";
 import * as _ from "../../../../support/Objects/ObjectsCore";
 
-describe("Update Workspace", { tags: ["@tag.Workspace"] }, function () {
-  let workspaceId;
-  let newWorkspaceName;
-  let appid;
-
-  it("1. Open the workspace general settings and update workspace name. The update should reflect in the workspace. It should also reflect in the workspace names on the left side and the workspace dropdown.	", function () {
-    _.homePage.NavigateToHome();
-    _.homePage.NavigateToHome();
-    _.agHelper.GenerateUUID();
-    cy.get("@guid").then((uid) => {
-      appid = "App" + uid;
-      workspaceId = uid;
-      _.homePage.CreateNewWorkspace(workspaceId);
-      cy.get(homePage.workspaceSettingOption).click({ force: true });
-      //_.homePage.CreateAppInWorkspace(workspaceId, appid);
-      cy.get(homePage.workspaceNameInput).click({ force: true });
-      cy.get(homePage.workspaceNameInput).clear();
-      cy.get(homePage.workspaceNameInput).type(workspaceId);
-      // eslint-disable-next-line cypress/no-unnecessary-waiting
-      cy.wait(2000);
-      cy.get(homePage.workspaceHeaderName).should(
-        "have.text",
-        `${workspaceId}`,
-      );
+describe(
+  "Update Workspace",
+  { tags: ["@tag.Workspace", "@tag.AccessControl"] },
+  function () {
+    let workspaceId;
+    let newWorkspaceName;
+    let appid;
 
+    it("1. Open the workspace general settings and update workspace name. The update should reflect in the workspace. It should also reflect in the workspace names on the left side and the workspace dropdown.	", function () {
+      _.homePage.NavigateToHome();
       _.homePage.NavigateToHome();
-      cy.get(homePage.leftPanelContainer).within(() => {
-        cy.get("span").should((item) => {
-          expect(item).to.contain.text(workspaceId);
+      _.agHelper.GenerateUUID();
+      cy.get("@guid").then((uid) => {
+        appid = "App" + uid;
+        workspaceId = uid;
+        _.homePage.CreateNewWorkspace(workspaceId);
+        cy.get(homePage.workspaceSettingOption).click({ force: true });
+        //_.homePage.CreateAppInWorkspace(workspaceId, appid);
+        cy.get(homePage.workspaceNameInput).click({ force: true });
+        cy.get(homePage.workspaceNameInput).clear();
+        cy.get(homePage.workspaceNameInput).type(workspaceId);
+        // eslint-disable-next-line cypress/no-unnecessary-waiting
+        cy.wait(2000);
+        cy.get(homePage.workspaceHeaderName).should(
+          "have.text",
+          `${workspaceId}`,
+        );
+
+        _.homePage.NavigateToHome();
+        cy.get(homePage.leftPanelContainer).within(() => {
+          cy.get("span").should((item) => {
+            expect(item).to.contain.text(workspaceId);
+          });
         });
       });
     });
-  });
 
-  it("2. Open the workspace general settings and update workspace email. The update should reflect in the workspace.", function () {
-    _.agHelper.GenerateUUID();
-    cy.get("@guid").then((uid) => {
-      newWorkspaceName = "SettingsUpdate" + uid;
-      _.homePage.CreateNewWorkspace(newWorkspaceName);
+    it("2. Open the workspace general settings and update workspace email. The update should reflect in the workspace.", function () {
+      _.agHelper.GenerateUUID();
+      cy.get("@guid").then((uid) => {
+        newWorkspaceName = "SettingsUpdate" + uid;
+        _.homePage.CreateNewWorkspace(newWorkspaceName);
+      });
+      cy.get(homePage.workspaceSettingOption).click({ force: true });
+      cy.get(homePage.workspaceEmailInput).clear();
+      cy.get(homePage.workspaceEmailInput).type(Cypress.env("TESTUSERNAME2"));
+      cy.wait("@updateWorkspace").should(
+        "have.nested.property",
+        "response.body.responseMeta.status",
+        200,
+      );
+      cy.get(homePage.workspaceEmailInput).should(
+        "have.value",
+        Cypress.env("TESTUSERNAME2"),
+      );
+      // update workspace website
+      cy.get(homePage.workspaceWebsiteInput).clear();
+      cy.get(homePage.workspaceWebsiteInput).type("demowebsite.com");
+      cy.wait("@updateWorkspace").should(
+        "have.nested.property",
+        "response.body.responseMeta.status",
+        200,
+      );
+      cy.get(homePage.workspaceWebsiteInput).should(
+        "have.value",
+        "demowebsite.com",
+      );
     });
-    cy.get(homePage.workspaceSettingOption).click({ force: true });
-    cy.get(homePage.workspaceEmailInput).clear();
-    cy.get(homePage.workspaceEmailInput).type(Cypress.env("TESTUSERNAME2"));
-    cy.wait("@updateWorkspace").should(
-      "have.nested.property",
-      "response.body.responseMeta.status",
-      200,
-    );
-    cy.get(homePage.workspaceEmailInput).should(
-      "have.value",
-      Cypress.env("TESTUSERNAME2"),
-    );
-    // update workspace website
-    cy.get(homePage.workspaceWebsiteInput).clear();
-    cy.get(homePage.workspaceWebsiteInput).type("demowebsite.com");
-    cy.wait("@updateWorkspace").should(
-      "have.nested.property",
-      "response.body.responseMeta.status",
-      200,
-    );
-    cy.get(homePage.workspaceWebsiteInput).should(
-      "have.value",
-      "demowebsite.com",
-    );
-  });
 
-  it("3. Upload logo / delete logo and validate", function () {
-    const fixturePath = "cypress/fixtures/appsmithlogo.png";
-    cy.xpath(homePage.uploadLogo).first().selectFile(fixturePath, {
-      force: true,
+    it("3. Upload logo / delete logo and validate", function () {
+      const fixturePath = "cypress/fixtures/appsmithlogo.png";
+      cy.xpath(homePage.uploadLogo).first().selectFile(fixturePath, {
+        force: true,
+      });
+      cy.wait("@updateLogo").should(
+        "have.nested.property",
+        "response.body.responseMeta.status",
+        200,
+      );
+      cy.wait(1000);
+      cy.get(homePage.removeLogo)
+        .last()
+        .should("be.hidden")
+        .invoke("show")
+        .click({ force: true });
+      cy.wait("@deleteLogo").should(
+        "have.nested.property",
+        "response.body.responseMeta.status",
+        200,
+      );
     });
-    cy.wait("@updateLogo").should(
-      "have.nested.property",
-      "response.body.responseMeta.status",
-      200,
-    );
-    cy.wait(1000);
-    cy.get(homePage.removeLogo)
-      .last()
-      .should("be.hidden")
-      .invoke("show")
-      .click({ force: true });
-    cy.wait("@deleteLogo").should(
-      "have.nested.property",
-      "response.body.responseMeta.status",
-      200,
-    );
-  });
-});
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Workspace/WorkspaceImportApplication_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Workspace/WorkspaceImportApplication_spec.js
index ba5a8f83d1d9..33033fa577af 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Workspace/WorkspaceImportApplication_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Workspace/WorkspaceImportApplication_spec.js
@@ -3,7 +3,7 @@ import { agHelper, homePage } from "../../../../support/Objects/ObjectsCore";
 
 describe(
   "Workspace Import Application",
-  { tags: ["@tag.Workspace", "@tag.Sanity"] },
+  { tags: ["@tag.Workspace", "@tag.Sanity", "@tag.AccessControl"] },
   function () {
     let workspaceId;
     let newWorkspaceName;
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Workspace/Workspace_validation_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Workspace/Workspace_validation_spec.js
index 98ed4776f685..60f805652354 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Workspace/Workspace_validation_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Workspace/Workspace_validation_spec.js
@@ -5,7 +5,7 @@ import * as _ from "../../../../support/Objects/ObjectsCore";
 
 describe(
   "Workspace name validation spec",
-  { tags: ["@tag.Workspace"] },
+  { tags: ["@tag.Workspace", "@tag.AccessControl"] },
   function () {
     let workspaceId;
     let newWorkspaceName;
diff --git a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_All_Verb_spec.js b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_All_Verb_spec.js
index d88c2c7ba3e8..8c4cfa434edc 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_All_Verb_spec.js
+++ b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_All_Verb_spec.js
@@ -16,7 +16,7 @@ import {
 
 describe(
   "API Panel Test Functionality",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   function () {
     const successMsg = "Executed successfully from user request";
     afterEach(function () {
diff --git a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Auto_Generated_Header_spec.ts b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Auto_Generated_Header_spec.ts
index 5acbf74d906b..bead7f2dc5c2 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Auto_Generated_Header_spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Auto_Generated_Header_spec.ts
@@ -2,7 +2,7 @@ import * as _ from "../../../../support/Objects/ObjectsCore";
 
 describe(
   "Validate API Auto generated headers",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   () => {
     it("1. Check whether auto generated header is set and overidden", () => {
       _.apiPage.CreateApi("FirstAPI");
diff --git a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Bugs_Spec.js b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Bugs_Spec.js
index 7feda064b36f..8f1a58ebc09f 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Bugs_Spec.js
+++ b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Bugs_Spec.js
@@ -18,211 +18,217 @@ import {
 } from "../../../../support/Objects/ObjectsCore";
 import PageList from "../../../../support/Pages/PageList";
 
-describe("Rest Bugs tests", { tags: ["@tag.Datasource"] }, function () {
-  beforeEach(() => {
-    agHelper.RestoreLocalStorageCache();
-  });
-
-  afterEach(() => {
-    agHelper.SaveLocalStorageCache();
-  });
-
-  it("1. Bug 5550: Not able to run APIs in parallel", function () {
-    agHelper.AddDsl("apiParallelDsl");
-    cy.get(".ads-v2-spinner").should("not.exist");
-
-    //Api 1
-    apiPage.CreateAndFillApi(
-      dataManager.dsValues[dataManager.defaultEnviorment].flowerImageUrl1,
-      "FlowerImage1",
-    );
-    agHelper.PressEscape();
-
-    //Api 2
-    apiPage.CreateAndFillApi(
-      dataManager.dsValues[dataManager.defaultEnviorment].flowerImageUrl2,
-      "FlowerImage2",
-    );
-    agHelper.PressEscape();
-
-    //Api 3
-    apiPage.CreateAndFillApi(
-      "http://host.docker.internal:8000/a.txt",
-      "SampleText",
-    );
-    agHelper.PressEscape();
-
-    //Api 4
-    apiPage.CreateAndFillApi(
-      "http://host.docker.internal:5001/v1/dynamicrecords/getrecordsArray",
-      "dynamicRecords",
-    );
-    agHelper.PressEscape();
-
-    PageLeftPane.switchSegment(PagePaneSegment.UI);
-    agHelper.ClickButton("Invoke APIs!");
-    cy.wait(12000); // for all api calls to complete!
-
-    //Flower1 Image
-    cy.xpath("//img/parent::div")
-      .eq(0)
-      .find("img")
-      .invoke("attr", "src")
-      .then(($src) => {
-        expect($src).not.eq(
-          "http://host.docker.internal:4200/clouddefaultImage.png",
-        );
-        //expect($src).contains("cat");
-      });
+describe(
+  "Rest Bugs tests",
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
+  function () {
+    beforeEach(() => {
+      agHelper.RestoreLocalStorageCache();
+    });
 
-    // cy.wait("@postExecute").then(({ response }) => {
-    //   expect(response.body.data.isExecutionSuccess).to.eq(true);
-    //   expect(response.body.data.body[0].url.length).to.be.above(0); //Cat image
-    // });
-
-    // cy.wait("@postExecute").then(({ response }) => {
-    //   expect(response.body.data.isExecutionSuccess).to.eq(true);
-    //   expect(response.body.data.body.message.length).to.be.above(0); //Dog Image
-    // });
-
-    //Flower2 Image
-    cy.xpath("//img/parent::div")
-      .eq(1)
-      .find("img")
-      .invoke("attr", "src")
-      .then(($src) => {
-        expect($src).not.eq(
-          "http://host.docker.internal:4200/clouddefaultImage.png",
-        );
-        //expect($src).contains("dog");
-      });
+    afterEach(() => {
+      agHelper.SaveLocalStorageCache();
+    });
 
-    // cy.wait("@postExecute").then(({ response }) => {
-    //   expect(response.body.data.isExecutionSuccess).to.eq(true);
-    //   expect(response.body.data.body.length).to.be.above(0); //Number fact
-    // });
-
-    cy.get(".t--widget-buttonwidget").scrollIntoView();
-
-    cy.get(".t--widget-textwidget")
-      .eq(0)
-      .invoke("text")
-      .then(($txt) => expect($txt).to.have.length.greaterThan(20));
-
-    // cy.wait("@postExecute").then(({ response }) => {
-    //   //cy.log("Response is :"+ JSON.stringify(response.body))
-    //   expect(response.body.data.isExecutionSuccess).to.eq(true);
-    //   expect(response.body.data.request.url.length).to.be.above(0); //Cocktail
-    // });
-
-    //Cocktail DB
-    cy.xpath("//img/parent::div")
-      .eq(2)
-      .find("img")
-      .invoke("attr", "src")
-      .then(($src) => {
-        expect($src).not.eq(
-          "http://host.docker.internal:4200/clouddefaultImage.png",
-        );
-        //expect($src).contains("cocktail");
-      });
+    it("1. Bug 5550: Not able to run APIs in parallel", function () {
+      agHelper.AddDsl("apiParallelDsl");
+      cy.get(".ads-v2-spinner").should("not.exist");
+
+      //Api 1
+      apiPage.CreateAndFillApi(
+        dataManager.dsValues[dataManager.defaultEnviorment].flowerImageUrl1,
+        "FlowerImage1",
+      );
+      agHelper.PressEscape();
+
+      //Api 2
+      apiPage.CreateAndFillApi(
+        dataManager.dsValues[dataManager.defaultEnviorment].flowerImageUrl2,
+        "FlowerImage2",
+      );
+      agHelper.PressEscape();
+
+      //Api 3
+      apiPage.CreateAndFillApi(
+        "http://host.docker.internal:8000/a.txt",
+        "SampleText",
+      );
+      agHelper.PressEscape();
+
+      //Api 4
+      apiPage.CreateAndFillApi(
+        "http://host.docker.internal:5001/v1/dynamicrecords/getrecordsArray",
+        "dynamicRecords",
+      );
+      agHelper.PressEscape();
+
+      PageLeftPane.switchSegment(PagePaneSegment.UI);
+      agHelper.ClickButton("Invoke APIs!");
+      cy.wait(12000); // for all api calls to complete!
+
+      //Flower1 Image
+      cy.xpath("//img/parent::div")
+        .eq(0)
+        .find("img")
+        .invoke("attr", "src")
+        .then(($src) => {
+          expect($src).not.eq(
+            "http://host.docker.internal:4200/clouddefaultImage.png",
+          );
+          //expect($src).contains("cat");
+        });
+
+      // cy.wait("@postExecute").then(({ response }) => {
+      //   expect(response.body.data.isExecutionSuccess).to.eq(true);
+      //   expect(response.body.data.body[0].url.length).to.be.above(0); //Cat image
+      // });
+
+      // cy.wait("@postExecute").then(({ response }) => {
+      //   expect(response.body.data.isExecutionSuccess).to.eq(true);
+      //   expect(response.body.data.body.message.length).to.be.above(0); //Dog Image
+      // });
+
+      //Flower2 Image
+      cy.xpath("//img/parent::div")
+        .eq(1)
+        .find("img")
+        .invoke("attr", "src")
+        .then(($src) => {
+          expect($src).not.eq(
+            "http://host.docker.internal:4200/clouddefaultImage.png",
+          );
+          //expect($src).contains("dog");
+        });
+
+      // cy.wait("@postExecute").then(({ response }) => {
+      //   expect(response.body.data.isExecutionSuccess).to.eq(true);
+      //   expect(response.body.data.body.length).to.be.above(0); //Number fact
+      // });
+
+      cy.get(".t--widget-buttonwidget").scrollIntoView();
+
+      cy.get(".t--widget-textwidget")
+        .eq(0)
+        .invoke("text")
+        .then(($txt) => expect($txt).to.have.length.greaterThan(20));
+
+      // cy.wait("@postExecute").then(({ response }) => {
+      //   //cy.log("Response is :"+ JSON.stringify(response.body))
+      //   expect(response.body.data.isExecutionSuccess).to.eq(true);
+      //   expect(response.body.data.request.url.length).to.be.above(0); //Cocktail
+      // });
+
+      //Cocktail DB
+      cy.xpath("//img/parent::div")
+        .eq(2)
+        .find("img")
+        .invoke("attr", "src")
+        .then(($src) => {
+          expect($src).not.eq(
+            "http://host.docker.internal:4200/clouddefaultImage.png",
+          );
+          //expect($src).contains("cocktail");
+        });
+
+      //Spread to check later!
+      // cy.wait(['@postExecute', '@postExecute', '@postExecute', '@postExecute'], { timeout: 8000 }).spread(
+      //     (postExecute1, postExecute2, postExecute3, postExecute4) => {
+      //         expect(postExecute1.body.data.isExecutionSuccess).to.eq(true);
+      //         expect(postExecute1.body.data.body.url.length).to.be.above(0);
+
+      //         expect(postExecute2.body.data.isExecutionSuccess).to.eq(true);
+      //         expect(postExecute2.body.data.body.type).to.eq('cat');
+
+      //         expect(postExecute3.body.data.isExecutionSuccess).to.eq(true);
+      //         expect(postExecute3.body.data.body.message.length).to.be.above(0);
+
+      //         expect(postExecute4.body.data.isExecutionSuccess).to.eq(true);
+      //         expect(postExecute4.body.data.body.type).to.eq('dog');
+
+      //     })
+    });
 
-    //Spread to check later!
-    // cy.wait(['@postExecute', '@postExecute', '@postExecute', '@postExecute'], { timeout: 8000 }).spread(
-    //     (postExecute1, postExecute2, postExecute3, postExecute4) => {
-    //         expect(postExecute1.body.data.isExecutionSuccess).to.eq(true);
-    //         expect(postExecute1.body.data.body.url.length).to.be.above(0);
-
-    //         expect(postExecute2.body.data.isExecutionSuccess).to.eq(true);
-    //         expect(postExecute2.body.data.body.type).to.eq('cat');
-
-    //         expect(postExecute3.body.data.isExecutionSuccess).to.eq(true);
-    //         expect(postExecute3.body.data.body.message.length).to.be.above(0);
-
-    //         expect(postExecute4.body.data.isExecutionSuccess).to.eq(true);
-    //         expect(postExecute4.body.data.body.type).to.eq('dog');
-
-    //     })
-  });
-
-  it("2. Bug 6863: Clicking on 'debug' crashes the appsmith application", function () {
-    cy.startErrorRoutes();
-    PageList.AddNewPage();
-    //Api 1
-    apiPage.CreateAndFillApi(
-      dataManager.dsValues[dataManager.defaultEnviorment].flowerImageUrl1,
-      "InternalServerErrorApi",
-    );
-    apiPage.RunAPI(false);
-    cy.wait("@postExecuteError");
-    cy.get(commonlocators.errorTab).should("be.visible").click({ force: true });
-    cy.get(commonlocators.debuggerLabel)
-      .invoke("text")
-      .then(($text) => {
-        expect($text).to.eq("An unexpected error occurred");
-      });
-  });
-
-  it("3. Bug 4775: No Cyclical dependency when Api returns an error", function () {
-    entityExplorer.DragDropWidgetNVerify(draggableWidgets.TABLE);
-    propPane.EnterJSContext("Table data", "{{MockApi.data}}");
-    //Api 1
-    apiPage.CreateAndFillApi(
-      dataManager.dsValues[dataManager.defaultEnviorment].mockApiUrl,
-      "MockApi",
-    );
-    apiPage.RunAPI();
-    cy.ResponseStatusCheck(testdata.successStatusCode);
-    EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
-    table.WaitUntilTableLoad(0, 0, "v2");
-
-    EditorNavigation.SelectEntityByName("MockApi", EntityType.Api);
-    apiPage.EnterURL(
-      dataManager.dsValues[dataManager.defaultEnviorment].mockHttpCodeUrl +
-        "404",
-    );
-    apiPage.RunAPI(false);
-    agHelper.AssertElementAbsence(
-      locators._specificToast("Cyclic dependency found while evaluating"),
-    );
-    cy.ResponseStatusCheck("404 NOT_FOUND");
-    agHelper.GetNClick(commonlocators.errorTab);
-    agHelper.GetNClick(commonlocators.debuggerToggle);
-    cy.get(commonlocators.debuggerLabel)
-      .invoke("text")
-      .then(($text) => {
-        expect($text.toLowerCase()).contains("Not Found".toLowerCase());
+    it("2. Bug 6863: Clicking on 'debug' crashes the appsmith application", function () {
+      cy.startErrorRoutes();
+      PageList.AddNewPage();
+      //Api 1
+      apiPage.CreateAndFillApi(
+        dataManager.dsValues[dataManager.defaultEnviorment].flowerImageUrl1,
+        "InternalServerErrorApi",
+      );
+      apiPage.RunAPI(false);
+      cy.wait("@postExecuteError");
+      cy.get(commonlocators.errorTab)
+        .should("be.visible")
+        .click({ force: true });
+      cy.get(commonlocators.debuggerLabel)
+        .invoke("text")
+        .then(($text) => {
+          expect($text).to.eq("An unexpected error occurred");
+        });
+    });
+
+    it("3. Bug 4775: No Cyclical dependency when Api returns an error", function () {
+      entityExplorer.DragDropWidgetNVerify(draggableWidgets.TABLE);
+      propPane.EnterJSContext("Table data", "{{MockApi.data}}");
+      //Api 1
+      apiPage.CreateAndFillApi(
+        dataManager.dsValues[dataManager.defaultEnviorment].mockApiUrl,
+        "MockApi",
+      );
+      apiPage.RunAPI();
+      cy.ResponseStatusCheck(testdata.successStatusCode);
+      EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
+      table.WaitUntilTableLoad(0, 0, "v2");
+
+      EditorNavigation.SelectEntityByName("MockApi", EntityType.Api);
+      apiPage.EnterURL(
+        dataManager.dsValues[dataManager.defaultEnviorment].mockHttpCodeUrl +
+          "404",
+      );
+      apiPage.RunAPI(false);
+      agHelper.AssertElementAbsence(
+        locators._specificToast("Cyclic dependency found while evaluating"),
+      );
+      cy.ResponseStatusCheck("404 NOT_FOUND");
+      agHelper.GetNClick(commonlocators.errorTab);
+      agHelper.GetNClick(commonlocators.debuggerToggle);
+      cy.get(commonlocators.debuggerLabel)
+        .invoke("text")
+        .then(($text) => {
+          expect($text.toLowerCase()).contains("Not Found".toLowerCase());
+        });
+    });
+
+    it("4. Bug 13515: API Response gets garbled if encoded with gzip", function () {
+      apiPage.CreateAndFillApi(
+        dataManager.dsValues[dataManager.defaultEnviorment].mockGzipApi,
+        "GarbledResponseAPI",
+      );
+      apiPage.RunAPI(false);
+      apiPage.SelectPaneTab("Response");
+      cy.wait("@postExecute").then(({ response }) => {
+        expect(response.body.data.isExecutionSuccess).to.eq(true);
+        const bodyArr = response.body.data.body;
+        expect(bodyArr).to.have.any.keys("gzipped");
       });
-  });
-
-  it("4. Bug 13515: API Response gets garbled if encoded with gzip", function () {
-    apiPage.CreateAndFillApi(
-      dataManager.dsValues[dataManager.defaultEnviorment].mockGzipApi,
-      "GarbledResponseAPI",
-    );
-    apiPage.RunAPI(false);
-    apiPage.SelectPaneTab("Response");
-    cy.wait("@postExecute").then(({ response }) => {
-      expect(response.body.data.isExecutionSuccess).to.eq(true);
-      const bodyArr = response.body.data.body;
-      expect(bodyArr).to.have.any.keys("gzipped");
     });
-  });
-
-  // this test applies to other fields as well - params and body formdata
-  it("5. Bug 25817: Assert that header fields are correctly updated.", function () {
-    apiPage.CreateAndFillApi(
-      dataManager.dsValues[dataManager.defaultEnviorment].mockGzipApi,
-      "HeaderTest",
-    );
-    apiPage.EnterHeader("hello", "world", 0);
-    apiPage.EnterHeader("", "", 1);
-    agHelper.GetNClick(apiPage._addMoreHeaderFieldButton);
-    apiPage.EnterHeader("hey", "there", 2);
-
-    agHelper.RefreshPage();
-
-    apiPage.ValidateHeaderParams({ key: "hello", value: "world" }, 0);
-    apiPage.ValidateHeaderParams({ key: "hey", value: "there" }, 1);
-  });
-});
+
+    // this test applies to other fields as well - params and body formdata
+    it("5. Bug 25817: Assert that header fields are correctly updated.", function () {
+      apiPage.CreateAndFillApi(
+        dataManager.dsValues[dataManager.defaultEnviorment].mockGzipApi,
+        "HeaderTest",
+      );
+      apiPage.EnterHeader("hello", "world", 0);
+      apiPage.EnterHeader("", "", 1);
+      agHelper.GetNClick(apiPage._addMoreHeaderFieldButton);
+      apiPage.EnterHeader("hey", "there", 2);
+
+      agHelper.RefreshPage();
+
+      apiPage.ValidateHeaderParams({ key: "hello", value: "world" }, 0);
+      apiPage.ValidateHeaderParams({ key: "hey", value: "there" }, 1);
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_ContextMenu_spec.js b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_ContextMenu_spec.js
index aef13e574d23..3c717e80e373 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_ContextMenu_spec.js
+++ b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_ContextMenu_spec.js
@@ -15,7 +15,7 @@ import {
 
 describe(
   "API Panel Test Functionality ",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   function () {
     it("1. Test API copy/Move/delete feature", function () {
       cy.Createpage("SecondPage");
diff --git a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_CurlPOSTImport_spec.js b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_CurlPOSTImport_spec.js
index a5e910cff0ac..573b74152c34 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_CurlPOSTImport_spec.js
+++ b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_CurlPOSTImport_spec.js
@@ -1,48 +1,52 @@
 const apiwidget = require("../../../../locators/apiWidgetslocator.json");
 import { apiPage, assertHelper } from "../../../../support/Objects/ObjectsCore";
 
-describe("Test curl import flow", { tags: ["@tag.Datasource"] }, function () {
-  it("1. Test curl import flow for POST action with JSON body", function () {
-    cy.fixture("datasources").then((datasourceFormData) => {
-      localStorage.setItem("ApiPaneV2", "ApiPaneV2");
-      apiPage.FillCurlNImport(
-        'curl -d \'{"name":"morpheus","job":"leader"}\' -H Content-Type:application/json -X POST ' +
-          datasourceFormData["echoApiUrl"],
-        {
-          force: true,
-          parseSpecialCharSequences: false,
-        },
-      );
-      assertHelper.AssertNetworkExecutionSuccess("@postExecute");
-      cy.get("@curlImport").then((response) => {
-        cy.expect(response.response.body.responseMeta.success).to.eq(true);
-        cy.get(apiwidget.ApiName)
-          .invoke("text")
-          .then((text) => {
-            const someText = text;
-            expect(someText).to.equal(response.response.body.data.name);
-          });
+describe(
+  "Test curl import flow",
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
+  function () {
+    it("1. Test curl import flow for POST action with JSON body", function () {
+      cy.fixture("datasources").then((datasourceFormData) => {
+        localStorage.setItem("ApiPaneV2", "ApiPaneV2");
+        apiPage.FillCurlNImport(
+          'curl -d \'{"name":"morpheus","job":"leader"}\' -H Content-Type:application/json -X POST ' +
+            datasourceFormData["echoApiUrl"],
+          {
+            force: true,
+            parseSpecialCharSequences: false,
+          },
+        );
+        assertHelper.AssertNetworkExecutionSuccess("@postExecute");
+        cy.get("@curlImport").then((response) => {
+          cy.expect(response.response.body.responseMeta.success).to.eq(true);
+          cy.get(apiwidget.ApiName)
+            .invoke("text")
+            .then((text) => {
+              const someText = text;
+              expect(someText).to.equal(response.response.body.data.name);
+            });
+        });
       });
     });
-  });
 
-  it("2. Test curl import flow for POST action with multipart form data", function () {
-    cy.fixture("datasources").then((datasourceFormData) => {
-      apiPage.FillCurlNImport(
-        `curl --request POST ${datasourceFormData["multipartAPI"]} -F 'randomKey=randomValue' --form 'randomKey2=\"randomValue2\"'`,
-      );
-      cy.get("@postExecute").then((response) => {
-        cy.log(response);
-        cy.expect(response.response.body.responseMeta.success).to.eq(true);
-        // Asserting if the form key value are returned in the response
-        cy.expect(response.response.body.data.body.data.randomKey).to.eq(
-          "randomValue",
+    it("2. Test curl import flow for POST action with multipart form data", function () {
+      cy.fixture("datasources").then((datasourceFormData) => {
+        apiPage.FillCurlNImport(
+          `curl --request POST ${datasourceFormData["multipartAPI"]} -F 'randomKey=randomValue' --form 'randomKey2=\"randomValue2\"'`,
         );
-        apiPage.ValidateHeaderParams({
-          key: "Content-Type",
-          value: "multipart/form-data",
+        cy.get("@postExecute").then((response) => {
+          cy.log(response);
+          cy.expect(response.response.body.responseMeta.success).to.eq(true);
+          // Asserting if the form key value are returned in the response
+          cy.expect(response.response.body.data.body.data.randomKey).to.eq(
+            "randomValue",
+          );
+          apiPage.ValidateHeaderParams({
+            key: "Content-Type",
+            value: "multipart/form-data",
+          });
         });
       });
     });
-  });
-});
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_DefaultContentType_spec.js b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_DefaultContentType_spec.js
index 75f2ba07d7d0..a673acae0ed4 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_DefaultContentType_spec.js
+++ b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_DefaultContentType_spec.js
@@ -8,70 +8,74 @@ import appPage from "../../../../locators/CMSApplocators";
 import apiEditor from "../../../../locators/ApiEditor";
 import { apiPage } from "../../../../support/Objects/ObjectsCore";
 
-describe("API Panel request body", { tags: ["@tag.Datasource"] }, function () {
-  it("1. Check whether the default content-type changes on changing method types and remains unchanged on switching to GET", function () {
-    cy.CreateAPI("FirstAPI");
+describe(
+  "API Panel request body",
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
+  function () {
+    it("1. Check whether the default content-type changes on changing method types and remains unchanged on switching to GET", function () {
+      cy.CreateAPI("FirstAPI");
 
-    // Checking for default Body type to be NONE
-    cy.contains(apiEditor.bodyTab).click({ force: true });
-    cy.get(apiEditor.bodyTypeSelected).should("have.text", "NONE");
+      // Checking for default Body type to be NONE
+      cy.contains(apiEditor.bodyTab).click({ force: true });
+      cy.get(apiEditor.bodyTypeSelected).should("have.text", "NONE");
 
-    apiPage.SelectSubTab("JSON");
+      apiPage.SelectSubTab("JSON");
 
-    //Switch to headers tab
-    cy.contains(apiEditor.headersTab).click();
+      //Switch to headers tab
+      cy.contains(apiEditor.headersTab).click();
 
-    // Changing method type to POST
-    cy.get(apiEditor.ApiVerb).click();
-    cy.get(appPage.selectPost).click();
+      // Changing method type to POST
+      cy.get(apiEditor.ApiVerb).click();
+      cy.get(appPage.selectPost).click();
 
-    // Checking Header for POST Type
-    cy.get(apiwidget.autoGeneratedHeaderKey)
-      .first()
-      .should("have.text", "content-type");
-    cy.get(apiwidget.autoGeneratedHeaderValue)
-      .first()
-      .should("have.text", "application/json");
+      // Checking Header for POST Type
+      cy.get(apiwidget.autoGeneratedHeaderKey)
+        .first()
+        .should("have.text", "content-type");
+      cy.get(apiwidget.autoGeneratedHeaderValue)
+        .first()
+        .should("have.text", "application/json");
 
-    // Checking Body type to be JSON
-    cy.contains(apiEditor.bodyTab).click({ force: true });
-    apiPage.SelectSubTab("JSON");
-    cy.get(apiEditor.bodyTypeSelected).should("have.text", "JSON");
+      // Checking Body type to be JSON
+      cy.contains(apiEditor.bodyTab).click({ force: true });
+      apiPage.SelectSubTab("JSON");
+      cy.get(apiEditor.bodyTypeSelected).should("have.text", "JSON");
 
-    // Changing method type to GET
-    cy.get(apiEditor.ApiVerb).first().click();
-    cy.get(appPage.selectGet).first().click();
+      // Changing method type to GET
+      cy.get(apiEditor.ApiVerb).first().click();
+      cy.get(appPage.selectGet).first().click();
 
-    // Checking Header for GET Type
-    cy.contains(apiEditor.headersTab).click();
-    cy.get(apiwidget.autoGeneratedHeaderKey)
-      .first()
-      .should("have.text", "content-type");
-    cy.get(apiwidget.autoGeneratedHeaderValue)
-      .first()
-      .should("have.text", "application/json");
+      // Checking Header for GET Type
+      cy.contains(apiEditor.headersTab).click();
+      cy.get(apiwidget.autoGeneratedHeaderKey)
+        .first()
+        .should("have.text", "content-type");
+      cy.get(apiwidget.autoGeneratedHeaderValue)
+        .first()
+        .should("have.text", "application/json");
 
-    cy.DeleteAPI();
-  });
+      cy.DeleteAPI();
+    });
 
-  it("2. Bug 14624 - Verifying the content-type none is not added", function () {
-    AppSidebar.navigate(AppSidebarButton.Editor);
-    cy.CreateAPI("FirstAPI");
+    it("2. Bug 14624 - Verifying the content-type none is not added", function () {
+      AppSidebar.navigate(AppSidebarButton.Editor);
+      cy.CreateAPI("FirstAPI");
 
-    // Checking for default Body type to be NONE
-    cy.contains(apiEditor.bodyTab).click({ force: true });
-    cy.get(apiEditor.bodyTypeSelected).should("have.text", "NONE");
+      // Checking for default Body type to be NONE
+      cy.contains(apiEditor.bodyTab).click({ force: true });
+      cy.get(apiEditor.bodyTypeSelected).should("have.text", "NONE");
 
-    //Switch to headers tab
-    cy.contains(apiEditor.headersTab).click();
+      //Switch to headers tab
+      cy.contains(apiEditor.headersTab).click();
 
-    // Checking Header to not have content-type:none
-    cy.get(`${apiwidget.headerKey} .CodeMirror .CodeMirror-code`)
-      .first()
-      .should("not.have.text", "content-type");
-    cy.get(`${apiwidget.headerValue} .CodeMirror .CodeMirror-code`)
-      .first()
-      .should("not.have.text", "none");
-    cy.DeleteAPI();
-  });
-});
+      // Checking Header to not have content-type:none
+      cy.get(`${apiwidget.headerKey} .CodeMirror .CodeMirror-code`)
+        .first()
+        .should("not.have.text", "content-type");
+      cy.get(`${apiwidget.headerValue} .CodeMirror .CodeMirror-code`)
+        .first()
+        .should("not.have.text", "none");
+      cy.DeleteAPI();
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Edit_spec.js b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Edit_spec.js
index 32f675a51fac..d0f1a21dd872 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Edit_spec.js
+++ b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Edit_spec.js
@@ -16,7 +16,7 @@ import {
 
 describe(
   "API Panel Test Functionality",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   function () {
     before(() => {
       agHelper.AddDsl("uiBindDsl");
diff --git a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_EvaluatedValue_spec.ts b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_EvaluatedValue_spec.ts
index 81439b394ae3..033506650095 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_EvaluatedValue_spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_EvaluatedValue_spec.ts
@@ -2,7 +2,7 @@ import { apiPage, dataManager } from "../../../../support/Objects/ObjectsCore";
 
 describe(
   "Validate API URL Evaluated value",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   () => {
     it("1. Check if url object does not crash App", () => {
       apiPage.CreateApi("FirstAPI");
diff --git a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_MultiPart_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_MultiPart_Spec.ts
index 7d05cf8f040e..44800a8afb24 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_MultiPart_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_MultiPart_Spec.ts
@@ -17,7 +17,7 @@ import EditorNavigation, {
 
 describe(
   "Validate API request body panel",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   () => {
     beforeEach(() => {
       agHelper.RestoreLocalStorageCache();
diff --git a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Mustache_spec.js b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Mustache_spec.js
index 3fe959483399..625b54243b5d 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Mustache_spec.js
+++ b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Mustache_spec.js
@@ -8,7 +8,7 @@ import { agHelper } from "../../../../support/Objects/ObjectsCore";
 
 describe(
   "Moustache test Functionality",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   function () {
     beforeEach(() => {
       agHelper.AddDsl("commondsl");
diff --git a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_RequestBody_spec.ts b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_RequestBody_spec.ts
index 950aa5c90a25..b1d11a12a5ee 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_RequestBody_spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_RequestBody_spec.ts
@@ -4,16 +4,20 @@ import {
   agHelper,
 } from "../../../../support/Objects/ObjectsCore";
 
-describe("API Panel request body", { tags: ["@tag.Datasource"] }, function () {
-  it("1. Check whether input exists when form-encoded is selected", function () {
-    apiPage.CreateApi("FirstAPI");
-    apiPage.SelectAPIVerb("POST");
-    apiPage.SelectPaneTab("Body");
-    apiPage.SelectSubTab("FORM_URLENCODED");
-    agHelper.AssertElementVisibility(apiPage._bodyKey(0));
-    agHelper.ActionContextMenuWithInPane({
-      action: "Delete",
-      entityType: entityItems.Api,
+describe(
+  "API Panel request body",
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
+  function () {
+    it("1. Check whether input exists when form-encoded is selected", function () {
+      apiPage.CreateApi("FirstAPI");
+      apiPage.SelectAPIVerb("POST");
+      apiPage.SelectPaneTab("Body");
+      apiPage.SelectSubTab("FORM_URLENCODED");
+      agHelper.AssertElementVisibility(apiPage._bodyKey(0));
+      agHelper.ActionContextMenuWithInPane({
+        action: "Delete",
+        entityType: entityItems.Api,
+      });
     });
-  });
-});
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Response_View_spec.js b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Response_View_spec.js
index 71a4106f6fde..630146e5d5e8 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Response_View_spec.js
+++ b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Response_View_spec.js
@@ -11,7 +11,7 @@ const testUrl1 =
 
 describe(
   "Bug 14666: Api Response Test Functionality ",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   function () {
     it("1. Test table loading when data is in array format", function () {
       cy.log("Login Successful");
diff --git a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Search_spec.js b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Search_spec.js
index bf98cae0b2db..a2e9fc56c0c6 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Search_spec.js
+++ b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Search_spec.js
@@ -20,7 +20,7 @@ const testUrl3 =
 
 describe(
   "API Panel Test Functionality ",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   function () {
     it("1. Test Search API fetaure", function () {
       cy.log("Login Successful");
diff --git a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Styles_spec.js b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Styles_spec.js
index eb249e75cf6e..12f5ad350a96 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Styles_spec.js
+++ b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Styles_spec.js
@@ -12,7 +12,7 @@ import EditorNavigation, {
 
 describe(
   "Validate API Panel CSS Styles",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   function () {
     const backgroundColorGray200 = "rgb(227, 232, 239)";
     const backgroundColorwhite = "rgb(255, 255, 255)";
diff --git a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_TestExecuteWithDynamicBindingInUrl_spec.ts b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_TestExecuteWithDynamicBindingInUrl_spec.ts
index 36df01ae346a..bdc97797f400 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_TestExecuteWithDynamicBindingInUrl_spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_TestExecuteWithDynamicBindingInUrl_spec.ts
@@ -8,7 +8,9 @@ import {
 
 describe(
   "Test API execution with dynamic binding in URL - Bug #24218",
-  { tags: ["@tag.Datasource", "@tag.Sanity"] },
+  {
+    tags: ["@tag.Datasource", "@tag.Sanity", "@tag.Git", "@tag.AccessControl"],
+  },
   () => {
     it("1. Test API execution with dynamic binding in URL", () => {
       // Create JS Object to set Appsmith store variable to mockApiUrl
diff --git a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Unique_name_spec.js b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Unique_name_spec.js
index fcf9d24b21b5..4679e43b2672 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Unique_name_spec.js
+++ b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Unique_name_spec.js
@@ -1,13 +1,17 @@
 import { apiPage } from "../../../../support/Objects/ObjectsCore";
 
-describe("Name uniqueness test", { tags: ["@tag.Datasource"] }, function () {
-  it("1. Validate Unique Name", () => {
-    apiPage.CreateApi("Uni"); //Creation of UniqueName Action successful
-    cy.CreationOfUniqueAPIcheck("Uni");
-    //2. Validate download apiname check
-    cy.CreationOfUniqueAPIcheck("download");
-    //3. Validate dedicated worker scope object property(Blob)apiname check
-    cy.CreationOfUniqueAPIcheck("Blob");
-    // expect(2 + 2).to.equal(5);
-  });
-});
+describe(
+  "Name uniqueness test",
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
+  function () {
+    it("1. Validate Unique Name", () => {
+      apiPage.CreateApi("Uni"); //Creation of UniqueName Action successful
+      cy.CreationOfUniqueAPIcheck("Uni");
+      //2. Validate download apiname check
+      cy.CreationOfUniqueAPIcheck("download");
+      //3. Validate dedicated worker scope object property(Blob)apiname check
+      cy.CreationOfUniqueAPIcheck("Blob");
+      // expect(2 + 2).to.equal(5);
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/Api_XSS_Vulnerability_spec.ts b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/Api_XSS_Vulnerability_spec.ts
index ecd353533faf..574ffee3f7e5 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/Api_XSS_Vulnerability_spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/Api_XSS_Vulnerability_spec.ts
@@ -2,9 +2,10 @@ import { apiPage, agHelper } from "../../../../support/Objects/ObjectsCore";
 
 describe(
   "Ensure XSS vulnerability are handled",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   () => {
-    const test_rest_api_url1 = "https://jsonplaceholder.typicode.com/users";
+    const test_rest_api_url1 =
+      "http://host.docker.internal:5001/v1/mock-api?records=20";
 
     it("1. Ensures xss scripts are not executed when an API is run.", () => {
       apiPage.CreateApi("FirstAPI");
diff --git a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/CurlImportFlow_spec.js b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/CurlImportFlow_spec.js
index 5059038431e6..68bd1520957e 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/CurlImportFlow_spec.js
+++ b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/CurlImportFlow_spec.js
@@ -15,36 +15,40 @@ import {
   dataManager,
 } from "../../../../support/Objects/ObjectsCore";
 
-describe("Test curl import flow", { tags: ["@tag.Datasource"] }, function () {
-  it("1. Test curl import flow Run and Delete", function () {
-    localStorage.setItem("ApiPaneV2", "ApiPaneV2");
-    apiPage.FillCurlNImport(
-      "curl -X GET " +
-        dataManager.dsValues[dataManager.defaultEnviorment].mockApiUrl,
-    );
-    agHelper.ActionContextMenuWithInPane({
-      action: "Delete",
-      entityType: entityItems.Api,
-    });
-  });
-
-  it("2. Bug:15175 Creating new cURL import query from entity explorer crashes the app", function () {
-    cy.fixture("datasources").then((datasourceFormData) => {
-      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+describe(
+  "Test curl import flow",
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
+  function () {
+    it("1. Test curl import flow Run and Delete", function () {
+      localStorage.setItem("ApiPaneV2", "ApiPaneV2");
       apiPage.FillCurlNImport(
-        'curl -d \'{"name":"morpheus","job":"leader"}\' -H Content-Type:application/json -X POST ' +
-          datasourceFormData["echoApiUrl"],
+        "curl -X GET " +
+          dataManager.dsValues[dataManager.defaultEnviorment].mockApiUrl,
       );
+      agHelper.ActionContextMenuWithInPane({
+        action: "Delete",
+        entityType: entityItems.Api,
+      });
     });
-  });
 
-  it("3. Bug:19214 Test curl import flow for request without any headers", function () {
-    cy.fixture("datasources").then((datasourceFormData) => {
-      apiPage.FillCurlNImport(
-        "curl -X GET " + datasourceFormData["echoApiUrl"],
-      );
-      apiPage.AssertEmptyHeaderKeyValuePairsPresent(0);
-      apiPage.AssertEmptyHeaderKeyValuePairsPresent(1);
+    it("2. Bug:15175 Creating new cURL import query from entity explorer crashes the app", function () {
+      cy.fixture("datasources").then((datasourceFormData) => {
+        EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+        apiPage.FillCurlNImport(
+          'curl -d \'{"name":"morpheus","job":"leader"}\' -H Content-Type:application/json -X POST ' +
+            datasourceFormData["echoApiUrl"],
+        );
+      });
+    });
+
+    it("3. Bug:19214 Test curl import flow for request without any headers", function () {
+      cy.fixture("datasources").then((datasourceFormData) => {
+        apiPage.FillCurlNImport(
+          "curl -X GET " + datasourceFormData["echoApiUrl"],
+        );
+        apiPage.AssertEmptyHeaderKeyValuePairsPresent(0);
+        apiPage.AssertEmptyHeaderKeyValuePairsPresent(1);
+      });
     });
-  });
-});
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ServerSide/AppLevelImport/AppImportwithDS_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/AppLevelImport/AppImportwithDS_Spec.ts
index b57c449e5515..2574b63898d2 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/AppLevelImport/AppImportwithDS_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/AppLevelImport/AppImportwithDS_Spec.ts
@@ -11,7 +11,7 @@ import {
 
 describe(
   "App level import with Datasource",
-  { tags: ["@tag.ImportExport"] },
+  { tags: ["@tag.ImportExport", "@tag.Git"] },
   () => {
     //this tests coveres Applevel import for MySql, Gsheet is covered in Gsheet folder
     it("1. Bug #26024 - Import an app at App Level with Datasource - MySql", () => {
diff --git a/app/client/cypress/e2e/Regression/ServerSide/Datasources/ConnectionErrors_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/Datasources/ConnectionErrors_Spec.ts
index 27933ddf85e2..9b7e3aeff018 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/Datasources/ConnectionErrors_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/Datasources/ConnectionErrors_Spec.ts
@@ -8,7 +8,7 @@ import {
 
 describe(
   "Validate Empty DS error messages",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   () => {
     let dataSourceName: string;
 
diff --git a/app/client/cypress/e2e/Regression/ServerSide/Datasources/ElasticSearch_Basic_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/Datasources/ElasticSearch_Basic_Spec.ts
index 37685be9ec54..ca372a29f6ac 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/Datasources/ElasticSearch_Basic_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/Datasources/ElasticSearch_Basic_Spec.ts
@@ -4,21 +4,24 @@ import {
   entityItems,
 } from "../../../../support/Objects/ObjectsCore";
 
-describe("Validate Elasticsearch DS", { tags: ["@tag.Datasource"] }, () => {
-  let dsName: any,
-    books: any,
-    containerName = "elasticsearch";
-
-  before("Create a new ElasticSearch DS", () => {
-    dataSources.StartContainerNVerify("Elasticsearch", containerName, 45000);
-    dataSources.CreateDataSource("Elasticsearch");
-    cy.get("@dsName").then(($dsName) => {
-      dsName = $dsName;
-    });
-  });
-
-  it("1. Validate POST/GET/PUT/DELETE", () => {
-    let singleBook = `{
+describe(
+  "Validate Elasticsearch DS",
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
+  () => {
+    let dsName: any,
+      books: any,
+      containerName = "elasticsearch";
+
+    before("Create a new ElasticSearch DS", () => {
+      dataSources.StartContainerNVerify("Elasticsearch", containerName, 45000);
+      dataSources.CreateDataSource("Elasticsearch");
+      cy.get("@dsName").then(($dsName) => {
+        dsName = $dsName;
+      });
+    });
+
+    it("1. Validate POST/GET/PUT/DELETE", () => {
+      let singleBook = `{
       "title": "The Lord of the Rings",
       "author": "J.R.R. Tolkien",
       "genre": ["Fantasy", "Adventure"],
@@ -27,187 +30,194 @@ describe("Validate Elasticsearch DS", { tags: ["@tag.Datasource"] }, () => {
       "description": "The Lord of the Rings is an epic high fantasy novel written by English author and scholar J. R. R. Tolkien. The story began as a sequel to Tolkien's earlier fantasy book The Hobbit and soon developed into a much larger story."
     }`;
 
-    let bulkBooks = `{ "index": {"_index": "books", "_id": "2"}}
+      let bulkBooks = `{ "index": {"_index": "books", "_id": "2"}}
     { "title": "To Kill a Mockingbird", "author": "Harper Lee", "genre": ["Classic Literature", "Coming-of-Age"], "rating": 4.5, "published_date": "1960-07-11", "description": "To Kill a Mockingbird is a novel by Harper Lee, published in 1960. It is a coming-of-age story about a young girl named Scout Finch in a fictional town in Alabama during the Great Depression. The novel is renowned for its warmth and humor, despite dealing with serious issues of rape and racial inequality." }
     { "index": {"_index": "books", "_id": "3"}}
     { "title": "The Hitchhiker's Guide to the Galaxy", "author": "Douglas Adams", "genre": ["Science Fiction", "Comedy"], "rating": 4.4, "published_date": "1979-10-12", "description": "The Hitchhiker's Guide to the Galaxy is a comedy science fiction series created by Douglas Adams. It follows the misadventures of hapless human Arthur Dent and his alien friend Ford Prefect as they travel through space and time." }`;
-    dataSources.CreateQueryAfterDSSaved();
-
-    //POST - single record
-    dataSources.ValidateNSelectDropdown("Method", "GET", "POST");
-
-    agHelper.EnterValue("/books/_doc/1", {
-      propFieldName: "",
-      directInput: false,
-      inputFieldName: "Path",
-    });
-
-    agHelper.EnterValue(singleBook, {
-      propFieldName: "",
-      directInput: false,
-      inputFieldName: "Body",
-    });
-
-    dataSources.RunQuery();
-    cy.get("@postExecute").then((resObj: any) => {
-      books = JSON.parse(JSON.stringify(resObj.response.body.data.body.result));
-      expect(books).to.eq("created");
-    });
-
-    //GET - single record
-    dataSources.ValidateNSelectDropdown("Method", "POST", "GET");
-    agHelper.EnterValue("", {
-      propFieldName: "",
-      directInput: false,
-      inputFieldName: "Body",
-    });
-    dataSources.RunQuery();
-    cy.get("@postExecute").then((resObj: any) => {
-      books = JSON.parse(
-        JSON.stringify(resObj.response.body.data.body._source.title),
-      );
-      expect(books).to.eq("The Lord of the Rings");
-    });
-
-    //POST - bulk record
-    dataSources.ValidateNSelectDropdown("Method", "GET", "POST");
-
-    agHelper.EnterValue("/_bulk", {
-      propFieldName: "",
-      directInput: false,
-      inputFieldName: "Path",
-    });
-
-    //We need to enter new line at end, since without that body data not getting considered
-    agHelper.EnterValue(bulkBooks, {
-      propFieldName: "",
-      directInput: false,
-      inputFieldName: "Body",
-    });
-
-    agHelper
-      .GetElement(dataSources._bodyCodeMirror)
-      .type("{downarrow}".repeat(10));
-
-    agHelper.PressEnter();
-
-    agHelper.Sleep(2000);
-    dataSources.RunQuery();
-    cy.get("@postExecute").then((resObj: any) => {
-      expect(
-        JSON.parse(
-          JSON.stringify(resObj.response.body.data.body.items[0].index._id),
-        ),
-      ).to.eq("2");
-      expect(
-        JSON.parse(
-          JSON.stringify(resObj.response.body.data.body.items[1].index._id),
-        ),
-      ).to.eq("3");
-    });
-
-    //GET - All inserted record
-    dataSources.ValidateNSelectDropdown("Method", "POST", "GET");
-    agHelper.EnterValue("", {
-      propFieldName: "",
-      directInput: false,
-      inputFieldName: "Body",
-    });
-
-    agHelper.EnterValue("/books/_search", {
-      propFieldName: "",
-      directInput: false,
-      inputFieldName: "Path",
-    });
-    dataSources.RunQuery();
-    cy.get("@postExecute").then((resObj: any) => {
-      books = JSON.parse(
-        JSON.stringify(resObj.response.body.data.body.hits.total.value),
-      );
-      expect(books).to.be.oneOf([1, 3]);
-    });
-
-    //PUT - update
-    let updateBook = `{ "title": "Pride and Prejudice", "author": "Jane Austen", "genre": ["Romance", "Classic Literature"], "rating": 4.5, "published_date": "1813-01-28", "description": "Pride and Prejudice is a romantic novel by Jane Austen, first published in 1813. The story follows the main character Elizabeth Bennet as she deals with issues of manners, upbringing, morality, education, and marriage in the society of the landed gentry of the British Regency." }`;
-    dataSources.ValidateNSelectDropdown("Method", "GET", "PUT");
-
-    agHelper.EnterValue("/books/_doc/1", {
-      propFieldName: "",
-      directInput: false,
-      inputFieldName: "Path",
-    });
-
-    agHelper.EnterValue(updateBook, {
-      propFieldName: "",
-      directInput: false,
-      inputFieldName: "Body",
-    });
-
-    agHelper
-      .GetElement(dataSources._bodyCodeMirror)
-      .type("{downarrow}".repeat(5));
-
-    agHelper.PressEnter();
-    agHelper.Sleep(2000);
-    dataSources.RunQuery();
-
-    cy.get("@postExecute").then((resObj: any) => {
-      books = JSON.parse(JSON.stringify(resObj.response.body.data.body.result));
-      expect(books).to.eq("updated");
-    });
-
-    //GET - single record - after update
-    dataSources.ValidateNSelectDropdown("Method", "PUT", "GET");
-    agHelper.EnterValue("", {
-      propFieldName: "",
-      directInput: false,
-      inputFieldName: "Body",
-    });
-    dataSources.RunQuery();
-    cy.get("@postExecute").then((resObj: any) => {
-      books = JSON.parse(
-        JSON.stringify(resObj.response.body.data.body._source.title),
-      );
-      expect(books).to.eq("Pride and Prejudice");
-    });
-
-    //DELETE - single record
-    dataSources.ValidateNSelectDropdown("Method", "GET", "DELETE");
-
-    agHelper.EnterValue("/books/_doc/1", {
-      propFieldName: "",
-      directInput: false,
-      inputFieldName: "Path",
-    });
-    dataSources.RunQuery();
-
-    cy.get("@postExecute").then((resObj: any) => {
-      books = JSON.parse(JSON.stringify(resObj.response.body.data.body.result));
-      expect(books).to.eq("deleted");
-    });
-
-    //DELETE - all records
-    agHelper.EnterValue("/_all", {
-      propFieldName: "",
-      directInput: false,
-      inputFieldName: "Path",
-    });
-    dataSources.RunQuery();
-
-    cy.get("@postExecute").then((resObj: any) => {
-      books = JSON.parse(
-        JSON.stringify(resObj.response.body.data.body.acknowledged),
-      );
-      expect(books).to.be.true;
-    });
-  });
-
-  after("Delete the query & datasource", () => {
-    agHelper.ActionContextMenuWithInPane({
-      action: "Delete",
-      entityType: entityItems.Query,
-    });
-    dataSources.DeleteDatasourceFromWithinDS(dsName);
-    dataSources.StopNDeleteContainer(containerName);
-  });
-});
+      dataSources.CreateQueryAfterDSSaved();
+
+      //POST - single record
+      dataSources.ValidateNSelectDropdown("Method", "GET", "POST");
+
+      agHelper.EnterValue("/books/_doc/1", {
+        propFieldName: "",
+        directInput: false,
+        inputFieldName: "Path",
+      });
+
+      agHelper.EnterValue(singleBook, {
+        propFieldName: "",
+        directInput: false,
+        inputFieldName: "Body",
+      });
+
+      dataSources.RunQuery();
+      cy.get("@postExecute").then((resObj: any) => {
+        books = JSON.parse(
+          JSON.stringify(resObj.response.body.data.body.result),
+        );
+        expect(books).to.eq("created");
+      });
+
+      //GET - single record
+      dataSources.ValidateNSelectDropdown("Method", "POST", "GET");
+      agHelper.EnterValue("", {
+        propFieldName: "",
+        directInput: false,
+        inputFieldName: "Body",
+      });
+      dataSources.RunQuery();
+      cy.get("@postExecute").then((resObj: any) => {
+        books = JSON.parse(
+          JSON.stringify(resObj.response.body.data.body._source.title),
+        );
+        expect(books).to.eq("The Lord of the Rings");
+      });
+
+      //POST - bulk record
+      dataSources.ValidateNSelectDropdown("Method", "GET", "POST");
+
+      agHelper.EnterValue("/_bulk", {
+        propFieldName: "",
+        directInput: false,
+        inputFieldName: "Path",
+      });
+
+      //We need to enter new line at end, since without that body data not getting considered
+      agHelper.EnterValue(bulkBooks, {
+        propFieldName: "",
+        directInput: false,
+        inputFieldName: "Body",
+      });
+
+      agHelper
+        .GetElement(dataSources._bodyCodeMirror)
+        .type("{downarrow}".repeat(10));
+
+      agHelper.PressEnter();
+
+      agHelper.Sleep(2000);
+      dataSources.RunQuery();
+      cy.get("@postExecute").then((resObj: any) => {
+        expect(
+          JSON.parse(
+            JSON.stringify(resObj.response.body.data.body.items[0].index._id),
+          ),
+        ).to.eq("2");
+        expect(
+          JSON.parse(
+            JSON.stringify(resObj.response.body.data.body.items[1].index._id),
+          ),
+        ).to.eq("3");
+      });
+
+      //GET - All inserted record
+      dataSources.ValidateNSelectDropdown("Method", "POST", "GET");
+      agHelper.EnterValue("", {
+        propFieldName: "",
+        directInput: false,
+        inputFieldName: "Body",
+      });
+
+      agHelper.EnterValue("/books/_search", {
+        propFieldName: "",
+        directInput: false,
+        inputFieldName: "Path",
+      });
+      dataSources.RunQuery();
+      cy.get("@postExecute").then((resObj: any) => {
+        books = JSON.parse(
+          JSON.stringify(resObj.response.body.data.body.hits.total.value),
+        );
+        expect(books).to.be.oneOf([1, 3]);
+      });
+
+      //PUT - update
+      let updateBook = `{ "title": "Pride and Prejudice", "author": "Jane Austen", "genre": ["Romance", "Classic Literature"], "rating": 4.5, "published_date": "1813-01-28", "description": "Pride and Prejudice is a romantic novel by Jane Austen, first published in 1813. The story follows the main character Elizabeth Bennet as she deals with issues of manners, upbringing, morality, education, and marriage in the society of the landed gentry of the British Regency." }`;
+      dataSources.ValidateNSelectDropdown("Method", "GET", "PUT");
+
+      agHelper.EnterValue("/books/_doc/1", {
+        propFieldName: "",
+        directInput: false,
+        inputFieldName: "Path",
+      });
+
+      agHelper.EnterValue(updateBook, {
+        propFieldName: "",
+        directInput: false,
+        inputFieldName: "Body",
+      });
+
+      agHelper
+        .GetElement(dataSources._bodyCodeMirror)
+        .type("{downarrow}".repeat(5));
+
+      agHelper.PressEnter();
+      agHelper.Sleep(2000);
+      dataSources.RunQuery();
+
+      cy.get("@postExecute").then((resObj: any) => {
+        books = JSON.parse(
+          JSON.stringify(resObj.response.body.data.body.result),
+        );
+        expect(books).to.eq("updated");
+      });
+
+      //GET - single record - after update
+      dataSources.ValidateNSelectDropdown("Method", "PUT", "GET");
+      agHelper.EnterValue("", {
+        propFieldName: "",
+        directInput: false,
+        inputFieldName: "Body",
+      });
+      dataSources.RunQuery();
+      cy.get("@postExecute").then((resObj: any) => {
+        books = JSON.parse(
+          JSON.stringify(resObj.response.body.data.body._source.title),
+        );
+        expect(books).to.eq("Pride and Prejudice");
+      });
+
+      //DELETE - single record
+      dataSources.ValidateNSelectDropdown("Method", "GET", "DELETE");
+
+      agHelper.EnterValue("/books/_doc/1", {
+        propFieldName: "",
+        directInput: false,
+        inputFieldName: "Path",
+      });
+      dataSources.RunQuery();
+
+      cy.get("@postExecute").then((resObj: any) => {
+        books = JSON.parse(
+          JSON.stringify(resObj.response.body.data.body.result),
+        );
+        expect(books).to.eq("deleted");
+      });
+
+      //DELETE - all records
+      agHelper.EnterValue("/_all", {
+        propFieldName: "",
+        directInput: false,
+        inputFieldName: "Path",
+      });
+      dataSources.RunQuery();
+
+      cy.get("@postExecute").then((resObj: any) => {
+        books = JSON.parse(
+          JSON.stringify(resObj.response.body.data.body.acknowledged),
+        );
+        expect(books).to.be.true;
+      });
+    });
+
+    after("Delete the query & datasource", () => {
+      agHelper.ActionContextMenuWithInPane({
+        action: "Delete",
+        entityType: entityItems.Query,
+      });
+      dataSources.DeleteDatasourceFromWithinDS(dsName);
+      dataSources.StopNDeleteContainer(containerName);
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ServerSide/Datasources/Firestore_Basic_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/Datasources/Firestore_Basic_Spec.ts
index 8412f77a9ca2..733ce02fff3c 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/Datasources/Firestore_Basic_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/Datasources/Firestore_Basic_Spec.ts
@@ -19,165 +19,97 @@ let dsName: any,
   newCityPath: any,
   createCity: any,
   cityName = "LA_";
-describe("Validate Firestore DS", { tags: ["@tag.Datasource"] }, () => {
-  before("Generate GUID for new Firestore DS", () => {
-    agHelper.GenerateUUID();
-    cy.get("@guid").then((uid) => {
-      guid = uid;
-      dsName = "Firestore" + " " + uid;
+describe(
+  "Validate Firestore DS",
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
+  () => {
+    before("Generate GUID for new Firestore DS", () => {
+      agHelper.GenerateUUID();
+      cy.get("@guid").then((uid) => {
+        guid = uid;
+        dsName = "Firestore" + " " + uid;
+      });
     });
-  });
-
-  it("1. Firestore placeholder & mandatory mark verification", () => {
-    dataSources.NavigateToDSCreateNew();
-    dataSources.CreatePlugIn("Firestore");
-    agHelper.AssertElementVisibility(dataSources._imgFireStoreLogo);
-    agHelper.GetNAssertContains(locators._dsName, "Untitled datasource");
-    agHelper.GetNClick(locators._dsName);
-    agHelper.ClearTextField(locators._dsNameTxt); //removing ds name
-    agHelper.AssertTooltip(Cypress.env("MESSAGES").ACTION_INVALID_NAME_ERROR());
-    agHelper.TypeText(locators._dsNameTxt, dsName);
-    agHelper.PressEnter();
-    agHelper.AssertAttribute(
-      locators._inputFieldByName("Database URL") + "//" + locators._inputField,
-      "placeholder",
-      "https://your-project-id.firebaseio.com",
-    );
-    agHelper
-      .GetElement(
-        locators._inputFieldByName("Project Id") + "//" + locators._inputField,
-      )
-      .should("not.have.attr", "placeholder");
-    dataSources.TestDatasource(false);
-    agHelper.ValidateToastMessage("Missing Firestore URL.");
-    agHelper.ValidateToastMessage("Missing ProjectID in datasource.");
-    agHelper.ValidateToastMessage("Missing ClientJSON in datasource.");
-    dataSources.FillFirestoreDSForm();
-    dataSources.TestSaveDatasource();
-  });
-
-  it("2. Validate List/Create/Update/Get", () => {
-    agHelper.GenerateUUID();
-    cy.get("@guid").then((uid) => {
-      cityName += uid;
-      createCity =
-        `{
+
+    it("1. Firestore placeholder & mandatory mark verification", () => {
+      dataSources.NavigateToDSCreateNew();
+      dataSources.CreatePlugIn("Firestore");
+      agHelper.AssertElementVisibility(dataSources._imgFireStoreLogo);
+      agHelper.GetNAssertContains(locators._dsName, "Untitled datasource");
+      agHelper.GetNClick(locators._dsName);
+      agHelper.ClearTextField(locators._dsNameTxt); //removing ds name
+      agHelper.AssertTooltip(
+        Cypress.env("MESSAGES").ACTION_INVALID_NAME_ERROR(),
+      );
+      agHelper.TypeText(locators._dsNameTxt, dsName);
+      agHelper.PressEnter();
+      agHelper.AssertAttribute(
+        locators._inputFieldByName("Database URL") +
+          "//" +
+          locators._inputField,
+        "placeholder",
+        "https://your-project-id.firebaseio.com",
+      );
+      agHelper
+        .GetElement(
+          locators._inputFieldByName("Project Id") +
+            "//" +
+            locators._inputField,
+        )
+        .should("not.have.attr", "placeholder");
+      dataSources.TestDatasource(false);
+      agHelper.ValidateToastMessage("Missing Firestore URL.");
+      agHelper.ValidateToastMessage("Missing ProjectID in datasource.");
+      agHelper.ValidateToastMessage("Missing ClientJSON in datasource.");
+      dataSources.FillFirestoreDSForm();
+      dataSources.TestSaveDatasource();
+    });
+
+    it("2. Validate List/Create/Update/Get", () => {
+      agHelper.GenerateUUID();
+      cy.get("@guid").then((uid) => {
+        cityName += uid;
+        createCity =
+          `{
       "name": "` +
-        cityName +
-        `",
+          cityName +
+          `",
       "state": "CA",
       "country": "USA",
       "capital": false,
       "population": 3900000,
       "regions": ["west_coast", "socal"]
     }`;
-      dataSources.CreateQueryAfterDSSaved();
-
-      //Create
-      dataSources.ValidateNSelectDropdown(
-        "Command",
-        "List Documents",
-        "Create document",
-      );
-
-      agHelper.EnterValue(
-        "cities/{{Math.random().toString(36).substring(2, 24)}}",
-        {
-          propFieldName: "",
-          directInput: false,
-          inputFieldName: "Collection Name",
-        },
-      );
-
-      agHelper.EnterValue(createCity, {
-        propFieldName: "",
-        directInput: false,
-        inputFieldName: "Body",
-      });
-
-      dataSources.RunQuery(); //Create the document
-
-      //Find the document id of the newly inserted record + Verify List all records
-      dataSources.ValidateNSelectDropdown(
-        "Command",
-        "Create document",
-        "List Documents",
-      );
-      agHelper.EnterValue("cities", {
-        propFieldName: "",
-        directInput: false,
-        inputFieldName: "Collection Name",
-      });
-
-      agHelper.TypeDynamicInputValueNValidate(
-        "name",
-        dataSources._nestedWhereClauseKey(0),
-      );
-      agHelper.TypeDynamicInputValueNValidate(
-        cityName,
-        dataSources._nestedWhereClauseValue(0),
-      );
-
-      dataSources.RunQuery();
-      cy.get("@postExecute").then((resObj: any) => {
-        cities = JSON.parse(JSON.stringify(resObj.response.body.data.body));
-
-        cy.wrap(cities)
-          .should("be.an", "array")
-          .its(0)
-          .should("have.property", "name", cityName); //making sure newly inserted record is returned
-        const newCity = cities.find(
-          (city: { name: string }) => city.name === cityName,
-        );
-        newCityPath = newCity._ref.path;
-
-        agHelper.GetNClick(dataSources._whereDelete(0)); //removign where clause, add new condition
-        agHelper.TypeDynamicInputValueNValidate(
-          "capital",
-          dataSources._nestedWhereClauseKey(0),
-        );
-        agHelper.TypeDynamicInputValueNValidate(
-          "true",
-          dataSources._nestedWhereClauseValue(0),
-        );
-        dataSources.RunQuery();
-        cy.get("@postExecute").then((resObj: any) => {
-          cities = JSON.stringify(resObj.response.body.data.body);
-          cy.wrap(cities).should("deep.equal", "[]"); //validating no record is returned
-        });
-
-        agHelper.GetNClick(dataSources._whereDelete(0)); //removign where clause
+        dataSources.CreateQueryAfterDSSaved();
 
-        //Update document
+        //Create
         dataSources.ValidateNSelectDropdown(
           "Command",
           "List Documents",
-          "Update document",
+          "Create document",
         );
 
-        agHelper.EnterValue(newCityPath, {
-          propFieldName: "",
-          directInput: false,
-          inputFieldName: "Collection Name",
-        });
-
         agHelper.EnterValue(
-          `{
-        "state": "LL"
-        }`,
+          "cities/{{Math.random().toString(36).substring(2, 24)}}",
           {
             propFieldName: "",
             directInput: false,
-            inputFieldName: "Body",
+            inputFieldName: "Collection Name",
           },
         );
 
-        dataSources.RunQuery(); //Update the document
+        agHelper.EnterValue(createCity, {
+          propFieldName: "",
+          directInput: false,
+          inputFieldName: "Body",
+        });
+
+        dataSources.RunQuery(); //Create the document
 
-        //Validate the update happened fine
+        //Find the document id of the newly inserted record + Verify List all records
         dataSources.ValidateNSelectDropdown(
           "Command",
-          "Update document",
+          "Create document",
           "List Documents",
         );
         agHelper.EnterValue("cities", {
@@ -185,6 +117,7 @@ describe("Validate Firestore DS", { tags: ["@tag.Datasource"] }, () => {
           directInput: false,
           inputFieldName: "Collection Name",
         });
+
         agHelper.TypeDynamicInputValueNValidate(
           "name",
           dataSources._nestedWhereClauseKey(0),
@@ -193,178 +126,255 @@ describe("Validate Firestore DS", { tags: ["@tag.Datasource"] }, () => {
           cityName,
           dataSources._nestedWhereClauseValue(0),
         );
-        dataSources.RunQuery();
 
+        dataSources.RunQuery();
         cy.get("@postExecute").then((resObj: any) => {
           cities = JSON.parse(JSON.stringify(resObj.response.body.data.body));
-          const losAngeles = cities.find(
+
+          cy.wrap(cities)
+            .should("be.an", "array")
+            .its(0)
+            .should("have.property", "name", cityName); //making sure newly inserted record is returned
+          const newCity = cities.find(
             (city: { name: string }) => city.name === cityName,
           );
-          expect(losAngeles.state).to.eq("LL"); //Verifying update is fine
-        });
+          newCityPath = newCity._ref.path;
 
-        //Get Document
-        dataSources.ValidateNSelectDropdown(
-          "Command",
-          "List Documents",
-          "Get Document",
-        );
+          agHelper.GetNClick(dataSources._whereDelete(0)); //removign where clause, add new condition
+          agHelper.TypeDynamicInputValueNValidate(
+            "capital",
+            dataSources._nestedWhereClauseKey(0),
+          );
+          agHelper.TypeDynamicInputValueNValidate(
+            "true",
+            dataSources._nestedWhereClauseValue(0),
+          );
+          dataSources.RunQuery();
+          cy.get("@postExecute").then((resObj: any) => {
+            cities = JSON.stringify(resObj.response.body.data.body);
+            cy.wrap(cities).should("deep.equal", "[]"); //validating no record is returned
+          });
+
+          agHelper.GetNClick(dataSources._whereDelete(0)); //removign where clause
+
+          //Update document
+          dataSources.ValidateNSelectDropdown(
+            "Command",
+            "List Documents",
+            "Update document",
+          );
 
-        agHelper.EnterValue(newCityPath, {
-          propFieldName: "",
-          directInput: false,
-          inputFieldName: "Collection/Document path",
-        });
+          agHelper.EnterValue(newCityPath, {
+            propFieldName: "",
+            directInput: false,
+            inputFieldName: "Collection Name",
+          });
 
-        dataSources.RunQuery();
-        cy.get("@postExecute").then((resObj: any) => {
-          cities = JSON.parse(JSON.stringify(resObj.response.body.data.body));
-          cy.wrap(cities).should("have.property", "name", cityName); //making sure inserted record is returned
+          agHelper.EnterValue(
+            `{
+        "state": "LL"
+        }`,
+            {
+              propFieldName: "",
+              directInput: false,
+              inputFieldName: "Body",
+            },
+          );
+
+          dataSources.RunQuery(); //Update the document
+
+          //Validate the update happened fine
+          dataSources.ValidateNSelectDropdown(
+            "Command",
+            "Update document",
+            "List Documents",
+          );
+          agHelper.EnterValue("cities", {
+            propFieldName: "",
+            directInput: false,
+            inputFieldName: "Collection Name",
+          });
+          agHelper.TypeDynamicInputValueNValidate(
+            "name",
+            dataSources._nestedWhereClauseKey(0),
+          );
+          agHelper.TypeDynamicInputValueNValidate(
+            cityName,
+            dataSources._nestedWhereClauseValue(0),
+          );
+          dataSources.RunQuery();
+
+          cy.get("@postExecute").then((resObj: any) => {
+            cities = JSON.parse(JSON.stringify(resObj.response.body.data.body));
+            const losAngeles = cities.find(
+              (city: { name: string }) => city.name === cityName,
+            );
+            expect(losAngeles.state).to.eq("LL"); //Verifying update is fine
+          });
+
+          //Get Document
+          dataSources.ValidateNSelectDropdown(
+            "Command",
+            "List Documents",
+            "Get Document",
+          );
+
+          agHelper.EnterValue(newCityPath, {
+            propFieldName: "",
+            directInput: false,
+            inputFieldName: "Collection/Document path",
+          });
+
+          dataSources.RunQuery();
+          cy.get("@postExecute").then((resObj: any) => {
+            cities = JSON.parse(JSON.stringify(resObj.response.body.data.body));
+            cy.wrap(cities).should("have.property", "name", cityName); //making sure inserted record is returned
+          });
         });
       });
     });
-  });
-
-  it("3. Validate Widget binding & Deploy app", () => {
-    dataSources.ValidateNSelectDropdown(
-      "Command",
-      "Get Document",
-      "List Documents",
-    );
-    agHelper.EnterValue("cities", {
-      propFieldName: "",
-      directInput: false,
-      inputFieldName: "Collection Name",
-    });
-    agHelper.GetNClick(dataSources._whereDelete(0)); //removign where clause, add new condition
-    dataSources.RunQuery();
-    dataSources.AddSuggestedWidget(Widgets.Table);
-    deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.TABLE));
-    table.WaitUntilTableLoad(0, 0, "v2");
-    deployMode.NavigateBacktoEditor();
-    EditorNavigation.SelectEntityByName("Query1", EntityType.Query);
-  });
-
-  it("4. Validate Upsert [Update & Insert]/Delete documents", () => {
-    //Validating Upsert
-    dataSources.ValidateNSelectDropdown(
-      "Command",
-      "List Documents",
-      "Upsert Document",
-    );
-
-    agHelper.EnterValue(newCityPath, {
-      propFieldName: "",
-      directInput: false,
-      inputFieldName: "Collection/Document path",
+
+    it("3. Validate Widget binding & Deploy app", () => {
+      dataSources.ValidateNSelectDropdown(
+        "Command",
+        "Get Document",
+        "List Documents",
+      );
+      agHelper.EnterValue("cities", {
+        propFieldName: "",
+        directInput: false,
+        inputFieldName: "Collection Name",
+      });
+      agHelper.GetNClick(dataSources._whereDelete(0)); //removign where clause, add new condition
+      dataSources.RunQuery();
+      dataSources.AddSuggestedWidget(Widgets.Table);
+      deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.TABLE));
+      table.WaitUntilTableLoad(0, 0, "v2");
+      deployMode.NavigateBacktoEditor();
+      EditorNavigation.SelectEntityByName("Query1", EntityType.Query);
     });
 
-    agHelper.EnterValue(
-      `{
+    it("4. Validate Upsert [Update & Insert]/Delete documents", () => {
+      //Validating Upsert
+      dataSources.ValidateNSelectDropdown(
+        "Command",
+        "List Documents",
+        "Upsert Document",
+      );
+
+      agHelper.EnterValue(newCityPath, {
+        propFieldName: "",
+        directInput: false,
+        inputFieldName: "Collection/Document path",
+      });
+
+      agHelper.EnterValue(
+        `{
         "population": 4000000
        }`,
-      {
+        {
+          propFieldName: "",
+          directInput: false,
+          inputFieldName: "Body",
+        },
+      );
+      dataSources.RunQuery(); //Upsert the document
+
+      dataSources.ValidateNSelectDropdown(
+        "Command",
+        "Upsert Document",
+        "List Documents",
+      );
+      agHelper.EnterValue("cities", {
         propFieldName: "",
         directInput: false,
-        inputFieldName: "Body",
-      },
-    );
-    dataSources.RunQuery(); //Upsert the document
-
-    dataSources.ValidateNSelectDropdown(
-      "Command",
-      "Upsert Document",
-      "List Documents",
-    );
-    agHelper.EnterValue("cities", {
-      propFieldName: "",
-      directInput: false,
-      inputFieldName: "Collection Name",
-    });
-    // agHelper.EnterValue('["population"]', {
-    //   propFieldName: "",
-    //   directInput: false,
-    //   inputFieldName: "Order By",
-    // });
-
-    agHelper.TypeDynamicInputValueNValidate(
-      "population",
-      dataSources._nestedWhereClauseKey(0),
-    );
-    agHelper.TypeDynamicInputValueNValidate(
-      "4000000",
-      dataSources._nestedWhereClauseValue(0),
-    );
-    dataSources.RunQuery();
-
-    const expectedKeys = ["_ref", "population"];
-    cy.get("@postExecute").then((resObj: any) => {
-      cities = JSON.parse(JSON.stringify(resObj.response.body.data.body));
-      const firstRecordFields = Object.keys(cities[0]);
-      cy.log("firstRecordFields is " + firstRecordFields);
-      expect(firstRecordFields.every((key) => expectedKeys.includes(key))).to.be
-        .true; //Validating Upsert!
-    });
+        inputFieldName: "Collection Name",
+      });
+      // agHelper.EnterValue('["population"]', {
+      //   propFieldName: "",
+      //   directInput: false,
+      //   inputFieldName: "Order By",
+      // });
 
-    //Validating Delete
-    dataSources.ValidateNSelectDropdown(
-      "Command",
-      "List Documents",
-      "Delete document",
-    );
-
-    agHelper.EnterValue(newCityPath, {
-      propFieldName: "",
-      directInput: false,
-      inputFieldName: "Collection/Document path",
-    });
-    dataSources.RunQuery(); //Delete the record
-
-    //Validate Deletion
-    dataSources.ValidateNSelectDropdown(
-      "Command",
-      "Delete document",
-      "List Documents",
-    );
-    agHelper.EnterValue("cities", {
-      propFieldName: "",
-      directInput: false,
-      inputFieldName: "Collection Name",
-    });
-    agHelper.TypeDynamicInputValueNValidate(
-      "name",
-      dataSources._nestedWhereClauseKey(0),
-    );
-    agHelper.TypeDynamicInputValueNValidate(
-      cityName,
-      dataSources._nestedWhereClauseValue(0),
-    );
-    dataSources.RunQuery();
-
-    cy.get("@postExecute").then((resObj: any) => {
-      cities = JSON.parse(JSON.stringify(resObj.response.body.data.body));
-      const hasNoInsertedCity = () => {
-        return Array.isArray(cities) && cities.length === 0;
-      };
-      expect(hasNoInsertedCity()).to.be.true; //Validating Deletion!
+      agHelper.TypeDynamicInputValueNValidate(
+        "population",
+        dataSources._nestedWhereClauseKey(0),
+      );
+      agHelper.TypeDynamicInputValueNValidate(
+        "4000000",
+        dataSources._nestedWhereClauseValue(0),
+      );
+      dataSources.RunQuery();
+
+      const expectedKeys = ["_ref", "population"];
+      cy.get("@postExecute").then((resObj: any) => {
+        cities = JSON.parse(JSON.stringify(resObj.response.body.data.body));
+        const firstRecordFields = Object.keys(cities[0]);
+        cy.log("firstRecordFields is " + firstRecordFields);
+        expect(firstRecordFields.every((key) => expectedKeys.includes(key))).to
+          .be.true; //Validating Upsert!
+      });
+
+      //Validating Delete
+      dataSources.ValidateNSelectDropdown(
+        "Command",
+        "List Documents",
+        "Delete document",
+      );
+
+      agHelper.EnterValue(newCityPath, {
+        propFieldName: "",
+        directInput: false,
+        inputFieldName: "Collection/Document path",
+      });
+      dataSources.RunQuery(); //Delete the record
+
+      //Validate Deletion
+      dataSources.ValidateNSelectDropdown(
+        "Command",
+        "Delete document",
+        "List Documents",
+      );
+      agHelper.EnterValue("cities", {
+        propFieldName: "",
+        directInput: false,
+        inputFieldName: "Collection Name",
+      });
+      agHelper.TypeDynamicInputValueNValidate(
+        "name",
+        dataSources._nestedWhereClauseKey(0),
+      );
+      agHelper.TypeDynamicInputValueNValidate(
+        cityName,
+        dataSources._nestedWhereClauseValue(0),
+      );
+      dataSources.RunQuery();
+
+      cy.get("@postExecute").then((resObj: any) => {
+        cities = JSON.parse(JSON.stringify(resObj.response.body.data.body));
+        const hasNoInsertedCity = () => {
+          return Array.isArray(cities) && cities.length === 0;
+        };
+        expect(hasNoInsertedCity()).to.be.true; //Validating Deletion!
+      });
     });
-  });
 
-  after("Delete the query & datasource", () => {
-    agHelper.ActionContextMenuWithInPane({
-      action: "Delete",
-      entityType: entityItems.Query,
+    after("Delete the query & datasource", () => {
+      agHelper.ActionContextMenuWithInPane({
+        action: "Delete",
+        entityType: entityItems.Query,
+      });
+      dataSources.DeleteDatasourceFromWithinDS(dsName, 409);
+      //commenting below since after query delete, we run into risk of not seeing the datasource in EntityExplorer
+      // EditorNavigation.SelectEntityByName(dsName, EntityType.Datasource);
+      // entityExplorer.ActionContextMenuByEntityName({
+      //   entityNameinLeftSidebar: dsName,
+      //   action: "Delete",
+      //   entityType: entityItems.Datasource,
+      // });
+      deployMode.DeployApp();
+      deployMode.NavigateBacktoEditor();
+      dataSources.DeleteDatasourceFromWithinDS(dsName, 200);
     });
-    dataSources.DeleteDatasourceFromWithinDS(dsName, 409);
-    //commenting below since after query delete, we run into risk of not seeing the datasource in EntityExplorer
-    // EditorNavigation.SelectEntityByName(dsName, EntityType.Datasource);
-    // entityExplorer.ActionContextMenuByEntityName({
-    //   entityNameinLeftSidebar: dsName,
-    //   action: "Delete",
-    //   entityType: entityItems.Datasource,
-    // });
-    deployMode.DeployApp();
-    deployMode.NavigateBacktoEditor();
-    dataSources.DeleteDatasourceFromWithinDS(dsName, 200);
-  });
-});
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ServerSide/Datasources/Oracle_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/Datasources/Oracle_Spec.ts
index fff33025788c..64eee9596048 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/Datasources/Oracle_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/Datasources/Oracle_Spec.ts
@@ -20,114 +20,131 @@ import EditorNavigation, {
 } from "../../../../support/Pages/EditorNavigation";
 import PageList from "../../../../support/Pages/PageList";
 
-describe("Validate Oracle DS", { tags: ["@tag.Datasource"] }, () => {
-  let dataSourceName: string, guid: any, query: string, selectQuery: string;
+describe(
+  "Validate Oracle DS",
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
+  () => {
+    let dataSourceName: string, guid: any, query: string, selectQuery: string;
 
-  before("Generate GUID", () => {
-    agHelper.GenerateUUID();
-    cy.get("@guid").then((uid) => {
-      guid = uid;
-      dataSourceName = "Oracle" + " " + uid;
+    before("Generate GUID", () => {
+      agHelper.GenerateUUID();
+      cy.get("@guid").then((uid) => {
+        guid = uid;
+        dataSourceName = "Oracle" + " " + uid;
+      });
     });
-  });
 
-  it("1. Tc #2354, #2204 - Oracle placeholder, port default value & mandatory mark verification", () => {
-    dataSources.NavigateToDSCreateNew();
-    dataSources.CreatePlugIn("Oracle");
-    agHelper.GetNAssertContains(locators._dsName, "Untitled datasource");
-    agHelper.GetNClick(locators._dsName);
-    agHelper.ClearTextField(locators._dsNameTxt); //removing ds name
-    agHelper.AssertTooltip(Cypress.env("MESSAGES").ACTION_INVALID_NAME_ERROR());
-    agHelper.TypeText(locators._dsNameTxt, dataSourceName);
-    agHelper.PressEnter();
-    agHelper.AssertAttribute(
-      dataSources._host(),
-      "placeholder",
-      "myapp.abcde.oracle.net",
-    );
-    agHelper.AssertAttribute(dataSources._port, "value", "1521");
-    agHelper.AssertAttribute(
-      dataSources._databaseName,
-      "placeholder",
-      "gfb284db6bcee33_testdb_high.adb.oraclecloud.com",
-    );
-    agHelper.AssertAttribute(dataSources._username, "placeholder", "admin");
-    agHelper.AssertAttribute(dataSources._password, "placeholder", "password");
-    agHelper.AssertElementLength(dataSources._mandatoryMark, 4); //verifyng all 4 fields are mandatory
-    agHelper.AssertText(dataSources._host(), "val", "");
-    agHelper.ClearNType(
-      dataSources._host(),
-      dataManager.dsValues[dataManager.environments[1]].oracle_host,
-    );
-    agHelper.AssertText(
-      dataSources._host(),
-      "val",
-      dataManager.dsValues[dataManager.environments[1]].oracle_host,
-    );
-    agHelper.GetNClick(dataSources._deleteDSHostPort); //Delete the value & verify
-    agHelper.AssertText(dataSources._host(), "val", "");
-    agHelper.ClickButton("Add more");
-    agHelper.AssertElementVisibility(dataSources._host("1"));
-    agHelper.ClickButton("Add more");
-    agHelper.AssertElementVisibility(dataSources._host("2"));
-    Cypress._.times(2, () => {
-      //Delete the added extra hosts
-      agHelper.GetNClick(dataSources._deleteDSHostPort);
+    it("1. Tc #2354, #2204 - Oracle placeholder, port default value & mandatory mark verification", () => {
+      dataSources.NavigateToDSCreateNew();
+      dataSources.CreatePlugIn("Oracle");
+      agHelper.GetNAssertContains(locators._dsName, "Untitled datasource");
+      agHelper.GetNClick(locators._dsName);
+      agHelper.ClearTextField(locators._dsNameTxt); //removing ds name
+      agHelper.AssertTooltip(
+        Cypress.env("MESSAGES").ACTION_INVALID_NAME_ERROR(),
+      );
+      agHelper.TypeText(locators._dsNameTxt, dataSourceName);
+      agHelper.PressEnter();
+      agHelper.AssertAttribute(
+        dataSources._host(),
+        "placeholder",
+        "myapp.abcde.oracle.net",
+      );
+      agHelper.AssertAttribute(dataSources._port, "value", "1521");
+      agHelper.AssertAttribute(
+        dataSources._databaseName,
+        "placeholder",
+        "gfb284db6bcee33_testdb_high.adb.oraclecloud.com",
+      );
+      agHelper.AssertAttribute(dataSources._username, "placeholder", "admin");
+      agHelper.AssertAttribute(
+        dataSources._password,
+        "placeholder",
+        "password",
+      );
+      agHelper.AssertElementLength(dataSources._mandatoryMark, 4); //verifyng all 4 fields are mandatory
+      agHelper.AssertText(dataSources._host(), "val", "");
+      agHelper.ClearNType(
+        dataSources._host(),
+        dataManager.dsValues[dataManager.environments[1]].oracle_host,
+      );
+      agHelper.AssertText(
+        dataSources._host(),
+        "val",
+        dataManager.dsValues[dataManager.environments[1]].oracle_host,
+      );
+      agHelper.GetNClick(dataSources._deleteDSHostPort); //Delete the value & verify
+      agHelper.AssertText(dataSources._host(), "val", "");
+      agHelper.ClickButton("Add more");
+      agHelper.AssertElementVisibility(dataSources._host("1"));
+      agHelper.ClickButton("Add more");
+      agHelper.AssertElementVisibility(dataSources._host("2"));
+      Cypress._.times(2, () => {
+        //Delete the added extra hosts
+        agHelper.GetNClick(dataSources._deleteDSHostPort);
+      });
     });
-  });
 
-  it("2. Tc #2357, #2356, #2355, #2354 Verify Oracle connection errors", () => {
-    dataSources.TestDatasource(false);
-    agHelper.ValidateToastMessage("Missing endpoint");
-    agHelper.ValidateToastMessage("Missing authentication details");
-    agHelper.WaitUntilAllToastsDisappear();
+    it("2. Tc #2357, #2356, #2355, #2354 Verify Oracle connection errors", () => {
+      dataSources.TestDatasource(false);
+      agHelper.ValidateToastMessage("Missing endpoint");
+      agHelper.ValidateToastMessage("Missing authentication details");
+      agHelper.WaitUntilAllToastsDisappear();
 
-    agHelper.ClearNType(
-      dataSources._host(),
-      dataManager.dsValues[dataManager.defaultEnviorment].oracle_host,
-    );
-    agHelper.ClearNType(
-      dataSources._databaseName,
-      dataManager.dsValues[dataManager.defaultEnviorment].oracle_service,
-    );
-    dataSources.TestDatasource(false);
-    agHelper.ValidateToastMessage("Missing username for authentication");
-    agHelper.ValidateToastMessage("Missing password for authentication");
+      agHelper.ClearNType(
+        dataSources._host(),
+        dataManager.dsValues[dataManager.defaultEnviorment].oracle_host,
+      );
+      agHelper.ClearNType(
+        dataSources._databaseName,
+        dataManager.dsValues[dataManager.defaultEnviorment].oracle_service,
+      );
+      dataSources.TestDatasource(false);
+      agHelper.ValidateToastMessage("Missing username for authentication");
+      agHelper.ValidateToastMessage("Missing password for authentication");
 
-    agHelper.ClearNType(
-      dataSources._username,
-      dataManager.dsValues[dataManager.defaultEnviorment].oracle_username,
-    );
-    agHelper.ClearNType(
-      dataSources._password,
-      dataManager.dsValues[dataManager.defaultEnviorment].oracle_password,
-    );
-    dataSources.TestDatasource(false);
-    agHelper.ValidateToastMessage(
-      "An exception occurred while creating connection pool. One or more arguments in the datasource configuration may be invalid.",
-    );
-    agHelper.ValidateToastMessage("Failed to initialize pool:");
-    propPane.AssertPropertiesDropDownValues("SSL mode", ["Disable", "TLS"]);
-    dataSources.ValidateNSelectDropdown("SSL mode", "TLS", "Disable");
-    dataSources.TestSaveDatasource();
-    //Validate Review page
-    dataSources.AssertDataSourceInfo(["Host address", "Port", "Service Name"]);
-    agHelper.ClickButton("Edit"); //Navigate to Edit page & check if DS edit is opened
-    dataSources.ValidateNSelectDropdown("SSL mode", "Disable");
-    AppSidebar.navigate(AppSidebarButton.Editor);
-    AppSidebar.navigate(AppSidebarButton.Data);
-    dataSources.AssertDSInActiveList(dataSourceName);
-  });
+      agHelper.ClearNType(
+        dataSources._username,
+        dataManager.dsValues[dataManager.defaultEnviorment].oracle_username,
+      );
+      agHelper.ClearNType(
+        dataSources._password,
+        dataManager.dsValues[dataManager.defaultEnviorment].oracle_password,
+      );
+      dataSources.TestDatasource(false);
+      agHelper.ValidateToastMessage(
+        "An exception occurred while creating connection pool. One or more arguments in the datasource configuration may be invalid.",
+      );
+      agHelper.ValidateToastMessage("Failed to initialize pool:");
+      propPane.AssertPropertiesDropDownValues("SSL mode", ["Disable", "TLS"]);
+      dataSources.ValidateNSelectDropdown("SSL mode", "TLS", "Disable");
+      dataSources.TestSaveDatasource();
+      //Validate Review page
+      dataSources.AssertDataSourceInfo([
+        "Host address",
+        "Port",
+        "Service Name",
+      ]);
+      agHelper.ClickButton("Edit"); //Navigate to Edit page & check if DS edit is opened
+      dataSources.ValidateNSelectDropdown("SSL mode", "Disable");
+      AppSidebar.navigate(AppSidebarButton.Editor);
+      AppSidebar.navigate(AppSidebarButton.Data);
+      dataSources.AssertDSInActiveList(dataSourceName);
+    });
 
-  it("3. Tc #2359, Tc # 2360 , Tc # 2358, Tc # 2366 - Create Insert, Alter & Select queries, Widgets to query binding", () => {
-    const currentDate = new Date().toISOString().slice(0, 10);
+    it("3. Tc #2359, Tc # 2360 , Tc # 2358, Tc # 2366 - Create Insert, Alter & Select queries, Widgets to query binding", () => {
+      const currentDate = new Date().toISOString().slice(0, 10);
 
-    entityExplorer.DragDropWidgetNVerify(draggableWidgets.DATEPICKER, 200, 50);
-    propPane.SelectPropertiesDropDown("Date format", "YYYY-MM-DD");
-    entityExplorer.DragDropWidgetNVerify(draggableWidgets.SELECT, 500, 50);
-    propPane.EnterJSContext(
-      "Source Data",
-      `[{
+      entityExplorer.DragDropWidgetNVerify(
+        draggableWidgets.DATEPICKER,
+        200,
+        50,
+      );
+      propPane.SelectPropertiesDropDown("Date format", "YYYY-MM-DD");
+      entityExplorer.DragDropWidgetNVerify(draggableWidgets.SELECT, 500, 50);
+      propPane.EnterJSContext(
+        "Source Data",
+        `[{
     "name": "Cargo Plane",
     "value": "Cargo Plane"
   },
@@ -139,30 +156,33 @@ describe("Validate Oracle DS", { tags: ["@tag.Datasource"] }, () => {
     "name": "Helicopter",
     "code": "Helicopter"
   }]`,
-    );
-    propPane.UpdatePropertyFieldValue("Default selected value", "Cargo Plane");
-    propPane.AssertPropertiesDropDownValues("Label key", [
-      "name",
-      "code",
-      "value",
-    ]);
-    propPane.SelectPropertiesDropDown(
-      "Label key",
-      "value",
-      "Action",
-      0,
-      0,
-      true,
-    );
-    propPane.SelectPropertiesDropDown(
-      "Value key",
-      "name",
-      "Action",
-      0,
-      1,
-      true,
-    );
-    query = `CREATE TABLE ${guid} (
+      );
+      propPane.UpdatePropertyFieldValue(
+        "Default selected value",
+        "Cargo Plane",
+      );
+      propPane.AssertPropertiesDropDownValues("Label key", [
+        "name",
+        "code",
+        "value",
+      ]);
+      propPane.SelectPropertiesDropDown(
+        "Label key",
+        "value",
+        "Action",
+        0,
+        0,
+        true,
+      );
+      propPane.SelectPropertiesDropDown(
+        "Value key",
+        "name",
+        "Action",
+        0,
+        1,
+        true,
+      );
+      query = `CREATE TABLE ${guid} (
       aircraft_id NUMBER(5) PRIMARY KEY,
       aircraft_type VARCHAR2(50) NOT NULL,
       registration_number VARCHAR2(20) UNIQUE,
@@ -174,10 +194,10 @@ describe("Validate Oracle DS", { tags: ["@tag.Datasource"] }, () => {
       maintenance_last_date DATE,
       notes CLOB
   );`;
-    dataSources.CreateQueryForDS(dataSourceName, query);
-    dataSources.RunQuery();
+      dataSources.CreateQueryForDS(dataSourceName, query);
+      dataSources.RunQuery();
 
-    query = `INSERT INTO ${guid} (
+      query = `INSERT INTO ${guid} (
     aircraft_id,
     aircraft_type,
     registration_number,
@@ -198,30 +218,32 @@ describe("Validate Oracle DS", { tags: ["@tag.Datasource"] }, () => {
     TO_DATE('2020-01-15', 'YYYY-MM-DD'),
     TO_DATE('{{DatePicker1.formattedDate}}', 'YYYY-MM-DD'),
     'This aircraft is used for domestic flights.')`;
-    selectQuery = `SELECT * FROM ${guid} WHERE ROWNUM < 10`;
-    dataSources.EnterQuery(selectQuery);
+      selectQuery = `SELECT * FROM ${guid} WHERE ROWNUM < 10`;
+      dataSources.EnterQuery(selectQuery);
 
-    dataSources.RunQuery();
-    agHelper
-      .GetText(dataSources._noRecordFound)
-      .then(($noRecMsg) => expect($noRecMsg).to.eq("No data records to show"));
-    dataSources.EnterQuery(query);
-    agHelper.VerifyEvaluatedValue(
-      `INSERT INTO ${guid} (\n    aircraft_id,\n    aircraft_type,\n    registration_number,\n    manufacturer,\n    seating_capacity,\n    maximum_speed,\n    range,\n    purchase_date,\n    maintenance_last_date,\n    notes) VALUES (\n    1,\n    $1,\n    'N12345',\n    'Boeing',\n    150,\n    550.03,\n    3500.30,\n    TO_DATE('2020-01-15', 'YYYY-MM-DD'),\n    TO_DATE($2, 'YYYY-MM-DD'),\n    'This aircraft is used for domestic flights.')`,
-    );
-    dataSources.ToggleUsePreparedStatement(false);
-    agHelper.GetNClick(locators._codeEditorTarget);
-    agHelper.VerifyEvaluatedValue(
-      `INSERT INTO ${guid} (\n    aircraft_id,\n    aircraft_type,\n    registration_number,\n    manufacturer,\n    seating_capacity,\n    maximum_speed,\n    range,\n    purchase_date,\n    maintenance_last_date,\n    notes) VALUES (\n    1,\n    'Cargo Plane',\n    'N12345',\n    'Boeing',\n    150,\n    550.03,\n    3500.30,\n    TO_DATE('2020-01-15', 'YYYY-MM-DD'),\n    TO_DATE('${currentDate}', 'YYYY-MM-DD'),\n    'This aircraft is used for domestic flights.')`,
-    );
-    dataSources.RunQuery();
-    dataSources.EnterQuery(selectQuery);
-    dataSources.RunQueryNVerifyResponseViews();
-    dataSources.ToggleUsePreparedStatement(true);
-    query = `ALTER TABLE ${guid} ADD (raw_data RAW(16), maintenance_interval INTERVAL YEAR(3) TO MONTH);`;
-    dataSources.EnterQuery(query);
-    dataSources.RunQuery();
-    query = `INSERT INTO ${guid} (
+      dataSources.RunQuery();
+      agHelper
+        .GetText(dataSources._noRecordFound)
+        .then(($noRecMsg) =>
+          expect($noRecMsg).to.eq("No data records to show"),
+        );
+      dataSources.EnterQuery(query);
+      agHelper.VerifyEvaluatedValue(
+        `INSERT INTO ${guid} (\n    aircraft_id,\n    aircraft_type,\n    registration_number,\n    manufacturer,\n    seating_capacity,\n    maximum_speed,\n    range,\n    purchase_date,\n    maintenance_last_date,\n    notes) VALUES (\n    1,\n    $1,\n    'N12345',\n    'Boeing',\n    150,\n    550.03,\n    3500.30,\n    TO_DATE('2020-01-15', 'YYYY-MM-DD'),\n    TO_DATE($2, 'YYYY-MM-DD'),\n    'This aircraft is used for domestic flights.')`,
+      );
+      dataSources.ToggleUsePreparedStatement(false);
+      agHelper.GetNClick(locators._codeEditorTarget);
+      agHelper.VerifyEvaluatedValue(
+        `INSERT INTO ${guid} (\n    aircraft_id,\n    aircraft_type,\n    registration_number,\n    manufacturer,\n    seating_capacity,\n    maximum_speed,\n    range,\n    purchase_date,\n    maintenance_last_date,\n    notes) VALUES (\n    1,\n    'Cargo Plane',\n    'N12345',\n    'Boeing',\n    150,\n    550.03,\n    3500.30,\n    TO_DATE('2020-01-15', 'YYYY-MM-DD'),\n    TO_DATE('${currentDate}', 'YYYY-MM-DD'),\n    'This aircraft is used for domestic flights.')`,
+      );
+      dataSources.RunQuery();
+      dataSources.EnterQuery(selectQuery);
+      dataSources.RunQueryNVerifyResponseViews();
+      dataSources.ToggleUsePreparedStatement(true);
+      query = `ALTER TABLE ${guid} ADD (raw_data RAW(16), maintenance_interval INTERVAL YEAR(3) TO MONTH);`;
+      dataSources.EnterQuery(query);
+      dataSources.RunQuery();
+      query = `INSERT INTO ${guid} (
     aircraft_id,
     aircraft_type,
     registration_number,
@@ -247,11 +269,11 @@ describe("Validate Oracle DS", { tags: ["@tag.Datasource"] }, () => {
     UTL_RAW.CAST_TO_RAW('raw_value'),
     INTERVAL '1' YEAR(3) -- 1 year maintenance interval
 );`;
-    dataSources.EnterQuery(query);
-    dataSources.RunQuery();
-    dataSources.EnterQuery(selectQuery);
-    dataSources.RunQueryNVerifyResponseViews(2);
-    query = `INSERT ALL
+      dataSources.EnterQuery(query);
+      dataSources.RunQuery();
+      dataSources.EnterQuery(selectQuery);
+      dataSources.RunQueryNVerifyResponseViews(2);
+      query = `INSERT ALL
       INTO ${guid} (
           aircraft_id,
           aircraft_type,
@@ -309,34 +331,34 @@ describe("Validate Oracle DS", { tags: ["@tag.Datasource"] }, () => {
           INTERVAL '6' MONTH -- Six-month maintenance interval
       );
       SELECT * FROM DUAL;`;
-    dataSources.EnterQuery(query);
-    dataSources.RunQuery();
-    dataSources.EnterQuery(selectQuery);
-    dataSources.RunQueryNVerifyResponseViews(4);
-    selectQuery = selectQuery + ` and  aircraft_id IN (1, 6)`;
-    dataSources.EnterQuery(selectQuery);
-    dataSources.RunQueryNVerifyResponseViews(2);
-    dataSources.AddSuggestedWidget(Widgets.Table);
-    deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.TABLE));
-    table.WaitUntilTableLoad(0, 0, "v2");
-    table.ReadTableRowColumnData(0, 10, "v2").then(($cellData) => {
-      expect($cellData).to.be.empty;
-    });
-    table.ReadTableRowColumnData(0, 11, "v2").then(($cellData) => {
-      expect($cellData).to.be.empty;
-    });
-    table.ReadTableRowColumnData(1, 10, "v2").then(($cellData) => {
-      expect($cellData).not.to.be.empty;
-    });
-    table.ReadTableRowColumnData(1, 11, "v2").then(($cellData) => {
-      expect($cellData).not.to.be.empty;
+      dataSources.EnterQuery(query);
+      dataSources.RunQuery();
+      dataSources.EnterQuery(selectQuery);
+      dataSources.RunQueryNVerifyResponseViews(4);
+      selectQuery = selectQuery + ` and  aircraft_id IN (1, 6)`;
+      dataSources.EnterQuery(selectQuery);
+      dataSources.RunQueryNVerifyResponseViews(2);
+      dataSources.AddSuggestedWidget(Widgets.Table);
+      deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.TABLE));
+      table.WaitUntilTableLoad(0, 0, "v2");
+      table.ReadTableRowColumnData(0, 10, "v2").then(($cellData) => {
+        expect($cellData).to.be.empty;
+      });
+      table.ReadTableRowColumnData(0, 11, "v2").then(($cellData) => {
+        expect($cellData).to.be.empty;
+      });
+      table.ReadTableRowColumnData(1, 10, "v2").then(($cellData) => {
+        expect($cellData).not.to.be.empty;
+      });
+      table.ReadTableRowColumnData(1, 11, "v2").then(($cellData) => {
+        expect($cellData).not.to.be.empty;
+      });
+      deployMode.NavigateBacktoEditor();
     });
-    deployMode.NavigateBacktoEditor();
-  });
 
-  it("4. Tc #2362  - Update query validation", () => {
-    EditorNavigation.SelectEntityByName("Query1", EntityType.Query);
-    query = `UPDATE ${guid}
+    it("4. Tc #2362  - Update query validation", () => {
+      EditorNavigation.SelectEntityByName("Query1", EntityType.Query);
+      query = `UPDATE ${guid}
 SET
     maximum_speed = CASE
         WHEN seating_capacity <= 100 THEN 400.89
@@ -349,117 +371,118 @@ SET
         ELSE TO_YMINTERVAL('1-0')
     END
 WHERE aircraft_type = 'Passenger Plane'`;
-    dataSources.EnterQuery(query);
-    dataSources.RunQuery();
-    selectQuery = selectQuery + ` or  aircraft_type = 'Passenger Plane'`;
-    dataSources.EnterQuery(selectQuery);
-    dataSources.RunQueryNVerifyResponseViews(3);
-    dataSources.AddSuggestedWidget(
-      Widgets.Table,
-      dataSources._addSuggestedExisting,
-    );
-    deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.TABLE));
-    table.WaitUntilTableLoad(0, 0, "v2");
-    table.ReadTableRowColumnData(1, 5, "v2").then(($cellData) => {
-      expect($cellData).to.eq("400.89");
-    });
-    table.ReadTableRowColumnData(1, 11, "v2").then(($cellData) => {
-      expect($cellData).to.eq("0-6");
+      dataSources.EnterQuery(query);
+      dataSources.RunQuery();
+      selectQuery = selectQuery + ` or  aircraft_type = 'Passenger Plane'`;
+      dataSources.EnterQuery(selectQuery);
+      dataSources.RunQueryNVerifyResponseViews(3);
+      dataSources.AddSuggestedWidget(
+        Widgets.Table,
+        dataSources._addSuggestedExisting,
+      );
+      deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.TABLE));
+      table.WaitUntilTableLoad(0, 0, "v2");
+      table.ReadTableRowColumnData(1, 5, "v2").then(($cellData) => {
+        expect($cellData).to.eq("400.89");
+      });
+      table.ReadTableRowColumnData(1, 11, "v2").then(($cellData) => {
+        expect($cellData).to.eq("0-6");
+      });
+      deployMode.NavigateBacktoEditor();
     });
-    deployMode.NavigateBacktoEditor();
-  });
 
-  it("5. Tc #2361  - Delete query validation", () => {
-    EditorNavigation.SelectEntityByName("Query1", EntityType.Query);
-    query = `DELETE FROM ${guid}
+    it("5. Tc #2361  - Delete query validation", () => {
+      EditorNavigation.SelectEntityByName("Query1", EntityType.Query);
+      query = `DELETE FROM ${guid}
     WHERE
         (aircraft_type = 'Cargo Plane' AND seating_capacity <= 100)
         OR
         (aircraft_type = 'Passenger Plane' AND purchase_date < TO_DATE('2020-01-01', 'YYYY-MM-DD'))
         OR
         (aircraft_type = 'Helicopter' AND manufacturer = 'Robinson' AND maintenance_interval = INTERVAL '6' MONTH)`;
-    dataSources.EnterQuery(query);
-    dataSources.RunQuery();
-    selectQuery = `SELECT * FROM ${guid}`;
-    dataSources.EnterQuery(selectQuery);
-    dataSources.RunQueryNVerifyResponseViews(2);
-    dataSources.AddSuggestedWidget(
-      Widgets.Table,
-      dataSources._addSuggestedExisting,
-    );
-    deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.TABLE));
-    table.WaitUntilTableLoad(0, 0, "v2");
-    for (let i = 0; i < 2; i++) {
-      table.ReadTableRowColumnData(i, 1, "v2").then(($cellData) => {
-        expect($cellData).to.eq("Cargo Plane");
-      });
-    }
+      dataSources.EnterQuery(query);
+      dataSources.RunQuery();
+      selectQuery = `SELECT * FROM ${guid}`;
+      dataSources.EnterQuery(selectQuery);
+      dataSources.RunQueryNVerifyResponseViews(2);
+      dataSources.AddSuggestedWidget(
+        Widgets.Table,
+        dataSources._addSuggestedExisting,
+      );
+      deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.TABLE));
+      table.WaitUntilTableLoad(0, 0, "v2");
+      for (let i = 0; i < 2; i++) {
+        table.ReadTableRowColumnData(i, 1, "v2").then(($cellData) => {
+          expect($cellData).to.eq("Cargo Plane");
+        });
+      }
 
-    table.OpenNFilterTable("MAINTENANCE_INTERVAL", "not empty");
-    table.ReadTableRowColumnData(0, 0, "v2").then(($cellData) => {
-      expect($cellData).to.eq("5");
+      table.OpenNFilterTable("MAINTENANCE_INTERVAL", "not empty");
+      table.ReadTableRowColumnData(0, 0, "v2").then(($cellData) => {
+        expect($cellData).to.eq("5");
+      });
+      agHelper
+        .GetText(table._showPageItemsCount)
+        .then(($count) => expect($count).contain("1"));
+      table.CloseFilter();
+      agHelper
+        .GetText(table._filtersCount)
+        .then(($count) => expect($count).contain("1"));
+      deployMode.NavigateBacktoEditor();
     });
-    agHelper
-      .GetText(table._showPageItemsCount)
-      .then(($count) => expect($count).contain("1"));
-    table.CloseFilter();
-    agHelper
-      .GetText(table._filtersCount)
-      .then(($count) => expect($count).contain("1"));
-    deployMode.NavigateBacktoEditor();
-  });
 
-  it("6. Tc #2363  - Copy & Move query validations", () => {
-    EditorNavigation.SelectEntityByName("Query1", EntityType.Query);
-    agHelper.ActionContextMenuWithInPane({
-      action: "Copy to page",
-      subAction: "Page1",
-      toastToValidate: "copied to page",
-    });
-    agHelper.GetNAssertContains(locators._queryName, "Query1Copy");
-    dataSources.RunQueryNVerifyResponseViews(2);
-    PageList.AddNewPage();
-    EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
-    agHelper.ActionContextMenuWithInPane({
-      action: "Move to page",
-      subAction: "Page2",
-      toastToValidate: "moved to page",
-    });
-    agHelper.WaitUntilAllToastsDisappear();
-    agHelper.GetNAssertContains(locators._queryName, "Query1Copy");
-    dataSources.RunQueryNVerifyResponseViews(2);
-    agHelper.ActionContextMenuWithInPane({
-      action: "Delete",
-      entityType: entityItems.Query,
+    it("6. Tc #2363  - Copy & Move query validations", () => {
+      EditorNavigation.SelectEntityByName("Query1", EntityType.Query);
+      agHelper.ActionContextMenuWithInPane({
+        action: "Copy to page",
+        subAction: "Page1",
+        toastToValidate: "copied to page",
+      });
+      agHelper.GetNAssertContains(locators._queryName, "Query1Copy");
+      dataSources.RunQueryNVerifyResponseViews(2);
+      PageList.AddNewPage();
+      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+      agHelper.ActionContextMenuWithInPane({
+        action: "Move to page",
+        subAction: "Page2",
+        toastToValidate: "moved to page",
+      });
+      agHelper.WaitUntilAllToastsDisappear();
+      agHelper.GetNAssertContains(locators._queryName, "Query1Copy");
+      dataSources.RunQueryNVerifyResponseViews(2);
+      agHelper.ActionContextMenuWithInPane({
+        action: "Delete",
+        entityType: entityItems.Query,
+      });
+      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+      EditorNavigation.SelectEntityByName("Query1", EntityType.Query);
     });
-    EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
-    EditorNavigation.SelectEntityByName("Query1", EntityType.Query);
-  });
 
-  it("7. Tc #2365  - Query settings tab validations", () => {
-    apiPage.ToggleOnPageLoadRun(false); // ALl above cases validated for onpage load run with confirmation dialog set to false
-    apiPage.ToggleConfirmBeforeRunning(true);
-    deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.TABLE));
-    table.WaitForTableEmpty("v2");
-    deployMode.NavigateBacktoEditor();
-    entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON, 300, 500);
-    propPane.EnterJSContext("onClick", `{{Query1.run()}}`);
-    deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.TABLE));
-    agHelper.ClickButton("Submit");
-    jsEditor.ConfirmationClick("No"); //Handling both No & Yes from confirmation dialog
-
-    table.WaitUntilTableLoad(0, 0, "v2");
-    deployMode.NavigateBacktoEditor();
-  });
+    it("7. Tc #2365  - Query settings tab validations", () => {
+      apiPage.ToggleOnPageLoadRun(false); // ALl above cases validated for onpage load run with confirmation dialog set to false
+      apiPage.ToggleConfirmBeforeRunning(true);
+      deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.TABLE));
+      table.WaitForTableEmpty("v2");
+      deployMode.NavigateBacktoEditor();
+      entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON, 300, 500);
+      propPane.EnterJSContext("onClick", `{{Query1.run()}}`);
+      deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.TABLE));
+      agHelper.ClickButton("Submit");
+      jsEditor.ConfirmationClick("No"); //Handling both No & Yes from confirmation dialog
 
-  after(
-    "Verify Deletion of the Oracle datasource after all created queries are deleted",
-    () => {
-      dataSources.DeleteDatasourceFromWithinDS(dataSourceName, 409); //Since all queries exists
-      entityExplorer.DeleteAllQueriesForDB(dataSourceName);
-      deployMode.DeployApp();
+      table.WaitUntilTableLoad(0, 0, "v2");
       deployMode.NavigateBacktoEditor();
-      dataSources.DeleteDatasourceFromWithinDS(dataSourceName, 200);
-    },
-  );
-});
+    });
+
+    after(
+      "Verify Deletion of the Oracle datasource after all created queries are deleted",
+      () => {
+        dataSources.DeleteDatasourceFromWithinDS(dataSourceName, 409); //Since all queries exists
+        entityExplorer.DeleteAllQueriesForDB(dataSourceName);
+        deployMode.DeployApp();
+        deployMode.NavigateBacktoEditor();
+        dataSources.DeleteDatasourceFromWithinDS(dataSourceName, 200);
+      },
+    );
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ServerSide/Datasources/Redis_Basic_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/Datasources/Redis_Basic_Spec.ts
index 274533088488..01e4106a4457 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/Datasources/Redis_Basic_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/Datasources/Redis_Basic_Spec.ts
@@ -6,103 +6,107 @@ import {
 
 let dsName: any;
 
-describe("Validate Redis DS", { tags: ["@tag.Datasource"] }, () => {
-  before("Create a new Redis DS", () => {
-    dataSources.CreateDataSource("Redis");
-    cy.get("@dsName").then(($dsName) => {
-      dsName = $dsName;
+describe(
+  "Validate Redis DS",
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
+  () => {
+    before("Create a new Redis DS", () => {
+      dataSources.CreateDataSource("Redis");
+      cy.get("@dsName").then(($dsName) => {
+        dsName = $dsName;
+      });
     });
-  });
-
-  it("1. Create HAST set (Multiple key value pair under single key name) in redis DB, Read, Delete", () => {
-    let hSetReceipe = `HSET recipe:1 name "Vegetable Stir Fry" ingredients "2 cups mixed vegetables (broccoli, carrots, bell peppers, mushrooms, snow peas), 2 cloves garlic, minced" instructions "1. Heat vegetable oil in a large skillet over medium-high heat. 2. Add mixed vegetables and garlic to the skillet and cook for 3-4 minutes. 3. In a small bowl, whisk together soy sauce and cornstarch. 4. Pour the soy sauce mixture over the vegetables and stir until the vegetables are coated. 5. Cook for an additional 1-2 minutes. 6. Serve hot." difficulty "easy"`;
-    let hGetKeys = "HGET recipe:1 name";
-    let hMGet = "HMGET recipe:1 difficulty name"; // getting multiple keys
-    let hUpdate = "HSET recipe:1 difficulty medium";
-    let getUpdatedKey = "HGET recipe:1 difficulty";
-    let getAll = "HGETALL recipe:1";
-    let addNewKeyValue = `HSET recipe:1 prep_time "10 minutes"`;
-    let deletehKey = "DEL recipe:1";
-
-    //Add HSET
-    dataSources.CreateQueryAfterDSSaved();
-    dataSources.EnterQuery(hSetReceipe);
-    dataSources.RunQueryNVerifyResponseViews(1); //verify all views are returned!
-    dataSources.AssertQueryTableResponse(0, "4"); //Success response for 4 keys inserted via above HSET!
-
-    //Read only one key from above HSET
-    dataSources.EnterQuery(hGetKeys);
-    dataSources.RunQueryNVerifyResponseViews(1); //verify all views are returned!
-    dataSources.AssertQueryTableResponse(0, "Vegetable Stir Fry");
-
-    //Read more than one key from above HSET
-    dataSources.EnterQuery(hMGet);
-    dataSources.RunQueryNVerifyResponseViews(2);
-    dataSources.AssertQueryTableResponse(0, "easy");
-    dataSources.AssertQueryTableResponse(1, "Vegetable Stir Fry");
-
-    //Update key value in HSET
-    dataSources.EnterQuery(hUpdate);
-    dataSources.RunQueryNVerifyResponseViews(1); //verify all views are returned!
-
-    //validate updated key
-    dataSources.EnterQuery(getUpdatedKey);
-    dataSources.RunQueryNVerifyResponseViews(1);
-    dataSources.AssertQueryTableResponse(0, "medium");
-
-    //Get All keys from HSET
-    dataSources.EnterQuery(getAll);
-    dataSources.RunQueryNVerifyResponseViews(8); //4 keys, 4 values
-    dataSources.ReadQueryTableResponse(0).then(($cellData: any) => {
-      expect($cellData).to.be.oneOf([
-        "name",
-        "ingredients",
-        "instructions",
-        "difficulty",
-      ]);
-    });
-    // dataSources.ReadQueryTableResponse(6).then(($cellData: any) => {
-    //   expect($cellData).to.eq("instructions");
-    // });//order not always matching - hence commented
-
-    //Ading one more key/value to HSET
-    dataSources.EnterQuery(addNewKeyValue);
-    dataSources.RunQueryNVerifyResponseViews(1);
-
-    //Verify new key/value also added to HSET
-    dataSources.EnterQuery(getAll);
-    dataSources.RunQueryNVerifyResponseViews(10); //5 keys, 5 values
-    dataSources.ReadQueryTableResponse(0).then(($cellData: any) => {
-      expect($cellData).to.be.oneOf([
-        "name",
-        "ingredients",
-        "instructions",
-        "difficulty",
-        "prep_time",
-      ]);
-    });
-
-    //Deleting the Hash key
-    dataSources.EnterQuery(deletehKey);
-    dataSources.RunQueryNVerifyResponseViews(1);
 
-    //Verify Deletion is success
-    dataSources.EnterQuery(hGetKeys);
-    dataSources.RunQueryNVerifyResponseViews(); //5 keys, 5 values
-    dataSources.AssertQueryTableResponse(0, "null");
-
-    // Delete the query & datasource
-    agHelper.ActionContextMenuWithInPane({
-      action: "Delete",
-      entityType: entityItems.Query,
+    it("1. Create HAST set (Multiple key value pair under single key name) in redis DB, Read, Delete", () => {
+      let hSetReceipe = `HSET recipe:1 name "Vegetable Stir Fry" ingredients "2 cups mixed vegetables (broccoli, carrots, bell peppers, mushrooms, snow peas), 2 cloves garlic, minced" instructions "1. Heat vegetable oil in a large skillet over medium-high heat. 2. Add mixed vegetables and garlic to the skillet and cook for 3-4 minutes. 3. In a small bowl, whisk together soy sauce and cornstarch. 4. Pour the soy sauce mixture over the vegetables and stir until the vegetables are coated. 5. Cook for an additional 1-2 minutes. 6. Serve hot." difficulty "easy"`;
+      let hGetKeys = "HGET recipe:1 name";
+      let hMGet = "HMGET recipe:1 difficulty name"; // getting multiple keys
+      let hUpdate = "HSET recipe:1 difficulty medium";
+      let getUpdatedKey = "HGET recipe:1 difficulty";
+      let getAll = "HGETALL recipe:1";
+      let addNewKeyValue = `HSET recipe:1 prep_time "10 minutes"`;
+      let deletehKey = "DEL recipe:1";
+
+      //Add HSET
+      dataSources.CreateQueryAfterDSSaved();
+      dataSources.EnterQuery(hSetReceipe);
+      dataSources.RunQueryNVerifyResponseViews(1); //verify all views are returned!
+      dataSources.AssertQueryTableResponse(0, "4"); //Success response for 4 keys inserted via above HSET!
+
+      //Read only one key from above HSET
+      dataSources.EnterQuery(hGetKeys);
+      dataSources.RunQueryNVerifyResponseViews(1); //verify all views are returned!
+      dataSources.AssertQueryTableResponse(0, "Vegetable Stir Fry");
+
+      //Read more than one key from above HSET
+      dataSources.EnterQuery(hMGet);
+      dataSources.RunQueryNVerifyResponseViews(2);
+      dataSources.AssertQueryTableResponse(0, "easy");
+      dataSources.AssertQueryTableResponse(1, "Vegetable Stir Fry");
+
+      //Update key value in HSET
+      dataSources.EnterQuery(hUpdate);
+      dataSources.RunQueryNVerifyResponseViews(1); //verify all views are returned!
+
+      //validate updated key
+      dataSources.EnterQuery(getUpdatedKey);
+      dataSources.RunQueryNVerifyResponseViews(1);
+      dataSources.AssertQueryTableResponse(0, "medium");
+
+      //Get All keys from HSET
+      dataSources.EnterQuery(getAll);
+      dataSources.RunQueryNVerifyResponseViews(8); //4 keys, 4 values
+      dataSources.ReadQueryTableResponse(0).then(($cellData: any) => {
+        expect($cellData).to.be.oneOf([
+          "name",
+          "ingredients",
+          "instructions",
+          "difficulty",
+        ]);
+      });
+      // dataSources.ReadQueryTableResponse(6).then(($cellData: any) => {
+      //   expect($cellData).to.eq("instructions");
+      // });//order not always matching - hence commented
+
+      //Ading one more key/value to HSET
+      dataSources.EnterQuery(addNewKeyValue);
+      dataSources.RunQueryNVerifyResponseViews(1);
+
+      //Verify new key/value also added to HSET
+      dataSources.EnterQuery(getAll);
+      dataSources.RunQueryNVerifyResponseViews(10); //5 keys, 5 values
+      dataSources.ReadQueryTableResponse(0).then(($cellData: any) => {
+        expect($cellData).to.be.oneOf([
+          "name",
+          "ingredients",
+          "instructions",
+          "difficulty",
+          "prep_time",
+        ]);
+      });
+
+      //Deleting the Hash key
+      dataSources.EnterQuery(deletehKey);
+      dataSources.RunQueryNVerifyResponseViews(1);
+
+      //Verify Deletion is success
+      dataSources.EnterQuery(hGetKeys);
+      dataSources.RunQueryNVerifyResponseViews(); //5 keys, 5 values
+      dataSources.AssertQueryTableResponse(0, "null");
+
+      // Delete the query & datasource
+      agHelper.ActionContextMenuWithInPane({
+        action: "Delete",
+        entityType: entityItems.Query,
+      });
+      dataSources.DeleteDatasourceFromWithinDS(dsName);
     });
-    dataSources.DeleteDatasourceFromWithinDS(dsName);
-  });
 
-  it("2. Verify the default port for the datasource", function () {
-    dataSources.NavigateToDSCreateNew();
-    dataSources.CreatePlugIn("Redis");
+    it("2. Verify the default port for the datasource", function () {
+      dataSources.NavigateToDSCreateNew();
+      dataSources.CreatePlugIn("Redis");
 
-    agHelper.AssertAttribute(dataSources._port, "value", "6379");
-  });
-});
+      agHelper.AssertAttribute(dataSources._port, "value", "6379");
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/MongoURI_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/MongoURI_Spec.ts
index 4b1d780a9ec5..0f7ab34774bf 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/MongoURI_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/MongoURI_Spec.ts
@@ -19,7 +19,7 @@ import data from "../../../../fixtures/mongouri_data_spec.json";
 
 describe(
   "Validate Mongo URI CRUD with JSON Form",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   () => {
     let dsName: any;
     let importDataCollectionName: string;
diff --git a/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/Mongo_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/Mongo_Spec.ts
index c6fbdd13f5b9..e85c63d70c18 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/Mongo_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/Mongo_Spec.ts
@@ -16,7 +16,9 @@ import PageList from "../../../../support/Pages/PageList";
 
 describe(
   "Validate Mongo CRUD with JSON Form",
-  { tags: ["@tag.Datasource", "@tag.Sanity"] },
+  {
+    tags: ["@tag.Datasource", "@tag.Sanity", "@tag.Git", "@tag.AccessControl"],
+  },
   () => {
     let dsName: any;
 
diff --git a/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/MySQL1_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/MySQL1_Spec.ts
index d0ee3d3d609f..e174cd171cfa 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/MySQL1_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/MySQL1_Spec.ts
@@ -21,7 +21,7 @@ let dsName: any;
 
 describe(
   "Validate MySQL Generate CRUD with JSON Form",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   () => {
     // beforeEach(function() {
     //   if (INTERCEPT.MYSQL) {
diff --git a/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/MySQL2_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/MySQL2_Spec.ts
index 3271e32094da..ce5773313e82 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/MySQL2_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/MySQL2_Spec.ts
@@ -19,7 +19,7 @@ let dsName: any, newStoreSecret: any;
 
 describe(
   "Validate MySQL Generate CRUD with JSON Form",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   () => {
     // beforeEach(function() {
     //   if (INTERCEPT.MYSQL) {
diff --git a/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/Postgres1_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/Postgres1_Spec.ts
index 70e6147c56e7..8177679f27db 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/Postgres1_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/Postgres1_Spec.ts
@@ -22,7 +22,7 @@ let dsName: any;
 
 describe(
   "Postgres Generate CRUD with JSON Form",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   () => {
     it("1. Create DS & then Add new Page and generate CRUD template using created datasource", () => {
       dataSources.CreateDataSource("Postgres");
diff --git a/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/Postgres2_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/Postgres2_Spec.ts
index 1dfb8b5e19a2..09a77eb14b2c 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/Postgres2_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/Postgres2_Spec.ts
@@ -18,7 +18,7 @@ let dsName: any, newCallsign: any;
 
 describe(
   "Validate Postgres Generate CRUD with JSON Form",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   () => {
     before("Create DS for generate CRUD template test", () => {
       dataSources.CreateDataSource("Postgres");
diff --git a/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/S3_Spec.js b/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/S3_Spec.js
index ab6851b32491..cb1be5c1cd5b 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/S3_Spec.js
+++ b/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/S3_Spec.js
@@ -16,7 +16,7 @@ import EditorNavigation, {
 
 describe(
   "Generate New CRUD Page Inside from entity explorer",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   function () {
     let datasourceName;
 
diff --git a/app/client/cypress/e2e/Regression/ServerSide/JsFunctionExecution/Fetch_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/JsFunctionExecution/Fetch_Spec.ts
index b59b5fb9dd2b..69dc83da04d2 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/JsFunctionExecution/Fetch_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/JsFunctionExecution/Fetch_Spec.ts
@@ -1,5 +1,7 @@
 import {
   agHelper,
+  apiPage,
+  dataManager,
   entityExplorer,
   jsEditor,
   propPane,
@@ -8,7 +10,7 @@ import EditorNavigation, {
   EntityType,
 } from "../../../../support/Pages/EditorNavigation";
 
-describe("Tests fetch calls", { tags: ["@tag.JS"] }, () => {
+describe("Tests fetch calls", { tags: ["@tag.JS", "@tag.Binding"] }, () => {
   it("1. Ensures that cookies are not passed with fetch calls", function () {
     jsEditor.CreateJSObject(
       `export default {
@@ -76,18 +78,25 @@ describe("Tests fetch calls", { tags: ["@tag.JS"] }, () => {
   });
 
   it("3. Tests if fetch works with store value", function () {
+    apiPage.CreateAndFillApi(
+      dataManager.dsValues[dataManager.defaultEnviorment].mockGenderAge +
+        `{{this.params.person}}`,
+      "Gender_Age",
+    );
+    apiPage.RunAPI();
     entityExplorer.DragDropWidgetNVerify("buttonwidget", 500, 200);
     EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-    propPane.TypeTextIntoField("Label", "getUserID");
+    propPane.TypeTextIntoField("Label", "getUserName");
     propPane.EnterJSContext(
       "onClick",
-      `{{fetch('https://jsonplaceholder.typicode.com/todos/1')
-    .then(res => res.json())
-    .then(json => storeValue('userId', json.userId))
-    .then(() => showAlert("UserId: " + appsmith.store.userId))}}`,
+      `{{(async function(){
+          const gender = await Gender_Age.run({ person: "sagar" });
+          storeValue("Gender", gender);
+          showAlert("Your name is " + appsmith.store.Gender.name);
+        })()}}`,
     );
-    agHelper.Sleep(2000);
-    agHelper.ClickButton("getUserID");
-    agHelper.AssertContains("UserId: 1", "exist");
+
+    agHelper.ClickButton("getUserName");
+    agHelper.AssertContains("Your name is sagar", "exist");
   });
 });
diff --git a/app/client/cypress/e2e/Regression/ServerSide/JsFunctionExecution/JSFunctionExecution_spec.ts b/app/client/cypress/e2e/Regression/ServerSide/JsFunctionExecution/JSFunctionExecution_spec.ts
index 71c7ac4762c9..a704db310d01 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/JsFunctionExecution/JSFunctionExecution_spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/JsFunctionExecution/JSFunctionExecution_spec.ts
@@ -30,7 +30,7 @@ let onPageLoadAndConfirmExecuteFunctionsLength: number,
 
 describe(
   "JS Function Execution",
-  { tags: ["@tag.JS", "@tag.Sanity"] },
+  { tags: ["@tag.JS", "@tag.Sanity", "@tag.Binding"] },
   function () {
     const FUNCTIONS_SETTINGS_DEFAULT_DATA: IFunctionSettingData[] = [
       {
diff --git a/app/client/cypress/e2e/Regression/ServerSide/JsFunctionExecution/PlatformFn_spec.ts b/app/client/cypress/e2e/Regression/ServerSide/JsFunctionExecution/PlatformFn_spec.ts
index 32c1fca74242..a9cd4d73410c 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/JsFunctionExecution/PlatformFn_spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/JsFunctionExecution/PlatformFn_spec.ts
@@ -11,7 +11,7 @@ import EditorNavigation from "../../../../support/Pages/EditorNavigation";
 
 describe(
   "Tests functionality of platform function",
-  { tags: ["@tag.JS"] },
+  { tags: ["@tag.JS", "@tag.Binding"] },
   () => {
     it("1. Tests access to outer variable", () => {
       apiPage.CreateAndFillApi(
diff --git a/app/client/cypress/e2e/Regression/ServerSide/JsFunctionExecution/SetTimeout_spec.ts b/app/client/cypress/e2e/Regression/ServerSide/JsFunctionExecution/SetTimeout_spec.ts
index fed88aed5966..59fb56693b34 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/JsFunctionExecution/SetTimeout_spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/JsFunctionExecution/SetTimeout_spec.ts
@@ -9,10 +9,13 @@ import {
 
 let userName: string;
 
-describe("Tests setTimeout API", { tags: ["@tag.JS"] }, function () {
-  it("1. Executes showAlert after 3 seconds and uses default value", () => {
-    jsEditor.CreateJSObject(
-      `export default {
+describe(
+  "Tests setTimeout API",
+  { tags: ["@tag.JS", "@tag.Binding"] },
+  function () {
+    it("1. Executes showAlert after 3 seconds and uses default value", () => {
+      jsEditor.CreateJSObject(
+        `export default {
         myVar1: [],
         myVar2: {},
         myFun1: (x = "default") => {
@@ -21,23 +24,23 @@ describe("Tests setTimeout API", { tags: ["@tag.JS"] }, function () {
             }, 3000);
         }
     }`,
-      {
-        paste: true,
-        completeReplace: true,
-        toRun: false,
-        shouldCreateNewJSObj: true,
-        prettify: true,
-      },
-    );
-    agHelper.Sleep(2000);
-    jsEditor.RunJSObj();
-    agHelper.Sleep(3000);
-    agHelper.AssertContains("Hello world - default", "exist");
-  });
+        {
+          paste: true,
+          completeReplace: true,
+          toRun: false,
+          shouldCreateNewJSObj: true,
+          prettify: true,
+        },
+      );
+      agHelper.Sleep(2000);
+      jsEditor.RunJSObj();
+      agHelper.Sleep(3000);
+      agHelper.AssertContains("Hello world - default", "exist");
+    });
 
-  it("2. Executes all three alerts in parallel after 3 seconds", () => {
-    jsEditor.CreateJSObject(
-      `export default {
+    it("2. Executes all three alerts in parallel after 3 seconds", () => {
+      jsEditor.CreateJSObject(
+        `export default {
         myVar1: [],
         myVar2: {},
         myFun1: (x = "default") => {
@@ -51,26 +54,26 @@ describe("Tests setTimeout API", { tags: ["@tag.JS"] }, function () {
             this.myFun1(3)
         }
     }`,
-      {
-        paste: true,
-        completeReplace: true,
-        toRun: false,
-        shouldCreateNewJSObj: true,
-        prettify: true,
-      },
-    );
-    agHelper.Sleep(2000);
-    jsEditor.SelectFunctionDropdown("myFun2");
-    jsEditor.RunJSObj();
-    agHelper.Sleep(3000);
-    agHelper.AssertContains("Hello world - 1", "exist");
-    agHelper.AssertContains("Hello world - 2", "exist");
-    agHelper.AssertContains("Hello world - 3", "exist");
-  });
+        {
+          paste: true,
+          completeReplace: true,
+          toRun: false,
+          shouldCreateNewJSObj: true,
+          prettify: true,
+        },
+      );
+      agHelper.Sleep(2000);
+      jsEditor.SelectFunctionDropdown("myFun2");
+      jsEditor.RunJSObj();
+      agHelper.Sleep(3000);
+      agHelper.AssertContains("Hello world - 1", "exist");
+      agHelper.AssertContains("Hello world - 2", "exist");
+      agHelper.AssertContains("Hello world - 3", "exist");
+    });
 
-  it("3. Resolves promise after 3 seconds and shows alert", () => {
-    jsEditor.CreateJSObject(
-      `export default {
+    it("3. Resolves promise after 3 seconds and shows alert", () => {
+      jsEditor.CreateJSObject(
+        `export default {
         myVar1: [],
         myVar2: {},
         myFun1: (x) => {
@@ -79,22 +82,22 @@ describe("Tests setTimeout API", { tags: ["@tag.JS"] }, function () {
             });
         },
     }`,
-      {
-        paste: true,
-        completeReplace: true,
-        toRun: false,
-        shouldCreateNewJSObj: true,
-        prettify: true,
-      },
-    );
-    agHelper.Sleep(2000);
-    jsEditor.RunJSObj();
-    agHelper.Sleep(3000);
-    agHelper.AssertContains("resolved");
-  });
-  it("4. Verifies code execution order when using setTimeout", () => {
-    jsEditor.CreateJSObject(
-      `export default {
+        {
+          paste: true,
+          completeReplace: true,
+          toRun: false,
+          shouldCreateNewJSObj: true,
+          prettify: true,
+        },
+      );
+      agHelper.Sleep(2000);
+      jsEditor.RunJSObj();
+      agHelper.Sleep(3000);
+      agHelper.AssertContains("resolved");
+    });
+    it("4. Verifies code execution order when using setTimeout", () => {
+      jsEditor.CreateJSObject(
+        `export default {
         myVar1: [],
         myVar2: {},
         myFun1: (x) => {
@@ -103,27 +106,27 @@ describe("Tests setTimeout API", { tags: ["@tag.JS"] }, function () {
             console.log("Bye!");
         },
     }`,
-      {
-        paste: true,
-        completeReplace: true,
-        toRun: false,
-        shouldCreateNewJSObj: true,
-        prettify: true,
-      },
-    );
-    agHelper.Sleep(2000);
-    jsEditor.RunJSObj();
-    agHelper.GetNClick(jsEditor._logsTab);
-    debuggerHelper.DoesConsoleLogExist("Hey there!");
-    debuggerHelper.DoesConsoleLogExist("Bye!");
-    debuggerHelper.DoesConsoleLogExist("Working!", false);
-    agHelper.Sleep(4000);
-    debuggerHelper.DoesConsoleLogExist("Working!");
-  });
+        {
+          paste: true,
+          completeReplace: true,
+          toRun: false,
+          shouldCreateNewJSObj: true,
+          prettify: true,
+        },
+      );
+      agHelper.Sleep(2000);
+      jsEditor.RunJSObj();
+      agHelper.GetNClick(jsEditor._logsTab);
+      debuggerHelper.DoesConsoleLogExist("Hey there!");
+      debuggerHelper.DoesConsoleLogExist("Bye!");
+      debuggerHelper.DoesConsoleLogExist("Working!", false);
+      agHelper.Sleep(4000);
+      debuggerHelper.DoesConsoleLogExist("Working!");
+    });
 
-  it("5. Resolves promise after 3 seconds and shows alert", () => {
-    jsEditor.CreateJSObject(
-      `export default {
+    it("5. Resolves promise after 3 seconds and shows alert", () => {
+      jsEditor.CreateJSObject(
+        `export default {
         myVar1: [],
         myVar2: {},
         myFun1: (x) => {
@@ -132,26 +135,26 @@ describe("Tests setTimeout API", { tags: ["@tag.JS"] }, function () {
             });
         },
     }`,
-      {
-        paste: true,
-        completeReplace: true,
-        toRun: false,
-        shouldCreateNewJSObj: true,
-        prettify: true,
-      },
-    );
-    agHelper.Sleep(2000);
-    jsEditor.RunJSObj();
-    agHelper.Sleep(3000);
-    agHelper.AssertContains("resolved");
-  });
+        {
+          paste: true,
+          completeReplace: true,
+          toRun: false,
+          shouldCreateNewJSObj: true,
+          prettify: true,
+        },
+      );
+      agHelper.Sleep(2000);
+      jsEditor.RunJSObj();
+      agHelper.Sleep(3000);
+      agHelper.AssertContains("resolved");
+    });
 
-  it("6. Access to args passed into success/error callback functions in API.run when using setTimeout", () => {
-    apiPage.CreateAndFillApi(
-      dataManager.dsValues[dataManager.defaultEnviorment].mockApiUrl,
-    );
-    jsEditor.CreateJSObject(
-      `export default {
+    it("6. Access to args passed into success/error callback functions in API.run when using setTimeout", () => {
+      apiPage.CreateAndFillApi(
+        dataManager.dsValues[dataManager.defaultEnviorment].mockApiUrl,
+      );
+      jsEditor.CreateJSObject(
+        `export default {
         myVar1: [],
         myVar2: {},
         myFun1: (x) => {
@@ -171,42 +174,42 @@ describe("Tests setTimeout API", { tags: ["@tag.JS"] }, function () {
           });
         }
       }`,
-      {
-        paste: true,
-        completeReplace: true,
-        toRun: false,
-        shouldCreateNewJSObj: true,
-        prettify: true,
-      },
-    );
-    jsEditor.RenameJSObjFromPane("Timeouts");
-    agHelper.Sleep(2000);
-    jsEditor.RunJSObj();
-    agHelper.Sleep(3000);
+        {
+          paste: true,
+          completeReplace: true,
+          toRun: false,
+          shouldCreateNewJSObj: true,
+          prettify: true,
+        },
+      );
+      jsEditor.RenameJSObjFromPane("Timeouts");
+      agHelper.Sleep(2000);
+      jsEditor.RunJSObj();
+      agHelper.Sleep(3000);
 
-    cy.wait("@postExecute").then((interception: any) => {
-      //Js function to match any name returned from API
-      userName = JSON.stringify(
-        interception.response.body.data.body[0].name,
-      ).replace(/['"]+/g, ""); //removing double quotes
-      agHelper.AssertContains(userName);
-    });
+      cy.wait("@postExecute").then((interception: any) => {
+        //Js function to match any name returned from API
+        userName = JSON.stringify(
+          interception.response.body.data.body[0].name,
+        ).replace(/['"]+/g, ""); //removing double quotes
+        agHelper.AssertContains(userName);
+      });
 
-    agHelper.Sleep(2000);
-    jsEditor.SelectFunctionDropdown("myFun2");
-    jsEditor.RunJSObj();
-    agHelper.Sleep(3000);
-    cy.wait("@postExecute").then((interception: any) => {
-      userName = JSON.stringify(
-        interception.response.body.data.body[0].name,
-      ).replace(/['"]+/g, "");
-      agHelper.AssertContains(userName);
+      agHelper.Sleep(2000);
+      jsEditor.SelectFunctionDropdown("myFun2");
+      jsEditor.RunJSObj();
+      agHelper.Sleep(3000);
+      cy.wait("@postExecute").then((interception: any) => {
+        userName = JSON.stringify(
+          interception.response.body.data.body[0].name,
+        ).replace(/['"]+/g, "");
+        agHelper.AssertContains(userName);
+      });
     });
-  });
 
-  it("7. Verifies whether setTimeout executes on page load", () => {
-    jsEditor.CreateJSObject(
-      `export default {
+    it("7. Verifies whether setTimeout executes on page load", () => {
+      jsEditor.CreateJSObject(
+        `export default {
         myVar1: [],
         myVar2: {},
         myFun1: (x) => {
@@ -216,24 +219,25 @@ describe("Tests setTimeout API", { tags: ["@tag.JS"] }, function () {
             }, 3000)
         },
       }`,
-      {
-        paste: true,
-        completeReplace: true,
-        toRun: false,
-        shouldCreateNewJSObj: true,
-        prettify: true,
-      },
-    );
-    jsEditor.EnableDisableAsyncFuncSettings("myFun1", true, false);
-    deployMode.DeployApp();
-    agHelper.Sleep(1000); //DeployApp already waiting 2000ms hence reducing it here to equate to 3000 timeout
-    agHelper.AssertContains("Success!");
-    agHelper.Sleep(1000);
-    cy.wait("@postExecute").then((interception: any) => {
-      userName = JSON.stringify(
-        interception.response.body.data.body[0].name,
-      ).replace(/['"]+/g, "");
-      agHelper.AssertContains(userName);
+        {
+          paste: true,
+          completeReplace: true,
+          toRun: false,
+          shouldCreateNewJSObj: true,
+          prettify: true,
+        },
+      );
+      jsEditor.EnableDisableAsyncFuncSettings("myFun1", true, false);
+      deployMode.DeployApp();
+      agHelper.Sleep(1000); //DeployApp already waiting 2000ms hence reducing it here to equate to 3000 timeout
+      agHelper.AssertContains("Success!");
+      agHelper.Sleep(1000);
+      cy.wait("@postExecute").then((interception: any) => {
+        userName = JSON.stringify(
+          interception.response.body.data.body[0].name,
+        ).replace(/['"]+/g, "");
+        agHelper.AssertContains(userName);
+      });
     });
-  });
-});
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ServerSide/MySQL_Datatypes/Basic_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/MySQL_Datatypes/Basic_Spec.ts
index dd05424b0a1c..77211348bab2 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/MySQL_Datatypes/Basic_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/MySQL_Datatypes/Basic_Spec.ts
@@ -20,138 +20,148 @@ import { featureFlagIntercept } from "../../../../support/Objects/FeatureFlags";
 
 let dsName: any, query: string;
 
-describe("MySQL Datatype tests", { tags: ["@tag.Datasource"] }, function () {
-  before("Load dsl, Change theme, Create Mysql DS", () => {
-    agHelper.AddDsl("Datatypes/mySQLdsl");
+describe(
+  "MySQL Datatype tests",
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
+  function () {
+    before("Load dsl, Change theme, Create Mysql DS", () => {
+      agHelper.AddDsl("Datatypes/mySQLdsl");
 
-    appSettings.OpenPaneAndChangeTheme("Moon");
-    dataSources.CreateDataSource("MySql");
-    cy.get("@dsName").then(($dsName) => {
-      dsName = $dsName;
+      appSettings.OpenPaneAndChangeTheme("Moon");
+      dataSources.CreateDataSource("MySql");
+      cy.get("@dsName").then(($dsName) => {
+        dsName = $dsName;
+      });
+      AppSidebar.navigate(AppSidebarButton.Editor);
     });
-    AppSidebar.navigate(AppSidebarButton.Editor);
-  });
 
-  it("1. Creating mysqlDTs table & queries", () => {
-    //IF NOT EXISTS can be used - which creates tabel if it does not exist and donot throw any error if table exists.
-    //But if we add this option then next case could fail inn that case.
-    query = inputData.query.createTable;
+    it("1. Creating mysqlDTs table & queries", () => {
+      //IF NOT EXISTS can be used - which creates tabel if it does not exist and donot throw any error if table exists.
+      //But if we add this option then next case could fail inn that case.
+      query = inputData.query.createTable;
 
-    dataSources.CreateQueryFromOverlay(dsName, query, "createTable"); //Creating query from EE overlay
-    dataSources.RunQuery();
+      dataSources.CreateQueryFromOverlay(dsName, query, "createTable"); //Creating query from EE overlay
+      dataSources.RunQuery();
 
-    //Other queries
-    query = inputData.query.insertRecord;
-    dataSources.createQueryWithDatasourceSchemaTemplate(
-      dsName,
-      inputData.tableName,
-      "Insert",
-    );
-    agHelper.RenameWithInPane("insertRecord");
-    dataSources.EnterQuery(query);
+      //Other queries
+      query = inputData.query.insertRecord;
+      dataSources.createQueryWithDatasourceSchemaTemplate(
+        dsName,
+        inputData.tableName,
+        "Insert",
+      );
+      agHelper.RenameWithInPane("insertRecord");
+      dataSources.EnterQuery(query);
 
-    query = inputData.query.dropTable;
-    dataSources.createQueryWithDatasourceSchemaTemplate(
-      dsName,
-      inputData.tableName,
-      "Delete",
-    );
-    agHelper.RenameWithInPane("dropTable");
-    dataSources.EnterQuery(query);
+      query = inputData.query.dropTable;
+      dataSources.createQueryWithDatasourceSchemaTemplate(
+        dsName,
+        inputData.tableName,
+        "Delete",
+      );
+      agHelper.RenameWithInPane("dropTable");
+      dataSources.EnterQuery(query);
 
-    //Creating SELECT query
-    dataSources.createQueryWithDatasourceSchemaTemplate(
-      dsName,
-      inputData.tableName,
-      "Select",
-    );
-    agHelper.RenameWithInPane("selectRecords");
-    dataSources.RunQuery();
-    agHelper
-      .GetText(dataSources._noRecordFound)
-      .then(($noRecMsg) => expect($noRecMsg).to.eq("No data records to show"));
-  });
+      //Creating SELECT query
+      dataSources.createQueryWithDatasourceSchemaTemplate(
+        dsName,
+        inputData.tableName,
+        "Select",
+      );
+      agHelper.RenameWithInPane("selectRecords");
+      dataSources.RunQuery();
+      agHelper
+        .GetText(dataSources._noRecordFound)
+        .then(($noRecMsg) =>
+          expect($noRecMsg).to.eq("No data records to show"),
+        );
+    });
 
-  //Insert valid/true values into datasource
-  it("2. Inserting record", () => {
-    deployMode.DeployApp();
-    table.WaitForTableEmpty(); //asserting table is empty before inserting!
-    agHelper.ClickButton("Run InsertQuery");
-    inputData.input.forEach((valueArr, i) => {
+    //Insert valid/true values into datasource
+    it("2. Inserting record", () => {
+      deployMode.DeployApp();
+      table.WaitForTableEmpty(); //asserting table is empty before inserting!
       agHelper.ClickButton("Run InsertQuery");
-      valueArr.forEach((value, index) => {
-        if (value !== "")
-          agHelper.EnterInputText(inputData.inputFieldName[index], value);
+      inputData.input.forEach((valueArr, i) => {
+        agHelper.ClickButton("Run InsertQuery");
+        valueArr.forEach((value, index) => {
+          if (value !== "")
+            agHelper.EnterInputText(inputData.inputFieldName[index], value);
+        });
+        i % 2 && agHelper.ToggleSwitch("Bool_column");
+        agHelper.ClickButton("insertRecord");
+        agHelper.Sleep(2000); //for the modal to close after entering all values & value to reflect in table
+        agHelper.AssertElementVisibility(
+          locators._buttonByText("Run InsertQuery"),
+        );
+        agHelper.Sleep(3000);
       });
-      i % 2 && agHelper.ToggleSwitch("Bool_column");
-      agHelper.ClickButton("insertRecord");
-      agHelper.Sleep(2000); //for the modal to close after entering all values & value to reflect in table
-      agHelper.AssertElementVisibility(
-        locators._buttonByText("Run InsertQuery"),
-      );
-      agHelper.Sleep(3000);
     });
-  });
 
-  //Verify weather expected value is present in each cell
-  //i.e. weather right data is pushed and fetched from datasource.
-  it("3. Validating values in each cell", () => {
-    cy.wait(2000);
-    inputData.result.forEach((res_array, i) => {
-      res_array.forEach((value, j) => {
-        table.ReadTableRowColumnData(j, i, "v1", 0).then(($cellData) => {
-          if (i === inputData.result.length - 1) {
-            const obj = JSON.parse($cellData);
-            expect(JSON.stringify(obj)).to.eq(JSON.stringify(value));
-          } else {
-            expect($cellData).to.eq(value);
-          }
+    //Verify weather expected value is present in each cell
+    //i.e. weather right data is pushed and fetched from datasource.
+    it("3. Validating values in each cell", () => {
+      cy.wait(2000);
+      inputData.result.forEach((res_array, i) => {
+        res_array.forEach((value, j) => {
+          table.ReadTableRowColumnData(j, i, "v1", 0).then(($cellData) => {
+            if (i === inputData.result.length - 1) {
+              const obj = JSON.parse($cellData);
+              expect(JSON.stringify(obj)).to.eq(JSON.stringify(value));
+            } else {
+              expect($cellData).to.eq(value);
+            }
+          });
         });
       });
     });
-  });
 
-  //null will be displayed as empty string in tables
-  //So test null we have to intercept execute request.
-  //And check response payload.
-  it("4. Testing null value", () => {
-    deployMode.NavigateBacktoEditor();
-    EditorNavigation.SelectEntityByName("selectRecords", EntityType.Query);
-    dataSources.RunQuery({ toValidateResponse: false });
-    cy.wait("@postExecute").then((intercept) => {
-      expect(
-        typeof intercept.response?.body.data.body[5].varchar_column,
-      ).to.be.equal("object");
-      expect(intercept.response?.body.data.body[5].varchar_column).to.be.equal(
-        null,
-      );
+    //null will be displayed as empty string in tables
+    //So test null we have to intercept execute request.
+    //And check response payload.
+    it("4. Testing null value", () => {
+      deployMode.NavigateBacktoEditor();
+      EditorNavigation.SelectEntityByName("selectRecords", EntityType.Query);
+      dataSources.RunQuery({ toValidateResponse: false });
+      cy.wait("@postExecute").then((intercept) => {
+        expect(
+          typeof intercept.response?.body.data.body[5].varchar_column,
+        ).to.be.equal("object");
+        expect(
+          intercept.response?.body.data.body[5].varchar_column,
+        ).to.be.equal(null);
+      });
     });
-  });
 
-  after(
-    "Verify Drop of tables & Deletion of the datasource after all created queries are deleted",
-    () => {
-      EditorNavigation.SelectEntityByName("dropTable", EntityType.Query);
-      dataSources.RunQuery();
-      dataSources.AssertQueryTableResponse(0, "0"); //Success response for dropped table!
-      dataSources.AssertTableInVirtuosoList(dsName, inputData.tableName, false);
+    after(
+      "Verify Drop of tables & Deletion of the datasource after all created queries are deleted",
+      () => {
+        EditorNavigation.SelectEntityByName("dropTable", EntityType.Query);
+        dataSources.RunQuery();
+        dataSources.AssertQueryTableResponse(0, "0"); //Success response for dropped table!
+        dataSources.AssertTableInVirtuosoList(
+          dsName,
+          inputData.tableName,
+          false,
+        );
 
-      //DS deletion
-      dataSources.DeleteDatasourceFromWithinDS(dsName, 409); //Since all queries exists
-      AppSidebar.navigate(AppSidebarButton.Editor);
-      PageLeftPane.switchSegment(PagePaneSegment.Queries);
-      ["createTable", "dropTable", "insertRecord", "selectRecords"].forEach(
-        (type) => {
-          entityExplorer.ActionContextMenuByEntityName({
-            entityNameinLeftSidebar: type,
-            action: "Delete",
-            entityType: entityItems.Query,
-          });
-        },
-      );
-      deployMode.DeployApp();
-      deployMode.NavigateBacktoEditor();
-      dataSources.DeleteDatasourceFromWithinDS(dsName, 200);
-    },
-  );
-});
+        //DS deletion
+        dataSources.DeleteDatasourceFromWithinDS(dsName, 409); //Since all queries exists
+        AppSidebar.navigate(AppSidebarButton.Editor);
+        PageLeftPane.switchSegment(PagePaneSegment.Queries);
+        ["createTable", "dropTable", "insertRecord", "selectRecords"].forEach(
+          (type) => {
+            entityExplorer.ActionContextMenuByEntityName({
+              entityNameinLeftSidebar: type,
+              action: "Delete",
+              entityType: entityItems.Query,
+            });
+          },
+        );
+        deployMode.DeployApp();
+        deployMode.NavigateBacktoEditor();
+        dataSources.DeleteDatasourceFromWithinDS(dsName, 200);
+      },
+    );
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ServerSide/MySQL_Datatypes/False_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/MySQL_Datatypes/False_Spec.ts
index c32baac8721b..821b89ff3f72 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/MySQL_Datatypes/False_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/MySQL_Datatypes/False_Spec.ts
@@ -9,67 +9,71 @@ import { featureFlagIntercept } from "../../../../support/Objects/FeatureFlags";
 
 let dsName: any, query: string;
 
-describe("MySQL Datatype tests", { tags: ["@tag.Datasource"] }, function () {
-  before("Create Mysql DS & Create mysqlDTs table", function () {
-    dataSources.CreateDataSource("MySql");
-    cy.get("@dsName").then(($dsName) => {
-      dsName = $dsName;
-      //IF NOT EXISTS can be used - which creates tabel if it does not exist and donot throw any error if table exists.
-      //But if we add this option then next case could fail inn that case.
-      query = inputData.query.createTable;
-      dataSources.CreateQueryAfterDSSaved(query, "createTable"); //Creating query from EE overlay
-      dataSources.RunQuery();
-    });
-  });
-
-  //Insert false values to each column and check for the error status of the request.
-  it("1. False Cases & Long Integer as query param", () => {
-    dataSources.createQueryWithDatasourceSchemaTemplate(
-      dsName,
-      inputData.tableName,
-      "Insert",
-    );
-    agHelper.RenameWithInPane("falseCases");
-    inputData.falseResult.forEach((res_array, i) => {
-      res_array.forEach((value) => {
-        query =
-          typeof value === "string"
-            ? `INSERT INTO ${inputData.tableName} (${inputData.inputFieldName[i]}) VALUES ({{"${value}"}})`
-            : `INSERT INTO ${inputData.tableName} (${inputData.inputFieldName[i]}) VALUES ({{${value}}})`;
-        dataSources.EnterQuery(query);
-        dataSources.RunQuery({ expectedStatus: false });
+describe(
+  "MySQL Datatype tests",
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
+  function () {
+    before("Create Mysql DS & Create mysqlDTs table", function () {
+      dataSources.CreateDataSource("MySql");
+      cy.get("@dsName").then(($dsName) => {
+        dsName = $dsName;
+        //IF NOT EXISTS can be used - which creates tabel if it does not exist and donot throw any error if table exists.
+        //But if we add this option then next case could fail inn that case.
+        query = inputData.query.createTable;
+        dataSources.CreateQueryAfterDSSaved(query, "createTable"); //Creating query from EE overlay
+        dataSources.RunQuery();
       });
     });
-    agHelper.Sleep(2000);
-    //agHelper.WaitUntilAllToastsDisappear();
 
-    //This is a special case.
-    //Added due to server side checks, which was handled in Datatype handling.
-    //Long Integer as query param
+    //Insert false values to each column and check for the error status of the request.
+    it("1. False Cases & Long Integer as query param", () => {
+      dataSources.createQueryWithDatasourceSchemaTemplate(
+        dsName,
+        inputData.tableName,
+        "Insert",
+      );
+      agHelper.RenameWithInPane("falseCases");
+      inputData.falseResult.forEach((res_array, i) => {
+        res_array.forEach((value) => {
+          query =
+            typeof value === "string"
+              ? `INSERT INTO ${inputData.tableName} (${inputData.inputFieldName[i]}) VALUES ({{"${value}"}})`
+              : `INSERT INTO ${inputData.tableName} (${inputData.inputFieldName[i]}) VALUES ({{${value}}})`;
+          dataSources.EnterQuery(query);
+          dataSources.RunQuery({ expectedStatus: false });
+        });
+      });
+      agHelper.Sleep(2000);
+      //agHelper.WaitUntilAllToastsDisappear();
 
-    query = `SELECT * FROM ${inputData.tableName} LIMIT {{2147483648}}`;
-    dataSources.EnterQuery(query);
-    dataSources.RunQuery();
-  });
+      //This is a special case.
+      //Added due to server side checks, which was handled in Datatype handling.
+      //Long Integer as query param
 
-  after(
-    "Verify Drop table & Deletion of the datasource after all created queries are deleted",
-    () => {
-      query = inputData.query.dropTable;
+      query = `SELECT * FROM ${inputData.tableName} LIMIT {{2147483648}}`;
       dataSources.EnterQuery(query);
       dataSources.RunQuery();
+    });
 
-      // ["falseCases", "createTable"].forEach((type) => {
-      //   entityExplorer.ActionContextMenuByEntityName(
-      //     type,
-      //     "Delete",
-      //     "Are you sure?",
-      //   );
-      // });
-      entityExplorer.DeleteAllQueriesForDB(dsName);
-      deployMode.DeployApp();
-      deployMode.NavigateBacktoEditor();
-      dataSources.DeleteDatasourceFromWithinDS(dsName, 200);
-    },
-  );
-});
+    after(
+      "Verify Drop table & Deletion of the datasource after all created queries are deleted",
+      () => {
+        query = inputData.query.dropTable;
+        dataSources.EnterQuery(query);
+        dataSources.RunQuery();
+
+        // ["falseCases", "createTable"].forEach((type) => {
+        //   entityExplorer.ActionContextMenuByEntityName(
+        //     type,
+        //     "Delete",
+        //     "Are you sure?",
+        //   );
+        // });
+        entityExplorer.DeleteAllQueriesForDB(dsName);
+        deployMode.DeployApp();
+        deployMode.NavigateBacktoEditor();
+        dataSources.DeleteDatasourceFromWithinDS(dsName, 200);
+      },
+    );
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/APIOnLoad_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/APIOnLoad_Spec.ts
index 440487f3521c..f5fe03d92b18 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/APIOnLoad_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/APIOnLoad_Spec.ts
@@ -15,7 +15,7 @@ import EditorNavigation, {
 
 describe(
   "JSObjects OnLoad Actions tests",
-  { tags: ["@tag.PropertyPane", "@tag.JS"] },
+  { tags: ["@tag.PropertyPane", "@tag.JS", "@tag.Binding"] },
   function () {
     before(() => {
       agHelper.AddDsl("tableWidgetDsl");
diff --git a/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/ExecuteAction_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/ExecuteAction_Spec.ts
index c4653d3f430e..72a9a83cdc1d 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/ExecuteAction_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/ExecuteAction_Spec.ts
@@ -8,7 +8,7 @@ import {
 
 describe(
   "Execute Action Functionality",
-  { tags: ["@tag.PropertyPane", "@tag.JS"] },
+  { tags: ["@tag.PropertyPane", "@tag.JS", "@tag.Binding"] },
   function () {
     before(() => {
       homePage.ImportApp("executeAction.json");
diff --git a/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/JSOnLoad2_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/JSOnLoad2_Spec.ts
index 300d27e05787..3e01eada4ec2 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/JSOnLoad2_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/JSOnLoad2_Spec.ts
@@ -12,7 +12,15 @@ import EditorNavigation, {
 
 describe(
   "JSObjects OnLoad Actions tests",
-  { tags: ["@tag.PropertyPane", "@tag.JS", "@tag.ImportExport"] },
+  {
+    tags: [
+      "@tag.PropertyPane",
+      "@tag.JS",
+      "@tag.ImportExport",
+      "@tag.Binding",
+      "@tag.Git",
+    ],
+  },
   function () {
     before(() => {
       homePage.CreateNewWorkspace("JSOnLoadTest", true);
diff --git a/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/JSOnLoad4_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/JSOnLoad4_Spec.ts
index 44e9d3773415..4d86a896aa8d 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/JSOnLoad4_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/JSOnLoad4_Spec.ts
@@ -11,7 +11,7 @@ let jsName: any;
 
 describe(
   "JSObjects OnLoad Actions tests",
-  { tags: ["@tag.PropertyPane", "@tag.JS"] },
+  { tags: ["@tag.PropertyPane", "@tag.JS", "@tag.Binding"] },
   function () {
     it("1. Tc 51, 52 Verify that JS editor function has a settings button available for functions", () => {
       jsEditor.CreateJSObject(
diff --git a/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/JSOnLoad_cyclic_dependency_errors_spec.js b/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/JSOnLoad_cyclic_dependency_errors_spec.js
index bb8cb9c8b9eb..28b691664998 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/JSOnLoad_cyclic_dependency_errors_spec.js
+++ b/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/JSOnLoad_cyclic_dependency_errors_spec.js
@@ -30,7 +30,7 @@ let dsname;
 
 describe(
   "Cyclic Dependency Informational Error Messages",
-  { tags: ["@tag.PropertyPane", "@tag.JS"] },
+  { tags: ["@tag.PropertyPane", "@tag.JS", "@tag.Binding"] },
   function () {
     before(() => {
       //appId = localStorage.getItem("applicationId");
diff --git a/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/JsOnLoad3_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/JsOnLoad3_Spec.ts
index 0414b93a8404..ac26d827c7d4 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/JsOnLoad3_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/JsOnLoad3_Spec.ts
@@ -17,7 +17,7 @@ let jsName: any;
 
 describe(
   "JSObjects OnLoad Actions tests",
-  { tags: ["@tag.PropertyPane", "@tag.JS"] },
+  { tags: ["@tag.PropertyPane", "@tag.JS", "@tag.Binding"] },
   function () {
     beforeEach(() => {
       agHelper.RestoreLocalStorageCache();
@@ -37,8 +37,8 @@ describe(
       cy.fixture("datasources").then((datasourceFormData: any) => {
         AppSidebar.navigate(AppSidebarButton.Editor);
         apiPage.CreateAndFillApi(
-          "https://api.forismatic.com/api/1.0/?method=getQuote&lang=en&format=json",
-          "Quotes",
+          "http://host.docker.internal:5001",
+          "AppsmithTed",
           30000,
         );
         apiPage.ToggleConfirmBeforeRunning(true);
@@ -54,8 +54,8 @@ describe(
         `export default {
       callTrump: async () => {
         return WhatTrumpThinks.run()},
-      callQuotes: () => {
-        return Quotes.run().then(()=> Quotes.data.quoteText);}
+      callAppsmithTed: () => {
+        return AppsmithTed.run()}
     }`,
         {
           paste: true,
@@ -71,16 +71,16 @@ describe(
           jsName as string,
           EntityType.JSObject,
         );
-        jsEditor.EnableDisableAsyncFuncSettings("callQuotes", false); //OnPageLoad made true once mapped with widget
+        jsEditor.EnableDisableAsyncFuncSettings("callAppsmithTed", false); //OnPageLoad made true once mapped with widget
 
         EditorNavigation.SelectEntityByName("Input1", EntityType.Widget);
         propPane.UpdatePropertyFieldValue(
           "Default value",
-          "{{" + jsObjName + ".callQuotes.data}}",
+          "{{" + jsObjName + ".callAppsmithTed.data}}",
         );
         cy.get(locators._toastMsg)
           .children()
-          .should("contain", "Quotes") //Quotes api also since its .data is accessed in callQuotes()
+          .should("contain", "AppsmithTed")
           .and("contain", jsName as string)
           .and("contain", "will be executed automatically on page load");
 
diff --git a/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/OnLoadActions_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/OnLoadActions_Spec.ts
index 8da531365f60..92a8ce84c282 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/OnLoadActions_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/OnLoadActions_Spec.ts
@@ -3,6 +3,7 @@ import {
   apiPage,
   assertHelper,
   dataManager,
+  dataSources,
   deployMode,
   entityExplorer,
   entityItems,
@@ -15,7 +16,7 @@ import EditorNavigation, {
 
 describe(
   "Layout OnLoad Actions tests",
-  { tags: ["@tag.PropertyPane", "@tag.JS", "@tag.Sanity"] },
+  { tags: ["@tag.PropertyPane", "@tag.JS", "@tag.Sanity", "@tag.Binding"] },
   function () {
     beforeEach(() => {
       agHelper.RestoreLocalStorageCache();
@@ -53,22 +54,35 @@ describe(
         "RandomUser",
       );
 
+      apiPage.RunAPI();
+      agHelper.GetNClick(dataSources._queryResponse("JSON"));
+
       apiPage.CreateAndFillApi(
-        "https://favqs.com/api/qotd",
+        "http://host.docker.internal:5001/v1/favqs/qotd",
         "InspiringQuotes",
         30000,
       );
       apiPage.EnterHeader("dependency", "{{RandomUser.data}}"); //via Params tab
+      apiPage.RunAPI();
+      agHelper.GetNClick(dataSources._queryResponse("JSON"));
 
       apiPage.CreateAndFillApi(
-        "https://www.boredapi.com/api/activity",
+        "http://host.docker.internal:5001/v1/boredapi/activity",
         "Suggestions",
         30000,
       );
-      apiPage.EnterHeader("dependency", "{{InspiringQuotes.data}}");
+      apiPage.EnterHeader("dependency", "{{InspiringQuotes.data.data}}");
+      apiPage.RunAPI();
+      agHelper.GetNClick(dataSources._queryResponse("JSON"));
 
-      apiPage.CreateAndFillApi("https://api.genderize.io", "Genderize", 30000);
-      apiPage.EnterParams("name", "{{RandomUser.data.results[0].name.first}}"); //via Params tab
+      apiPage.CreateAndFillApi(
+        "http://host.docker.internal:5001/v1/genderize/sampledata",
+        "Genderize",
+        30000,
+      );
+      apiPage.EnterParams("name", "{{RandomUser.data[0].name}}"); //via Params tab
+      apiPage.RunAPI();
+      agHelper.GetNClick(dataSources._queryResponse("JSON"));
 
       //Adding dependency in right order matters!
       EditorNavigation.SelectEntityByName("Image1", EntityType.Widget);
@@ -77,19 +91,19 @@ describe(
       EditorNavigation.SelectEntityByName("Image2", EntityType.Widget);
       propPane.UpdatePropertyFieldValue(
         "Image",
-        `{{RandomUser.data.results[0].picture.large}}`,
+        `{{RandomUser.data[0].avatar}}`,
       );
 
       EditorNavigation.SelectEntityByName("Text1", EntityType.Widget);
       propPane.UpdatePropertyFieldValue(
         "Text",
-        `{{InspiringQuotes.data.quote.body}}\n--\n{{InspiringQuotes.data.quote.author}}\n`,
+        `{{InspiringQuotes.data.data.quote.body}}\n--\n{{InspiringQuotes.data.data.quote.author}}\n`,
       );
 
       EditorNavigation.SelectEntityByName("Text2", EntityType.Widget);
       propPane.UpdatePropertyFieldValue(
         "Text",
-        `Hi, here is {{RandomUser.data.results[0].name.first}} & I'm {{RandomUser.data.results[0].dob.age}}'yo\nI live in {{RandomUser.data.results[0].location.country}}\nMy Suggestion : {{Suggestions.data.activity}}\n\nI'm {{Genderize.data.gender}}`,
+        `Hi, here is {{RandomUser.data[0].name}} & I'm {{RandomUser.data[0].id}}'yo\nI live in {{RandomUser.data[0].address}}\nMy Suggestion : {{Suggestions.data.data.activity}}\n\nI'm {{Genderize.data.data.gender}}`,
       );
 
       deployMode.DeployApp(locators._widgetInDeployed("textwidget"), false);
@@ -99,32 +113,27 @@ describe(
       cy.get("@getConsolidatedData").then(($response: any) => {
         const respBody = JSON.stringify($response.response?.body);
         const { pageWithMigratedDsl } = JSON.parse(respBody)?.data;
-        const _randomFlora =
-          pageWithMigratedDsl.data.layouts[0].layoutOnLoadActions[0];
-        const _randomUser =
-          pageWithMigratedDsl.data.layouts[0].layoutOnLoadActions[1];
-        const _genderize =
-          pageWithMigratedDsl.data.layouts[0].layoutOnLoadActions[2];
-        const _suggestions =
-          pageWithMigratedDsl.data.layouts[0].layoutOnLoadActions[3];
-
-        expect(JSON.parse(JSON.stringify(_randomFlora))[0]["name"]).to.eq(
-          "RandomFlora",
-        );
-        expect(JSON.parse(JSON.stringify(_randomUser))[0]["name"]).to.eq(
-          "RandomUser",
-        );
-        expect(JSON.parse(JSON.stringify(_genderize))[0]["name"]).to.be.oneOf([
-          "Genderize",
-          "InspiringQuotes",
-        ]);
-        expect(JSON.parse(JSON.stringify(_genderize))[1]["name"]).to.be.oneOf([
-          "Genderize",
-          "InspiringQuotes",
-        ]);
-        expect(JSON.parse(JSON.stringify(_suggestions))[0]["name"]).to.eq(
-          "Suggestions",
-        );
+
+        // Extract the layoutOnLoadActions array from the first layout
+        const layoutActions =
+          pageWithMigratedDsl.data.layouts[0].layoutOnLoadActions;
+
+        // Get individual actions from the array
+        const _randomFlora = layoutActions[0][0]; // RandomFlora is the first action in the first array
+        const _randomUser = layoutActions[1][0]; // RandomUser is the first action in the second array
+        const _inspiringQuotes = layoutActions[2][0]; // InspiringQuotes is the first action in the third array
+        const _genderize = layoutActions[3][0]; // Genderize is the first action in the fourth array
+        const _suggestions = layoutActions[4][0]; // Suggestions is the first action in the fifth array
+
+        // Assertions for the API names
+        expect(_randomFlora.name).to.eq("RandomFlora");
+        expect(_randomUser.name).to.eq("RandomUser");
+
+        // Check if the name is either 'Genderize' or 'InspiringQuotes' for this position
+        expect(_inspiringQuotes.name).to.eq("InspiringQuotes");
+        expect(_genderize.name).to.eq("Genderize");
+
+        expect(_suggestions.name).to.eq("Suggestions");
       });
 
       deployMode.NavigateBacktoEditor();
@@ -141,7 +150,7 @@ describe(
       });
 
       apiPage.CreateAndFillApi(
-        "https://api.genderize.io?name={{RandomUser.data.results[0].name.first}}",
+        "http://host.docker.internal:5001/v1/genderize/sampledata?name={{RandomUser.data[0].name}}",
         "Genderize",
         30000,
         "GET",
@@ -150,8 +159,10 @@ describe(
       );
       apiPage.ValidateQueryParams({
         key: "name",
-        value: "{{RandomUser.data.results[0].name.first}}",
+        value: "{{RandomUser.data[0].name}}",
       }); // verifies Bug 10055
+      apiPage.RunAPI();
+      agHelper.GetNClick(dataSources._queryResponse("JSON"));
 
       deployMode.DeployApp(
         locators._widgetInDeployed("textwidget"),
@@ -164,32 +175,27 @@ describe(
         const respBody = JSON.stringify($response.response?.body);
         const { pageWithMigratedDsl } = JSON.parse(respBody)?.data;
 
-        const _randomFlora =
-          pageWithMigratedDsl.data.layouts[0].layoutOnLoadActions[0];
-        const _randomUser =
-          pageWithMigratedDsl.data.layouts[0].layoutOnLoadActions[1];
-        const _genderize =
-          pageWithMigratedDsl.data.layouts[0].layoutOnLoadActions[2];
-        const _suggestions =
-          pageWithMigratedDsl.data.layouts[0].layoutOnLoadActions[3];
-
-        expect(JSON.parse(JSON.stringify(_randomFlora))[0]["name"]).to.eq(
-          "RandomFlora",
-        );
-        expect(JSON.parse(JSON.stringify(_randomUser))[0]["name"]).to.eq(
-          "RandomUser",
-        );
-        expect(JSON.parse(JSON.stringify(_genderize))[0]["name"]).to.be.oneOf([
-          "Genderize",
-          "InspiringQuotes",
-        ]);
-        expect(JSON.parse(JSON.stringify(_genderize))[1]["name"]).to.be.oneOf([
-          "Genderize",
-          "InspiringQuotes",
-        ]);
-        expect(JSON.parse(JSON.stringify(_suggestions))[0]["name"]).to.eq(
-          "Suggestions",
-        );
+        // Extract layoutOnLoadActions from the first layout
+        const layoutActions =
+          pageWithMigratedDsl.data.layouts[0].layoutOnLoadActions;
+
+        // Get the individual actions
+        const _randomFlora = layoutActions[0][0]; // First item in the first array
+        const _randomUser = layoutActions[1][0]; // First item in the second array
+        const _inspiringQuotes = layoutActions[2][0]; // First item in the third array
+        const _genderize = layoutActions[3][0]; // First item in the fourth array
+        const _suggestions = layoutActions[4][0]; // First item in the fifth array
+
+        // Assertions for the API names
+        expect(_randomFlora.name).to.eq("RandomFlora");
+        expect(_randomUser.name).to.eq("RandomUser");
+
+        // Check if the name is either 'Genderize' or 'InspiringQuotes' for these positions
+        expect(_inspiringQuotes.name).to.eq("InspiringQuotes");
+        expect(_genderize.name).to.eq("Genderize");
+
+        // Assertions for 'Suggestions'
+        expect(_suggestions.name).to.eq("Suggestions");
       });
     });
   },
diff --git a/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/PostgresConnections_spec.ts b/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/PostgresConnections_spec.ts
index 62d096a0f373..df94b5bc09d7 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/PostgresConnections_spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/PostgresConnections_spec.ts
@@ -17,7 +17,7 @@ let guid: any, dsName_1: any, dsName_2: any;
 
 describe(
   "Test Postgres number of connections on page load + Bug 11572, Bug 11202",
-  { tags: ["@tag.PropertyPane", "@tag.JS", "@tag.Sanity"] },
+  { tags: ["@tag.PropertyPane", "@tag.JS", "@tag.Sanity", "@tag.Binding"] },
   function () {
     before(() => {
       agHelper.GenerateUUID();
diff --git a/app/client/cypress/e2e/Regression/ServerSide/Params/ExecutionParams_spec.js b/app/client/cypress/e2e/Regression/ServerSide/Params/ExecutionParams_spec.js
index 6e2974a0c778..700bc2da2cf9 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/Params/ExecutionParams_spec.js
+++ b/app/client/cypress/e2e/Regression/ServerSide/Params/ExecutionParams_spec.js
@@ -13,7 +13,7 @@ import {
 
 describe(
   "API Panel Test Functionality",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   function () {
     let datasourceName;
     before(() => {
diff --git a/app/client/cypress/e2e/Regression/ServerSide/Params/PassingParams_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/Params/PassingParams_Spec.ts
index 3abcb2829e4b..b5a82ab53da8 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/Params/PassingParams_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/Params/PassingParams_Spec.ts
@@ -22,7 +22,7 @@ let jsName: any, dsName: any;
 
 describe(
   "Bug #10784 - Passing params from JS to SQL query should not break",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   () => {
     before(() => {
       entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON, 100, 100);
diff --git a/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Array_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Array_Spec.ts
index 8ac68212e086..7def8bf3e6da 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Array_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Array_Spec.ts
@@ -17,524 +17,544 @@ import EditorNavigation, {
   PagePaneSegment,
 } from "../../../../support/Pages/EditorNavigation";
 
-describe("Array Datatype tests", { tags: ["@tag.Datasource"] }, function () {
-  let dsName: any, query: string;
-
-  before("Create DS, Add DS & setting theme", () => {
-    dataSources.CreateDataSource("Postgres");
-    cy.get("@dsName").then(($dsName) => {
-      dsName = $dsName;
+describe(
+  "Array Datatype tests",
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
+  function () {
+    let dsName: any, query: string;
+
+    before("Create DS, Add DS & setting theme", () => {
+      dataSources.CreateDataSource("Postgres");
+      cy.get("@dsName").then(($dsName) => {
+        dsName = $dsName;
+      });
+      agHelper.AddDsl("Datatypes/ArrayDTdsl");
+      appSettings.OpenPaneAndChangeThemeColors(-31, -27);
     });
-    agHelper.AddDsl("Datatypes/ArrayDTdsl");
-    appSettings.OpenPaneAndChangeThemeColors(-31, -27);
-  });
-
-  it("1. Creating table query - arraytypes + Bug 14493", () => {
-    dataSources.CreateQueryForDS(
-      dsName,
-      `CREATE TABLE arraytypes (serialId SERIAL not null primary key, name text, pay_by_quarter  integer[], schedule text[][]);`,
-      "createTable",
-    );
-    dataSources.RunQuery();
 
-    //Creating other queries
-    query = `INSERT INTO arraytypes ("name", "pay_by_quarter", "schedule")  VALUES ('{{Insertname.text}}', ARRAY{{Insertpaybyquarter.text.split(',').map(Number)}}, ARRAY[['{{Insertschedule.text.split(',').slice(0,2).toString()}}'],['{{Insertschedule.text.split(',').slice(2,4).toString()}}']]);`;
+    it("1. Creating table query - arraytypes + Bug 14493", () => {
+      dataSources.CreateQueryForDS(
+        dsName,
+        `CREATE TABLE arraytypes (serialId SERIAL not null primary key, name text, pay_by_quarter  integer[], schedule text[][]);`,
+        "createTable",
+      );
+      dataSources.RunQuery();
+
+      //Creating other queries
+      query = `INSERT INTO arraytypes ("name", "pay_by_quarter", "schedule")  VALUES ('{{Insertname.text}}', ARRAY{{Insertpaybyquarter.text.split(',').map(Number)}}, ARRAY[['{{Insertschedule.text.split(',').slice(0,2).toString()}}'],['{{Insertschedule.text.split(',').slice(2,4).toString()}}']]);`;
 
-    dataSources.CreateQueryFromOverlay(dsName, query, "insertRecord"); //Creating query from EE overlay
-    dataSources.ToggleUsePreparedStatement(false);
+      dataSources.CreateQueryFromOverlay(dsName, query, "insertRecord"); //Creating query from EE overlay
+      dataSources.ToggleUsePreparedStatement(false);
 
-    query = `UPDATE public."arraytypes" SET "name" = '{{Updatename.text}}', "pay_by_quarter" = ARRAY{{Updatepaybyquarter.text.split(',').map(Number)}},
+      query = `UPDATE public."arraytypes" SET "name" = '{{Updatename.text}}', "pay_by_quarter" = ARRAY{{Updatepaybyquarter.text.split(',').map(Number)}},
       "schedule" = ARRAY[['{{Updateschedule.text.split(',').slice(0,2).toString()}}'],['{{Updateschedule.text.split(',').slice(2,4).toString()}}']] WHERE serialid = {{Table1.selectedRow.serialid}};`;
 
-    dataSources.CreateQueryFromOverlay(dsName, query, "updateRecord"); //Creating query from EE overlay
-    dataSources.ToggleUsePreparedStatement(false);
+      dataSources.CreateQueryFromOverlay(dsName, query, "updateRecord"); //Creating query from EE overlay
+      dataSources.ToggleUsePreparedStatement(false);
 
-    query = `DELETE FROM public."arraytypes" WHERE serialId = {{Table1.selectedRow.serialid}}`;
-    dataSources.CreateQueryFromOverlay(dsName, query, "deleteRecord"); //Creating query from EE overlay
+      query = `DELETE FROM public."arraytypes" WHERE serialId = {{Table1.selectedRow.serialid}}`;
+      dataSources.CreateQueryFromOverlay(dsName, query, "deleteRecord"); //Creating query from EE overlay
 
-    query = `DELETE FROM public."arraytypes"`;
-    dataSources.CreateQueryFromOverlay(dsName, query, "deleteAllRecords"); //Creating query from EE overlay
+      query = `DELETE FROM public."arraytypes"`;
+      dataSources.CreateQueryFromOverlay(dsName, query, "deleteAllRecords"); //Creating query from EE overlay
 
-    query = `DROP table public."arraytypes"`;
-    dataSources.CreateQueryFromOverlay(dsName, query, "dropTable"); //Creating query from EE overlay
+      query = `DROP table public."arraytypes"`;
+      dataSources.CreateQueryFromOverlay(dsName, query, "dropTable"); //Creating query from EE overlay
 
-    //Creating SELECT query - arraytypes + Bug 14493
-    dataSources.createQueryWithDatasourceSchemaTemplate(
-      dsName,
-      "public.arraytypes",
-      "Select",
-    );
-    agHelper.RenameWithInPane("selectRecords");
-    dataSources.RunQuery();
-    agHelper
-      .GetText(dataSources._noRecordFound)
-      .then(($noRecMsg) => expect($noRecMsg).to.eq("No data records to show"));
-  });
-
-  it("2. Inserting record - arraytypes", () => {
-    EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
-    deployMode.DeployApp();
-    table.WaitForTableEmpty(); //asserting table is empty before inserting!
-    agHelper.ClickButton("Run InsertQuery");
-    agHelper.AssertElementVisibility(locators._modal);
-
-    agHelper.EnterInputText("Name", "Lily Bush");
-    agHelper.EnterInputText("Pay_by_quarter", "100,200,300,400");
-    agHelper.EnterInputText("Schedule", "Arrival,Breakfast,Meeting,Lunch");
-
-    agHelper.ClickButton("Insert");
-    agHelper.AssertElementAbsence(locators._toastMsg); //Assert that Insert did not fail
-    agHelper.AssertElementVisibility(locators._buttonByText("Run InsertQuery"));
-    table.ReadTableRowColumnData(0, 0, "v1", 2000).then(($cellData) => {
-      expect($cellData).to.eq("1"); //asserting serial column is inserting fine in sequence
+      //Creating SELECT query - arraytypes + Bug 14493
+      dataSources.createQueryWithDatasourceSchemaTemplate(
+        dsName,
+        "public.arraytypes",
+        "Select",
+      );
+      agHelper.RenameWithInPane("selectRecords");
+      dataSources.RunQuery();
+      agHelper
+        .GetText(dataSources._noRecordFound)
+        .then(($noRecMsg) =>
+          expect($noRecMsg).to.eq("No data records to show"),
+        );
     });
-    table.ReadTableRowColumnData(0, 1, "v1", 200).then(($cellData) => {
-      expect($cellData).not.to.eq("");
+
+    it("2. Inserting record - arraytypes", () => {
+      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+      deployMode.DeployApp();
+      table.WaitForTableEmpty(); //asserting table is empty before inserting!
+      agHelper.ClickButton("Run InsertQuery");
+      agHelper.AssertElementVisibility(locators._modal);
+
+      agHelper.EnterInputText("Name", "Lily Bush");
+      agHelper.EnterInputText("Pay_by_quarter", "100,200,300,400");
+      agHelper.EnterInputText("Schedule", "Arrival,Breakfast,Meeting,Lunch");
+
+      agHelper.ClickButton("Insert");
+      agHelper.AssertElementAbsence(locators._toastMsg); //Assert that Insert did not fail
+      agHelper.AssertElementVisibility(
+        locators._buttonByText("Run InsertQuery"),
+      );
+      table.ReadTableRowColumnData(0, 0, "v1", 2000).then(($cellData) => {
+        expect($cellData).to.eq("1"); //asserting serial column is inserting fine in sequence
+      });
+      table.ReadTableRowColumnData(0, 1, "v1", 200).then(($cellData) => {
+        expect($cellData).not.to.eq("");
+      });
     });
-  });
 
-  it("3. Inserting another record - arraytypes", () => {
-    agHelper.ClickButton("Run InsertQuery");
-    agHelper.AssertElementVisibility(locators._modal);
+    it("3. Inserting another record - arraytypes", () => {
+      agHelper.ClickButton("Run InsertQuery");
+      agHelper.AssertElementVisibility(locators._modal);
 
-    agHelper.EnterInputText("Name", "Josh William");
-    agHelper.EnterInputText("Pay_by_quarter", "8700,5454,9898,23257");
-    agHelper.EnterInputText("Schedule", "Stand up,Update,Report,Executive");
+      agHelper.EnterInputText("Name", "Josh William");
+      agHelper.EnterInputText("Pay_by_quarter", "8700,5454,9898,23257");
+      agHelper.EnterInputText("Schedule", "Stand up,Update,Report,Executive");
 
-    agHelper.ClickButton("Insert");
-    agHelper.AssertElementVisibility(locators._buttonByText("Run InsertQuery"));
-    table.ReadTableRowColumnData(1, 0, "v1", 2000).then(($cellData) => {
-      expect($cellData).to.eq("2"); //asserting serial column is inserting fine in sequence
-    });
-    table.ReadTableRowColumnData(1, 1, "v1", 200).then(($cellData) => {
-      expect($cellData).not.to.eq("");
+      agHelper.ClickButton("Insert");
+      agHelper.AssertElementVisibility(
+        locators._buttonByText("Run InsertQuery"),
+      );
+      table.ReadTableRowColumnData(1, 0, "v1", 2000).then(($cellData) => {
+        expect($cellData).to.eq("2"); //asserting serial column is inserting fine in sequence
+      });
+      table.ReadTableRowColumnData(1, 1, "v1", 200).then(($cellData) => {
+        expect($cellData).not.to.eq("");
+      });
     });
-  });
 
-  it("4. Inserting another record - arraytypes", () => {
-    agHelper.ClickButton("Run InsertQuery");
-    agHelper.AssertElementVisibility(locators._modal);
+    it("4. Inserting another record - arraytypes", () => {
+      agHelper.ClickButton("Run InsertQuery");
+      agHelper.AssertElementVisibility(locators._modal);
 
-    agHelper.EnterInputText("Name", "Mary Clark");
-    agHelper.EnterInputText("Pay_by_quarter", "9898,21726,87387,8372837");
-    agHelper.EnterInputText(
-      "Schedule",
-      "Travel,Meet Sales,Take Action,Sky Rocket",
-    );
+      agHelper.EnterInputText("Name", "Mary Clark");
+      agHelper.EnterInputText("Pay_by_quarter", "9898,21726,87387,8372837");
+      agHelper.EnterInputText(
+        "Schedule",
+        "Travel,Meet Sales,Take Action,Sky Rocket",
+      );
 
-    agHelper.ClickButton("Insert");
-    agHelper.AssertElementVisibility(locators._buttonByText("Run InsertQuery"));
-    table.ReadTableRowColumnData(2, 0, "v1", 2000).then(($cellData) => {
-      expect($cellData).to.eq("3"); //asserting serial column is inserting fine in sequence
-    });
-    table.ReadTableRowColumnData(2, 1, "v1", 200).then(($cellData) => {
-      expect($cellData).not.to.eq("");
+      agHelper.ClickButton("Insert");
+      agHelper.AssertElementVisibility(
+        locators._buttonByText("Run InsertQuery"),
+      );
+      table.ReadTableRowColumnData(2, 0, "v1", 2000).then(($cellData) => {
+        expect($cellData).to.eq("3"); //asserting serial column is inserting fine in sequence
+      });
+      table.ReadTableRowColumnData(2, 1, "v1", 200).then(($cellData) => {
+        expect($cellData).not.to.eq("");
+      });
     });
-  });
-
-  it("5. Updating record - arraytypes", () => {
-    table.SelectTableRow(1);
-    agHelper.ClickButton("Run UpdateQuery");
-    agHelper.AssertElementVisibility(locators._modal);
-
-    agHelper.EnterInputText("Name", "Josh Clarion", true);
-    agHelper.EnterInputText("Pay_by_quarter", "3232,3232,4567,12234", true);
-    agHelper.EnterInputText(
-      "Schedule",
-      "Breakfat,Presentation,Consulting,Training",
-      true,
-    );
 
-    agHelper.ClickButton("Update");
-    agHelper.AssertElementAbsence(locators._toastMsg); //Assert that Update did not fail
-    agHelper.AssertElementVisibility(locators._buttonByText("Run UpdateQuery"));
-    table.WaitUntilTableLoad();
-    agHelper.Sleep(5000); //some more time for rows to rearrange!
-    table.ReadTableRowColumnData(1, 0, "v1", 2000).then(($cellData) => {
-      expect($cellData).to.eq("3");
-    });
-    table.ReadTableRowColumnData(2, 0, "v1", 2000).then(($cellData) => {
-      expect($cellData).to.eq("2"); //Since recently updated column to pushed to last!
-    });
-    table.ReadTableRowColumnData(2, 1, "v1", 200).then(($cellData) => {
-      expect($cellData).not.to.eq("");
+    it("5. Updating record - arraytypes", () => {
+      table.SelectTableRow(1);
+      agHelper.ClickButton("Run UpdateQuery");
+      agHelper.AssertElementVisibility(locators._modal);
+
+      agHelper.EnterInputText("Name", "Josh Clarion", true);
+      agHelper.EnterInputText("Pay_by_quarter", "3232,3232,4567,12234", true);
+      agHelper.EnterInputText(
+        "Schedule",
+        "Breakfat,Presentation,Consulting,Training",
+        true,
+      );
+
+      agHelper.ClickButton("Update");
+      agHelper.AssertElementAbsence(locators._toastMsg); //Assert that Update did not fail
+      agHelper.AssertElementVisibility(
+        locators._buttonByText("Run UpdateQuery"),
+      );
+      table.WaitUntilTableLoad();
+      agHelper.Sleep(5000); //some more time for rows to rearrange!
+      table.ReadTableRowColumnData(1, 0, "v1", 2000).then(($cellData) => {
+        expect($cellData).to.eq("3");
+      });
+      table.ReadTableRowColumnData(2, 0, "v1", 2000).then(($cellData) => {
+        expect($cellData).to.eq("2"); //Since recently updated column to pushed to last!
+      });
+      table.ReadTableRowColumnData(2, 1, "v1", 200).then(($cellData) => {
+        expect($cellData).not.to.eq("");
+      });
     });
-  });
-
-  it("6. Validating JSON functions", () => {
-    deployMode.NavigateBacktoEditor();
-    table.WaitUntilTableLoad();
-    AppSidebar.navigate(AppSidebarButton.Editor);
-    PageLeftPane.switchSegment(PagePaneSegment.Queries);
-    dataSources.CreateQueryForDS(dsName);
-    agHelper.RenameWithInPane("verifyArrayFunctions");
-
-    query = `SELECT name FROM arraytypes WHERE pay_by_quarter[1] <> pay_by_quarter[2];`;
-    dataSources.EnterQuery(query);
-    dataSources.RunQuery();
-    dataSources.AssertQueryResponseHeaders(["name"]);
-    dataSources.AssertQueryTableResponse(0, "Lily Bush");
-    dataSources.AssertQueryTableResponse(1, "Mary Clark");
-
-    query = `SELECT pay_by_quarter[3] FROM arraytypes;`;
-    dataSources.EnterQuery(query);
-    dataSources.RunQuery();
-    dataSources.AssertQueryResponseHeaders(["pay_by_quarter"]);
-    dataSources.AssertQueryTableResponse(0, "300");
-    dataSources.AssertQueryTableResponse(1, "87387");
-    dataSources.AssertQueryTableResponse(2, "4567");
-
-    //Verifying OR
-    query = `SELECT * FROM arraytypes WHERE pay_by_quarter[1] = 300 OR pay_by_quarter[2] = 200 OR pay_by_quarter[3] = 4567 OR pay_by_quarter[4] = 10000;`;
-    dataSources.EnterQuery(query);
-    dataSources.RunQuery();
-    dataSources.AssertQueryResponseHeaders([
-      "serialid",
-      "name",
-      "pay_by_quarter",
-      "schedule",
-    ]);
-    dataSources.AssertQueryTableResponse(0, "1");
-    dataSources.AssertQueryTableResponse(1, "Lily Bush");
-    dataSources.AssertQueryTableResponse(4, "2");
-    dataSources.AssertQueryTableResponse(5, "Josh Clarion");
-
-    //Verifying &&
-    query = `SELECT * FROM arraytypes WHERE pay_by_quarter && ARRAY[87387];`;
-    dataSources.EnterQuery(query);
-    dataSources.RunQuery();
-    dataSources.AssertQueryResponseHeaders([
-      "serialid",
-      "name",
-      "pay_by_quarter",
-      "schedule",
-    ]);
-    dataSources.AssertQueryTableResponse(0, "3");
-    dataSources.AssertQueryTableResponse(1, "Mary Clark");
-    dataSources.AssertQueryTableResponse(2, "[9898,21726,87387,8372837]");
-    dataSources.AssertQueryTableResponse(
-      3,
-      `[["Travel,Meet Sales"],["Take Action,Sky Rocket"]]`,
-    );
 
-    //Verifying ANY
-    query = `SELECT * FROM arraytypes WHERE 9898 = ANY (pay_by_quarter);`;
-    dataSources.EnterQuery(query);
-    dataSources.RunQuery();
-    dataSources.AssertQueryResponseHeaders([
-      "serialid",
-      "name",
-      "pay_by_quarter",
-      "schedule",
-    ]);
-    dataSources.AssertQueryTableResponse(0, "3");
-    dataSources.AssertQueryTableResponse(1, "Mary Clark");
-
-    //Verifying generate_script
-    query = `SELECT * FROM
+    it("6. Validating JSON functions", () => {
+      deployMode.NavigateBacktoEditor();
+      table.WaitUntilTableLoad();
+      AppSidebar.navigate(AppSidebarButton.Editor);
+      PageLeftPane.switchSegment(PagePaneSegment.Queries);
+      dataSources.CreateQueryForDS(dsName);
+      agHelper.RenameWithInPane("verifyArrayFunctions");
+
+      query = `SELECT name FROM arraytypes WHERE pay_by_quarter[1] <> pay_by_quarter[2];`;
+      dataSources.EnterQuery(query);
+      dataSources.RunQuery();
+      dataSources.AssertQueryResponseHeaders(["name"]);
+      dataSources.AssertQueryTableResponse(0, "Lily Bush");
+      dataSources.AssertQueryTableResponse(1, "Mary Clark");
+
+      query = `SELECT pay_by_quarter[3] FROM arraytypes;`;
+      dataSources.EnterQuery(query);
+      dataSources.RunQuery();
+      dataSources.AssertQueryResponseHeaders(["pay_by_quarter"]);
+      dataSources.AssertQueryTableResponse(0, "300");
+      dataSources.AssertQueryTableResponse(1, "87387");
+      dataSources.AssertQueryTableResponse(2, "4567");
+
+      //Verifying OR
+      query = `SELECT * FROM arraytypes WHERE pay_by_quarter[1] = 300 OR pay_by_quarter[2] = 200 OR pay_by_quarter[3] = 4567 OR pay_by_quarter[4] = 10000;`;
+      dataSources.EnterQuery(query);
+      dataSources.RunQuery();
+      dataSources.AssertQueryResponseHeaders([
+        "serialid",
+        "name",
+        "pay_by_quarter",
+        "schedule",
+      ]);
+      dataSources.AssertQueryTableResponse(0, "1");
+      dataSources.AssertQueryTableResponse(1, "Lily Bush");
+      dataSources.AssertQueryTableResponse(4, "2");
+      dataSources.AssertQueryTableResponse(5, "Josh Clarion");
+
+      //Verifying &&
+      query = `SELECT * FROM arraytypes WHERE pay_by_quarter && ARRAY[87387];`;
+      dataSources.EnterQuery(query);
+      dataSources.RunQuery();
+      dataSources.AssertQueryResponseHeaders([
+        "serialid",
+        "name",
+        "pay_by_quarter",
+        "schedule",
+      ]);
+      dataSources.AssertQueryTableResponse(0, "3");
+      dataSources.AssertQueryTableResponse(1, "Mary Clark");
+      dataSources.AssertQueryTableResponse(2, "[9898,21726,87387,8372837]");
+      dataSources.AssertQueryTableResponse(
+        3,
+        `[["Travel,Meet Sales"],["Take Action,Sky Rocket"]]`,
+      );
+
+      //Verifying ANY
+      query = `SELECT * FROM arraytypes WHERE 9898 = ANY (pay_by_quarter);`;
+      dataSources.EnterQuery(query);
+      dataSources.RunQuery();
+      dataSources.AssertQueryResponseHeaders([
+        "serialid",
+        "name",
+        "pay_by_quarter",
+        "schedule",
+      ]);
+      dataSources.AssertQueryTableResponse(0, "3");
+      dataSources.AssertQueryTableResponse(1, "Mary Clark");
+
+      //Verifying generate_script
+      query = `SELECT * FROM
     (SELECT pay_by_quarter,
             generate_subscripts(pay_by_quarter, 1) AS position
        FROM arraytypes) AS foo
   WHERE pay_by_quarter[position] = 100;`;
-    dataSources.EnterQuery(query);
-    dataSources.RunQuery();
-    dataSources.AssertQueryResponseHeaders(["pay_by_quarter", "position"]);
-    dataSources.AssertQueryTableResponse(0, "[100,200,300,400]");
-    dataSources.AssertQueryTableResponse(1, "1");
+      dataSources.EnterQuery(query);
+      dataSources.RunQuery();
+      dataSources.AssertQueryResponseHeaders(["pay_by_quarter", "position"]);
+      dataSources.AssertQueryTableResponse(0, "[100,200,300,400]");
+      dataSources.AssertQueryTableResponse(1, "1");
 
-    query = `SELECT * FROM
+      query = `SELECT * FROM
     (SELECT pay_by_quarter,
             generate_subscripts(pay_by_quarter, 1) AS position
        FROM arraytypes) AS foo
   WHERE pay_by_quarter[position] = 3232;`;
-    dataSources.EnterQuery(query);
-    dataSources.RunQuery();
-    dataSources.AssertQueryResponseHeaders(["pay_by_quarter", "position"]);
-    dataSources.AssertQueryTableResponse(0, "[3232,3232,4567,12234]");
-    dataSources.AssertQueryTableResponse(1, "1");
-    dataSources.AssertQueryTableResponse(2, "[3232,3232,4567,12234]");
-    dataSources.AssertQueryTableResponse(3, "2");
-
-    //Verifying ALL
-    query = `SELECT * FROM arraytypes WHERE 100 = ALL (pay_by_quarter);`;
-    dataSources.EnterQuery(query);
-    dataSources.RunQuery();
-    agHelper
-      .GetText(dataSources._noRecordFound)
-      .then(($noRecMsg) => expect($noRecMsg).to.eq("No data records to show"));
-
-    //Verifying unnest
-    query = `SELECT name, unnest(schedule) FROM arraytypes;`;
-    dataSources.EnterQuery(query);
-    dataSources.RunQuery();
-    dataSources.AssertQueryResponseHeaders(["name", "unnest"]);
-    dataSources.AssertQueryTableResponse(0, "Lily Bush");
-    dataSources.AssertQueryTableResponse(1, "Arrival,Breakfast");
-    dataSources.AssertQueryTableResponse(4, "Mary Clark");
-    dataSources.AssertQueryTableResponse(5, "Travel,Meet Sales");
-    dataSources.AssertQueryTableResponse(10, "Josh Clarion");
-    dataSources.AssertQueryTableResponse(11, "Consulting,Training");
-
-    //Verifying index access
-    query = `SELECT schedule[1:2][1:1] FROM arraytypes WHERE name = 'Lily Bush';`;
-    dataSources.EnterQuery(query);
-    dataSources.RunQuery();
-    dataSources.AssertQueryResponseHeaders(["schedule"]);
-    dataSources.AssertQueryTableResponse(
-      0,
-      `[["Arrival,Breakfast"],["Meeting,Lunch"]]`,
-    );
-
-    //Verifying index access
-    query = `SELECT schedule[1:2][2] FROM arraytypes WHERE name = 'Josh Clarion';`;
-    dataSources.EnterQuery(query);
-    dataSources.RunQuery();
-    dataSources.AssertQueryResponseHeaders(["schedule"]);
-    dataSources.AssertQueryTableResponse(
-      0,
-      `[["Breakfat,Presentation"],["Consulting,Training"]]`,
-    );
+      dataSources.EnterQuery(query);
+      dataSources.RunQuery();
+      dataSources.AssertQueryResponseHeaders(["pay_by_quarter", "position"]);
+      dataSources.AssertQueryTableResponse(0, "[3232,3232,4567,12234]");
+      dataSources.AssertQueryTableResponse(1, "1");
+      dataSources.AssertQueryTableResponse(2, "[3232,3232,4567,12234]");
+      dataSources.AssertQueryTableResponse(3, "2");
+
+      //Verifying ALL
+      query = `SELECT * FROM arraytypes WHERE 100 = ALL (pay_by_quarter);`;
+      dataSources.EnterQuery(query);
+      dataSources.RunQuery();
+      agHelper
+        .GetText(dataSources._noRecordFound)
+        .then(($noRecMsg) =>
+          expect($noRecMsg).to.eq("No data records to show"),
+        );
+
+      //Verifying unnest
+      query = `SELECT name, unnest(schedule) FROM arraytypes;`;
+      dataSources.EnterQuery(query);
+      dataSources.RunQuery();
+      dataSources.AssertQueryResponseHeaders(["name", "unnest"]);
+      dataSources.AssertQueryTableResponse(0, "Lily Bush");
+      dataSources.AssertQueryTableResponse(1, "Arrival,Breakfast");
+      dataSources.AssertQueryTableResponse(4, "Mary Clark");
+      dataSources.AssertQueryTableResponse(5, "Travel,Meet Sales");
+      dataSources.AssertQueryTableResponse(10, "Josh Clarion");
+      dataSources.AssertQueryTableResponse(11, "Consulting,Training");
+
+      //Verifying index access
+      query = `SELECT schedule[1:2][1:1] FROM arraytypes WHERE name = 'Lily Bush';`;
+      dataSources.EnterQuery(query);
+      dataSources.RunQuery();
+      dataSources.AssertQueryResponseHeaders(["schedule"]);
+      dataSources.AssertQueryTableResponse(
+        0,
+        `[["Arrival,Breakfast"],["Meeting,Lunch"]]`,
+      );
 
-    query = `SELECT schedule[:1][1:] FROM arraytypes WHERE name = 'Mary Clark';`;
-    dataSources.EnterQuery(query);
-    dataSources.RunQuery();
-    dataSources.AssertQueryResponseHeaders(["schedule"]);
-    dataSources.AssertQueryTableResponse(0, `[["Travel,Meet Sales"]]`);
-
-    query = `SELECT schedule[2:2][:] FROM arraytypes WHERE name = 'Mary Clark';`;
-    dataSources.EnterQuery(query);
-    dataSources.RunQuery();
-    dataSources.AssertQueryResponseHeaders(["schedule"]);
-    dataSources.AssertQueryTableResponse(0, `[["Take Action,Sky Rocket"]]`);
-
-    //Verifying array_dims
-    query = `SELECT array_dims(schedule) FROM arraytypes WHERE name = 'Lily Bush';`;
-    dataSources.EnterQuery(query);
-    dataSources.RunQuery();
-    dataSources.AssertQueryResponseHeaders(["array_dims"]);
-    dataSources.AssertQueryTableResponse(0, "[1:2][1:1]");
-
-    //Verifying array_length
-    query = `SELECT array_length(schedule, 1) FROM arraytypes WHERE name = 'Mary Clark';`;
-    dataSources.EnterQuery(query);
-    dataSources.RunQuery();
-    dataSources.AssertQueryResponseHeaders(["array_length"]);
-    dataSources.AssertQueryTableResponse(0, "2");
-
-    //Verifying array_upper, cardinality
-    query = `SELECT array_upper(pay_by_quarter, 1), cardinality(schedule)  FROM arraytypes WHERE name = 'Josh Clarion';`;
-    dataSources.EnterQuery(query);
-    dataSources.RunQuery();
-    dataSources.AssertQueryResponseHeaders(["array_upper", "cardinality"]);
-    dataSources.AssertQueryTableResponse(0, "4");
-    dataSources.AssertQueryTableResponse(1, "2");
-
-    //Verifying ||
-    query = `SELECT ARRAY[1,2] || ARRAY[3,4] as "Test ||", ARRAY[5,6] || ARRAY[[1,2],[3,4]] as "Test || of 2D Array", ARRAY[1, 2] || '{3, 4}' as "Test || with {}"`;
-    dataSources.EnterQuery(query);
-    dataSources.RunQuery();
-    dataSources.AssertQueryResponseHeaders([
-      "Test ||",
-      "Test || of 2D Array",
-      "Test || with {}",
-    ]);
-    dataSources.AssertQueryTableResponse(0, "[1,2,3,4]");
-    dataSources.AssertQueryTableResponse(1, "[[5,6],[1,2],[3,4]]");
-    dataSources.AssertQueryTableResponse(2, "[1,2,3,4]");
-
-    //Verifying array_dims
-    query = `SELECT array_dims(1 || '[0:1]={2,3}'::int[]) as "array_dims1", array_dims(ARRAY[1,2] || 3) as "array_dims2", array_dims(ARRAY[1,2] || ARRAY[3,4,5]) as "array_dims3", array_dims(ARRAY[[1,2],[3,4]] || ARRAY[[5,6],[7,8],[9,0]])  as "array_dims4";`;
-    dataSources.EnterQuery(query);
-    dataSources.RunQuery();
-    dataSources.AssertQueryResponseHeaders([
-      "array_dims1",
-      "array_dims2",
-      "array_dims3",
-      "array_dims4",
-    ]);
-    dataSources.AssertQueryTableResponse(0, "[0:2]");
-    dataSources.AssertQueryTableResponse(1, "[1:3]");
-    dataSources.AssertQueryTableResponse(2, "[1:5]");
-    dataSources.AssertQueryTableResponse(3, "[1:5][1:2]");
-
-    //Verifying array_prepend, array_append
-    query = `SELECT array_prepend(1, ARRAY[2,3]) as "array_prepend", array_append(ARRAY[1,2], 3) as "array_append";`;
-    dataSources.EnterQuery(query);
-    dataSources.RunQuery();
-    dataSources.AssertQueryResponseHeaders(["array_prepend", "array_append"]);
-    dataSources.AssertQueryTableResponse(0, "[1,2,3]");
-    dataSources.AssertQueryTableResponse(1, "[1,2,3]");
-
-    //Verifying array_cat
-    query = `SELECT array_cat(ARRAY[1,2], ARRAY[3,4]) as "array_cat1", array_cat(ARRAY[[1,2],[3,4]], ARRAY[5,6]) as "array_cat2", array_cat(ARRAY[5,6], ARRAY[[1,2],[3,4]]) as "array_cat3"`;
-    dataSources.EnterQuery(query);
-    dataSources.RunQuery();
-    dataSources.AssertQueryResponseHeaders([
-      "array_cat1",
-      "array_cat2",
-      "array_cat3",
-    ]);
-    dataSources.AssertQueryTableResponse(0, "[1,2,3,4]");
-    dataSources.AssertQueryTableResponse(1, "[[1,2],[3,4],[5,6]]");
-    dataSources.AssertQueryTableResponse(2, "[[5,6],[1,2],[3,4]]");
-
-    //Verifying || with NULL
-    query = `SELECT ARRAY[1, 2] || NULL as "|| with NULL", array_append(ARRAY[1, 2], NULL) as "array_append";`;
-    dataSources.EnterQuery(query);
-    dataSources.RunQuery();
-    dataSources.AssertQueryResponseHeaders(["|| with NULL", "array_append"]);
-    dataSources.AssertQueryTableResponse(0, "[1,2]");
-    dataSources.AssertQueryTableResponse(1, "[1,2,null]");
-
-    //Verifying array_position, array_positions
-    query = `SELECT array_position(ARRAY['sun','mon','tue','wed','thu','fri','sat'], 'sat'), array_positions(ARRAY[1, 4, 3, 1, 3, 4, 2, 1], 1);`;
-    dataSources.EnterQuery(query);
-    dataSources.RunQuery();
-    dataSources.AssertQueryResponseHeaders([
-      "array_position",
-      "array_positions",
-    ]);
-    dataSources.AssertQueryTableResponse(0, "7");
-    dataSources.AssertQueryTableResponse(1, "[1,4,8]");
-
-    //Verifying input & output syntaxes
-    query = `SELECT f1[1][-2][3] AS e1, f1[1][-1][5] AS e2 FROM (SELECT '[1:1][-2:-1] [3:5]={ {{1,2,3},{4,5,6} } }'::int[] AS f1) AS ss;`;
-    dataSources.EnterQuery(query);
-    dataSources.RunQuery();
-    dataSources.AssertQueryResponseHeaders(["e1", "e2"]);
-    dataSources.AssertQueryTableResponse(0, "1");
-    dataSources.AssertQueryTableResponse(1, "6");
-
-    //Verifying array_remove
-    query = `SELECT array_remove(ARRAY['sun','mon','tue','wed','thu','fri','sat'], 'wed') as "array_remove"`;
-    dataSources.EnterQuery(query);
-    dataSources.RunQuery();
-    dataSources.AssertQueryResponseHeaders(["array_remove"]);
-    dataSources.AssertQueryTableResponse(
-      0,
-      `["sun","mon","tue","thu","fri","sat"]`,
-    );
+      //Verifying index access
+      query = `SELECT schedule[1:2][2] FROM arraytypes WHERE name = 'Josh Clarion';`;
+      dataSources.EnterQuery(query);
+      dataSources.RunQuery();
+      dataSources.AssertQueryResponseHeaders(["schedule"]);
+      dataSources.AssertQueryTableResponse(
+        0,
+        `[["Breakfat,Presentation"],["Consulting,Training"]]`,
+      );
 
-    //Verifying array_replace
-    query = `select ARRAY[1,2,3,2,5] as "before_replace", array_replace(ARRAY[1,2,3,2,5], 2, 10) as two_becomes_ten;`;
-    dataSources.EnterQuery(query);
-    dataSources.RunQuery();
-    dataSources.AssertQueryResponseHeaders([
-      "before_replace",
-      "two_becomes_ten",
-    ]);
-    dataSources.AssertQueryTableResponse(0, `[1,2,3,2,5]`);
-    dataSources.AssertQueryTableResponse(1, `[1,10,3,10,5]`);
-
-    //Verifying operators
-    query = `select ARRAY[1.1,2.1,3.1]::int[] = ARRAY[1,2,3]	as "=", ARRAY[1,2,3] <> ARRAY[1,2,4] as "<>", ARRAY[1,2,3] < ARRAY[1,2,4] as "<", ARRAY[1,4,3] > ARRAY[1,2,4]	 as ">", ARRAY[1,2,3] <= ARRAY[1,2,3]	 as "<=", ARRAY[1,4,3] >= ARRAY[1,4,3]	as ">=", ARRAY[1,4,3] @> ARRAY[3,1,3]	as "@>", ARRAY[2,2,7] <@ ARRAY[1,7,4,2,6]	as "<@", ARRAY[1,4,3] && ARRAY[2,1]	 as "&&"`;
-    dataSources.EnterQuery(query);
-    dataSources.RunQuery();
-    dataSources.AssertQueryResponseHeaders([
-      "=",
-      "<>",
-      "<",
-      ">",
-      "<=",
-      ">=",
-      "@>",
-      "<@",
-      "&&",
-    ]);
-    dataSources.AssertQueryTableResponse(0, "true");
-    dataSources.AssertQueryTableResponse(8, "true");
-
-    //Verifying array_to_string
-    query = `SELECT array_to_string(ARRAY[1, 2, 3, NULL, 5], ',', '*')	as array_to_string, string_to_array('xx~^~yy~^~zz', '~^~', 'yy') as string_to_array;`;
-    dataSources.EnterQuery(query);
-    dataSources.RunQuery();
-    dataSources.AssertQueryResponseHeaders([
-      "array_to_string",
-      "string_to_array",
-    ]);
-    dataSources.AssertQueryTableResponse(0, "1,2,3,*,5");
-    dataSources.AssertQueryTableResponse(1, `["xx",null,"zz"]`);
-
-    //Verifying error
-    query = `SELECT ARRAY[1, 2] || '7';`;
-    dataSources.EnterQuery(query);
-    agHelper.FocusElement(locators._codeMirrorTextArea);
-    dataSources.RunQuery({ expectedStatus: false });
-    agHelper
-      .GetText(dataSources._queryError)
-      .then(($errorText) =>
-        expect($errorText).to.contain(
-          `ERROR: malformed array literal: "7"\n  Detail: Array value must start with "{" or dimension information`,
-        ),
+      query = `SELECT schedule[:1][1:] FROM arraytypes WHERE name = 'Mary Clark';`;
+      dataSources.EnterQuery(query);
+      dataSources.RunQuery();
+      dataSources.AssertQueryResponseHeaders(["schedule"]);
+      dataSources.AssertQueryTableResponse(0, `[["Travel,Meet Sales"]]`);
+
+      query = `SELECT schedule[2:2][:] FROM arraytypes WHERE name = 'Mary Clark';`;
+      dataSources.EnterQuery(query);
+      dataSources.RunQuery();
+      dataSources.AssertQueryResponseHeaders(["schedule"]);
+      dataSources.AssertQueryTableResponse(0, `[["Take Action,Sky Rocket"]]`);
+
+      //Verifying array_dims
+      query = `SELECT array_dims(schedule) FROM arraytypes WHERE name = 'Lily Bush';`;
+      dataSources.EnterQuery(query);
+      dataSources.RunQuery();
+      dataSources.AssertQueryResponseHeaders(["array_dims"]);
+      dataSources.AssertQueryTableResponse(0, "[1:2][1:1]");
+
+      //Verifying array_length
+      query = `SELECT array_length(schedule, 1) FROM arraytypes WHERE name = 'Mary Clark';`;
+      dataSources.EnterQuery(query);
+      dataSources.RunQuery();
+      dataSources.AssertQueryResponseHeaders(["array_length"]);
+      dataSources.AssertQueryTableResponse(0, "2");
+
+      //Verifying array_upper, cardinality
+      query = `SELECT array_upper(pay_by_quarter, 1), cardinality(schedule)  FROM arraytypes WHERE name = 'Josh Clarion';`;
+      dataSources.EnterQuery(query);
+      dataSources.RunQuery();
+      dataSources.AssertQueryResponseHeaders(["array_upper", "cardinality"]);
+      dataSources.AssertQueryTableResponse(0, "4");
+      dataSources.AssertQueryTableResponse(1, "2");
+
+      //Verifying ||
+      query = `SELECT ARRAY[1,2] || ARRAY[3,4] as "Test ||", ARRAY[5,6] || ARRAY[[1,2],[3,4]] as "Test || of 2D Array", ARRAY[1, 2] || '{3, 4}' as "Test || with {}"`;
+      dataSources.EnterQuery(query);
+      dataSources.RunQuery();
+      dataSources.AssertQueryResponseHeaders([
+        "Test ||",
+        "Test || of 2D Array",
+        "Test || with {}",
+      ]);
+      dataSources.AssertQueryTableResponse(0, "[1,2,3,4]");
+      dataSources.AssertQueryTableResponse(1, "[[5,6],[1,2],[3,4]]");
+      dataSources.AssertQueryTableResponse(2, "[1,2,3,4]");
+
+      //Verifying array_dims
+      query = `SELECT array_dims(1 || '[0:1]={2,3}'::int[]) as "array_dims1", array_dims(ARRAY[1,2] || 3) as "array_dims2", array_dims(ARRAY[1,2] || ARRAY[3,4,5]) as "array_dims3", array_dims(ARRAY[[1,2],[3,4]] || ARRAY[[5,6],[7,8],[9,0]])  as "array_dims4";`;
+      dataSources.EnterQuery(query);
+      dataSources.RunQuery();
+      dataSources.AssertQueryResponseHeaders([
+        "array_dims1",
+        "array_dims2",
+        "array_dims3",
+        "array_dims4",
+      ]);
+      dataSources.AssertQueryTableResponse(0, "[0:2]");
+      dataSources.AssertQueryTableResponse(1, "[1:3]");
+      dataSources.AssertQueryTableResponse(2, "[1:5]");
+      dataSources.AssertQueryTableResponse(3, "[1:5][1:2]");
+
+      //Verifying array_prepend, array_append
+      query = `SELECT array_prepend(1, ARRAY[2,3]) as "array_prepend", array_append(ARRAY[1,2], 3) as "array_append";`;
+      dataSources.EnterQuery(query);
+      dataSources.RunQuery();
+      dataSources.AssertQueryResponseHeaders(["array_prepend", "array_append"]);
+      dataSources.AssertQueryTableResponse(0, "[1,2,3]");
+      dataSources.AssertQueryTableResponse(1, "[1,2,3]");
+
+      //Verifying array_cat
+      query = `SELECT array_cat(ARRAY[1,2], ARRAY[3,4]) as "array_cat1", array_cat(ARRAY[[1,2],[3,4]], ARRAY[5,6]) as "array_cat2", array_cat(ARRAY[5,6], ARRAY[[1,2],[3,4]]) as "array_cat3"`;
+      dataSources.EnterQuery(query);
+      dataSources.RunQuery();
+      dataSources.AssertQueryResponseHeaders([
+        "array_cat1",
+        "array_cat2",
+        "array_cat3",
+      ]);
+      dataSources.AssertQueryTableResponse(0, "[1,2,3,4]");
+      dataSources.AssertQueryTableResponse(1, "[[1,2],[3,4],[5,6]]");
+      dataSources.AssertQueryTableResponse(2, "[[5,6],[1,2],[3,4]]");
+
+      //Verifying || with NULL
+      query = `SELECT ARRAY[1, 2] || NULL as "|| with NULL", array_append(ARRAY[1, 2], NULL) as "array_append";`;
+      dataSources.EnterQuery(query);
+      dataSources.RunQuery();
+      dataSources.AssertQueryResponseHeaders(["|| with NULL", "array_append"]);
+      dataSources.AssertQueryTableResponse(0, "[1,2]");
+      dataSources.AssertQueryTableResponse(1, "[1,2,null]");
+
+      //Verifying array_position, array_positions
+      query = `SELECT array_position(ARRAY['sun','mon','tue','wed','thu','fri','sat'], 'sat'), array_positions(ARRAY[1, 4, 3, 1, 3, 4, 2, 1], 1);`;
+      dataSources.EnterQuery(query);
+      dataSources.RunQuery();
+      dataSources.AssertQueryResponseHeaders([
+        "array_position",
+        "array_positions",
+      ]);
+      dataSources.AssertQueryTableResponse(0, "7");
+      dataSources.AssertQueryTableResponse(1, "[1,4,8]");
+
+      //Verifying input & output syntaxes
+      query = `SELECT f1[1][-2][3] AS e1, f1[1][-1][5] AS e2 FROM (SELECT '[1:1][-2:-1] [3:5]={ {{1,2,3},{4,5,6} } }'::int[] AS f1) AS ss;`;
+      dataSources.EnterQuery(query);
+      dataSources.RunQuery();
+      dataSources.AssertQueryResponseHeaders(["e1", "e2"]);
+      dataSources.AssertQueryTableResponse(0, "1");
+      dataSources.AssertQueryTableResponse(1, "6");
+
+      //Verifying array_remove
+      query = `SELECT array_remove(ARRAY['sun','mon','tue','wed','thu','fri','sat'], 'wed') as "array_remove"`;
+      dataSources.EnterQuery(query);
+      dataSources.RunQuery();
+      dataSources.AssertQueryResponseHeaders(["array_remove"]);
+      dataSources.AssertQueryTableResponse(
+        0,
+        `["sun","mon","tue","thu","fri","sat"]`,
       );
 
-    agHelper.ActionContextMenuWithInPane({
-      action: "Delete",
-      entityType: entityItems.Query,
-    });
-    AppSidebar.navigate(AppSidebarButton.Editor);
-  });
-
-  it("7. Deleting records - arraytypes", () => {
-    EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
-    deployMode.DeployApp();
-    table.WaitUntilTableLoad();
-    table.SelectTableRow(1);
-    agHelper.ClickButton("DeleteQuery", 1);
-    assertHelper.AssertNetworkStatus("@postExecute", 200);
-    assertHelper.AssertNetworkStatus("@postExecute", 200);
-    agHelper.Sleep(2500); //Allwowing time for delete to be success
-    table.ReadTableRowColumnData(1, 0, "v1", 2000).then(($cellData) => {
-      expect($cellData).not.to.eq("3"); //asserting 2nd record is deleted
-    });
-    table.ReadTableRowColumnData(1, 0, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("2");
+      //Verifying array_replace
+      query = `select ARRAY[1,2,3,2,5] as "before_replace", array_replace(ARRAY[1,2,3,2,5], 2, 10) as two_becomes_ten;`;
+      dataSources.EnterQuery(query);
+      dataSources.RunQuery();
+      dataSources.AssertQueryResponseHeaders([
+        "before_replace",
+        "two_becomes_ten",
+      ]);
+      dataSources.AssertQueryTableResponse(0, `[1,2,3,2,5]`);
+      dataSources.AssertQueryTableResponse(1, `[1,10,3,10,5]`);
+
+      //Verifying operators
+      query = `select ARRAY[1.1,2.1,3.1]::int[] = ARRAY[1,2,3]	as "=", ARRAY[1,2,3] <> ARRAY[1,2,4] as "<>", ARRAY[1,2,3] < ARRAY[1,2,4] as "<", ARRAY[1,4,3] > ARRAY[1,2,4]	 as ">", ARRAY[1,2,3] <= ARRAY[1,2,3]	 as "<=", ARRAY[1,4,3] >= ARRAY[1,4,3]	as ">=", ARRAY[1,4,3] @> ARRAY[3,1,3]	as "@>", ARRAY[2,2,7] <@ ARRAY[1,7,4,2,6]	as "<@", ARRAY[1,4,3] && ARRAY[2,1]	 as "&&"`;
+      dataSources.EnterQuery(query);
+      dataSources.RunQuery();
+      dataSources.AssertQueryResponseHeaders([
+        "=",
+        "<>",
+        "<",
+        ">",
+        "<=",
+        ">=",
+        "@>",
+        "<@",
+        "&&",
+      ]);
+      dataSources.AssertQueryTableResponse(0, "true");
+      dataSources.AssertQueryTableResponse(8, "true");
+
+      //Verifying array_to_string
+      query = `SELECT array_to_string(ARRAY[1, 2, 3, NULL, 5], ',', '*')	as array_to_string, string_to_array('xx~^~yy~^~zz', '~^~', 'yy') as string_to_array;`;
+      dataSources.EnterQuery(query);
+      dataSources.RunQuery();
+      dataSources.AssertQueryResponseHeaders([
+        "array_to_string",
+        "string_to_array",
+      ]);
+      dataSources.AssertQueryTableResponse(0, "1,2,3,*,5");
+      dataSources.AssertQueryTableResponse(1, `["xx",null,"zz"]`);
+
+      //Verifying error
+      query = `SELECT ARRAY[1, 2] || '7';`;
+      dataSources.EnterQuery(query);
+      agHelper.FocusElement(locators._codeMirrorTextArea);
+      dataSources.RunQuery({ expectedStatus: false });
+      agHelper
+        .GetText(dataSources._queryError)
+        .then(($errorText) =>
+          expect($errorText).to.contain(
+            `ERROR: malformed array literal: "7"\n  Detail: Array value must start with "{" or dimension information`,
+          ),
+        );
+
+      agHelper.ActionContextMenuWithInPane({
+        action: "Delete",
+        entityType: entityItems.Query,
+      });
+      AppSidebar.navigate(AppSidebarButton.Editor);
     });
 
-    //Deleting all records from table - arraytypes
-    agHelper.GetNClick(locators._deleteIcon);
-    agHelper.AssertElementVisibility(locators._buttonByText("Run InsertQuery"));
-    agHelper.Sleep(2000);
-    table.WaitForTableEmpty();
-  });
-
-  it("8. Inserting another record (to check serial column) - arraytypes", () => {
-    agHelper.ClickButton("Run InsertQuery");
-    agHelper.AssertElementVisibility(locators._modal);
-
-    agHelper.EnterInputText("Name", "Bob Sim");
-    agHelper.EnterInputText("Pay_by_quarter", "121,3234,4454,21213");
-    agHelper.EnterInputText("Schedule", "Travel,Chillax,Hire,Give rewards");
-
-    agHelper.ClickButton("Insert");
-    agHelper.AssertElementVisibility(locators._buttonByText("Run InsertQuery"));
-    table.ReadTableRowColumnData(0, 0, "v1", 2000).then(($cellData) => {
-      expect($cellData).to.eq("4"); //asserting serial column is inserting fine in sequence
+    it("7. Deleting records - arraytypes", () => {
+      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+      deployMode.DeployApp();
+      table.WaitUntilTableLoad();
+      table.SelectTableRow(1);
+      agHelper.ClickButton("DeleteQuery", 1);
+      assertHelper.AssertNetworkStatus("@postExecute", 200);
+      assertHelper.AssertNetworkStatus("@postExecute", 200);
+      agHelper.Sleep(2500); //Allwowing time for delete to be success
+      table.ReadTableRowColumnData(1, 0, "v1", 2000).then(($cellData) => {
+        expect($cellData).not.to.eq("3"); //asserting 2nd record is deleted
+      });
+      table.ReadTableRowColumnData(1, 0, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq("2");
+      });
+
+      //Deleting all records from table - arraytypes
+      agHelper.GetNClick(locators._deleteIcon);
+      agHelper.AssertElementVisibility(
+        locators._buttonByText("Run InsertQuery"),
+      );
+      agHelper.Sleep(2000);
+      table.WaitForTableEmpty();
     });
-    table.ReadTableRowColumnData(0, 1, "v1", 200).then(($cellData) => {
-      expect($cellData).not.to.eq("");
+
+    it("8. Inserting another record (to check serial column) - arraytypes", () => {
+      agHelper.ClickButton("Run InsertQuery");
+      agHelper.AssertElementVisibility(locators._modal);
+
+      agHelper.EnterInputText("Name", "Bob Sim");
+      agHelper.EnterInputText("Pay_by_quarter", "121,3234,4454,21213");
+      agHelper.EnterInputText("Schedule", "Travel,Chillax,Hire,Give rewards");
+
+      agHelper.ClickButton("Insert");
+      agHelper.AssertElementVisibility(
+        locators._buttonByText("Run InsertQuery"),
+      );
+      table.ReadTableRowColumnData(0, 0, "v1", 2000).then(($cellData) => {
+        expect($cellData).to.eq("4"); //asserting serial column is inserting fine in sequence
+      });
+      table.ReadTableRowColumnData(0, 1, "v1", 200).then(($cellData) => {
+        expect($cellData).not.to.eq("");
+      });
     });
-  });
-
-  it("9. Validate Drop of the Newly Created - arraytypes - Table from Postgres datasource", () => {
-    deployMode.NavigateBacktoEditor();
-    EditorNavigation.SelectEntityByName("dropTable", EntityType.Query);
-    dataSources.RunQuery();
-    dataSources.AssertQueryTableResponse(0, "0");
-    dataSources.AssertTableInVirtuosoList(dsName, "public.arraytypes", false);
-  });
-
-  after(
-    "Verify Deletion of all created queries & Deletion of datasource",
-    () => {
-      //Verify Deletion of all created queries
-      dataSources.DeleteDatasourceFromWithinDS(dsName, 409); //Since all queries exists
-      entityExplorer.DeleteAllQueriesForDB(dsName);
-      //Ds Deletion
-      deployMode.DeployApp();
+
+    it("9. Validate Drop of the Newly Created - arraytypes - Table from Postgres datasource", () => {
       deployMode.NavigateBacktoEditor();
-      dataSources.DeleteDatasourceFromWithinDS(dsName, 200);
-      AppSidebar.navigate(AppSidebarButton.Editor);
-    },
-  );
-});
+      EditorNavigation.SelectEntityByName("dropTable", EntityType.Query);
+      dataSources.RunQuery();
+      dataSources.AssertQueryTableResponse(0, "0");
+      dataSources.AssertTableInVirtuosoList(dsName, "public.arraytypes", false);
+    });
+
+    after(
+      "Verify Deletion of all created queries & Deletion of datasource",
+      () => {
+        //Verify Deletion of all created queries
+        dataSources.DeleteDatasourceFromWithinDS(dsName, 409); //Since all queries exists
+        entityExplorer.DeleteAllQueriesForDB(dsName);
+        //Ds Deletion
+        deployMode.DeployApp();
+        deployMode.NavigateBacktoEditor();
+        dataSources.DeleteDatasourceFromWithinDS(dsName, 200);
+        AppSidebar.navigate(AppSidebarButton.Editor);
+      },
+    );
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Binary_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Binary_Spec.ts
index bb8ad38cb77b..d3b406336b59 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Binary_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Binary_Spec.ts
@@ -16,354 +16,378 @@ import EditorNavigation, {
   PagePaneSegment,
 } from "../../../../support/Pages/EditorNavigation";
 
-describe("Binary Datatype tests", { tags: ["@tag.Datasource"] }, function () {
-  let dsName: any, query: string, imageNameToUpload: string;
-
-  before("Create DS, Importing App & setting theme", () => {
-    agHelper.AddDsl("Datatypes/BinaryDTdsl");
-    appSettings.OpenPaneAndChangeThemeColors(7, -9);
-    dataSources.CreateDataSource("Postgres");
-    cy.get("@dsName").then(($dsName) => {
-      dsName = $dsName;
-    });
-  });
-
-  it("1. Creating SELECT query - binarytype + Bug 14493", () => {
-    query = `CREATE table binarytype (serialid SERIAL primary key, imagename TEXT, existingImage bytea, newImage bytea);`;
-    dataSources.CreateQueryAfterDSSaved(query, "createTable");
-    dataSources.RunQuery();
-
-    //Creating SELECT query - binarytype + Bug 14493
-    query = `SELECT binarytype.serialid, binarytype.imagename, encode(binarytype.existingimage, 'escape') as "OldImage", encode(binarytype.newimage, 'escape') as "NewImage" from public."binarytype";`;
-    dataSources.createQueryWithDatasourceSchemaTemplate(
-      dsName,
-      "public.binarytype",
-      "Select",
-    );
-    dataSources.RunQuery();
-    agHelper
-      .GetText(dataSources._noRecordFound)
-      .then(($noRecMsg) => expect($noRecMsg).to.eq("No data records to show"));
-    dataSources.EnterQuery(query);
-    agHelper.RenameWithInPane("selectRecords");
-  });
-
-  it("2. Creating all queries- binarytype", () => {
-    //Other queries
-    query = `INSERT INTO public."binarytype" ("imagename", "existingimage", "newimage") VALUES ('{{Insertimagename.text}}', '{{Insertimage.files[0].data}}', '{{Insertimage.files[0].data}}');`;
-    dataSources.CreateQueryFromOverlay(dsName, query, "insertRecord");
-    dataSources.SetQueryTimeout(30000);
-
-    query = `UPDATE public."binarytype" SET "imagename" ='{{Updatename.text}}', "existingimage" = '{{Table1.selectedRow.OldImage}}',  "newimage" = '{{Updateimage.files[0].data}}' WHERE serialid = {{Table1.selectedRow.serialid}};`;
-    dataSources.CreateQueryFromOverlay(dsName, query, "updateRecord");
-    dataSources.SetQueryTimeout(30000);
-
-    query = `DELETE FROM public."binarytype" WHERE serialId = {{Table1.selectedRow.serialid}}`;
-    dataSources.CreateQueryFromOverlay(dsName, query, "deleteRecord");
-    dataSources.SetQueryTimeout(30000);
-
-    query = `DELETE FROM public."binarytype"`;
-    dataSources.CreateQueryFromOverlay(dsName, query, "deleteAllRecords");
-    dataSources.SetQueryTimeout(30000);
-
-    query = `DROP table public."binarytype"`;
-    dataSources.CreateQueryFromOverlay(dsName, query, "dropTable");
-    dataSources.SetQueryTimeout(30000);
-
-    EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
-    deployMode.DeployApp();
-    table.WaitForTableEmpty(); //asserting table is empty before inserting!
-  });
-
-  it("3. Inserting another record - binarytype", () => {
-    imageNameToUpload = "Datatypes/Georgia.jpeg";
-
-    agHelper.ClickButton("Run InsertQuery");
-    agHelper.AssertElementVisibility(locators._modal);
-
-    agHelper.ClickButton("Select New Image");
-    agHelper.UploadFile(imageNameToUpload);
-
-    agHelper.ClickButton("Insert");
-    agHelper.AssertElementAbsence(locators._toastMsg); //Assert that Insert did not fail
-    agHelper.AssertElementVisibility(locators._buttonByText("Run InsertQuery"));
-    agHelper.AssertElementAbsence(locators._btnSpinner, 20000); //for the update row to appear at last
-    table.WaitUntilTableLoad();
-    const rowIndex = 0;
-    table.ReadTableRowColumnData(rowIndex, 0).then(($cellData) => {
-      expect($cellData).to.eq("1"); //asserting serial column is inserting fine in sequence
-    });
-    table.ReadTableRowColumnData(rowIndex, 1, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("Georgia.jpeg");
+describe(
+  "Binary Datatype tests",
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
+  function () {
+    let dsName: any, query: string, imageNameToUpload: string;
+
+    before("Create DS, Importing App & setting theme", () => {
+      agHelper.AddDsl("Datatypes/BinaryDTdsl");
+      appSettings.OpenPaneAndChangeThemeColors(7, -9);
+      dataSources.CreateDataSource("Postgres");
+      cy.get("@dsName").then(($dsName) => {
+        dsName = $dsName;
+      });
     });
-    table.AssertTableRowImageColumnIsLoaded(rowIndex, 2).then(($oldimage) => {
-      table.AssertTableRowImageColumnIsLoaded(rowIndex, 3).then(($newimage) => {
-        expect($oldimage).to.eq($newimage);
+
+    it("1. Creating SELECT query - binarytype + Bug 14493", () => {
+      query = `CREATE table binarytype (serialid SERIAL primary key, imagename TEXT, existingImage bytea, newImage bytea);`;
+      dataSources.CreateQueryAfterDSSaved(query, "createTable");
+      dataSources.RunQuery();
+
+      //Creating SELECT query - binarytype + Bug 14493
+      query = `SELECT binarytype.serialid, binarytype.imagename, encode(binarytype.existingimage, 'escape') as "OldImage", encode(binarytype.newimage, 'escape') as "NewImage" from public."binarytype";`;
+      dataSources.createQueryWithDatasourceSchemaTemplate(
+        dsName,
+        "public.binarytype",
+        "Select",
+      );
+      dataSources.RunQuery();
+      agHelper
+        .GetText(dataSources._noRecordFound)
+        .then(($noRecMsg) =>
+          expect($noRecMsg).to.eq("No data records to show"),
+        );
+      dataSources.EnterQuery(query);
+      agHelper.RenameWithInPane("selectRecords");
+    });
+
+    it("2. Creating all queries- binarytype", () => {
+      //Other queries
+      query = `INSERT INTO public."binarytype" ("imagename", "existingimage", "newimage") VALUES ('{{Insertimagename.text}}', '{{Insertimage.files[0].data}}', '{{Insertimage.files[0].data}}');`;
+      dataSources.CreateQueryFromOverlay(dsName, query, "insertRecord");
+      dataSources.SetQueryTimeout(30000);
+
+      query = `UPDATE public."binarytype" SET "imagename" ='{{Updatename.text}}', "existingimage" = '{{Table1.selectedRow.OldImage}}',  "newimage" = '{{Updateimage.files[0].data}}' WHERE serialid = {{Table1.selectedRow.serialid}};`;
+      dataSources.CreateQueryFromOverlay(dsName, query, "updateRecord");
+      dataSources.SetQueryTimeout(30000);
+
+      query = `DELETE FROM public."binarytype" WHERE serialId = {{Table1.selectedRow.serialid}}`;
+      dataSources.CreateQueryFromOverlay(dsName, query, "deleteRecord");
+      dataSources.SetQueryTimeout(30000);
+
+      query = `DELETE FROM public."binarytype"`;
+      dataSources.CreateQueryFromOverlay(dsName, query, "deleteAllRecords");
+      dataSources.SetQueryTimeout(30000);
+
+      query = `DROP table public."binarytype"`;
+      dataSources.CreateQueryFromOverlay(dsName, query, "dropTable");
+      dataSources.SetQueryTimeout(30000);
+
+      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+      deployMode.DeployApp();
+      table.WaitForTableEmpty(); //asserting table is empty before inserting!
+    });
+
+    it("3. Inserting another record - binarytype", () => {
+      imageNameToUpload = "Datatypes/Georgia.jpeg";
+
+      agHelper.ClickButton("Run InsertQuery");
+      agHelper.AssertElementVisibility(locators._modal);
+
+      agHelper.ClickButton("Select New Image");
+      agHelper.UploadFile(imageNameToUpload);
+
+      agHelper.ClickButton("Insert");
+      agHelper.AssertElementAbsence(locators._toastMsg); //Assert that Insert did not fail
+      agHelper.AssertElementVisibility(
+        locators._buttonByText("Run InsertQuery"),
+      );
+      agHelper.AssertElementAbsence(locators._btnSpinner, 20000); //for the update row to appear at last
+      table.WaitUntilTableLoad();
+      const rowIndex = 0;
+      table.ReadTableRowColumnData(rowIndex, 0).then(($cellData) => {
+        expect($cellData).to.eq("1"); //asserting serial column is inserting fine in sequence
+      });
+      table.ReadTableRowColumnData(rowIndex, 1, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq("Georgia.jpeg");
+      });
+      table.AssertTableRowImageColumnIsLoaded(rowIndex, 2).then(($oldimage) => {
+        table
+          .AssertTableRowImageColumnIsLoaded(rowIndex, 3)
+          .then(($newimage) => {
+            expect($oldimage).to.eq($newimage);
+          });
       });
     });
-  });
 
-  it("4. Inserting another record - binarytype", () => {
-    imageNameToUpload = "Datatypes/Maine.jpeg";
+    it("4. Inserting another record - binarytype", () => {
+      imageNameToUpload = "Datatypes/Maine.jpeg";
 
-    agHelper.ClickButton("Run InsertQuery");
-    agHelper.AssertElementVisibility(locators._modal);
+      agHelper.ClickButton("Run InsertQuery");
+      agHelper.AssertElementVisibility(locators._modal);
 
-    agHelper.ClickButton("Select New Image");
-    agHelper.UploadFile(imageNameToUpload);
+      agHelper.ClickButton("Select New Image");
+      agHelper.UploadFile(imageNameToUpload);
 
-    agHelper.ClickButton("Insert");
-    agHelper.AssertElementAbsence(locators._toastMsg); //Assert that Insert did not fail
-    agHelper.AssertElementVisibility(locators._buttonByText("Run InsertQuery"));
-    agHelper.AssertElementAbsence(locators._btnSpinner, 20000); //for the update row to appear at last
-    table.WaitUntilTableLoad();
-    const rowIndex = 1;
-    table.ReadTableRowColumnData(rowIndex, 0).then(($cellData) => {
-      expect($cellData).to.eq("2"); //asserting serial column is inserting fine in sequence
-    });
-    table.ReadTableRowColumnData(rowIndex, 1, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("Maine.jpeg");
-    });
-    table.AssertTableRowImageColumnIsLoaded(rowIndex, 2).then(($oldimage) => {
-      table.AssertTableRowImageColumnIsLoaded(rowIndex, 3).then(($newimage) => {
-        expect($oldimage).to.eq($newimage);
+      agHelper.ClickButton("Insert");
+      agHelper.AssertElementAbsence(locators._toastMsg); //Assert that Insert did not fail
+      agHelper.AssertElementVisibility(
+        locators._buttonByText("Run InsertQuery"),
+      );
+      agHelper.AssertElementAbsence(locators._btnSpinner, 20000); //for the update row to appear at last
+      table.WaitUntilTableLoad();
+      const rowIndex = 1;
+      table.ReadTableRowColumnData(rowIndex, 0).then(($cellData) => {
+        expect($cellData).to.eq("2"); //asserting serial column is inserting fine in sequence
       });
-    });
-  });
-
-  it("5. Updating record - binarytype", () => {
-    imageNameToUpload = "Datatypes/NewJersey.jpeg";
-
-    table.SelectTableRow(1);
-    agHelper.ClickButton("Run UpdateQuery");
-    agHelper.AssertElementVisibility(locators._modal);
-
-    agHelper.ClickButton("Select update image");
-    agHelper.UploadFile(imageNameToUpload);
-
-    agHelper.ClickButton("Update");
-    agHelper.AssertElementAbsence(locators._toastMsg); //Assert that Update did not fail
-    agHelper.AssertElementVisibility(locators._buttonByText("Run UpdateQuery"));
-    agHelper.AssertElementAbsence(locators._btnSpinner, 20000); //for the update row to appear at last
-    table.WaitUntilTableLoad();
-    const rowIndex = 1;
-    table.ReadTableRowColumnData(rowIndex, 0, "v1", 2000).then(($cellData) => {
-      expect($cellData).to.eq("2"); //asserting serial column is inserting fine in sequence
-    });
-    table.ReadTableRowColumnData(rowIndex, 1, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("NewJersey.jpeg");
-    });
-    table.AssertTableRowImageColumnIsLoaded(rowIndex, 2).then(($oldimage) => {
-      table.AssertTableRowImageColumnIsLoaded(rowIndex, 3).then(($newimage) => {
-        expect($oldimage).to.not.eq($newimage);
+      table.ReadTableRowColumnData(rowIndex, 1, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq("Maine.jpeg");
+      });
+      table.AssertTableRowImageColumnIsLoaded(rowIndex, 2).then(($oldimage) => {
+        table
+          .AssertTableRowImageColumnIsLoaded(rowIndex, 3)
+          .then(($newimage) => {
+            expect($oldimage).to.eq($newimage);
+          });
       });
     });
-  });
-
-  it("6. Deleting records - binarytype", () => {
-    table.WaitUntilTableLoad();
-    table.SelectTableRow(1);
-    agHelper.ClickButton("DeleteQuery", 1);
-    assertHelper.AssertNetworkStatus("@postExecute", 200);
-    assertHelper.AssertNetworkStatus("@postExecute", 200);
-    agHelper.WaitUntilEleDisappear(locators._btnSpinner); //Allowing time for delete to be success
-    table.ReadTableRowColumnData(0, 0).then(($cellData) => {
-      expect($cellData).to.eq("1");
+
+    it("5. Updating record - binarytype", () => {
+      imageNameToUpload = "Datatypes/NewJersey.jpeg";
+
+      table.SelectTableRow(1);
+      agHelper.ClickButton("Run UpdateQuery");
+      agHelper.AssertElementVisibility(locators._modal);
+
+      agHelper.ClickButton("Select update image");
+      agHelper.UploadFile(imageNameToUpload);
+
+      agHelper.ClickButton("Update");
+      agHelper.AssertElementAbsence(locators._toastMsg); //Assert that Update did not fail
+      agHelper.AssertElementVisibility(
+        locators._buttonByText("Run UpdateQuery"),
+      );
+      agHelper.AssertElementAbsence(locators._btnSpinner, 20000); //for the update row to appear at last
+      table.WaitUntilTableLoad();
+      const rowIndex = 1;
+      table
+        .ReadTableRowColumnData(rowIndex, 0, "v1", 2000)
+        .then(($cellData) => {
+          expect($cellData).to.eq("2"); //asserting serial column is inserting fine in sequence
+        });
+      table.ReadTableRowColumnData(rowIndex, 1, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq("NewJersey.jpeg");
+      });
+      table.AssertTableRowImageColumnIsLoaded(rowIndex, 2).then(($oldimage) => {
+        table
+          .AssertTableRowImageColumnIsLoaded(rowIndex, 3)
+          .then(($newimage) => {
+            expect($oldimage).to.not.eq($newimage);
+          });
+      });
     });
 
-    //Deleting all records from .table
-    agHelper.GetNClick(locators._deleteIcon);
-    agHelper.AssertElementVisibility(locators._buttonByText("Run InsertQuery"));
-    table.WaitForTableEmpty();
-  });
+    it("6. Deleting records - binarytype", () => {
+      table.WaitUntilTableLoad();
+      table.SelectTableRow(1);
+      agHelper.ClickButton("DeleteQuery", 1);
+      assertHelper.AssertNetworkStatus("@postExecute", 200);
+      assertHelper.AssertNetworkStatus("@postExecute", 200);
+      agHelper.WaitUntilEleDisappear(locators._btnSpinner); //Allowing time for delete to be success
+      table.ReadTableRowColumnData(0, 0).then(($cellData) => {
+        expect($cellData).to.eq("1");
+      });
+
+      //Deleting all records from .table
+      agHelper.GetNClick(locators._deleteIcon);
+      agHelper.AssertElementVisibility(
+        locators._buttonByText("Run InsertQuery"),
+      );
+      table.WaitForTableEmpty();
+    });
 
-  it("7. Inserting another record (to check serial column) - binarytype", () => {
-    imageNameToUpload = "Datatypes/Massachusetts.jpeg";
+    it("7. Inserting another record (to check serial column) - binarytype", () => {
+      imageNameToUpload = "Datatypes/Massachusetts.jpeg";
 
-    agHelper.ClickButton("Run InsertQuery");
-    agHelper.AssertElementVisibility(locators._modal);
+      agHelper.ClickButton("Run InsertQuery");
+      agHelper.AssertElementVisibility(locators._modal);
 
-    //agHelper.EnterInputText("Imagename", "Massachusetts");
-    agHelper.ClickButton("Select New Image");
-    agHelper.UploadFile(imageNameToUpload);
+      //agHelper.EnterInputText("Imagename", "Massachusetts");
+      agHelper.ClickButton("Select New Image");
+      agHelper.UploadFile(imageNameToUpload);
 
-    agHelper.ClickButton("Insert");
-    agHelper.AssertElementAbsence(locators._toastMsg); //Assert that Insert did not fail
-    agHelper.AssertElementVisibility(locators._buttonByText("Run InsertQuery"));
-    table.WaitUntilTableLoad();
-    table.ReadTableRowColumnData(0, 0, "v1", 2000).then(($cellData) => {
-      expect($cellData).to.eq("3"); //asserting serial column is inserting fine in sequence
-    });
-    table.ReadTableRowColumnData(0, 1, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("Massachusetts.jpeg");
-    });
-    table.AssertTableRowImageColumnIsLoaded(0, 2).then(($oldimage) => {
-      table.AssertTableRowImageColumnIsLoaded(0, 3).then(($newimage) => {
-        expect($oldimage).to.eq($newimage);
+      agHelper.ClickButton("Insert");
+      agHelper.AssertElementAbsence(locators._toastMsg); //Assert that Insert did not fail
+      agHelper.AssertElementVisibility(
+        locators._buttonByText("Run InsertQuery"),
+      );
+      table.WaitUntilTableLoad();
+      table.ReadTableRowColumnData(0, 0, "v1", 2000).then(($cellData) => {
+        expect($cellData).to.eq("3"); //asserting serial column is inserting fine in sequence
+      });
+      table.ReadTableRowColumnData(0, 1, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq("Massachusetts.jpeg");
+      });
+      table.AssertTableRowImageColumnIsLoaded(0, 2).then(($oldimage) => {
+        table.AssertTableRowImageColumnIsLoaded(0, 3).then(($newimage) => {
+          expect($oldimage).to.eq($newimage);
+        });
       });
-    });
-  });
-
-  it("8. Validating Binary (bytea) - escape, hex, base64 functions", () => {
-    deployMode.NavigateBacktoEditor();
-    table.WaitUntilTableLoad();
-    PageLeftPane.switchSegment(PagePaneSegment.Queries);
-    //Validating zero octet
-    query = `select encode('\\000'::bytea, 'hex') as "zero octet Hex", encode('\\000'::bytea, 'escape') as "zero octet Escape";`;
-    dataSources.CreateQueryForDS(dsName, query, "verifyBinaryFunctions");
-    dataSources.RunQuery();
-    dataSources.AssertQueryResponseHeaders([
-      "zero octet Hex",
-      "zero octet Escape",
-    ]);
-    dataSources.ReadQueryTableResponse(0).then(($cellData) => {
-      expect($cellData).to.eq("00");
-    });
-    dataSources.ReadQueryTableResponse(1).then(($cellData) => {
-      expect($cellData).to.eq(`\\000`);
     });
 
-    //Validating single quote
-    query = `select encode(''''::bytea, 'escape') as "single quote Escape1", encode('\\047'::bytea, 'escape') as "single quote Escape2", encode(''''::bytea, 'hex') as "single quote Hex1", encode('\\047'::bytea, 'hex') as "single quote Hex2", encode(''''::bytea, 'base64') as "single quote Base64";`;
-    dataSources.EnterQuery(query);
-    dataSources.RunQuery();
-    dataSources.AssertQueryResponseHeaders([
-      "single quote Escape1",
-      "single quote Escape2",
-      "single quote Hex1",
-      "single quote Hex2",
-      "single quote Base64",
-    ]);
-    dataSources.ReadQueryTableResponse(0).then(($cellData) => {
-      expect($cellData).to.eq("'");
-    });
-    dataSources.ReadQueryTableResponse(1).then(($cellData) => {
-      expect($cellData).to.eq("'");
-    });
-    dataSources.ReadQueryTableResponse(2).then(($cellData) => {
-      expect($cellData).to.eq("27");
-    });
-    dataSources.ReadQueryTableResponse(3).then(($cellData) => {
-      expect($cellData).to.eq("27");
-    });
-    dataSources.ReadQueryTableResponse(4).then(($cellData) => {
-      expect($cellData).to.eq("Jw==");
-    });
-  });
-
-  it("9. Validating Binary (bytea) - escape, hex, base64 functions, conts", () => {
-    //Validating backslash
-    query = `select encode('\\\\'::bytea, 'escape') as "backslash Escape1", encode('\\134'::bytea, 'escape') as "backslash Escape2", encode('\\\\'::bytea, 'hex') as "backslash Hex1", encode('\\134'::bytea, 'hex') as "backslash Hex2", encode('\\\\'::bytea, 'base64') as "backslash Base64";`;
-    dataSources.EnterQuery(query);
-    dataSources.RunQuery();
-    dataSources.AssertQueryResponseHeaders([
-      "backslash Escape1",
-      "backslash Escape2",
-      "backslash Hex1",
-      "backslash Hex2",
-      "backslash Base64",
-    ]);
-    dataSources.ReadQueryTableResponse(0).then(($cellData) => {
-      expect($cellData).to.eq("\\\\");
-    });
-    dataSources.ReadQueryTableResponse(1).then(($cellData) => {
-      expect($cellData).to.eq("\\\\");
-    });
-    dataSources.ReadQueryTableResponse(2).then(($cellData) => {
-      expect($cellData).to.eq("5c");
-    });
-    dataSources.ReadQueryTableResponse(3).then(($cellData) => {
-      expect($cellData).to.eq("5c");
-    });
-    dataSources.ReadQueryTableResponse(4).then(($cellData) => {
-      expect($cellData).to.eq("XA==");
-    });
+    it("8. Validating Binary (bytea) - escape, hex, base64 functions", () => {
+      deployMode.NavigateBacktoEditor();
+      table.WaitUntilTableLoad();
+      PageLeftPane.switchSegment(PagePaneSegment.Queries);
+      //Validating zero octet
+      query = `select encode('\\000'::bytea, 'hex') as "zero octet Hex", encode('\\000'::bytea, 'escape') as "zero octet Escape";`;
+      dataSources.CreateQueryForDS(dsName, query, "verifyBinaryFunctions");
+      dataSources.RunQuery();
+      dataSources.AssertQueryResponseHeaders([
+        "zero octet Hex",
+        "zero octet Escape",
+      ]);
+      dataSources.ReadQueryTableResponse(0).then(($cellData) => {
+        expect($cellData).to.eq("00");
+      });
+      dataSources.ReadQueryTableResponse(1).then(($cellData) => {
+        expect($cellData).to.eq(`\\000`);
+      });
 
-    //Validating random string
-    query = `select encode('abc \\153\\154\\155 \\052\\251\\124'::bytea::bytea, 'escape') as "string bytea_output Escape", encode('abc \\153\\154\\155 \\052\\251\\124'::bytea::bytea, 'hex') as "string bytea_output Hex", encode('abc \\153\\154\\155 \\052\\251\\124'::bytea::bytea, 'base64') as "string bytea_output Base64";`;
-    dataSources.EnterQuery(query);
-    dataSources.RunQuery();
-    dataSources.AssertQueryResponseHeaders([
-      "string bytea_output Escape",
-      "string bytea_output Hex",
-      "string bytea_output Base64",
-    ]);
-    dataSources.ReadQueryTableResponse(0).then(($cellData) => {
-      expect($cellData).to.eq(`abc klm *\\251T`);
-    });
-    dataSources.ReadQueryTableResponse(1).then(($cellData) => {
-      expect($cellData).to.eq("616263206b6c6d202aa954");
-    });
-    dataSources.ReadQueryTableResponse(2).then(($cellData) => {
-      expect($cellData).to.eq("YWJjIGtsbSAqqVQ=");
+      //Validating single quote
+      query = `select encode(''''::bytea, 'escape') as "single quote Escape1", encode('\\047'::bytea, 'escape') as "single quote Escape2", encode(''''::bytea, 'hex') as "single quote Hex1", encode('\\047'::bytea, 'hex') as "single quote Hex2", encode(''''::bytea, 'base64') as "single quote Base64";`;
+      dataSources.EnterQuery(query);
+      dataSources.RunQuery();
+      dataSources.AssertQueryResponseHeaders([
+        "single quote Escape1",
+        "single quote Escape2",
+        "single quote Hex1",
+        "single quote Hex2",
+        "single quote Base64",
+      ]);
+      dataSources.ReadQueryTableResponse(0).then(($cellData) => {
+        expect($cellData).to.eq("'");
+      });
+      dataSources.ReadQueryTableResponse(1).then(($cellData) => {
+        expect($cellData).to.eq("'");
+      });
+      dataSources.ReadQueryTableResponse(2).then(($cellData) => {
+        expect($cellData).to.eq("27");
+      });
+      dataSources.ReadQueryTableResponse(3).then(($cellData) => {
+        expect($cellData).to.eq("27");
+      });
+      dataSources.ReadQueryTableResponse(4).then(($cellData) => {
+        expect($cellData).to.eq("Jw==");
+      });
     });
 
-    //Validating text value1
-    query = `select encode(E'123abc456', 'escape') as "Escape1", encode(E'123abc456', 'hex') as "Hex1", encode('abc456', 'escape') as "Escape2", encode('abc456', 'hex') as "Hex2", encode(E'123\\\\000456'::bytea, 'escape') as "Escape3", encode(E'123\\\\000456'::bytea, 'hex') as "Hex3";`;
-    dataSources.EnterQuery(query);
-    dataSources.RunQuery();
-    dataSources.AssertQueryResponseHeaders([
-      "Escape1",
-      "Hex1",
-      "Escape2",
-      "Hex2",
-      "Escape3",
-      "Hex3",
-    ]);
-    dataSources.ReadQueryTableResponse(0).then(($cellData) => {
-      expect($cellData).to.eq("123abc456");
-    });
-    dataSources.ReadQueryTableResponse(1).then(($cellData) => {
-      expect($cellData).to.eq("313233616263343536");
-    });
-    dataSources.ReadQueryTableResponse(2).then(($cellData) => {
-      expect($cellData).to.eq("abc456");
-    });
-    dataSources.ReadQueryTableResponse(3).then(($cellData) => {
-      expect($cellData).to.eq("616263343536");
-    });
-    dataSources.ReadQueryTableResponse(4).then(($cellData) => {
-      expect($cellData).to.eq(`123\\000456`);
-    });
-    dataSources.ReadQueryTableResponse(5).then(($cellData) => {
-      expect($cellData).to.eq("31323300343536");
-    });
+    it("9. Validating Binary (bytea) - escape, hex, base64 functions, conts", () => {
+      //Validating backslash
+      query = `select encode('\\\\'::bytea, 'escape') as "backslash Escape1", encode('\\134'::bytea, 'escape') as "backslash Escape2", encode('\\\\'::bytea, 'hex') as "backslash Hex1", encode('\\134'::bytea, 'hex') as "backslash Hex2", encode('\\\\'::bytea, 'base64') as "backslash Base64";`;
+      dataSources.EnterQuery(query);
+      dataSources.RunQuery();
+      dataSources.AssertQueryResponseHeaders([
+        "backslash Escape1",
+        "backslash Escape2",
+        "backslash Hex1",
+        "backslash Hex2",
+        "backslash Base64",
+      ]);
+      dataSources.ReadQueryTableResponse(0).then(($cellData) => {
+        expect($cellData).to.eq("\\\\");
+      });
+      dataSources.ReadQueryTableResponse(1).then(($cellData) => {
+        expect($cellData).to.eq("\\\\");
+      });
+      dataSources.ReadQueryTableResponse(2).then(($cellData) => {
+        expect($cellData).to.eq("5c");
+      });
+      dataSources.ReadQueryTableResponse(3).then(($cellData) => {
+        expect($cellData).to.eq("5c");
+      });
+      dataSources.ReadQueryTableResponse(4).then(($cellData) => {
+        expect($cellData).to.eq("XA==");
+      });
 
-    agHelper.ActionContextMenuWithInPane({
-      action: "Delete",
-      entityType: entityItems.Query,
-    });
-    AppSidebar.navigate(AppSidebarButton.Editor);
-  });
-  // after(
-  //   "Validate Drop of the Newly Created - binarytype - Table & Verify Deletion of all created queries",
-  //   () => {
-  //     //Drop table
-  //     deployMode.NavigateBacktoEditor();
-  //     entityExplorer.ExpandCollapseEntity("Queries/JS");
-  //     entityExplorer.SelectEntityByName("dropTable");
-  //     dataSources.RunQuery();
-  //     dataSources.ReadQueryTableResponse(0).then(($cellData) => {
-  //       expect($cellData).to.eq("0"); //Success response for dropped table!
-  //     });
-  //     entityExplorer.ExpandCollapseEntity("Queries/JS", false);
-  //     entityExplorer.ExpandCollapseEntity("Datasources");
-  //     entityExplorer.ExpandCollapseEntity(dsName);
-  //     entityExplorer.ActionContextMenuByEntityName(dsName, "Refresh");
-  //     agHelper.AssertElementAbsence(
-  //       entityExplorer._entityNameInExplorer("public.binarytype"),
-  //     );
-
-  //     //Delete all queries
-  //     dataSources.DeleteDatasourceFromWithinDS(dsName, 409); //Since all queries exists
-  //     entityExplorer.ExpandCollapseEntity("Queries/JS");
-  //      entityExplorer.DeleteAllQueriesForDB(dsName);
-
-  //     //Delete DS
-  //     deployMode.DeployApp();
-  //     deployMode.NavigateBacktoEditor();
-  //     entityExplorer.ExpandCollapseEntity("Queries/JS");
-  //     dataSources.DeleteDatasourceFromWithinDS(dsName, 200);
-  //   },
-  // );
-});
+      //Validating random string
+      query = `select encode('abc \\153\\154\\155 \\052\\251\\124'::bytea::bytea, 'escape') as "string bytea_output Escape", encode('abc \\153\\154\\155 \\052\\251\\124'::bytea::bytea, 'hex') as "string bytea_output Hex", encode('abc \\153\\154\\155 \\052\\251\\124'::bytea::bytea, 'base64') as "string bytea_output Base64";`;
+      dataSources.EnterQuery(query);
+      dataSources.RunQuery();
+      dataSources.AssertQueryResponseHeaders([
+        "string bytea_output Escape",
+        "string bytea_output Hex",
+        "string bytea_output Base64",
+      ]);
+      dataSources.ReadQueryTableResponse(0).then(($cellData) => {
+        expect($cellData).to.eq(`abc klm *\\251T`);
+      });
+      dataSources.ReadQueryTableResponse(1).then(($cellData) => {
+        expect($cellData).to.eq("616263206b6c6d202aa954");
+      });
+      dataSources.ReadQueryTableResponse(2).then(($cellData) => {
+        expect($cellData).to.eq("YWJjIGtsbSAqqVQ=");
+      });
+
+      //Validating text value1
+      query = `select encode(E'123abc456', 'escape') as "Escape1", encode(E'123abc456', 'hex') as "Hex1", encode('abc456', 'escape') as "Escape2", encode('abc456', 'hex') as "Hex2", encode(E'123\\\\000456'::bytea, 'escape') as "Escape3", encode(E'123\\\\000456'::bytea, 'hex') as "Hex3";`;
+      dataSources.EnterQuery(query);
+      dataSources.RunQuery();
+      dataSources.AssertQueryResponseHeaders([
+        "Escape1",
+        "Hex1",
+        "Escape2",
+        "Hex2",
+        "Escape3",
+        "Hex3",
+      ]);
+      dataSources.ReadQueryTableResponse(0).then(($cellData) => {
+        expect($cellData).to.eq("123abc456");
+      });
+      dataSources.ReadQueryTableResponse(1).then(($cellData) => {
+        expect($cellData).to.eq("313233616263343536");
+      });
+      dataSources.ReadQueryTableResponse(2).then(($cellData) => {
+        expect($cellData).to.eq("abc456");
+      });
+      dataSources.ReadQueryTableResponse(3).then(($cellData) => {
+        expect($cellData).to.eq("616263343536");
+      });
+      dataSources.ReadQueryTableResponse(4).then(($cellData) => {
+        expect($cellData).to.eq(`123\\000456`);
+      });
+      dataSources.ReadQueryTableResponse(5).then(($cellData) => {
+        expect($cellData).to.eq("31323300343536");
+      });
+
+      agHelper.ActionContextMenuWithInPane({
+        action: "Delete",
+        entityType: entityItems.Query,
+      });
+      AppSidebar.navigate(AppSidebarButton.Editor);
+    });
+    // after(
+    //   "Validate Drop of the Newly Created - binarytype - Table & Verify Deletion of all created queries",
+    //   () => {
+    //     //Drop table
+    //     deployMode.NavigateBacktoEditor();
+    //     entityExplorer.ExpandCollapseEntity("Queries/JS");
+    //     entityExplorer.SelectEntityByName("dropTable");
+    //     dataSources.RunQuery();
+    //     dataSources.ReadQueryTableResponse(0).then(($cellData) => {
+    //       expect($cellData).to.eq("0"); //Success response for dropped table!
+    //     });
+    //     entityExplorer.ExpandCollapseEntity("Queries/JS", false);
+    //     entityExplorer.ExpandCollapseEntity("Datasources");
+    //     entityExplorer.ExpandCollapseEntity(dsName);
+    //     entityExplorer.ActionContextMenuByEntityName(dsName, "Refresh");
+    //     agHelper.AssertElementAbsence(
+    //       entityExplorer._entityNameInExplorer("public.binarytype"),
+    //     );
+
+    //     //Delete all queries
+    //     dataSources.DeleteDatasourceFromWithinDS(dsName, 409); //Since all queries exists
+    //     entityExplorer.ExpandCollapseEntity("Queries/JS");
+    //      entityExplorer.DeleteAllQueriesForDB(dsName);
+
+    //     //Delete DS
+    //     deployMode.DeployApp();
+    //     deployMode.NavigateBacktoEditor();
+    //     entityExplorer.ExpandCollapseEntity("Queries/JS");
+    //     dataSources.DeleteDatasourceFromWithinDS(dsName, 200);
+    //   },
+    // );
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/BooleanEnum_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/BooleanEnum_Spec.ts
index fc0f5f1c7ae1..ed587c29a7ce 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/BooleanEnum_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/BooleanEnum_Spec.ts
@@ -17,7 +17,7 @@ import EditorNavigation, {
 
 describe(
   "Boolean & Enum Datatype tests",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   function () {
     let dsName: any, query: string;
 
diff --git a/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Character_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Character_Spec.ts
index 5f4cc6862d06..a8ed6a0d73ff 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Character_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Character_Spec.ts
@@ -17,7 +17,7 @@ import EditorNavigation, {
 
 describe(
   "Character Datatype tests",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   function () {
     let dsName: any, query: string;
 
diff --git a/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/DateTime_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/DateTime_Spec.ts
index c0ad3c9fb1cb..d63bcee9d3c3 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/DateTime_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/DateTime_Spec.ts
@@ -16,325 +16,353 @@ import EditorNavigation, {
   EntityType,
 } from "../../../../support/Pages/EditorNavigation";
 
-describe("DateTime Datatype tests", { tags: ["@tag.Datasource"] }, function () {
-  let dsName: any, query: string;
+describe(
+  "DateTime Datatype tests",
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
+  function () {
+    let dsName: any, query: string;
 
-  before("Create Postgress DS", () => {
-    agHelper.AddDsl("Datatypes/DateTimeDTdsl");
-    appSettings.OpenPaneAndChangeThemeColors(22, 32);
-    dataSources.CreateDataSource("Postgres");
-    cy.get("@dsName").then(($dsName) => {
-      dsName = $dsName;
+    before("Create Postgress DS", () => {
+      agHelper.AddDsl("Datatypes/DateTimeDTdsl");
+      appSettings.OpenPaneAndChangeThemeColors(22, 32);
+      dataSources.CreateDataSource("Postgres");
+      cy.get("@dsName").then(($dsName) => {
+        dsName = $dsName;
+      });
     });
-  });
 
-  it("1. Creating table - datetimetypes", () => {
-    query = `CREATE TABLE datetimeTypes (serialId serial primary key, ts TIMESTAMP not null DEFAULT NOW(),
+    it("1. Creating table - datetimetypes", () => {
+      query = `CREATE TABLE datetimeTypes (serialId serial primary key, ts TIMESTAMP not null DEFAULT NOW(),
     tstz TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP, dater date NOT NULL, timer time NOT NULL,
     timertz time with time zone not null default now(), intervaler interval not null);`;
-    dataSources.CreateQueryForDS(dsName, query, "createTable");
-    agHelper.FocusElement(locators._codeMirrorTextArea);
-    dataSources.RunQuery();
-  });
+      dataSources.CreateQueryForDS(dsName, query, "createTable");
+      agHelper.FocusElement(locators._codeMirrorTextArea);
+      dataSources.RunQuery();
+    });
 
-  it("2. Creating SELECT query - datetimetypes + Bug 14493", () => {
-    query = `SELECT *, TO_CHAR(datetimeT.dater , 'dd.mm.yyyy') as "dd.mm.yyyy",
+    it("2. Creating SELECT query - datetimetypes + Bug 14493", () => {
+      query = `SELECT *, TO_CHAR(datetimeT.dater , 'dd.mm.yyyy') as "dd.mm.yyyy",
     TO_CHAR (datetimeT.ts, 'MM/DD/YYYY HH12:MI:SS AM') as "MM/DD/YYYY",
     TO_CHAR (datetimeT.ts, 'YYYY')||' / ' || TO_CHAR (datetimeT.dater, 'YYY') as "YYYY/YYY",
     TO_CHAR (datetimeT.ts, 'MONTH') ||' / ' || TO_CHAR(datetimeT.dater, 'Month') as "MONTH/Month",
     TO_CHAR (datetimeT.dater, 'D') ||' / ' || TO_CHAR(datetimeT.dater, 'day') as "Day of the wentityExplorer.k/WentityExplorer.kday",
     TO_CHAR (datetimeT.dater, 'W') as "WentityExplorer.k of Month" FROM public."datetimetypes" as datetimeT;`;
-    dataSources.createQueryWithDatasourceSchemaTemplate(
-      dsName,
-      "public.datetimetypes",
-      "Select",
-    );
-    dataSources.RunQuery();
-    agHelper
-      .GetText(dataSources._noRecordFound)
-      .then(($noRecMsg) => expect($noRecMsg).to.eq("No data records to show"));
-    dataSources.EnterQuery(query);
-    agHelper.RenameWithInPane("selectRecords");
-  });
+      dataSources.createQueryWithDatasourceSchemaTemplate(
+        dsName,
+        "public.datetimetypes",
+        "Select",
+      );
+      dataSources.RunQuery();
+      agHelper
+        .GetText(dataSources._noRecordFound)
+        .then(($noRecMsg) =>
+          expect($noRecMsg).to.eq("No data records to show"),
+        );
+      dataSources.EnterQuery(query);
+      agHelper.RenameWithInPane("selectRecords");
+    });
 
-  it("3. Creating all queries - datetimetypes", () => {
-    query = `INSERT INTO public."datetimetypes" (ts, tstz, dater, timer, intervaler)
+    it("3. Creating all queries - datetimetypes", () => {
+      query = `INSERT INTO public."datetimetypes" (ts, tstz, dater, timer, intervaler)
     VALUES('{{Insertts.text}}', '{{Inserttstz.text}}', '{{Insertdater.text}}', '{{Inserttimer.text}}', '{{Insertintervaler.text}}');`;
-    dataSources.createQueryWithDatasourceSchemaTemplate(
-      dsName,
-      "public.datetimetypes",
-      "Insert",
-    );
-    dataSources.EnterQuery(query);
-    agHelper.RenameWithInPane("insertRecord");
-    dataSources.ToggleUsePreparedStatement(false);
+      dataSources.createQueryWithDatasourceSchemaTemplate(
+        dsName,
+        "public.datetimetypes",
+        "Insert",
+      );
+      dataSources.EnterQuery(query);
+      agHelper.RenameWithInPane("insertRecord");
+      dataSources.ToggleUsePreparedStatement(false);
 
-    query = `UPDATE public."datetimetypes" SET
+      query = `UPDATE public."datetimetypes" SET
     "ts" = '{{Updatets.text}}', "tstz" = '{{Updatetstz.text}}', "dater" = '{{Updatedater.text}}', "timer" = '{{Updatetimer.text}}',
     "intervaler" = '{{Updateintervaler.text}}' WHERE serialid = {{Table1.selectedRow.serialid}};`;
-    dataSources.createQueryWithDatasourceSchemaTemplate(
-      dsName,
-      "public.datetimetypes",
-      "Update",
-    );
-    dataSources.EnterQuery(query);
-    agHelper.RenameWithInPane("updateRecord");
-    dataSources.ToggleUsePreparedStatement(false);
+      dataSources.createQueryWithDatasourceSchemaTemplate(
+        dsName,
+        "public.datetimetypes",
+        "Update",
+      );
+      dataSources.EnterQuery(query);
+      agHelper.RenameWithInPane("updateRecord");
+      dataSources.ToggleUsePreparedStatement(false);
 
-    query = `DELETE FROM public."datetimetypes"`;
-    dataSources.createQueryWithDatasourceSchemaTemplate(
-      dsName,
-      "public.datetimetypes",
-      "Delete",
-    );
-    dataSources.EnterQuery(query);
-    agHelper.RenameWithInPane("deleteAllRecords");
+      query = `DELETE FROM public."datetimetypes"`;
+      dataSources.createQueryWithDatasourceSchemaTemplate(
+        dsName,
+        "public.datetimetypes",
+        "Delete",
+      );
+      dataSources.EnterQuery(query);
+      agHelper.RenameWithInPane("deleteAllRecords");
 
-    query = `drop table public."datetimetypes"`;
-    dataSources.createQueryWithDatasourceSchemaTemplate(
-      dsName,
-      "public.datetimetypes",
-      "Delete",
-    );
-    dataSources.EnterQuery(query);
-    agHelper.RenameWithInPane("dropTable");
+      query = `drop table public."datetimetypes"`;
+      dataSources.createQueryWithDatasourceSchemaTemplate(
+        dsName,
+        "public.datetimetypes",
+        "Delete",
+      );
+      dataSources.EnterQuery(query);
+      agHelper.RenameWithInPane("dropTable");
 
-    query = `DELETE FROM public."datetimetypes"
+      query = `DELETE FROM public."datetimetypes"
     WHERE serialId = {{Table1.selectedRow.serialid}};`;
-    dataSources.createQueryWithDatasourceSchemaTemplate(
-      dsName,
-      "public.datetimetypes",
-      "Delete",
-    );
-    dataSources.EnterQuery(query);
-    agHelper.RenameWithInPane("deleteRecord");
-  });
+      dataSources.createQueryWithDatasourceSchemaTemplate(
+        dsName,
+        "public.datetimetypes",
+        "Delete",
+      );
+      dataSources.EnterQuery(query);
+      agHelper.RenameWithInPane("deleteRecord");
+    });
 
-  it("4. Validating interval methods", () => {
-    query = `SELECT
+    it("4. Validating interval methods", () => {
+      query = `SELECT
     justify_interval(interval '1 year - 1 hour'),
    justify_days(INTERVAL '30 days'),
    justify_hours(INTERVAL '24 hours'),
    EXTRACT (MINUTE  FROM  INTERVAL '5 hours 21 minutes');`;
-    dataSources.createQueryWithDatasourceSchemaTemplate(
-      dsName,
-      "public.datetimetypes",
-      "Select",
-    );
-    dataSources.EnterQuery(query);
-    agHelper.RenameWithInPane("intervalRecords");
-    dataSources.RunQuery();
-    dataSources.ReadQueryTableResponse(0).then(($cellData) => {
-      expect($cellData).to.eq(
-        "0 years 11 mons 29 days 23 hours 0 mins 0.0 secs",
+      dataSources.createQueryWithDatasourceSchemaTemplate(
+        dsName,
+        "public.datetimetypes",
+        "Select",
       );
+      dataSources.EnterQuery(query);
+      agHelper.RenameWithInPane("intervalRecords");
+      dataSources.RunQuery();
+      dataSources.ReadQueryTableResponse(0).then(($cellData) => {
+        expect($cellData).to.eq(
+          "0 years 11 mons 29 days 23 hours 0 mins 0.0 secs",
+        );
+      });
+      dataSources.ReadQueryTableResponse(1).then(($cellData) => {
+        expect($cellData).to.eq(
+          "0 years 1 mons 0 days 0 hours 0 mins 0.0 secs",
+        );
+      });
+      dataSources.ReadQueryTableResponse(2).then(($cellData) => {
+        expect($cellData).to.eq(
+          "0 years 0 mons 1 days 0 hours 0 mins 0.0 secs",
+        );
+      });
+      dataSources.ReadQueryTableResponse(3).then(($cellData) => {
+        expect($cellData).to.eq("21");
+      });
+      agHelper.ActionContextMenuWithInPane({
+        action: "Delete",
+        entityType: entityItems.Query,
+      });
+      AppSidebar.navigate(AppSidebarButton.Editor);
     });
-    dataSources.ReadQueryTableResponse(1).then(($cellData) => {
-      expect($cellData).to.eq("0 years 1 mons 0 days 0 hours 0 mins 0.0 secs");
-    });
-    dataSources.ReadQueryTableResponse(2).then(($cellData) => {
-      expect($cellData).to.eq("0 years 0 mons 1 days 0 hours 0 mins 0.0 secs");
-    });
-    dataSources.ReadQueryTableResponse(3).then(($cellData) => {
-      expect($cellData).to.eq("21");
-    });
-    agHelper.ActionContextMenuWithInPane({
-      action: "Delete",
-      entityType: entityItems.Query,
-    });
-    AppSidebar.navigate(AppSidebarButton.Editor);
-  });
 
-  it("5. Inserting record - datetimetypes", () => {
-    EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
-    deployMode.DeployApp();
-    table.WaitForTableEmpty(); //asserting table is empty before inserting!
-    agHelper.ClickButton("Run InsertQuery");
-    agHelper.AssertElementVisibility(locators._modal);
+    it("5. Inserting record - datetimetypes", () => {
+      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+      deployMode.DeployApp();
+      table.WaitForTableEmpty(); //asserting table is empty before inserting!
+      agHelper.ClickButton("Run InsertQuery");
+      agHelper.AssertElementVisibility(locators._modal);
 
-    agHelper.EnterInputText("Ts", "2016-06-22 19:10:25-07");
-    agHelper.EnterInputText("Tstz", "2016-06-22 19:10:25-07");
-    agHelper.EnterInputText("Dater", "January 19, 1989");
-    agHelper.EnterInputText("Timer", "04:05 PM");
-    agHelper.EnterInputText("Intervaler", "P6Y5M4DT3H2M1S");
+      agHelper.EnterInputText("Ts", "2016-06-22 19:10:25-07");
+      agHelper.EnterInputText("Tstz", "2016-06-22 19:10:25-07");
+      agHelper.EnterInputText("Dater", "January 19, 1989");
+      agHelper.EnterInputText("Timer", "04:05 PM");
+      agHelper.EnterInputText("Intervaler", "P6Y5M4DT3H2M1S");
 
-    agHelper.ClickButton("Insert");
-    agHelper.AssertElementVisibility(locators._buttonByText("Run InsertQuery"));
-    table.ReadTableRowColumnData(0, 0, "v1", 2000).then(($cellData) => {
-      expect($cellData).to.eq("1"); //asserting serial column is inserting fine in sequence
-    });
-    table.ReadTableRowColumnData(0, 1, "v1", 200).then(($ts) => {
-      table.ReadTableRowColumnData(0, 2, "v1", 200).then(($tstz) => {
-        expect($ts).to.not.eq($tstz); //ts & tstz not equal since tstz is time zone applied
+      agHelper.ClickButton("Insert");
+      agHelper.AssertElementVisibility(
+        locators._buttonByText("Run InsertQuery"),
+      );
+      table.ReadTableRowColumnData(0, 0, "v1", 2000).then(($cellData) => {
+        expect($cellData).to.eq("1"); //asserting serial column is inserting fine in sequence
       });
+      table.ReadTableRowColumnData(0, 1, "v1", 200).then(($ts) => {
+        table.ReadTableRowColumnData(0, 2, "v1", 200).then(($tstz) => {
+          expect($ts).to.not.eq($tstz); //ts & tstz not equal since tstz is time zone applied
+        });
+      });
+      table.ReadTableRowColumnData(0, 3, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq("1989-01-19"); //date format!
+      });
+      table.ReadTableRowColumnData(0, 4, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq("16:05:00"); //time format
+      });
+      table.ReadTableRowColumnData(0, 6, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq(
+          "6 years 5 mons 4 days 3 hours 2 mins 1.0 secs",
+        ); //Interval format!
+      });
+      table.ReadTableRowColumnData(0, 7).then(($cellData) => {
+        expect($cellData).to.eq("19.01.1989");
+      });
+      agHelper
+        .GetText(table._showPageItemsCount)
+        .then(($count) => expect($count).contain("1"));
     });
-    table.ReadTableRowColumnData(0, 3, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("1989-01-19"); //date format!
-    });
-    table.ReadTableRowColumnData(0, 4, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("16:05:00"); //time format
-    });
-    table.ReadTableRowColumnData(0, 6, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("6 years 5 mons 4 days 3 hours 2 mins 1.0 secs"); //Interval format!
-    });
-    table.ReadTableRowColumnData(0, 7).then(($cellData) => {
-      expect($cellData).to.eq("19.01.1989");
-    });
-    agHelper
-      .GetText(table._showPageItemsCount)
-      .then(($count) => expect($count).contain("1"));
-  });
 
-  it("6. Inserting another format of record - datetimetypes", () => {
-    agHelper.ClickButton("Run InsertQuery");
-    agHelper.AssertElementVisibility(locators._modal);
+    it("6. Inserting another format of record - datetimetypes", () => {
+      agHelper.ClickButton("Run InsertQuery");
+      agHelper.AssertElementVisibility(locators._modal);
 
-    agHelper.EnterInputText("Ts", "2020-10-05 14:01:10-08");
-    agHelper.EnterInputText("Tstz", "2020-10-05 14:01:10-08");
-    agHelper.EnterInputText("Dater", "20451229");
-    agHelper.EnterInputText("Timer", "04:05 AM");
-    agHelper.EnterInputText("Intervaler", "3 4:05:06");
+      agHelper.EnterInputText("Ts", "2020-10-05 14:01:10-08");
+      agHelper.EnterInputText("Tstz", "2020-10-05 14:01:10-08");
+      agHelper.EnterInputText("Dater", "20451229");
+      agHelper.EnterInputText("Timer", "04:05 AM");
+      agHelper.EnterInputText("Intervaler", "3 4:05:06");
 
-    agHelper.ClickButton("Insert");
-    agHelper.AssertElementVisibility(locators._buttonByText("Run InsertQuery"));
+      agHelper.ClickButton("Insert");
+      agHelper.AssertElementVisibility(
+        locators._buttonByText("Run InsertQuery"),
+      );
 
-    table.ReadTableRowColumnData(1, 0, "v1", 2000).then(($cellData) => {
-      expect($cellData).to.eq("2"); //asserting serial column is inserting fine in sequence
-    });
-    table.ReadTableRowColumnData(1, 1, "v1", 200).then(($ts) => {
-      table.ReadTableRowColumnData(1, 2, "v1", 200).then(($tstz) => {
-        expect($ts).to.not.eq($tstz); //ts & tstz not equal since tstz is time zone applied
+      table.ReadTableRowColumnData(1, 0, "v1", 2000).then(($cellData) => {
+        expect($cellData).to.eq("2"); //asserting serial column is inserting fine in sequence
       });
+      table.ReadTableRowColumnData(1, 1, "v1", 200).then(($ts) => {
+        table.ReadTableRowColumnData(1, 2, "v1", 200).then(($tstz) => {
+          expect($ts).to.not.eq($tstz); //ts & tstz not equal since tstz is time zone applied
+        });
+      });
+      table.ReadTableRowColumnData(1, 3, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq("2045-12-29");
+      });
+      table.ReadTableRowColumnData(1, 4, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq("04:05:00");
+      });
+      table.ReadTableRowColumnData(1, 6, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq(
+          "0 years 0 mons 3 days 4 hours 5 mins 6.0 secs",
+        );
+      });
+      table.ReadTableRowColumnData(1, 7, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq("29.12.2045");
+      });
+      agHelper
+        .GetText(table._showPageItemsCount)
+        .then(($count) => expect($count).contain("2"));
     });
-    table.ReadTableRowColumnData(1, 3, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("2045-12-29");
-    });
-    table.ReadTableRowColumnData(1, 4, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("04:05:00");
-    });
-    table.ReadTableRowColumnData(1, 6, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("0 years 0 mons 3 days 4 hours 5 mins 6.0 secs");
-    });
-    table.ReadTableRowColumnData(1, 7, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("29.12.2045");
-    });
-    agHelper
-      .GetText(table._showPageItemsCount)
-      .then(($count) => expect($count).contain("2"));
-  });
 
-  it("7. Updating record (emtying some field) - datetimetypes", () => {
-    table.SelectTableRow(1);
-    agHelper.ClickButton("Run UpdateQuery");
-    agHelper.AssertElementVisibility(locators._modal);
+    it("7. Updating record (emtying some field) - datetimetypes", () => {
+      table.SelectTableRow(1);
+      agHelper.ClickButton("Run UpdateQuery");
+      agHelper.AssertElementVisibility(locators._modal);
 
-    agHelper.EnterInputText("Ts", "2019-07-01", true);
-    agHelper.EnterInputText("Tstz", "2019-07-01 00:00:00+11", true);
-    agHelper.EnterInputText("Dater", "17-Mar-2014", true);
-    agHelper.EnterInputText("Timer", "04:05:06.789", true);
-    agHelper.EnterInputText("Intervaler", "P0001-03-02T06:04:05", true);
+      agHelper.EnterInputText("Ts", "2019-07-01", true);
+      agHelper.EnterInputText("Tstz", "2019-07-01 00:00:00+11", true);
+      agHelper.EnterInputText("Dater", "17-Mar-2014", true);
+      agHelper.EnterInputText("Timer", "04:05:06.789", true);
+      agHelper.EnterInputText("Intervaler", "P0001-03-02T06:04:05", true);
 
-    agHelper.ClickButton("Update");
-    agHelper.AssertElementVisibility(locators._buttonByText("Run UpdateQuery"));
-    table.ReadTableRowColumnData(1, 0, "v1", 2000).then(($cellData) => {
-      expect($cellData).to.eq("2"); //asserting serial column is same
-    });
-    table.ReadTableRowColumnData(1, 1, "v1", 200).then(($ts) => {
-      table.ReadTableRowColumnData(1, 2, "v1", 200).then(($tstz) => {
-        expect($ts).to.not.eq($tstz);
+      agHelper.ClickButton("Update");
+      agHelper.AssertElementVisibility(
+        locators._buttonByText("Run UpdateQuery"),
+      );
+      table.ReadTableRowColumnData(1, 0, "v1", 2000).then(($cellData) => {
+        expect($cellData).to.eq("2"); //asserting serial column is same
       });
+      table.ReadTableRowColumnData(1, 1, "v1", 200).then(($ts) => {
+        table.ReadTableRowColumnData(1, 2, "v1", 200).then(($tstz) => {
+          expect($ts).to.not.eq($tstz);
+        });
+      });
+      table.ReadTableRowColumnData(1, 3, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq("2014-03-17");
+      });
+      table.ReadTableRowColumnData(1, 4, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq("04:05:06.789");
+      });
+      table.ReadTableRowColumnData(1, 6, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq(
+          "1 years 3 mons 2 days 6 hours 4 mins 5.0 secs",
+        );
+      });
+      table.ReadTableRowColumnData(1, 7, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq("17.03.2014");
+      });
+      agHelper
+        .GetText(table._showPageItemsCount)
+        .then(($count) => expect($count).contain("2"));
     });
-    table.ReadTableRowColumnData(1, 3, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("2014-03-17");
-    });
-    table.ReadTableRowColumnData(1, 4, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("04:05:06.789");
-    });
-    table.ReadTableRowColumnData(1, 6, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("1 years 3 mons 2 days 6 hours 4 mins 5.0 secs");
-    });
-    table.ReadTableRowColumnData(1, 7, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("17.03.2014");
-    });
-    agHelper
-      .GetText(table._showPageItemsCount)
-      .then(($count) => expect($count).contain("2"));
-  });
 
-  it("8. Deleting records - datetimetypes", () => {
-    agHelper.ClickButton("DeleteQuery", 1);
-    assertHelper.AssertNetworkStatus("@postExecute", 200);
-    assertHelper.AssertNetworkStatus("@postExecute", 200);
-    agHelper.Sleep(2500); //Allwowing time for delete to be success
-    agHelper
-      .GetText(table._showPageItemsCount)
-      .then(($count) => expect($count).contain("1")); //asserting 2nd record is deleted
-  });
+    it("8. Deleting records - datetimetypes", () => {
+      agHelper.ClickButton("DeleteQuery", 1);
+      assertHelper.AssertNetworkStatus("@postExecute", 200);
+      assertHelper.AssertNetworkStatus("@postExecute", 200);
+      agHelper.Sleep(2500); //Allwowing time for delete to be success
+      agHelper
+        .GetText(table._showPageItemsCount)
+        .then(($count) => expect($count).contain("1")); //asserting 2nd record is deleted
+    });
 
-  it("9. Inserting another record (+ve record - to check serial column) - datetimetypes", () => {
-    agHelper.ClickButton("Run InsertQuery");
-    agHelper.AssertElementVisibility(locators._modal);
+    it("9. Inserting another record (+ve record - to check serial column) - datetimetypes", () => {
+      agHelper.ClickButton("Run InsertQuery");
+      agHelper.AssertElementVisibility(locators._modal);
 
-    agHelper.EnterInputText("Ts", "February 8 04:05:06 1999");
-    agHelper.EnterInputText("Tstz", "February 10 04:05:06 1999 PST");
-    agHelper.EnterInputText("Dater", "J2451187"); // 20451229
-    agHelper.EnterInputText("Timer", "181416");
-    agHelper.EnterInputText("Intervaler", "1-2");
+      agHelper.EnterInputText("Ts", "February 8 04:05:06 1999");
+      agHelper.EnterInputText("Tstz", "February 10 04:05:06 1999 PST");
+      agHelper.EnterInputText("Dater", "J2451187"); // 20451229
+      agHelper.EnterInputText("Timer", "181416");
+      agHelper.EnterInputText("Intervaler", "1-2");
 
-    agHelper.ClickButton("Insert");
-    agHelper.AssertElementVisibility(locators._buttonByText("Run InsertQuery"));
+      agHelper.ClickButton("Insert");
+      agHelper.AssertElementVisibility(
+        locators._buttonByText("Run InsertQuery"),
+      );
 
-    table.ReadTableRowColumnData(1, 0, "v1", 2000).then(($cellData) => {
-      expect($cellData).to.eq("3"); //asserting serial column is inserting fine in sequence
-    });
-    table.ReadTableRowColumnData(1, 1, "v1", 200).then(($ts) => {
-      table.ReadTableRowColumnData(1, 2, "v1", 200).then(($tstz) => {
-        expect($ts).to.not.eq($tstz); //ts & tstz not equal since tstz is time zone applied
+      table.ReadTableRowColumnData(1, 0, "v1", 2000).then(($cellData) => {
+        expect($cellData).to.eq("3"); //asserting serial column is inserting fine in sequence
       });
+      table.ReadTableRowColumnData(1, 1, "v1", 200).then(($ts) => {
+        table.ReadTableRowColumnData(1, 2, "v1", 200).then(($tstz) => {
+          expect($ts).to.not.eq($tstz); //ts & tstz not equal since tstz is time zone applied
+        });
+      });
+      table.ReadTableRowColumnData(1, 3, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq("1999-01-08");
+      });
+      table.ReadTableRowColumnData(1, 4, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq("18:14:16");
+      });
+      table.ReadTableRowColumnData(1, 6, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq(
+          "1 years 2 mons 0 days 0 hours 0 mins 0.0 secs",
+        );
+      });
+      table.ReadTableRowColumnData(1, 7, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq("08.01.1999");
+      });
+      agHelper
+        .GetText(table._showPageItemsCount)
+        .then(($count) => expect($count).contain("2"));
     });
-    table.ReadTableRowColumnData(1, 3, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("1999-01-08");
-    });
-    table.ReadTableRowColumnData(1, 4, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("18:14:16");
-    });
-    table.ReadTableRowColumnData(1, 6, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("1 years 2 mons 0 days 0 hours 0 mins 0.0 secs");
-    });
-    table.ReadTableRowColumnData(1, 7, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("08.01.1999");
-    });
-    agHelper
-      .GetText(table._showPageItemsCount)
-      .then(($count) => expect($count).contain("2"));
-  });
 
-  it("10. Deleting all records from table - datetimetypes", () => {
-    agHelper.GetNClick(locators._deleteIcon);
-    agHelper.AssertElementVisibility(locators._buttonByText("Run InsertQuery"));
-    agHelper.Sleep(2000);
-    table.WaitForTableEmpty();
-  });
+    it("10. Deleting all records from table - datetimetypes", () => {
+      agHelper.GetNClick(locators._deleteIcon);
+      agHelper.AssertElementVisibility(
+        locators._buttonByText("Run InsertQuery"),
+      );
+      agHelper.Sleep(2000);
+      table.WaitForTableEmpty();
+    });
 
-  it("11. Validate Drop of the Newly Created - datetimetypes - Table from Postgres datasource", () => {
-    deployMode.NavigateBacktoEditor();
-    EditorNavigation.SelectEntityByName("dropTable", EntityType.Query);
-    dataSources.RunQuery();
-    dataSources.ReadQueryTableResponse(0).then(($cellData) => {
-      expect($cellData).to.eq("0"); //Success response for dropped table!
+    it("11. Validate Drop of the Newly Created - datetimetypes - Table from Postgres datasource", () => {
+      deployMode.NavigateBacktoEditor();
+      EditorNavigation.SelectEntityByName("dropTable", EntityType.Query);
+      dataSources.RunQuery();
+      dataSources.ReadQueryTableResponse(0).then(($cellData) => {
+        expect($cellData).to.eq("0"); //Success response for dropped table!
+      });
+      dataSources.AssertTableInVirtuosoList(
+        dsName,
+        "public.datetimetypes",
+        false,
+      );
     });
-    dataSources.AssertTableInVirtuosoList(
-      dsName,
-      "public.datetimetypes",
-      false,
-    );
-  });
 
-  it("12. Verify Deletion of the datasource after all created queries are deleted", () => {
-    dataSources.DeleteDatasourceFromWithinDS(dsName, 409); //Since all queries exists
-    entityExplorer.DeleteAllQueriesForDB(dsName);
-    deployMode.DeployApp();
-    deployMode.NavigateBacktoEditor();
-    dataSources.DeleteDatasourceFromWithinDS(dsName, 200); //ProductLines, EmployentityExplorer.s pages are still using this ds
-  });
-});
+    it("12. Verify Deletion of the datasource after all created queries are deleted", () => {
+      dataSources.DeleteDatasourceFromWithinDS(dsName, 409); //Since all queries exists
+      entityExplorer.DeleteAllQueriesForDB(dsName);
+      deployMode.DeployApp();
+      deployMode.NavigateBacktoEditor();
+      dataSources.DeleteDatasourceFromWithinDS(dsName, 200); //ProductLines, EmployentityExplorer.s pages are still using this ds
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Json_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Json_Spec.ts
index 01a6a7ba2edd..03371dcfb95e 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Json_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Json_Spec.ts
@@ -18,7 +18,7 @@ import { featureFlagIntercept } from "../../../../support/Objects/FeatureFlags";
 
 describe(
   "Json & JsonB Datatype tests",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   function () {
     let dsName: any, query: string;
 
diff --git a/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Numeric_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Numeric_Spec.ts
index d28ef7683d50..db11106b543c 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Numeric_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Numeric_Spec.ts
@@ -12,300 +12,328 @@ import EditorNavigation, {
   EntityType,
 } from "../../../../support/Pages/EditorNavigation";
 
-describe("Numeric Datatype tests", { tags: ["@tag.Datasource"] }, function () {
-  let dsName: any, query: string;
+describe(
+  "Numeric Datatype tests",
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
+  function () {
+    let dsName: any, query: string;
 
-  before("Create Postgress DS, set Theme", () => {
-    agHelper.AddDsl("Datatypes/NumericDTdsl");
+    before("Create Postgress DS, set Theme", () => {
+      agHelper.AddDsl("Datatypes/NumericDTdsl");
 
-    appSettings.OpenPaneAndChangeTheme("Moon");
-    dataSources.CreateDataSource("Postgres");
-    cy.get("@dsName").then(($dsName) => {
-      dsName = $dsName;
+      appSettings.OpenPaneAndChangeTheme("Moon");
+      dataSources.CreateDataSource("Postgres");
+      cy.get("@dsName").then(($dsName) => {
+        dsName = $dsName;
+      });
     });
-  });
 
-  it("1. Creating table - numerictypes", () => {
-    query = `create table numerictypes (serialId SERIAL not null primary key, bigintId bigint not null, decimalId decimal not null, numericId numeric not null)`;
-    dataSources.CreateQueryForDS(dsName, query, "createTable");
-    agHelper.FocusElement(locators._codeMirrorTextArea);
-    dataSources.RunQuery();
-  });
+    it("1. Creating table - numerictypes", () => {
+      query = `create table numerictypes (serialId SERIAL not null primary key, bigintId bigint not null, decimalId decimal not null, numericId numeric not null)`;
+      dataSources.CreateQueryForDS(dsName, query, "createTable");
+      agHelper.FocusElement(locators._codeMirrorTextArea);
+      dataSources.RunQuery();
+    });
 
-  it("2. Creating SELECT query - numerictypes + Bug 14493", () => {
-    dataSources.createQueryWithDatasourceSchemaTemplate(
-      dsName,
-      "public.numerictypes",
-      "Select",
-    );
-    dataSources.RunQuery();
-    agHelper
-      .GetText(dataSources._noRecordFound)
-      .then(($noRecMsg) => expect($noRecMsg).to.eq("No data records to show"));
-    agHelper.RenameWithInPane("selectRecords");
-  });
+    it("2. Creating SELECT query - numerictypes + Bug 14493", () => {
+      dataSources.createQueryWithDatasourceSchemaTemplate(
+        dsName,
+        "public.numerictypes",
+        "Select",
+      );
+      dataSources.RunQuery();
+      agHelper
+        .GetText(dataSources._noRecordFound)
+        .then(($noRecMsg) =>
+          expect($noRecMsg).to.eq("No data records to show"),
+        );
+      agHelper.RenameWithInPane("selectRecords");
+    });
 
-  it("3. Creating all queries - numerictypes", () => {
-    query = `INSERT INTO public."numerictypes" ("bigintid", "decimalid", "numericid")
+    it("3. Creating all queries - numerictypes", () => {
+      query = `INSERT INTO public."numerictypes" ("bigintid", "decimalid", "numericid")
     VALUES ({{Insertbigint.text}}, {{Insertdecimal.text}}, {{Insertnumeric.text}})`;
-    dataSources.createQueryWithDatasourceSchemaTemplate(
-      dsName,
-      "public.numerictypes",
-      "Insert",
-    );
-    dataSources.EnterQuery(query);
-    agHelper.RenameWithInPane("insertRecord");
+      dataSources.createQueryWithDatasourceSchemaTemplate(
+        dsName,
+        "public.numerictypes",
+        "Insert",
+      );
+      dataSources.EnterQuery(query);
+      agHelper.RenameWithInPane("insertRecord");
 
-    query = `UPDATE public."numerictypes" SET
+      query = `UPDATE public."numerictypes" SET
     "bigintid" = {{Updatebigint.text}},
     "decimalid" = {{Updatedecimal.text}},
     "numericid" = {{Updatenumeric.text}}
   WHERE serialid = {{Table1.selectedRow.serialid}};`;
-    dataSources.createQueryWithDatasourceSchemaTemplate(
-      dsName,
-      "public.numerictypes",
-      "Update",
-    );
-    dataSources.EnterQuery(query);
-    agHelper.RenameWithInPane("updateRecord");
+      dataSources.createQueryWithDatasourceSchemaTemplate(
+        dsName,
+        "public.numerictypes",
+        "Update",
+      );
+      dataSources.EnterQuery(query);
+      agHelper.RenameWithInPane("updateRecord");
 
-    query = `DELETE FROM public."numerictypes"`;
-    dataSources.createQueryWithDatasourceSchemaTemplate(
-      dsName,
-      "public.numerictypes",
-      "Delete",
-    );
-    dataSources.EnterQuery(query);
-    agHelper.RenameWithInPane("deleteAllRecords");
+      query = `DELETE FROM public."numerictypes"`;
+      dataSources.createQueryWithDatasourceSchemaTemplate(
+        dsName,
+        "public.numerictypes",
+        "Delete",
+      );
+      dataSources.EnterQuery(query);
+      agHelper.RenameWithInPane("deleteAllRecords");
 
-    query = `drop table public."numerictypes"`;
-    dataSources.createQueryWithDatasourceSchemaTemplate(
-      dsName,
-      "public.numerictypes",
-      "Delete",
-    );
-    dataSources.EnterQuery(query);
-    agHelper.RenameWithInPane("dropTable");
+      query = `drop table public."numerictypes"`;
+      dataSources.createQueryWithDatasourceSchemaTemplate(
+        dsName,
+        "public.numerictypes",
+        "Delete",
+      );
+      dataSources.EnterQuery(query);
+      agHelper.RenameWithInPane("dropTable");
 
-    query = `DELETE FROM public."numerictypes"
+      query = `DELETE FROM public."numerictypes"
     WHERE serialId ={{Table1.selectedRow.serialid}}`;
-    dataSources.createQueryWithDatasourceSchemaTemplate(
-      dsName,
-      "public.numerictypes",
-      "Delete",
-    );
-    dataSources.EnterQuery(query);
-    agHelper.RenameWithInPane("deleteRecord");
-  });
-
-  it("4. Inserting record (+ve limit) - numerictypes + Bug 14516", () => {
-    EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
-    deployMode.DeployApp();
-    table.WaitForTableEmpty(); //asserting table is empty before inserting!
-    agHelper.ClickButton("Run InsertQuery");
-    agHelper.AssertElementVisibility(locators._modal);
-    agHelper.EnterInputText("Bigintid", "922337203685477"); //9223372036854775807
-    agHelper.EnterInputText("Decimalid", "865456.987654567");
-    agHelper.EnterInputText("Numericid", "2147483647.2147484"); //2147483647.2147483647
-    agHelper.ClickButton("Insert");
-    agHelper.AssertElementVisibility(locators._buttonByText("Run InsertQuery"));
-    table.ReadTableRowColumnData(0, 0, "v1", 2000).then(($cellData) => {
-      expect($cellData).to.eq("1"); //asserting serial column is inserting fine in sequence
-    });
-    table.ReadTableRowColumnData(0, 1, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("922337203685477");
+      dataSources.createQueryWithDatasourceSchemaTemplate(
+        dsName,
+        "public.numerictypes",
+        "Delete",
+      );
+      dataSources.EnterQuery(query);
+      agHelper.RenameWithInPane("deleteRecord");
     });
-    table.ReadTableRowColumnData(0, 2, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("865456.987654567");
-    });
-    table.ReadTableRowColumnData(0, 3, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("2147483647.2147484");
-    });
-  });
 
-  it("5. Inserting record (-ve limit) - numerictypes + Bug 14516", () => {
-    agHelper.ClickButton("Run InsertQuery");
-    agHelper.AssertElementVisibility(locators._modal);
-    agHelper.EnterInputText("Bigintid", "-922337203685477"); //-9223372036854775808
-    agHelper.EnterInputText("Decimalid", "232143455655456.34"); //232143455655456.3434456565
-    agHelper.EnterInputText("Numericid", "9877700000.143423"); //9877700000.14342340008876
-    agHelper.ClickButton("Insert");
-    agHelper.AssertElementVisibility(locators._buttonByText("Run InsertQuery"));
-    table.ReadTableRowColumnData(1, 0, "v1", 2000).then(($cellData) => {
-      expect($cellData).to.eq("2"); //asserting serial column is inserting fine in sequence
-    });
-    table.ReadTableRowColumnData(1, 1, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("-922337203685477"); //-9223372036854775808
+    it("4. Inserting record (+ve limit) - numerictypes + Bug 14516", () => {
+      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+      deployMode.DeployApp();
+      table.WaitForTableEmpty(); //asserting table is empty before inserting!
+      agHelper.ClickButton("Run InsertQuery");
+      agHelper.AssertElementVisibility(locators._modal);
+      agHelper.EnterInputText("Bigintid", "922337203685477"); //9223372036854775807
+      agHelper.EnterInputText("Decimalid", "865456.987654567");
+      agHelper.EnterInputText("Numericid", "2147483647.2147484"); //2147483647.2147483647
+      agHelper.ClickButton("Insert");
+      agHelper.AssertElementVisibility(
+        locators._buttonByText("Run InsertQuery"),
+      );
+      table.ReadTableRowColumnData(0, 0, "v1", 2000).then(($cellData) => {
+        expect($cellData).to.eq("1"); //asserting serial column is inserting fine in sequence
+      });
+      table.ReadTableRowColumnData(0, 1, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq("922337203685477");
+      });
+      table.ReadTableRowColumnData(0, 2, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq("865456.987654567");
+      });
+      table.ReadTableRowColumnData(0, 3, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq("2147483647.2147484");
+      });
     });
-    table.ReadTableRowColumnData(1, 2, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("232143455655456.34");
-    });
-    table.ReadTableRowColumnData(1, 3, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("9877700000.143423");
-    });
-  });
 
-  it("6. Inserting another record (+ve record) - numerictypes", () => {
-    agHelper.ClickButton("Run InsertQuery");
-    agHelper.AssertElementVisibility(locators._modal);
-    agHelper.EnterInputText("Bigintid", "12233720368547758");
-    agHelper.EnterInputText("Decimalid", "877675655441232.1"); //877675655441232.00998765 , 877675655441232.111
-    agHelper.EnterInputText("Numericid", "86542300099.1"); //86542300099.1000099999876
-    agHelper.ClickButton("Insert");
-    agHelper.AssertElementVisibility(locators._buttonByText("Run InsertQuery"));
-    table.ReadTableRowColumnData(2, 0, "v1", 2000).then(($cellData) => {
-      expect($cellData).to.eq("3"); //asserting serial column is inserting fine in sequence
-    });
-    table.ReadTableRowColumnData(2, 1, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("12233720368547758");
-    });
-    table.ReadTableRowColumnData(2, 2, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("877675655441232.1");
+    it("5. Inserting record (-ve limit) - numerictypes + Bug 14516", () => {
+      agHelper.ClickButton("Run InsertQuery");
+      agHelper.AssertElementVisibility(locators._modal);
+      agHelper.EnterInputText("Bigintid", "-922337203685477"); //-9223372036854775808
+      agHelper.EnterInputText("Decimalid", "232143455655456.34"); //232143455655456.3434456565
+      agHelper.EnterInputText("Numericid", "9877700000.143423"); //9877700000.14342340008876
+      agHelper.ClickButton("Insert");
+      agHelper.AssertElementVisibility(
+        locators._buttonByText("Run InsertQuery"),
+      );
+      table.ReadTableRowColumnData(1, 0, "v1", 2000).then(($cellData) => {
+        expect($cellData).to.eq("2"); //asserting serial column is inserting fine in sequence
+      });
+      table.ReadTableRowColumnData(1, 1, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq("-922337203685477"); //-9223372036854775808
+      });
+      table.ReadTableRowColumnData(1, 2, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq("232143455655456.34");
+      });
+      table.ReadTableRowColumnData(1, 3, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq("9877700000.143423");
+      });
     });
-    table.ReadTableRowColumnData(2, 3, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("86542300099.1");
-    });
-  });
 
-  it("7. Updating record (permissible value) - numerictypes", () => {
-    table.SelectTableRow(2);
-    agHelper.ClickButton("Run UpdateQuery");
-    agHelper.AssertElementVisibility(locators._modal);
-    agHelper.EnterInputText("Bigintid", "11233720368547758", true);
-    agHelper.EnterInputText("Decimalid", "777675655441232.1", true); //777675655441232.00998765 , 777675655441232.111
-    agHelper.EnterInputText("Numericid", "76542300099.10988", true); //76542300099.109876788
-    agHelper.ClickButton("Update");
-    agHelper.AssertElementVisibility(locators._buttonByText("Run UpdateQuery"));
-    table.ReadTableRowColumnData(2, 0, "v1", 2000).then(($cellData) => {
-      expect($cellData).to.eq("3"); //asserting serial column is inserting fine in sequence
-    });
-    table.ReadTableRowColumnData(2, 1, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("11233720368547758");
-    });
-    table.ReadTableRowColumnData(2, 2, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("777675655441232.1");
+    it("6. Inserting another record (+ve record) - numerictypes", () => {
+      agHelper.ClickButton("Run InsertQuery");
+      agHelper.AssertElementVisibility(locators._modal);
+      agHelper.EnterInputText("Bigintid", "12233720368547758");
+      agHelper.EnterInputText("Decimalid", "877675655441232.1"); //877675655441232.00998765 , 877675655441232.111
+      agHelper.EnterInputText("Numericid", "86542300099.1"); //86542300099.1000099999876
+      agHelper.ClickButton("Insert");
+      agHelper.AssertElementVisibility(
+        locators._buttonByText("Run InsertQuery"),
+      );
+      table.ReadTableRowColumnData(2, 0, "v1", 2000).then(($cellData) => {
+        expect($cellData).to.eq("3"); //asserting serial column is inserting fine in sequence
+      });
+      table.ReadTableRowColumnData(2, 1, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq("12233720368547758");
+      });
+      table.ReadTableRowColumnData(2, 2, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq("877675655441232.1");
+      });
+      table.ReadTableRowColumnData(2, 3, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq("86542300099.1");
+      });
     });
-    table.ReadTableRowColumnData(2, 3, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("76542300099.10988");
-    });
-  });
 
-  it("8. Deleting records - numerictypes", () => {
-    table.SelectTableRow(1);
-    agHelper.ClickButton("DeleteQuery", 1);
-    assertHelper.AssertNetworkStatus("@postExecute", 200);
-    assertHelper.AssertNetworkStatus("@postExecute", 200);
-    agHelper.Sleep(2500); //Allwowing time for delete to be success
-    table.ReadTableRowColumnData(1, 0, "v1", 2000).then(($cellData) => {
-      expect($cellData).not.to.eq("2"); //asserting 2nd record is deleted
-    });
-    table.ReadTableRowColumnData(1, 0, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("3");
+    it("7. Updating record (permissible value) - numerictypes", () => {
+      table.SelectTableRow(2);
+      agHelper.ClickButton("Run UpdateQuery");
+      agHelper.AssertElementVisibility(locators._modal);
+      agHelper.EnterInputText("Bigintid", "11233720368547758", true);
+      agHelper.EnterInputText("Decimalid", "777675655441232.1", true); //777675655441232.00998765 , 777675655441232.111
+      agHelper.EnterInputText("Numericid", "76542300099.10988", true); //76542300099.109876788
+      agHelper.ClickButton("Update");
+      agHelper.AssertElementVisibility(
+        locators._buttonByText("Run UpdateQuery"),
+      );
+      table.ReadTableRowColumnData(2, 0, "v1", 2000).then(($cellData) => {
+        expect($cellData).to.eq("3"); //asserting serial column is inserting fine in sequence
+      });
+      table.ReadTableRowColumnData(2, 1, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq("11233720368547758");
+      });
+      table.ReadTableRowColumnData(2, 2, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq("777675655441232.1");
+      });
+      table.ReadTableRowColumnData(2, 3, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq("76542300099.10988");
+      });
     });
-  });
 
-  it("9. Updating record again - numerictypes", () => {
-    table.SelectTableRow(1);
-    agHelper.ClickButton("Run UpdateQuery");
-    agHelper.AssertElementVisibility(locators._modal);
-    agHelper.EnterInputText("Bigintid", "11133720368547700", true);
-    agHelper.EnterInputText("Decimalid", "777575655441232.1", true); //777575655441232.716716716716 , 777575655441232.1115
-    agHelper.EnterInputText("Numericid", "66542300099.00088", true); //66542300099.0008767675
-    agHelper.ClickButton("Update");
-    agHelper.AssertElementVisibility(locators._buttonByText("Run UpdateQuery"));
-    table.ReadTableRowColumnData(1, 0, "v1", 2000).then(($cellData) => {
-      expect($cellData).to.eq("3"); //asserting serial column is inserting fine in sequence
-    });
-    table.ReadTableRowColumnData(1, 1, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("11133720368547700");
-    });
-    table.ReadTableRowColumnData(1, 2, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("777575655441232.1");
+    it("8. Deleting records - numerictypes", () => {
+      table.SelectTableRow(1);
+      agHelper.ClickButton("DeleteQuery", 1);
+      assertHelper.AssertNetworkStatus("@postExecute", 200);
+      assertHelper.AssertNetworkStatus("@postExecute", 200);
+      agHelper.Sleep(2500); //Allwowing time for delete to be success
+      table.ReadTableRowColumnData(1, 0, "v1", 2000).then(($cellData) => {
+        expect($cellData).not.to.eq("2"); //asserting 2nd record is deleted
+      });
+      table.ReadTableRowColumnData(1, 0, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq("3");
+      });
     });
-    table.ReadTableRowColumnData(1, 3, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("66542300099.00088");
-    });
-  });
 
-  it("10. Inserting another record (+ve record - to check serial column) - numerictypes", () => {
-    agHelper.ClickButton("Run InsertQuery");
-    agHelper.AssertElementVisibility(locators._modal);
-    agHelper.EnterInputText("Bigintid", "11111720368547700");
-    agHelper.EnterInputText("Decimalid", "8765456.987654345"); //8765456.98765434567
-    agHelper.EnterInputText("Numericid", "87654356.98765436"); // 87654356.987654356
-    agHelper.ClickButton("Insert");
-    agHelper.AssertElementVisibility(locators._buttonByText("Run InsertQuery"));
-    table.ReadTableRowColumnData(2, 0, "v1", 2000).then(($cellData) => {
-      expect($cellData).to.eq("4"); //asserting serial column is inserting fine in sequence
-    });
-    table.ReadTableRowColumnData(2, 1, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("11111720368547700");
-    });
-    table.ReadTableRowColumnData(2, 2, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("8765456.987654345");
+    it("9. Updating record again - numerictypes", () => {
+      table.SelectTableRow(1);
+      agHelper.ClickButton("Run UpdateQuery");
+      agHelper.AssertElementVisibility(locators._modal);
+      agHelper.EnterInputText("Bigintid", "11133720368547700", true);
+      agHelper.EnterInputText("Decimalid", "777575655441232.1", true); //777575655441232.716716716716 , 777575655441232.1115
+      agHelper.EnterInputText("Numericid", "66542300099.00088", true); //66542300099.0008767675
+      agHelper.ClickButton("Update");
+      agHelper.AssertElementVisibility(
+        locators._buttonByText("Run UpdateQuery"),
+      );
+      table.ReadTableRowColumnData(1, 0, "v1", 2000).then(($cellData) => {
+        expect($cellData).to.eq("3"); //asserting serial column is inserting fine in sequence
+      });
+      table.ReadTableRowColumnData(1, 1, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq("11133720368547700");
+      });
+      table.ReadTableRowColumnData(1, 2, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq("777575655441232.1");
+      });
+      table.ReadTableRowColumnData(1, 3, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq("66542300099.00088");
+      });
     });
-    table.ReadTableRowColumnData(2, 3, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("87654356.98765436");
-    });
-  });
 
-  it("11. Deleting records - numerictypes", () => {
-    table.SelectTableRow(1);
-    agHelper.ClickButton("DeleteQuery", 1);
-    agHelper.Sleep(3000); //for CI to finish delete
-    agHelper.AssertElementVisibility(locators._buttonByText("Run InsertQuery"));
-    table.ReadTableRowColumnData(1, 0, "v1", 2000).then(($cellData) => {
-      expect($cellData).not.to.eq("3"); //asserting 3rd record is deleted
-    });
-    table.ReadTableRowColumnData(1, 0, "v1", 2000).then(($cellData) => {
-      expect($cellData).to.eq("4");
+    it("10. Inserting another record (+ve record - to check serial column) - numerictypes", () => {
+      agHelper.ClickButton("Run InsertQuery");
+      agHelper.AssertElementVisibility(locators._modal);
+      agHelper.EnterInputText("Bigintid", "11111720368547700");
+      agHelper.EnterInputText("Decimalid", "8765456.987654345"); //8765456.98765434567
+      agHelper.EnterInputText("Numericid", "87654356.98765436"); // 87654356.987654356
+      agHelper.ClickButton("Insert");
+      agHelper.AssertElementVisibility(
+        locators._buttonByText("Run InsertQuery"),
+      );
+      table.ReadTableRowColumnData(2, 0, "v1", 2000).then(($cellData) => {
+        expect($cellData).to.eq("4"); //asserting serial column is inserting fine in sequence
+      });
+      table.ReadTableRowColumnData(2, 1, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq("11111720368547700");
+      });
+      table.ReadTableRowColumnData(2, 2, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq("8765456.987654345");
+      });
+      table.ReadTableRowColumnData(2, 3, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq("87654356.98765436");
+      });
     });
-  });
-
-  it("12. Deleting all records from table - numerictypes", () => {
-    agHelper.GetNClick(locators._deleteIcon);
-    agHelper.AssertElementVisibility(locators._buttonByText("Run InsertQuery"));
-    agHelper.Sleep(2000);
-    table.WaitForTableEmpty();
-  });
 
-  it("13. Inserting record (+ve record - to check serial column) - numerictypes", () => {
-    agHelper.ClickButton("Run InsertQuery");
-    agHelper.AssertElementVisibility(locators._modal);
-    agHelper.EnterInputText("Bigintid", "11111720368547700");
-    agHelper.EnterInputText("Decimalid", "8765456.987654345");
-    agHelper.EnterInputText("Numericid", "87654356.98765436"); // 87654356.9876543567
-    agHelper.ClickButton("Insert");
-    agHelper.AssertElementVisibility(locators._buttonByText("Run InsertQuery"));
-    table.ReadTableRowColumnData(0, 0, "v1", 2000).then(($cellData) => {
-      expect($cellData).to.eq("5"); //asserting serial column is inserting fine in sequence
+    it("11. Deleting records - numerictypes", () => {
+      table.SelectTableRow(1);
+      agHelper.ClickButton("DeleteQuery", 1);
+      agHelper.Sleep(3000); //for CI to finish delete
+      agHelper.AssertElementVisibility(
+        locators._buttonByText("Run InsertQuery"),
+      );
+      table.ReadTableRowColumnData(1, 0, "v1", 2000).then(($cellData) => {
+        expect($cellData).not.to.eq("3"); //asserting 3rd record is deleted
+      });
+      table.ReadTableRowColumnData(1, 0, "v1", 2000).then(($cellData) => {
+        expect($cellData).to.eq("4");
+      });
     });
-    table.ReadTableRowColumnData(0, 1, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("11111720368547700");
-    });
-    table.ReadTableRowColumnData(0, 2, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("8765456.987654345");
+
+    it("12. Deleting all records from table - numerictypes", () => {
+      agHelper.GetNClick(locators._deleteIcon);
+      agHelper.AssertElementVisibility(
+        locators._buttonByText("Run InsertQuery"),
+      );
+      agHelper.Sleep(2000);
+      table.WaitForTableEmpty();
     });
-    table.ReadTableRowColumnData(0, 3, "v1", 200).then(($cellData) => {
-      expect($cellData).to.eq("87654356.98765436");
+
+    it("13. Inserting record (+ve record - to check serial column) - numerictypes", () => {
+      agHelper.ClickButton("Run InsertQuery");
+      agHelper.AssertElementVisibility(locators._modal);
+      agHelper.EnterInputText("Bigintid", "11111720368547700");
+      agHelper.EnterInputText("Decimalid", "8765456.987654345");
+      agHelper.EnterInputText("Numericid", "87654356.98765436"); // 87654356.9876543567
+      agHelper.ClickButton("Insert");
+      agHelper.AssertElementVisibility(
+        locators._buttonByText("Run InsertQuery"),
+      );
+      table.ReadTableRowColumnData(0, 0, "v1", 2000).then(($cellData) => {
+        expect($cellData).to.eq("5"); //asserting serial column is inserting fine in sequence
+      });
+      table.ReadTableRowColumnData(0, 1, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq("11111720368547700");
+      });
+      table.ReadTableRowColumnData(0, 2, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq("8765456.987654345");
+      });
+      table.ReadTableRowColumnData(0, 3, "v1", 200).then(($cellData) => {
+        expect($cellData).to.eq("87654356.98765436");
+      });
     });
-  });
 
-  it("14. Validate Drop of the Newly Created - numerictypes - Table from Postgres datasource", () => {
-    deployMode.NavigateBacktoEditor();
-    EditorNavigation.SelectEntityByName("dropTable", EntityType.Query);
-    dataSources.RunQuery();
-    dataSources.ReadQueryTableResponse(0).then(($cellData) => {
-      expect($cellData).to.eq("0"); //Success response for dropped table!
+    it("14. Validate Drop of the Newly Created - numerictypes - Table from Postgres datasource", () => {
+      deployMode.NavigateBacktoEditor();
+      EditorNavigation.SelectEntityByName("dropTable", EntityType.Query);
+      dataSources.RunQuery();
+      dataSources.ReadQueryTableResponse(0).then(($cellData) => {
+        expect($cellData).to.eq("0"); //Success response for dropped table!
+      });
+      dataSources.AssertTableInVirtuosoList(
+        dsName,
+        "public.numerictypes",
+        false,
+      );
     });
-    dataSources.AssertTableInVirtuosoList(dsName, "public.numerictypes", false);
-  });
 
-  it("15. Verify Deletion of the datasource after all created queries are deleted", () => {
-    dataSources.DeleteDatasourceFromWithinDS(dsName, 409); //Since all queries exists
-    entityExplorer.DeleteAllQueriesForDB(dsName);
-    deployMode.DeployApp();
-    deployMode.NavigateBacktoEditor();
-    dataSources.DeleteDatasourceFromWithinDS(dsName, 200); //ProductLines, Employees pages are still using this ds
-  });
-});
+    it("15. Verify Deletion of the datasource after all created queries are deleted", () => {
+      dataSources.DeleteDatasourceFromWithinDS(dsName, 409); //Since all queries exists
+      entityExplorer.DeleteAllQueriesForDB(dsName);
+      deployMode.DeployApp();
+      deployMode.NavigateBacktoEditor();
+      dataSources.DeleteDatasourceFromWithinDS(dsName, 200); //ProductLines, Employees pages are still using this ds
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/UUID_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/UUID_Spec.ts
index b910774ba8ce..d63fde861a2d 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/UUID_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/UUID_Spec.ts
@@ -19,371 +19,395 @@ import EditorNavigation, {
 } from "../../../../support/Pages/EditorNavigation";
 import { featureFlagIntercept } from "../../../../support/Objects/FeatureFlags";
 
-describe("UUID Datatype tests", { tags: ["@tag.Datasource"] }, function () {
-  let dsName: any, query: string, imageNameToUpload: string;
+describe(
+  "UUID Datatype tests",
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
+  function () {
+    let dsName: any, query: string, imageNameToUpload: string;
+
+    before("Importing App & setting theme", () => {
+      dataSources.CreateDataSource("Postgres");
+      cy.get("@dsName").then(($dsName) => {
+        dsName = $dsName;
+      });
+      AppSidebar.navigate(AppSidebarButton.Editor);
+      agHelper.AddDsl("Datatypes/UUIDDTdsl");
 
-  before("Importing App & setting theme", () => {
-    dataSources.CreateDataSource("Postgres");
-    cy.get("@dsName").then(($dsName) => {
-      dsName = $dsName;
+      appSettings.OpenPaneAndChangeTheme("Earth");
     });
-    AppSidebar.navigate(AppSidebarButton.Editor);
-    agHelper.AddDsl("Datatypes/UUIDDTdsl");
-
-    appSettings.OpenPaneAndChangeTheme("Earth");
-  });
 
-  it("1. Creating supporting api's for generating random UUID's", () => {
-    cy.fixture("datasources").then((datasourceFormData) => {
-      apiPage.CreateAndFillApi(datasourceFormData.uuid1Api, "version1");
-      apiPage.CreateAndFillApi(datasourceFormData.uuid4Api, "version4");
-      apiPage.CreateAndFillApi(datasourceFormData.nillApi, "nill");
-    });
-  });
-
-  it("2. Creating table query - uuidtype", () => {
-    query = `CREATE table uuidtype (serialid SERIAL primary key, v1 uuid, v4 uuid, nil uuid);`;
-    dataSources.CreateQueryForDS(dsName, query, "createTable");
-    dataSources.RunQuery();
-  });
-
-  it("3. Creating SELECT query - uuidtype + Bug 14493", () => {
-    dataSources.createQueryWithDatasourceSchemaTemplate(
-      dsName,
-      "public.uuidtype",
-      "Select",
-    );
-    dataSources.RunQuery();
-    agHelper
-      .GetText(dataSources._noRecordFound)
-      .then(($noRecMsg) => expect($noRecMsg).to.eq("No data records to show"));
-    agHelper.RenameWithInPane("selectRecords");
-  });
-
-  it("4. Creating all queries - uuidtype", () => {
-    query = `INSERT INTO public."uuidtype" ("v1", "v4", "nil") VALUES ('{{version1.data}}', '{{version4.data}}', '{{nill.data}}');`;
-    entityExplorer.CreateNewDsQuery(dsName);
-    dataSources.EnterQuery(query);
-    agHelper.RenameWithInPane("insertRecord");
-
-    query = `UPDATE public."uuidtype" SET "v1" ='{{version1.data ? version1.data : Table1.selectedRow.v1}}', "v4" ='{{version4.data ? version4.data : Table1.selectedRow.v4}}', "nil" ='{{nill.data ? nill.data : Table1.selectedRow.nil}}' WHERE serialid = {{Table1.selectedRow.serialid}};`;
-    entityExplorer.CreateNewDsQuery(dsName);
-    dataSources.EnterQuery(query);
-    agHelper.RenameWithInPane("updateRecord");
-
-    query = `DELETE FROM public."uuidtype"`;
-    entityExplorer.CreateNewDsQuery(dsName);
-    dataSources.EnterQuery(query);
-    agHelper.RenameWithInPane("deleteAllRecords");
-
-    query = `drop table public."uuidtype"`;
-    entityExplorer.CreateNewDsQuery(dsName);
-    dataSources.EnterQuery(query);
-    agHelper.RenameWithInPane("dropTable");
-
-    query = `DELETE FROM public."uuidtype" WHERE serialId = {{Table1.selectedRow.serialid}}`;
-    entityExplorer.CreateNewDsQuery(dsName);
-    dataSources.EnterQuery(query);
-    agHelper.RenameWithInPane("deleteRecord");
-  });
-
-  it("5. Inserting record - uuidtype", () => {
-    EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
-    deployMode.DeployApp();
-    table.WaitForTableEmpty(); //asserting table is empty before inserting!
-    agHelper.ClickButton("Run InsertQuery");
-    agHelper.AssertElementVisibility(locators._modal);
-
-    agHelper.ClickButton("Generate UUID's");
-    agHelper.AssertContains("All UUIDs generated & available");
-    agHelper.ClickButton("Insert");
-    agHelper.AssertElementAbsence(locators._specificToast("failed to execute")); //Assert that Insert did not fail
-    agHelper.AssertElementVisibility(locators._buttonByText("Run InsertQuery"));
-    table.WaitUntilTableLoad();
-    table.ReadTableRowColumnData(0, 0).then(($cellData) => {
-      expect($cellData).to.eq("1"); //asserting serial column is inserting fine in sequence
-    });
-    table.ReadTableRowColumnData(0, 1, "v1", 200).then(($v1) => {
-      expect($v1).not.empty;
-    });
-    table.ReadTableRowColumnData(0, 2, "v1", 200).then(($v4) => {
-      expect($v4).not.empty;
-    });
-    table.ReadTableRowColumnData(0, 3, "v1", 200).then(($nil) => {
-      expect($nil).not.empty;
-    });
-  });
-
-  it("6. Inserting another record - uuidtype", () => {
-    agHelper.WaitUntilAllToastsDisappear();
-    agHelper.ClickButton("Run InsertQuery");
-    agHelper.AssertElementVisibility(locators._modal);
-
-    agHelper.ClickButton("Generate UUID's");
-    agHelper.AssertContains("All UUIDs generated & available");
-
-    agHelper.ClickButton("Insert");
-    agHelper.AssertElementAbsence(locators._specificToast("failed to execute")); //Assert that Insert did not fail
-    agHelper.AssertElementVisibility(locators._buttonByText("Run InsertQuery"));
-    table.WaitUntilTableLoad();
-    table.ReadTableRowColumnData(1, 0).then(($cellData) => {
-      expect($cellData).to.eq("2"); //asserting serial column is inserting fine in sequence
-    });
-    table.ReadTableRowColumnData(1, 1, "v1", 200).then(($v1) => {
-      expect($v1).not.empty;
-    });
-    table.ReadTableRowColumnData(1, 2, "v1", 200).then(($v4) => {
-      expect($v4).not.empty;
-    });
-    table.ReadTableRowColumnData(1, 3, "v1", 200).then(($nil) => {
-      expect($nil).not.empty;
+    it("1. Creating supporting api's for generating random UUID's", () => {
+      cy.fixture("datasources").then((datasourceFormData) => {
+        apiPage.CreateAndFillApi(datasourceFormData.uuid1Api, "version1");
+        apiPage.CreateAndFillApi(datasourceFormData.uuid4Api, "version4");
+        apiPage.CreateAndFillApi(datasourceFormData.nillApi, "nill");
+      });
     });
-  });
-
-  it("7. Inserting another record - uuidtype", () => {
-    agHelper.WaitUntilAllToastsDisappear();
-    agHelper.ClickButton("Run InsertQuery");
-    agHelper.AssertElementVisibility(locators._modal);
-
-    agHelper.ClickButton("Generate UUID's");
-    agHelper.AssertContains("All UUIDs generated & available");
-
-    agHelper.ClickButton("Insert");
-    agHelper.AssertElementAbsence(locators._specificToast("failed to execute")); //Assert that Insert did not fail
-    agHelper.AssertElementVisibility(locators._buttonByText("Run InsertQuery"));
-    table.WaitUntilTableLoad();
-    table.ReadTableRowColumnData(2, 0).then(($cellData) => {
-      expect($cellData).to.eq("3"); //asserting serial column is inserting fine in sequence
+
+    it("2. Creating table query - uuidtype", () => {
+      query = `CREATE table uuidtype (serialid SERIAL primary key, v1 uuid, v4 uuid, nil uuid);`;
+      dataSources.CreateQueryForDS(dsName, query, "createTable");
+      dataSources.RunQuery();
     });
-    table.ReadTableRowColumnData(2, 1, "v1", 200).then(($v1) => {
-      expect($v1).not.empty;
+
+    it("3. Creating SELECT query - uuidtype + Bug 14493", () => {
+      dataSources.createQueryWithDatasourceSchemaTemplate(
+        dsName,
+        "public.uuidtype",
+        "Select",
+      );
+      dataSources.RunQuery();
+      agHelper
+        .GetText(dataSources._noRecordFound)
+        .then(($noRecMsg) =>
+          expect($noRecMsg).to.eq("No data records to show"),
+        );
+      agHelper.RenameWithInPane("selectRecords");
+    });
+
+    it("4. Creating all queries - uuidtype", () => {
+      query = `INSERT INTO public."uuidtype" ("v1", "v4", "nil") VALUES ('{{version1.data}}', '{{version4.data}}', '{{nill.data}}');`;
+      entityExplorer.CreateNewDsQuery(dsName);
+      dataSources.EnterQuery(query);
+      agHelper.RenameWithInPane("insertRecord");
+
+      query = `UPDATE public."uuidtype" SET "v1" ='{{version1.data ? version1.data : Table1.selectedRow.v1}}', "v4" ='{{version4.data ? version4.data : Table1.selectedRow.v4}}', "nil" ='{{nill.data ? nill.data : Table1.selectedRow.nil}}' WHERE serialid = {{Table1.selectedRow.serialid}};`;
+      entityExplorer.CreateNewDsQuery(dsName);
+      dataSources.EnterQuery(query);
+      agHelper.RenameWithInPane("updateRecord");
+
+      query = `DELETE FROM public."uuidtype"`;
+      entityExplorer.CreateNewDsQuery(dsName);
+      dataSources.EnterQuery(query);
+      agHelper.RenameWithInPane("deleteAllRecords");
+
+      query = `drop table public."uuidtype"`;
+      entityExplorer.CreateNewDsQuery(dsName);
+      dataSources.EnterQuery(query);
+      agHelper.RenameWithInPane("dropTable");
+
+      query = `DELETE FROM public."uuidtype" WHERE serialId = {{Table1.selectedRow.serialid}}`;
+      entityExplorer.CreateNewDsQuery(dsName);
+      dataSources.EnterQuery(query);
+      agHelper.RenameWithInPane("deleteRecord");
+    });
+
+    it("5. Inserting record - uuidtype", () => {
+      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+      deployMode.DeployApp();
+      table.WaitForTableEmpty(); //asserting table is empty before inserting!
+      agHelper.ClickButton("Run InsertQuery");
+      agHelper.AssertElementVisibility(locators._modal);
+
+      agHelper.ClickButton("Generate UUID's");
+      agHelper.AssertContains("All UUIDs generated & available");
+      agHelper.ClickButton("Insert");
+      agHelper.AssertElementAbsence(
+        locators._specificToast("failed to execute"),
+      ); //Assert that Insert did not fail
+      agHelper.AssertElementVisibility(
+        locators._buttonByText("Run InsertQuery"),
+      );
+      table.WaitUntilTableLoad();
+      table.ReadTableRowColumnData(0, 0).then(($cellData) => {
+        expect($cellData).to.eq("1"); //asserting serial column is inserting fine in sequence
+      });
+      table.ReadTableRowColumnData(0, 1, "v1", 200).then(($v1) => {
+        expect($v1).not.empty;
+      });
+      table.ReadTableRowColumnData(0, 2, "v1", 200).then(($v4) => {
+        expect($v4).not.empty;
+      });
+      table.ReadTableRowColumnData(0, 3, "v1", 200).then(($nil) => {
+        expect($nil).not.empty;
+      });
     });
-    table.ReadTableRowColumnData(2, 2, "v1", 200).then(($v4) => {
-      expect($v4).not.empty;
+
+    it("6. Inserting another record - uuidtype", () => {
+      agHelper.WaitUntilAllToastsDisappear();
+      agHelper.ClickButton("Run InsertQuery");
+      agHelper.AssertElementVisibility(locators._modal);
+
+      agHelper.ClickButton("Generate UUID's");
+      agHelper.AssertContains("All UUIDs generated & available");
+
+      agHelper.ClickButton("Insert");
+      agHelper.AssertElementAbsence(
+        locators._specificToast("failed to execute"),
+      ); //Assert that Insert did not fail
+      agHelper.AssertElementVisibility(
+        locators._buttonByText("Run InsertQuery"),
+      );
+      table.WaitUntilTableLoad();
+      table.ReadTableRowColumnData(1, 0).then(($cellData) => {
+        expect($cellData).to.eq("2"); //asserting serial column is inserting fine in sequence
+      });
+      table.ReadTableRowColumnData(1, 1, "v1", 200).then(($v1) => {
+        expect($v1).not.empty;
+      });
+      table.ReadTableRowColumnData(1, 2, "v1", 200).then(($v4) => {
+        expect($v4).not.empty;
+      });
+      table.ReadTableRowColumnData(1, 3, "v1", 200).then(($nil) => {
+        expect($nil).not.empty;
+      });
     });
-    table.ReadTableRowColumnData(2, 3, "v1", 200).then(($nil) => {
-      expect($nil).not.empty;
+
+    it("7. Inserting another record - uuidtype", () => {
+      agHelper.WaitUntilAllToastsDisappear();
+      agHelper.ClickButton("Run InsertQuery");
+      agHelper.AssertElementVisibility(locators._modal);
+
+      agHelper.ClickButton("Generate UUID's");
+      agHelper.AssertContains("All UUIDs generated & available");
+
+      agHelper.ClickButton("Insert");
+      agHelper.AssertElementAbsence(
+        locators._specificToast("failed to execute"),
+      ); //Assert that Insert did not fail
+      agHelper.AssertElementVisibility(
+        locators._buttonByText("Run InsertQuery"),
+      );
+      table.WaitUntilTableLoad();
+      table.ReadTableRowColumnData(2, 0).then(($cellData) => {
+        expect($cellData).to.eq("3"); //asserting serial column is inserting fine in sequence
+      });
+      table.ReadTableRowColumnData(2, 1, "v1", 200).then(($v1) => {
+        expect($v1).not.empty;
+      });
+      table.ReadTableRowColumnData(2, 2, "v1", 200).then(($v4) => {
+        expect($v4).not.empty;
+      });
+      table.ReadTableRowColumnData(2, 3, "v1", 200).then(($nil) => {
+        expect($nil).not.empty;
+      });
     });
-  });
-
-  it("8. Updating record - uuidtype - updating only v1", () => {
-    table.SelectTableRow(2); //As Table Selected row has issues due to fast selction
-    agHelper.Sleep(2000); //for table selection to be captured
-
-    table.ReadTableRowColumnData(2, 1, "v1", 200).then(($oldV1) => {
-      table.ReadTableRowColumnData(2, 2, "v1", 200).then(($oldV4) => {
-        agHelper.ClickButton("Run UpdateQuery");
-        agHelper.AssertElementVisibility(locators._modal);
-
-        agHelper.ClickButton("Generate new v1");
-        agHelper.AssertContains("New V1 UUID available!");
-
-        agHelper.ClickButton("Update");
-        agHelper.AssertElementAbsence(
-          locators._specificToast("failed to execute"),
-        ); //Assert that Insert did not fail
-        agHelper.AssertElementVisibility(
-          locators._buttonByText("Run UpdateQuery"),
-        );
-        table.WaitUntilTableLoad();
-        agHelper.Sleep(5000); //some more time for rows to rearrange for CI flakyness!
-        table.ReadTableRowColumnData(2, 0).then(($cellData) => {
-          expect($cellData).to.eq("3"); //asserting serial column is inserting fine in sequence
-        });
-        table.ReadTableRowColumnData(2, 1, "v1", 200).then(($newV1) => {
-          expect($oldV1).to.not.eq($newV1); //making sure new v1 is updated
-        });
-        table.ReadTableRowColumnData(2, 2, "v1", 200).then(($newV4) => {
-          expect($oldV4).to.eq($newV4); //making sure new v4 is not updated
+
+    it("8. Updating record - uuidtype - updating only v1", () => {
+      table.SelectTableRow(2); //As Table Selected row has issues due to fast selction
+      agHelper.Sleep(2000); //for table selection to be captured
+
+      table.ReadTableRowColumnData(2, 1, "v1", 200).then(($oldV1) => {
+        table.ReadTableRowColumnData(2, 2, "v1", 200).then(($oldV4) => {
+          agHelper.ClickButton("Run UpdateQuery");
+          agHelper.AssertElementVisibility(locators._modal);
+
+          agHelper.ClickButton("Generate new v1");
+          agHelper.AssertContains("New V1 UUID available!");
+
+          agHelper.ClickButton("Update");
+          agHelper.AssertElementAbsence(
+            locators._specificToast("failed to execute"),
+          ); //Assert that Insert did not fail
+          agHelper.AssertElementVisibility(
+            locators._buttonByText("Run UpdateQuery"),
+          );
+          table.WaitUntilTableLoad();
+          agHelper.Sleep(5000); //some more time for rows to rearrange for CI flakyness!
+          table.ReadTableRowColumnData(2, 0).then(($cellData) => {
+            expect($cellData).to.eq("3"); //asserting serial column is inserting fine in sequence
+          });
+          table.ReadTableRowColumnData(2, 1, "v1", 200).then(($newV1) => {
+            expect($oldV1).to.not.eq($newV1); //making sure new v1 is updated
+          });
+          table.ReadTableRowColumnData(2, 2, "v1", 200).then(($newV4) => {
+            expect($oldV4).to.eq($newV4); //making sure new v4 is not updated
+          });
         });
       });
     });
-  });
-
-  it("9. Updating record - uuidtype - updating v4 ", () => {
-    //table.SelectTableRow(2); //As Table Selected row has issues due to fast selction
-    table.ReadTableRowColumnData(2, 1, "v1", 200).then(($oldV1) => {
-      table.ReadTableRowColumnData(2, 2, "v1", 200).then(($oldV4) => {
-        //table.ReadTableRowColumnData(2, 3, "v1", 200).then(($oldguid) => {
-        agHelper.ClickButton("Run UpdateQuery");
-        agHelper.AssertElementVisibility(locators._modal);
-
-        agHelper.ClickButton("Generate new v4");
-        agHelper.AssertContains("New V4 UUID available!");
-
-        agHelper.ClickButton("Update");
-        agHelper.AssertElementAbsence(
-          locators._specificToast("failed to execute"),
-        ); //Assert that Insert did not fail
-        agHelper.AssertElementVisibility(
-          locators._buttonByText("Run UpdateQuery"),
-        );
-        table.WaitUntilTableLoad();
-        table.ReadTableRowColumnData(2, 0).then(($cellData) => {
-          expect($cellData).to.eq("3"); //asserting serial column is inserting fine in sequence
-        });
-        table.ReadTableRowColumnData(2, 1, "v1", 200).then(($newV1) => {
-          expect($oldV1).to.eq($newV1); //making sure v1 is same
-        });
-        table.ReadTableRowColumnData(2, 2, "v1", 200).then(($newV4) => {
-          expect($oldV4).to.not.eq($newV4); //making sure new v4 is updated
-        });
-        /*table.ReadTableRowColumnData(2, 3, "v1", 200).then(($newguid) => {
+
+    it("9. Updating record - uuidtype - updating v4 ", () => {
+      //table.SelectTableRow(2); //As Table Selected row has issues due to fast selction
+      table.ReadTableRowColumnData(2, 1, "v1", 200).then(($oldV1) => {
+        table.ReadTableRowColumnData(2, 2, "v1", 200).then(($oldV4) => {
+          //table.ReadTableRowColumnData(2, 3, "v1", 200).then(($oldguid) => {
+          agHelper.ClickButton("Run UpdateQuery");
+          agHelper.AssertElementVisibility(locators._modal);
+
+          agHelper.ClickButton("Generate new v4");
+          agHelper.AssertContains("New V4 UUID available!");
+
+          agHelper.ClickButton("Update");
+          agHelper.AssertElementAbsence(
+            locators._specificToast("failed to execute"),
+          ); //Assert that Insert did not fail
+          agHelper.AssertElementVisibility(
+            locators._buttonByText("Run UpdateQuery"),
+          );
+          table.WaitUntilTableLoad();
+          table.ReadTableRowColumnData(2, 0).then(($cellData) => {
+            expect($cellData).to.eq("3"); //asserting serial column is inserting fine in sequence
+          });
+          table.ReadTableRowColumnData(2, 1, "v1", 200).then(($newV1) => {
+            expect($oldV1).to.eq($newV1); //making sure v1 is same
+          });
+          table.ReadTableRowColumnData(2, 2, "v1", 200).then(($newV4) => {
+            expect($oldV4).to.not.eq($newV4); //making sure new v4 is updated
+          });
+          /*table.ReadTableRowColumnData(2, 3, "v1", 200).then(($newguid) => {
             expect($oldguid).to.not.eq($newguid); //making sure new guid is updated
           }); */
+        });
       });
     });
-  });
-
-  it("10. Validating UUID functions", () => {
-    deployMode.NavigateBacktoEditor();
-    table.WaitUntilTableLoad();
-    PageLeftPane.switchSegment(PagePaneSegment.Queries);
-    //Validating use of extention
-    query = `CREATE EXTENSION IF NOT EXISTS "uuid-ossp"; CREATE EXTENSION IF NOT EXISTS "pgcrypto"`;
-    dataSources.CreateQueryForDS(dsName, query, "verifyUUIDFunctions");
-    dataSources.RunQueryNVerifyResponseViews(1);
-    dataSources.AssertQueryResponseHeaders(["affectedRows"]);
-    dataSources.ReadQueryTableResponse(0).then(($cellData) => {
-      expect($cellData).to.eq("0");
-    });
 
-    agHelper.Sleep(2000); // Above entensions settling time
-
-    //Validating generation of new uuid via the extension package
-    query = `SELECT uuid_generate_v1() as v1, uuid_generate_v4() as v4, gen_random_uuid() as cryptov4, uuid_in(overlay(overlay(md5(random()::text || ':' || random()::text) placing '4' from 13) placing to_hex(floor(random()*(11-8+1) + 8)::int)::text from 17)::cstring) as form_uuid1, uuid_in(md5(random()::text || random()::text)::cstring) as form_uuid2;`;
-    dataSources.EnterQuery(query);
-    dataSources.RunQuery();
-    dataSources.AssertQueryResponseHeaders([
-      "v1",
-      "v4",
-      "cryptov4",
-      "form_uuid1",
-      "form_uuid2",
-    ]);
-    dataSources.ReadQueryTableResponse(0).then(($cellData) => {
-      expect($cellData).not.to.be.empty;
-    });
-    dataSources.ReadQueryTableResponse(1).then(($cellData) => {
-      expect($cellData).not.to.be.empty;
-    });
-    dataSources.ReadQueryTableResponse(2).then(($cellData) => {
-      expect($cellData).not.to.be.empty;
-    });
-    dataSources.ReadQueryTableResponse(3).then(($cellData) => {
-      expect($cellData).not.to.be.empty;
-    });
-    dataSources.ReadQueryTableResponse(4).then(($cellData) => {
-      expect($cellData).not.to.be.empty;
-    });
+    it("10. Validating UUID functions", () => {
+      deployMode.NavigateBacktoEditor();
+      table.WaitUntilTableLoad();
+      PageLeftPane.switchSegment(PagePaneSegment.Queries);
+      //Validating use of extention
+      query = `CREATE EXTENSION IF NOT EXISTS "uuid-ossp"; CREATE EXTENSION IF NOT EXISTS "pgcrypto"`;
+      dataSources.CreateQueryForDS(dsName, query, "verifyUUIDFunctions");
+      dataSources.RunQueryNVerifyResponseViews(1);
+      dataSources.AssertQueryResponseHeaders(["affectedRows"]);
+      dataSources.ReadQueryTableResponse(0).then(($cellData) => {
+        expect($cellData).to.eq("0");
+      });
 
-    //Validating Addition of new column taking default value form package method
-    query = `ALTER TABLE uuidtype ADD COLUMN newUUID uuid DEFAULT uuid_generate_v4();`;
-    dataSources.EnterQuery(query);
-    dataSources.RunQueryNVerifyResponseViews(1);
-    dataSources.AssertQueryResponseHeaders(["affectedRows"]);
-    dataSources.ReadQueryTableResponse(0).then(($cellData) => {
-      expect($cellData).to.eq("0");
-    });
-    deployMode.DeployApp();
-    table.WaitUntilTableLoad();
-    deployMode.NavigateBacktoEditor();
-    table.WaitUntilTableLoad();
-    EditorNavigation.SelectEntityByName(
-      "verifyUUIDFunctions",
-      EntityType.Query,
-    );
-
-    //Validating altering the new column default value to generate id from pgcrypto package
-    query = `ALTER TABLE uuidtype ALTER COLUMN newUUID SET DEFAULT gen_random_uuid();`;
-    dataSources.EnterQuery(query);
-    dataSources.RunQueryNVerifyResponseViews(1);
-    dataSources.AssertQueryResponseHeaders(["affectedRows"]);
-    dataSources.ReadQueryTableResponse(0).then(($cellData) => {
-      expect($cellData).to.eq("0");
-    });
-    deployMode.DeployApp();
-    table.WaitUntilTableLoad();
-
-    deployMode.NavigateBacktoEditor();
-    table.WaitUntilTableLoad();
-    EditorNavigation.SelectEntityByName(
-      "verifyUUIDFunctions",
-      EntityType.Query,
-    );
-    agHelper.ActionContextMenuWithInPane({
-      action: "Delete",
-      entityType: entityItems.Query,
-    });
-    AppSidebar.navigate(AppSidebarButton.Editor);
-  });
-
-  it("11. Deleting records - uuidtype", () => {
-    EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
-    deployMode.DeployApp();
-    table.WaitUntilTableLoad();
-    table.SelectTableRow(1);
-    agHelper.ClickButton("DeleteQuery", 1);
-    assertHelper.AssertNetworkStatus("@postExecute", 200);
-    assertHelper.AssertNetworkStatus("@postExecute", 200);
-    table.ReadTableRowColumnData(1, 0).then(($cellData) => {
-      expect($cellData).not.to.eq("2"); //asserting 2nd record is deleted
-    });
-  });
-
-  it("12. Deleting all records from table - uuidtype", () => {
-    agHelper.GetNClick(locators._deleteIcon);
-    agHelper.AssertElementVisibility(locators._buttonByText("Run InsertQuery"));
-    agHelper.Sleep(2000);
-    table.WaitForTableEmpty();
-  });
-
-  it("13. Inserting another record (to check serial column & new default column added) - uuidtype", () => {
-    agHelper.ClickButton("Run InsertQuery");
-    agHelper.AssertElementVisibility(locators._modal);
-
-    agHelper.ClickButton("Generate UUID's");
-    agHelper.AssertContains("All UUIDs generated & available");
-
-    agHelper.ClickButton("Insert");
-    agHelper.AssertElementAbsence(locators._specificToast("failed to execute")); //Assert that Insert did not fail
-    agHelper.AssertElementVisibility(locators._buttonByText("Run InsertQuery"));
-    table.WaitUntilTableLoad();
-    table.ReadTableRowColumnData(0, 0).then(($cellData) => {
-      expect($cellData).to.eq("4"); //asserting serial column is inserting fine in sequence
-    });
-    table.ReadTableRowColumnData(0, 1, "v1", 200).then(($v1) => {
-      expect($v1).not.empty;
+      agHelper.Sleep(2000); // Above entensions settling time
+
+      //Validating generation of new uuid via the extension package
+      query = `SELECT uuid_generate_v1() as v1, uuid_generate_v4() as v4, gen_random_uuid() as cryptov4, uuid_in(overlay(overlay(md5(random()::text || ':' || random()::text) placing '4' from 13) placing to_hex(floor(random()*(11-8+1) + 8)::int)::text from 17)::cstring) as form_uuid1, uuid_in(md5(random()::text || random()::text)::cstring) as form_uuid2;`;
+      dataSources.EnterQuery(query);
+      dataSources.RunQuery();
+      dataSources.AssertQueryResponseHeaders([
+        "v1",
+        "v4",
+        "cryptov4",
+        "form_uuid1",
+        "form_uuid2",
+      ]);
+      dataSources.ReadQueryTableResponse(0).then(($cellData) => {
+        expect($cellData).not.to.be.empty;
+      });
+      dataSources.ReadQueryTableResponse(1).then(($cellData) => {
+        expect($cellData).not.to.be.empty;
+      });
+      dataSources.ReadQueryTableResponse(2).then(($cellData) => {
+        expect($cellData).not.to.be.empty;
+      });
+      dataSources.ReadQueryTableResponse(3).then(($cellData) => {
+        expect($cellData).not.to.be.empty;
+      });
+      dataSources.ReadQueryTableResponse(4).then(($cellData) => {
+        expect($cellData).not.to.be.empty;
+      });
+
+      //Validating Addition of new column taking default value form package method
+      query = `ALTER TABLE uuidtype ADD COLUMN newUUID uuid DEFAULT uuid_generate_v4();`;
+      dataSources.EnterQuery(query);
+      dataSources.RunQueryNVerifyResponseViews(1);
+      dataSources.AssertQueryResponseHeaders(["affectedRows"]);
+      dataSources.ReadQueryTableResponse(0).then(($cellData) => {
+        expect($cellData).to.eq("0");
+      });
+      deployMode.DeployApp();
+      table.WaitUntilTableLoad();
+      deployMode.NavigateBacktoEditor();
+      table.WaitUntilTableLoad();
+      EditorNavigation.SelectEntityByName(
+        "verifyUUIDFunctions",
+        EntityType.Query,
+      );
+
+      //Validating altering the new column default value to generate id from pgcrypto package
+      query = `ALTER TABLE uuidtype ALTER COLUMN newUUID SET DEFAULT gen_random_uuid();`;
+      dataSources.EnterQuery(query);
+      dataSources.RunQueryNVerifyResponseViews(1);
+      dataSources.AssertQueryResponseHeaders(["affectedRows"]);
+      dataSources.ReadQueryTableResponse(0).then(($cellData) => {
+        expect($cellData).to.eq("0");
+      });
+      deployMode.DeployApp();
+      table.WaitUntilTableLoad();
+
+      deployMode.NavigateBacktoEditor();
+      table.WaitUntilTableLoad();
+      EditorNavigation.SelectEntityByName(
+        "verifyUUIDFunctions",
+        EntityType.Query,
+      );
+      agHelper.ActionContextMenuWithInPane({
+        action: "Delete",
+        entityType: entityItems.Query,
+      });
+      AppSidebar.navigate(AppSidebarButton.Editor);
+    });
+
+    it("11. Deleting records - uuidtype", () => {
+      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+      deployMode.DeployApp();
+      table.WaitUntilTableLoad();
+      table.SelectTableRow(1);
+      agHelper.ClickButton("DeleteQuery", 1);
+      assertHelper.AssertNetworkStatus("@postExecute", 200);
+      assertHelper.AssertNetworkStatus("@postExecute", 200);
+      table.ReadTableRowColumnData(1, 0).then(($cellData) => {
+        expect($cellData).not.to.eq("2"); //asserting 2nd record is deleted
+      });
     });
-    table.ReadTableRowColumnData(0, 2, "v1", 200).then(($v4) => {
-      expect($v4).not.empty;
+
+    it("12. Deleting all records from table - uuidtype", () => {
+      agHelper.GetNClick(locators._deleteIcon);
+      agHelper.AssertElementVisibility(
+        locators._buttonByText("Run InsertQuery"),
+      );
+      agHelper.Sleep(2000);
+      table.WaitForTableEmpty();
+    });
+
+    it("13. Inserting another record (to check serial column & new default column added) - uuidtype", () => {
+      agHelper.ClickButton("Run InsertQuery");
+      agHelper.AssertElementVisibility(locators._modal);
+
+      agHelper.ClickButton("Generate UUID's");
+      agHelper.AssertContains("All UUIDs generated & available");
+
+      agHelper.ClickButton("Insert");
+      agHelper.AssertElementAbsence(
+        locators._specificToast("failed to execute"),
+      ); //Assert that Insert did not fail
+      agHelper.AssertElementVisibility(
+        locators._buttonByText("Run InsertQuery"),
+      );
+      table.WaitUntilTableLoad();
+      table.ReadTableRowColumnData(0, 0).then(($cellData) => {
+        expect($cellData).to.eq("4"); //asserting serial column is inserting fine in sequence
+      });
+      table.ReadTableRowColumnData(0, 1, "v1", 200).then(($v1) => {
+        expect($v1).not.empty;
+      });
+      table.ReadTableRowColumnData(0, 2, "v1", 200).then(($v4) => {
+        expect($v4).not.empty;
+      });
+      table.ReadTableRowColumnData(0, 3, "v1", 200).then(($nil) => {
+        expect($nil).not.empty;
+      });
+      table.ReadTableRowColumnData(0, 4, "v1", 200).then(($newGenUUID) => {
+        expect($newGenUUID).not.empty;
+      });
     });
-    table.ReadTableRowColumnData(0, 3, "v1", 200).then(($nil) => {
-      expect($nil).not.empty;
+
+    it("14. Validate Drop of the Newly Created - uuidtype - Table from Postgres datasource", () => {
+      deployMode.NavigateBacktoEditor();
+      EditorNavigation.SelectEntityByName("dropTable", EntityType.Query);
+      dataSources.RunQuery();
+      dataSources.ReadQueryTableResponse(0).then(($cellData) => {
+        expect($cellData).to.eq("0"); //Success response for dropped table!
+      });
+      dataSources.AssertTableInVirtuosoList(dsName, "public.uuidtype", false);
     });
-    table.ReadTableRowColumnData(0, 4, "v1", 200).then(($newGenUUID) => {
-      expect($newGenUUID).not.empty;
+
+    it("15. Verify Deletion of all created queries", () => {
+      dataSources.DeleteDatasourceFromWithinDS(dsName, 409); //Since all queries exists
+      entityExplorer.DeleteAllQueriesForDB(dsName);
     });
-  });
-
-  it("14. Validate Drop of the Newly Created - uuidtype - Table from Postgres datasource", () => {
-    deployMode.NavigateBacktoEditor();
-    EditorNavigation.SelectEntityByName("dropTable", EntityType.Query);
-    dataSources.RunQuery();
-    dataSources.ReadQueryTableResponse(0).then(($cellData) => {
-      expect($cellData).to.eq("0"); //Success response for dropped table!
+
+    it("16. Verify Deletion of datasource", () => {
+      deployMode.DeployApp();
+      deployMode.NavigateBacktoEditor();
+      dataSources.DeleteDatasourceFromWithinDS(dsName, 200);
     });
-    dataSources.AssertTableInVirtuosoList(dsName, "public.uuidtype", false);
-  });
-
-  it("15. Verify Deletion of all created queries", () => {
-    dataSources.DeleteDatasourceFromWithinDS(dsName, 409); //Since all queries exists
-    entityExplorer.DeleteAllQueriesForDB(dsName);
-  });
-
-  it("16. Verify Deletion of datasource", () => {
-    deployMode.DeployApp();
-    deployMode.NavigateBacktoEditor();
-    dataSources.DeleteDatasourceFromWithinDS(dsName, 200);
-  });
-});
+  },
+);
diff --git a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/AddWidgetTableAndBind_spec.js b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/AddWidgetTableAndBind_spec.js
index cd7fc2c74086..ff85dae304f3 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/AddWidgetTableAndBind_spec.js
+++ b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/AddWidgetTableAndBind_spec.js
@@ -16,7 +16,7 @@ import { Widgets } from "../../../../support/Pages/DataSources";
 
 describe(
   "Addwidget from Query and bind with other widgets",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   function () {
     before(() => {
       agHelper.AddDsl("inputdsl");
diff --git a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/AddWidget_spec.js b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/AddWidget_spec.js
index 5fae39d4fe6d..94870a8fe237 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/AddWidget_spec.js
+++ b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/AddWidget_spec.js
@@ -8,7 +8,7 @@ let datasourceName;
 
 describe(
   "Add widget - Postgress DataSource",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   function () {
     beforeEach(() => {
       dataSources.StartDataSourceRoutes();
diff --git a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/DSDocs_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/DSDocs_Spec.ts
index 35f56c3530b5..96ea6018a64c 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/DSDocs_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/DSDocs_Spec.ts
@@ -12,7 +12,7 @@ let dsName: any;
 
 describe(
   "Check datasource doc links",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   function () {
     it("1. Verify Postgres documentation opens", function () {
       CreateDummyDSNSave(DataSourceKVP["Postgres"]);
diff --git a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/EmptyDataSource_spec.js b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/EmptyDataSource_spec.js
index 5f24c8213b29..ae3dd19742be 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/EmptyDataSource_spec.js
+++ b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/EmptyDataSource_spec.js
@@ -6,7 +6,7 @@ import {
 
 describe(
   "Create a query with a empty datasource, run, save the query",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   function () {
     beforeEach(() => {
       dataSources.StartDataSourceRoutes();
diff --git a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/EvaluatedValuePopUp_spec.ts b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/EvaluatedValuePopUp_spec.ts
index 34393e2e9ca8..f81c3ca2e8fd 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/EvaluatedValuePopUp_spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/EvaluatedValuePopUp_spec.ts
@@ -3,7 +3,7 @@ import formControls from "../../../../locators/FormControl.json";
 
 describe(
   "Ensures evaluated popup is viewable when dynamic bindings are present and draggable",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   function () {
     it("shows evaluated pop up is visible and draggable", () => {
       _.dataSources.CreateDataSource("Mongo", true, true);
diff --git a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/GoogleSheets_spec.ts b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/GoogleSheets_spec.ts
index 792f633cd865..0c81622a800e 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/GoogleSheets_spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/GoogleSheets_spec.ts
@@ -11,7 +11,15 @@ import {
 
 describe(
   "Google Sheets datasource row objects placeholder",
-  { tags: ["@tag.GSheet", "@tag.Datasource", "@tag.excludeForAirgap"] },
+  {
+    tags: [
+      "@tag.GSheet",
+      "@tag.Datasource",
+      "@tag.excludeForAirgap",
+      "@tag.Git",
+      "@tag.AccessControl",
+    ],
+  },
   function () {
     let pluginName = "Google Sheets";
 
diff --git a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/Mongo1_spec.ts b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/Mongo1_spec.ts
index d6f16abe1e23..5ed89ec798df 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/Mongo1_spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/Mongo1_spec.ts
@@ -21,7 +21,9 @@ let dsName: any;
 
 describe(
   "Validate Mongo Query Pane Validations",
-  { tags: ["@tag.Datasource", "@tag.Sanity"] },
+  {
+    tags: ["@tag.Datasource", "@tag.Sanity", "@tag.Git", "@tag.AccessControl"],
+  },
   () => {
     before(() => {
       //dataSources.StartDataSourceRoutes(); //already started in index.js beforeeach
diff --git a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/QueryPane_MySQL_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/QueryPane_MySQL_Spec.ts
index bf1b9606359e..248acdf30ad2 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/QueryPane_MySQL_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/QueryPane_MySQL_Spec.ts
@@ -14,7 +14,7 @@ import EditorNavigation, {
 
 describe(
   "Validate MySQL query UI flows - Bug 14054",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   () => {
     let dsName: any;
 
diff --git a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/QueryPane_Postgres_Spec.js b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/QueryPane_Postgres_Spec.js
index 04d1f567c37f..f42ef1527359 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/QueryPane_Postgres_Spec.js
+++ b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/QueryPane_Postgres_Spec.js
@@ -20,7 +20,7 @@ let datasourceName;
 
 describe(
   "Validate CRUD queries for Postgres along with UI flow verifications",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   function () {
     // afterEach(function() {
     //   if (this.currentTest.state === "failed") {
diff --git a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/Querypane_Mongo_Spec.js b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/Querypane_Mongo_Spec.js
index 8a5f313c449f..b3764037d926 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/Querypane_Mongo_Spec.js
+++ b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/Querypane_Mongo_Spec.js
@@ -22,7 +22,9 @@ let datasourceName;
 
 describe(
   "Validate Mongo query commands",
-  { tags: ["@tag.Datasource", "@tag.Sanity"] },
+  {
+    tags: ["@tag.Datasource", "@tag.Sanity", "@tag.Git", "@tag.AccessControl"],
+  },
   function () {
     // afterEach(function() {
     //   if (this.currentTest.state === "failed") {
diff --git a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/S3_1_spec.js b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/S3_1_spec.js
index f3a4aa0f1949..339eb14bb812 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/S3_1_spec.js
+++ b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/S3_1_spec.js
@@ -16,7 +16,7 @@ let datasourceName;
 
 describe(
   "Validate CRUD queries for Amazon S3 along with UI flow verifications",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   function () {
     let fileName;
 
diff --git a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/S3_2_spec.ts b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/S3_2_spec.ts
index 310b1cfdbc6d..d93c201197ba 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/S3_2_spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/S3_2_spec.ts
@@ -21,7 +21,7 @@ import EditorNavigation, {
 
 describe(
   "Validate CRUD queries for Amazon S3 along with UI flow verifications",
-  { tags: ["@tag.Datasource"] },
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
   function () {
     let bucketName = "assets-test--appsmith",
       uid: any,
diff --git a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/SwitchDatasource_spec.js b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/SwitchDatasource_spec.js
index 1165a9b6f9a3..720a31dd23ef 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/SwitchDatasource_spec.js
+++ b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/SwitchDatasource_spec.js
@@ -1,44 +1,50 @@
 import { dataSources, agHelper } from "../../../../support/Objects/ObjectsCore";
-describe("Switch datasource", { tags: ["@tag.Datasource"] }, function () {
-  let dsName_1, dsName_2, MongoDB;
-  beforeEach(() => {
-    dataSources.StartDataSourceRoutes();
-  });
+describe.skip(
+  "Switch datasource",
+  { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
+  function () {
+    let dsName_1, dsName_2, MongoDB;
+    beforeEach(() => {
+      dataSources.StartDataSourceRoutes();
+    });
 
-  it("1. Create postgres datasource", function () {
-    dataSources.CreateDataSource("Postgres");
-    cy.get("@dsName").then(($dsName) => {
-      dsName_1 = $dsName;
+    it("1. Create postgres datasource", function () {
+      dataSources.CreateDataSource("Postgres");
+      cy.get("@dsName").then(($dsName) => {
+        dsName_1 = $dsName;
+      });
     });
-  });
-  it("2. Create another postgres datasource", function () {
-    dataSources.CreateDataSource("Postgres");
-    cy.get("@dsName").then(($dsName) => {
-      dsName_2 = $dsName;
+    it("2. Create another postgres datasource", function () {
+      dataSources.CreateDataSource("Postgres");
+      cy.get("@dsName").then(($dsName) => {
+        dsName_2 = $dsName;
+      });
     });
-  });
 
-  it("3. Create mongo datasource", function () {
-    dataSources.CreateDataSource("Mongo");
-    cy.get("@dsName").then(($dsName) => {
-      MongoDB = $dsName;
+    it("3. Create mongo datasource", function () {
+      dataSources.CreateDataSource("Mongo");
+      cy.get("@dsName").then(($dsName) => {
+        MongoDB = $dsName;
+      });
     });
-  });
 
-  it("4. By switching datasources execute a query with both the datasources", function () {
-    dataSources.CreateQueryForDS(dsName_1);
-    agHelper.GetNClick(".rc-select-show-arrow");
-    cy.contains(".rc-select-item-option-content", dsName_2).click().wait(1000);
-    cy.runQuery();
-    // Confirm mongo datasource is not present in the switch datasources dropdown
-    agHelper.GetNClick(".rc-select-show-arrow");
-    cy.get(".rc-select-item-option-content").should("not.have", MongoDB);
-  });
+    it("4. By switching datasources execute a query with both the datasources", function () {
+      dataSources.CreateQueryForDS(dsName_1);
+      agHelper.GetNClick(".rc-select-show-arrow");
+      cy.contains(".rc-select-item-option-content", dsName_2)
+        .click()
+        .wait(1000);
+      cy.runQuery();
+      // Confirm mongo datasource is not present in the switch datasources dropdown
+      agHelper.GetNClick(".rc-select-show-arrow");
+      cy.get(".rc-select-item-option-content").should("not.have", MongoDB);
+    });
 
-  after(() => {
-    dataSources.DeleteQuery("Query1");
-    cy.deleteDatasource(MongoDB);
-    cy.deleteDatasource(dsName_1);
-    cy.deleteDatasource(dsName_2);
-  });
-});
+    after(() => {
+      dataSources.DeleteQuery("Query1");
+      cy.deleteDatasource(MongoDB);
+      cy.deleteDatasource(dsName_1);
+      cy.deleteDatasource(dsName_2);
+    });
+  },
+);
diff --git a/app/client/cypress/e2e/Sanity/Datasources/Airtable_Basic_Spec.ts b/app/client/cypress/e2e/Sanity/Datasources/Airtable_Basic_Spec.ts
index 189c7153eaaa..534a68a8345f 100644
--- a/app/client/cypress/e2e/Sanity/Datasources/Airtable_Basic_Spec.ts
+++ b/app/client/cypress/e2e/Sanity/Datasources/Airtable_Basic_Spec.ts
@@ -17,7 +17,15 @@ import EditorNavigation, {
 let dsName: any, jsonSpecies: any, offset: any, insertedRecordId: any;
 describe(
   "Validate Airtable Ds",
-  { tags: ["@tag.Datasource", "@tag.Sanity", "@tag.excludeForAirgap"] },
+  {
+    tags: [
+      "@tag.Datasource",
+      "@tag.Sanity",
+      "@tag.excludeForAirgap",
+      "@tag.Git",
+      "@tag.AccessControl",
+    ],
+  },
   () => {
     before("Create a new Airtable DS", () => {
       dataSources.CreateDataSource("Airtable", true, false);
diff --git a/app/client/cypress/e2e/Sanity/Datasources/ArangoDataSourceStub_spec.js b/app/client/cypress/e2e/Sanity/Datasources/ArangoDataSourceStub_spec.js
index a87849fdd30c..7dfa7ff1396c 100644
--- a/app/client/cypress/e2e/Sanity/Datasources/ArangoDataSourceStub_spec.js
+++ b/app/client/cypress/e2e/Sanity/Datasources/ArangoDataSourceStub_spec.js
@@ -2,7 +2,9 @@ import { agHelper, dataSources } from "../../../support/Objects/ObjectsCore";
 
 describe(
   "Arango datasource test cases",
-  { tags: ["@tag.Datasource", "@tag.Sanity"] },
+  {
+    tags: ["@tag.Datasource", "@tag.Sanity", "@tag.Git", "@tag.AccessControl"],
+  },
   function () {
     it("1. Create, test, save then delete a Arango datasource", function () {
       dataSources.NavigateToDSCreateNew();
diff --git a/app/client/cypress/e2e/Sanity/Datasources/Arango_Basic_Spec.ts b/app/client/cypress/e2e/Sanity/Datasources/Arango_Basic_Spec.ts
index ffe98530a9ae..cbf69cdf90b9 100644
--- a/app/client/cypress/e2e/Sanity/Datasources/Arango_Basic_Spec.ts
+++ b/app/client/cypress/e2e/Sanity/Datasources/Arango_Basic_Spec.ts
@@ -22,7 +22,14 @@ import EditorNavigation, {
 if (CURRENT_REPO == REPO.CE) {
   describe(
     "Validate Arango & CURL Import Datasources",
-    { tags: ["@tag.Datasource", "@tag.Sanity"] },
+    {
+      tags: [
+        "@tag.Datasource",
+        "@tag.Sanity",
+        "@tag.Git",
+        "@tag.AccessControl",
+      ],
+    },
     () => {
       let dsName: any,
         collectionName = "countries_places_to_visit",
diff --git a/app/client/cypress/e2e/Sanity/Datasources/AuthenticatedApiDatasource_spec.js b/app/client/cypress/e2e/Sanity/Datasources/AuthenticatedApiDatasource_spec.js
index 5a1d92342448..40ab6eb34765 100644
--- a/app/client/cypress/e2e/Sanity/Datasources/AuthenticatedApiDatasource_spec.js
+++ b/app/client/cypress/e2e/Sanity/Datasources/AuthenticatedApiDatasource_spec.js
@@ -7,7 +7,9 @@ import { agHelper, dataSources } from "../../../support/Objects/ObjectsCore";
 
 describe(
   "Authenticated API Datasource",
-  { tags: ["@tag.Datasource", "@tag.Sanity"] },
+  {
+    tags: ["@tag.Datasource", "@tag.Sanity", "@tag.Git", "@tag.AccessControl"],
+  },
   function () {
     const URL = datasourceFormData["authenticatedApiUrl"];
     const headers = "Headers";
diff --git a/app/client/cypress/e2e/Sanity/Datasources/AuthenticatedApiWithOAuth_spec.ts b/app/client/cypress/e2e/Sanity/Datasources/AuthenticatedApiWithOAuth_spec.ts
index 9926565e0c19..390bf2889910 100644
--- a/app/client/cypress/e2e/Sanity/Datasources/AuthenticatedApiWithOAuth_spec.ts
+++ b/app/client/cypress/e2e/Sanity/Datasources/AuthenticatedApiWithOAuth_spec.ts
@@ -7,7 +7,9 @@ import {
 
 describe(
   "Authentiacted Api with OAuth 2.O authorization code test cases",
-  { tags: ["@tag.Datasource", "@tag.Sanity"] },
+  {
+    tags: ["@tag.Datasource", "@tag.Sanity", "@tag.Git", "@tag.AccessControl"],
+  },
   function () {
     it("1. Create & Save an Authenticated API with OAuth 2.O authorization code", function () {
       // Create OAuth client
diff --git a/app/client/cypress/e2e/Sanity/Datasources/DSAutosaveImprovements_spec.ts b/app/client/cypress/e2e/Sanity/Datasources/DSAutosaveImprovements_spec.ts
index fe4a189b30f1..a1bb173a62b2 100644
--- a/app/client/cypress/e2e/Sanity/Datasources/DSAutosaveImprovements_spec.ts
+++ b/app/client/cypress/e2e/Sanity/Datasources/DSAutosaveImprovements_spec.ts
@@ -11,7 +11,9 @@ let dsName: any;
 
 describe(
   "Datasource Autosave Improvements Tests",
-  { tags: ["@tag.Datasource", "@tag.Sanity"] },
+  {
+    tags: ["@tag.Datasource", "@tag.Sanity", "@tag.Git", "@tag.AccessControl"],
+  },
   function () {
     it("1. Test to verify that when datasource is discarded, no datasource can be seen in active list", () => {
       dataSources.NavigateToDSCreateNew();
diff --git a/app/client/cypress/e2e/Sanity/Datasources/DatasourceForm_spec.js b/app/client/cypress/e2e/Sanity/Datasources/DatasourceForm_spec.js
index 33265c28b320..706edb756f15 100644
--- a/app/client/cypress/e2e/Sanity/Datasources/DatasourceForm_spec.js
+++ b/app/client/cypress/e2e/Sanity/Datasources/DatasourceForm_spec.js
@@ -14,7 +14,9 @@ import {
 
 describe(
   "Datasource form related tests",
-  { tags: ["@tag.Datasource", "@tag.Sanity"] },
+  {
+    tags: ["@tag.Datasource", "@tag.Sanity", "@tag.Git", "@tag.AccessControl"],
+  },
   function () {
     it("1. Check whether the number of key value pairs is equal to number of delete buttons", function () {
       apiPage.CreateAndFillApi(testdata.baseUrl + testdata.methods);
diff --git a/app/client/cypress/e2e/Sanity/Datasources/ElasticSearchDatasource_spec.js b/app/client/cypress/e2e/Sanity/Datasources/ElasticSearchDatasource_spec.js
index 151311f95952..5177fa44788d 100644
--- a/app/client/cypress/e2e/Sanity/Datasources/ElasticSearchDatasource_spec.js
+++ b/app/client/cypress/e2e/Sanity/Datasources/ElasticSearchDatasource_spec.js
@@ -6,7 +6,9 @@ let elasticSearchName;
 
 describe(
   "Elastic search datasource tests",
-  { tags: ["@tag.Datasource", "@tag.Sanity"] },
+  {
+    tags: ["@tag.Datasource", "@tag.Sanity", "@tag.Git", "@tag.AccessControl"],
+  },
   function () {
     beforeEach(() => {
       dataSources.StartDataSourceRoutes();
diff --git a/app/client/cypress/e2e/Sanity/Datasources/GraphQL_spec.ts b/app/client/cypress/e2e/Sanity/Datasources/GraphQL_spec.ts
index 22f5f17454cd..33dd9ba475ab 100644
--- a/app/client/cypress/e2e/Sanity/Datasources/GraphQL_spec.ts
+++ b/app/client/cypress/e2e/Sanity/Datasources/GraphQL_spec.ts
@@ -48,7 +48,9 @@ const GRAPHQL_LIMIT_DATA = [
 
 describe(
   "GraphQL Datasource Implementation",
-  { tags: ["@tag.Datasource", "@tag.Sanity"] },
+  {
+    tags: ["@tag.Datasource", "@tag.Sanity", "@tag.Git", "@tag.AccessControl"],
+  },
   function () {
     before(() => {
       agHelper.GenerateUUID();
diff --git a/app/client/cypress/e2e/Sanity/Datasources/MockDBs_Spec.ts b/app/client/cypress/e2e/Sanity/Datasources/MockDBs_Spec.ts
index 33f132d7aa93..b1cd5d459fcf 100644
--- a/app/client/cypress/e2e/Sanity/Datasources/MockDBs_Spec.ts
+++ b/app/client/cypress/e2e/Sanity/Datasources/MockDBs_Spec.ts
@@ -17,7 +17,14 @@ import PageList from "../../../support/Pages/PageList";
 
 describe(
   "Validate Mock Query Active Ds querying & count",
-  { tags: ["@tag.Datasource", "@tag.excludeForAirgap"] },
+  {
+    tags: [
+      "@tag.Datasource",
+      "@tag.excludeForAirgap",
+      "@tag.Git",
+      "@tag.AccessControl",
+    ],
+  },
   () => {
     it("1. Create Query from Mock Postgres DB & verify active queries count", () => {
       PageList.AddNewPage();
diff --git a/app/client/cypress/e2e/Sanity/Datasources/MongoDatasourceURI_spec.ts b/app/client/cypress/e2e/Sanity/Datasources/MongoDatasourceURI_spec.ts
index 356d71264c6f..cf5836077056 100644
--- a/app/client/cypress/e2e/Sanity/Datasources/MongoDatasourceURI_spec.ts
+++ b/app/client/cypress/e2e/Sanity/Datasources/MongoDatasourceURI_spec.ts
@@ -10,7 +10,9 @@ let dsName: any;
 //  https://github.com/appsmithorg/TestEventDriver/issues/40
 describe(
   "Create, test, save then delete a mongo datasource using URI",
-  { tags: ["@tag.Datasource", "@tag.Sanity"] },
+  {
+    tags: ["@tag.Datasource", "@tag.Sanity", "@tag.Git", "@tag.AccessControl"],
+  },
   function () {
     it("1. Create, test, save then delete a mongo datasource using URI without username and password - #24897 ", function () {
       dataSources.NavigateToDSCreateNew();
diff --git a/app/client/cypress/e2e/Sanity/Datasources/MsSQLDataSourceStub_spec.js b/app/client/cypress/e2e/Sanity/Datasources/MsSQLDataSourceStub_spec.js
index 6eb064d9e117..f67224b5ca9b 100644
--- a/app/client/cypress/e2e/Sanity/Datasources/MsSQLDataSourceStub_spec.js
+++ b/app/client/cypress/e2e/Sanity/Datasources/MsSQLDataSourceStub_spec.js
@@ -3,7 +3,9 @@ import { dataSources } from "../../../support/Objects/ObjectsCore";
 
 describe(
   "MsSQL datasource test cases",
-  { tags: ["@tag.Datasource", "@tag.Sanity"] },
+  {
+    tags: ["@tag.Datasource", "@tag.Sanity", "@tag.Git", "@tag.AccessControl"],
+  },
   function () {
     let datasourceName;
 
diff --git a/app/client/cypress/e2e/Sanity/Datasources/MsSQL_Basic_Spec.ts b/app/client/cypress/e2e/Sanity/Datasources/MsSQL_Basic_Spec.ts
index 9f97d88433a2..1b595f35bb32 100644
--- a/app/client/cypress/e2e/Sanity/Datasources/MsSQL_Basic_Spec.ts
+++ b/app/client/cypress/e2e/Sanity/Datasources/MsSQL_Basic_Spec.ts
@@ -23,7 +23,9 @@ const oneClickBinding = new OneClickBinding();
 
 describe(
   "Validate MsSQL connection & basic querying with UI flows",
-  { tags: ["@tag.Datasource", "@tag.Sanity"] },
+  {
+    tags: ["@tag.Datasource", "@tag.Sanity", "@tag.Git", "@tag.AccessControl"],
+  },
   () => {
     let dsName: any,
       query: string,
@@ -83,16 +85,16 @@ describe(
        ,rating           NUMERIC(3,1)
        ,votes            INTEGER
      );
-     INSERT INTO Simpsons(episode_id,season,episode,number_in_series,title,summary,air_date,episode_image,rating,votes) VALUES ('S1-E1',1,1,1,'Simpsons Roasting on an Open Fire','The family is forced to spend all of their savings to get Bart''s new tattoo removed, and with no money for Christmas, Homer is forced to become a store Santa.','1989-12-17','https://m.media-amazon.com/images/M/MV5BZjJjMzMwOTctODk5ZC00NWM4LTgyNjAtNjNmN2I1OTc5OTAyXkEyXkFqcGdeQXVyNTAyODkwOQ@@._V1_UY126_UX224_ALjpg',8.1,5499);
-     INSERT INTO Simpsons(episode_id,season,episode,number_in_series,title,summary,air_date,episode_image,rating,votes) VALUES ('S1-E2',1,2,2,'Bart the Genius','Bart ends up at a school for gifted children after cheating on an IQ test.','1990-01-14','https://m.media-amazon.com/images/M/MV5BOTA0MTk3ZjktZGFhMi00ODcxLTlkYzgtZTJiMTQ5Y2I4MzhiXkEyXkFqcGdeQXVyNTAyODkwOQ@@._V1_UY126_UX224_ALjpg',7.8,3456);
-     INSERT INTO Simpsons(episode_id,season,episode,number_in_series,title,summary,air_date,episode_image,rating,votes) VALUES ('S1-E3',1,3,3,'Homer''s Odyssey','After losing his job, Homer contemplates ending it all, until he discovers a new life path as a safety advocate.','1990-01-21','https://m.media-amazon.com/images/M/MV5BMzQ3M2M1YjQtNTkzNS00MDlhLWFiY2QtOWJiODZhNGJlZWMxXkEyXkFqcGdeQXVyNTAyODkwOQ@@._V1_UY126_UX224_ALjpg',7.4,3034);
-     INSERT INTO Simpsons(episode_id,season,episode,number_in_series,title,summary,air_date,episode_image,rating,votes) VALUES ('S1-E4',1,4,4,'There''s No Disgrace Like Home','After being embarrassed by the rest of the family at a company picnic, Homer becomes obsessed with improving their behavior towards each other.','1990-01-28','https://m.media-amazon.com/images/M/MV5BOTZmNmE1NDUtMmRhOC00ZTYyLTkzMTEtOTM5YTgwMTc5YmMxXkEyXkFqcGdeQXVyNTAyODkwOQ@@._V1_UY126_UX224_ALjpg',7.7,2978);
-     INSERT INTO Simpsons(episode_id,season,episode,number_in_series,title,summary,air_date,episode_image,rating,votes) VALUES ('S1-E5',1,5,5,'Bart the General','After being beaten up by Nelson Muntz one too many times, Bart turns to Grampa for help, and soon leads a rebellion against the school bully.','1990-02-04','https://m.media-amazon.com/images/M/MV5BMzk4ZDU2OTMtZjM0NC00ZWIyLWFmNmQtMjcyZGQ1OWE0ZWMyXkEyXkFqcGdeQXVyNTAyODkwOQ@@._V1_UY126_UX224_ALjpg',8.0,3023);
-     INSERT INTO Simpsons(episode_id,season,episode,number_in_series,title,summary,air_date,episode_image,rating,votes) VALUES ('S1-E6',1,6,6,'Moaning Lisa','A depressed Lisa''s spirit is lifted when she meets a jazz-man, Bleeding Gums Murphy.','1990-02-11','https://m.media-amazon.com/images/M/MV5BODI3ZmEzMmEtNjE2MS00MjMyLWI0MmEtMTdhMWE4YzUwMzkwXkEyXkFqcGdeQXVyNTAyODkwOQ@@._V1_UY126_UX224_ALjpg',7.6,2903);
-     INSERT INTO Simpsons(episode_id,season,episode,number_in_series,title,summary,air_date,episode_image,rating,votes) VALUES ('S1-E7',1,7,7,'The Call of the Simpsons','Homer takes the family camping, but it soon becomes a misadventure when they lose their equipment and Homer is mistaken for Bigfoot.','1990-02-18','https://m.media-amazon.com/images/M/MV5BOTkxMzY3Y2QtMWMyMC00NDllLTkyMTctZTY4MDFjZGExYTc1XkEyXkFqcGdeQXVyNTAyODkwOQ@@._V1_UY126_UX224_ALjpg',7.8,2807);
-     INSERT INTO Simpsons(episode_id,season,episode,number_in_series,title,summary,air_date,episode_image,rating,votes) VALUES ('S1-E8',1,8,8,'The Telltale Head','Bart gets more than he bargained for when he saws the head off a statue of the town''s founder.','1990-02-25','https://m.media-amazon.com/images/M/MV5BMzhhNTM3ZDYtYWQ3OS00NDU2LTk4MGEtOGZmMWUwODlmMjQyXkEyXkFqcGdeQXVyNTAyODkwOQ@@._V1_UY126_UX224_ALjpg',7.7,2733);
-     INSERT INTO Simpsons(episode_id,season,episode,number_in_series,title,summary,air_date,episode_image,rating,votes) VALUES ('S1-E9',1,9,9,'Life on the Fast Lane','Marge contemplates an affair with a handsome bowling instructor.','1990-03-18','https://m.media-amazon.com/images/M/MV5BNzcxYWExZWYtMzY1MC00YjhlLWFmZmUtOTQ3ODZhZTUwN2EzXkEyXkFqcGdeQXVyNTAyODkwOQ@@._V1_UY126_UX224_ALjpg',7.5,2716);
-     INSERT INTO Simpsons(episode_id,season,episode,number_in_series,title,summary,air_date,episode_image,rating,votes) VALUES ('S1-E10',1,10,10,'Homer''s Night Out','After a photograph of Homer canoodling with an exotic dancer is distributed throughout Springfield, he finds himself kicked out of the house by Marge.','1990-03-25','https://m.media-amazon.com/images/M/MV5BMTQ4NzU0MjY1OF5BMl5BanBnXkFtZTgwNTE4NTQ2MjE@._V1_UX224_CR0,0,224,126_ALjpg',7.3,2624);`;
+     INSERT INTO Simpsons(episode_id,season,episode,number_in_series,title,summary,air_date,episode_image,rating,votes) VALUES ('S1-E1',1,1,1,'Simpsons Roasting on an Open Fire','The family is forced to spend all of their savings to get Bart''s new tattoo removed, and with no money for Christmas, Homer is forced to become a store Santa.','1989-12-17','https://appsmith.com/images/M/MV5BZjJjMzMwOTctODk5ZC00NWM4LTgyNjAtNjNmN2I1OTc5OTAyXkEyXkFqcGdeQXVyNTAyODkwOQ@@._V1_UY126_UX224_ALjpg',8.1,5499);
+     INSERT INTO Simpsons(episode_id,season,episode,number_in_series,title,summary,air_date,episode_image,rating,votes) VALUES ('S1-E2',1,2,2,'Bart the Genius','Bart ends up at a school for gifted children after cheating on an IQ test.','1990-01-14','https://appsmith.com/images/M/MV5BOTA0MTk3ZjktZGFhMi00ODcxLTlkYzgtZTJiMTQ5Y2I4MzhiXkEyXkFqcGdeQXVyNTAyODkwOQ@@._V1_UY126_UX224_ALjpg',7.8,3456);
+     INSERT INTO Simpsons(episode_id,season,episode,number_in_series,title,summary,air_date,episode_image,rating,votes) VALUES ('S1-E3',1,3,3,'Homer''s Odyssey','After losing his job, Homer contemplates ending it all, until he discovers a new life path as a safety advocate.','1990-01-21','https://appsmith.com/images/M/MV5BMzQ3M2M1YjQtNTkzNS00MDlhLWFiY2QtOWJiODZhNGJlZWMxXkEyXkFqcGdeQXVyNTAyODkwOQ@@._V1_UY126_UX224_ALjpg',7.4,3034);
+     INSERT INTO Simpsons(episode_id,season,episode,number_in_series,title,summary,air_date,episode_image,rating,votes) VALUES ('S1-E4',1,4,4,'There''s No Disgrace Like Home','After being embarrassed by the rest of the family at a company picnic, Homer becomes obsessed with improving their behavior towards each other.','1990-01-28','https://appsmith.com/images/M/MV5BOTZmNmE1NDUtMmRhOC00ZTYyLTkzMTEtOTM5YTgwMTc5YmMxXkEyXkFqcGdeQXVyNTAyODkwOQ@@._V1_UY126_UX224_ALjpg',7.7,2978);
+     INSERT INTO Simpsons(episode_id,season,episode,number_in_series,title,summary,air_date,episode_image,rating,votes) VALUES ('S1-E5',1,5,5,'Bart the General','After being beaten up by Nelson Muntz one too many times, Bart turns to Grampa for help, and soon leads a rebellion against the school bully.','1990-02-04','https://appsmith.com/images/M/MV5BMzk4ZDU2OTMtZjM0NC00ZWIyLWFmNmQtMjcyZGQ1OWE0ZWMyXkEyXkFqcGdeQXVyNTAyODkwOQ@@._V1_UY126_UX224_ALjpg',8.0,3023);
+     INSERT INTO Simpsons(episode_id,season,episode,number_in_series,title,summary,air_date,episode_image,rating,votes) VALUES ('S1-E6',1,6,6,'Moaning Lisa','A depressed Lisa''s spirit is lifted when she meets a jazz-man, Bleeding Gums Murphy.','1990-02-11','https://appsmith.com/images/M/MV5BODI3ZmEzMmEtNjE2MS00MjMyLWI0MmEtMTdhMWE4YzUwMzkwXkEyXkFqcGdeQXVyNTAyODkwOQ@@._V1_UY126_UX224_ALjpg',7.6,2903);
+     INSERT INTO Simpsons(episode_id,season,episode,number_in_series,title,summary,air_date,episode_image,rating,votes) VALUES ('S1-E7',1,7,7,'The Call of the Simpsons','Homer takes the family camping, but it soon becomes a misadventure when they lose their equipment and Homer is mistaken for Bigfoot.','1990-02-18','https://appsmith.com/images/M/MV5BOTkxMzY3Y2QtMWMyMC00NDllLTkyMTctZTY4MDFjZGExYTc1XkEyXkFqcGdeQXVyNTAyODkwOQ@@._V1_UY126_UX224_ALjpg',7.8,2807);
+     INSERT INTO Simpsons(episode_id,season,episode,number_in_series,title,summary,air_date,episode_image,rating,votes) VALUES ('S1-E8',1,8,8,'The Telltale Head','Bart gets more than he bargained for when he saws the head off a statue of the town''s founder.','1990-02-25','https://appsmith.com/images/M/MV5BMzhhNTM3ZDYtYWQ3OS00NDU2LTk4MGEtOGZmMWUwODlmMjQyXkEyXkFqcGdeQXVyNTAyODkwOQ@@._V1_UY126_UX224_ALjpg',7.7,2733);
+     INSERT INTO Simpsons(episode_id,season,episode,number_in_series,title,summary,air_date,episode_image,rating,votes) VALUES ('S1-E9',1,9,9,'Life on the Fast Lane','Marge contemplates an affair with a handsome bowling instructor.','1990-03-18','https://appsmith.com/images/M/MV5BNzcxYWExZWYtMzY1MC00YjhlLWFmZmUtOTQ3ODZhZTUwN2EzXkEyXkFqcGdeQXVyNTAyODkwOQ@@._V1_UY126_UX224_ALjpg',7.5,2716);
+     INSERT INTO Simpsons(episode_id,season,episode,number_in_series,title,summary,air_date,episode_image,rating,votes) VALUES ('S1-E10',1,10,10,'Homer''s Night Out','After a photograph of Homer canoodling with an exotic dancer is distributed throughout Springfield, he finds himself kicked out of the house by Marge.','1990-03-25','https://appsmith.com/images/M/MV5BMTQ4NzU0MjY1OF5BMl5BanBnXkFtZTgwNTE4NTQ2MjE@._V1_UX224_CR0,0,224,126_ALjpg',7.3,2624);`;
         dataSources.EnterQuery(query);
         dataSources.RunQuery();
       });
diff --git a/app/client/cypress/e2e/Sanity/Datasources/MySQLDataSourceStub_spec.js b/app/client/cypress/e2e/Sanity/Datasources/MySQLDataSourceStub_spec.js
index ba90846b0796..2db2c9c9628c 100644
--- a/app/client/cypress/e2e/Sanity/Datasources/MySQLDataSourceStub_spec.js
+++ b/app/client/cypress/e2e/Sanity/Datasources/MySQLDataSourceStub_spec.js
@@ -3,7 +3,9 @@ import { agHelper, dataSources } from "../../../support/Objects/ObjectsCore";
 
 describe(
   "MySQL datasource test cases",
-  { tags: ["@tag.Datasource", "@tag.Sanity"] },
+  {
+    tags: ["@tag.Datasource", "@tag.Sanity", "@tag.Git", "@tag.AccessControl"],
+  },
   function () {
     let datasourceName;
     it("1. Create, test, save then delete a MySQL datasource", function () {
diff --git a/app/client/cypress/e2e/Sanity/Datasources/MySQLNoiseTest_spec.js b/app/client/cypress/e2e/Sanity/Datasources/MySQLNoiseTest_spec.js
index ecbc34e02481..bd4acb0b9e5d 100644
--- a/app/client/cypress/e2e/Sanity/Datasources/MySQLNoiseTest_spec.js
+++ b/app/client/cypress/e2e/Sanity/Datasources/MySQLNoiseTest_spec.js
@@ -13,7 +13,9 @@ const commonlocators = require("../../../locators/commonlocators.json");
 
 describe(
   "MySQL noise test",
-  { tags: ["@tag.Datasource", "@tag.Sanity"] },
+  {
+    tags: ["@tag.Datasource", "@tag.Sanity", "@tag.Git", "@tag.AccessControl"],
+  },
   function () {
     let datasourceName;
 
diff --git a/app/client/cypress/e2e/Sanity/Datasources/MySQL_spec.js b/app/client/cypress/e2e/Sanity/Datasources/MySQL_spec.js
index 97e59863018c..ab266b339ea6 100644
--- a/app/client/cypress/e2e/Sanity/Datasources/MySQL_spec.js
+++ b/app/client/cypress/e2e/Sanity/Datasources/MySQL_spec.js
@@ -5,7 +5,9 @@ let datasourceName;
 
 describe(
   "MySQL datasource test cases",
-  { tags: ["@tag.Datasource", "@tag.Sanity"] },
+  {
+    tags: ["@tag.Datasource", "@tag.Sanity", "@tag.Git", "@tag.AccessControl"],
+  },
   function () {
     beforeEach(() => {
       dataSources.StartDataSourceRoutes();
diff --git a/app/client/cypress/e2e/Sanity/Datasources/Port_Number_Placeholder_Spec.ts b/app/client/cypress/e2e/Sanity/Datasources/Port_Number_Placeholder_Spec.ts
index 5d996f35e8b3..39bbc8d7b6c5 100644
--- a/app/client/cypress/e2e/Sanity/Datasources/Port_Number_Placeholder_Spec.ts
+++ b/app/client/cypress/e2e/Sanity/Datasources/Port_Number_Placeholder_Spec.ts
@@ -2,7 +2,9 @@ import { agHelper, dataSources } from "../../../support/Objects/ObjectsCore";
 
 describe(
   "Test placeholder value for port number for all datasources - tests #24960",
-  { tags: ["@tag.Datasource", "@tag.Sanity"] },
+  {
+    tags: ["@tag.Datasource", "@tag.Sanity", "@tag.Git", "@tag.AccessControl"],
+  },
   () => {
     it("1. Test datasource port number placeholder", () => {
       // MsSQL
diff --git a/app/client/cypress/e2e/Sanity/Datasources/RedshiftDataSourceStub_spec.js b/app/client/cypress/e2e/Sanity/Datasources/RedshiftDataSourceStub_spec.js
index 2febce52d1f2..80cfcb996c05 100644
--- a/app/client/cypress/e2e/Sanity/Datasources/RedshiftDataSourceStub_spec.js
+++ b/app/client/cypress/e2e/Sanity/Datasources/RedshiftDataSourceStub_spec.js
@@ -5,7 +5,9 @@ import { ObjectsRegistry } from "../../../support/Objects/Registry";
 
 describe(
   "Redshift datasource test cases",
-  { tags: ["@tag.Datasource", "@tag.Sanity"] },
+  {
+    tags: ["@tag.Datasource", "@tag.Sanity", "@tag.Git", "@tag.AccessControl"],
+  },
   function () {
     beforeEach(() => {
       dataSources.StartDataSourceRoutes();
diff --git a/app/client/cypress/e2e/Sanity/Datasources/RestApiDatasource_spec.js b/app/client/cypress/e2e/Sanity/Datasources/RestApiDatasource_spec.js
index b91b22b68178..41224748eaac 100644
--- a/app/client/cypress/e2e/Sanity/Datasources/RestApiDatasource_spec.js
+++ b/app/client/cypress/e2e/Sanity/Datasources/RestApiDatasource_spec.js
@@ -7,7 +7,9 @@ import {
 
 describe(
   "Create a rest datasource",
-  { tags: ["@tag.Datasource", "@tag.Sanity"] },
+  {
+    tags: ["@tag.Datasource", "@tag.Sanity", "@tag.Git", "@tag.AccessControl"],
+  },
   function () {
     it("1. Create a rest datasource + Bug 14566", function () {
       apiPage.CreateAndFillApi(testdata.baseUrl + testdata.methods);
diff --git a/app/client/cypress/e2e/Sanity/Datasources/RestApiOAuth2Validation_spec.ts b/app/client/cypress/e2e/Sanity/Datasources/RestApiOAuth2Validation_spec.ts
index e9c83ab4b16b..9b52a88bcf97 100644
--- a/app/client/cypress/e2e/Sanity/Datasources/RestApiOAuth2Validation_spec.ts
+++ b/app/client/cypress/e2e/Sanity/Datasources/RestApiOAuth2Validation_spec.ts
@@ -10,7 +10,9 @@ import {
 
 describe(
   "Datasource form OAuth2 client credentials related tests",
-  { tags: ["@tag.Datasource", "@tag.Sanity"] },
+  {
+    tags: ["@tag.Datasource", "@tag.Sanity", "@tag.Git", "@tag.AccessControl"],
+  },
   function () {
     let clientId, clientSecret;
 
diff --git a/app/client/cypress/e2e/Sanity/Datasources/SMTPDatasource_spec.js b/app/client/cypress/e2e/Sanity/Datasources/SMTPDatasource_spec.js
index e6da42b6a93f..4274883a09a4 100644
--- a/app/client/cypress/e2e/Sanity/Datasources/SMTPDatasource_spec.js
+++ b/app/client/cypress/e2e/Sanity/Datasources/SMTPDatasource_spec.js
@@ -6,7 +6,9 @@ import { agHelper, dataSources } from "../../../support/Objects/ObjectsCore";
 
 describe(
   "SMTP datasource test cases using ted",
-  { tags: ["@tag.Datasource", "@tag.Sanity"] },
+  {
+    tags: ["@tag.Datasource", "@tag.Sanity", "@tag.Git", "@tag.AccessControl"],
+  },
   function () {
     let SMTPDatasourceName;
     beforeEach(() => {
diff --git a/app/client/cypress/e2e/Sanity/Datasources/Styles_spec.js b/app/client/cypress/e2e/Sanity/Datasources/Styles_spec.js
index 2f3dfa6649a9..c98c1b3dc1f3 100644
--- a/app/client/cypress/e2e/Sanity/Datasources/Styles_spec.js
+++ b/app/client/cypress/e2e/Sanity/Datasources/Styles_spec.js
@@ -3,7 +3,15 @@ import { agHelper, dataSources } from "../../../support/Objects/ObjectsCore";
 let dsName;
 describe(
   "Validate Datasource Panel Styles",
-  { tags: ["@tag.Datasource", "@tag.Sanity", "@tag.excludeForAirgap"] },
+  {
+    tags: [
+      "@tag.Datasource",
+      "@tag.Sanity",
+      "@tag.excludeForAirgap",
+      "@tag.Git",
+      "@tag.AccessControl",
+    ],
+  },
   function () {
     const backgroundColorGray700 = "rgb(76, 86, 100)";
     const backgroundColorGray1 = "rgb(241, 245, 249)";
diff --git a/app/client/cypress/e2e/Smoke/Apps/ReconnectDatasource_spec.js b/app/client/cypress/e2e/Smoke/Apps/ReconnectDatasource_spec.js
index eec5e901dbea..e8a3d6c0183e 100644
--- a/app/client/cypress/e2e/Smoke/Apps/ReconnectDatasource_spec.js
+++ b/app/client/cypress/e2e/Smoke/Apps/ReconnectDatasource_spec.js
@@ -7,7 +7,9 @@ import {
 
 describe(
   "Reconnect Datasource Modal validation while importing application",
-  { tags: ["@tag.Datasource", "@tag.Sanity"] },
+  {
+    tags: ["@tag.Datasource", "@tag.Sanity", "@tag.Git", "@tag.AccessControl"],
+  },
   function () {
     let workspaceId;
     let appid;
diff --git a/app/client/cypress/e2e/Smoke/GenerateCRUD/Generate_Crud_New_Page_spec.ts b/app/client/cypress/e2e/Smoke/GenerateCRUD/Generate_Crud_New_Page_spec.ts
index a361763aa9be..6385c02be792 100644
--- a/app/client/cypress/e2e/Smoke/GenerateCRUD/Generate_Crud_New_Page_spec.ts
+++ b/app/client/cypress/e2e/Smoke/GenerateCRUD/Generate_Crud_New_Page_spec.ts
@@ -3,7 +3,9 @@ import PageList from "../../../support/Pages/PageList";
 
 describe(
   "Validate generate CRUD operation by creating a datasource from generate CRUD form",
-  { tags: ["@tag.Datasource", "@tag.Sanity"] },
+  {
+    tags: ["@tag.Datasource", "@tag.Sanity", "@tag.Git", "@tag.AccessControl"],
+  },
   () => {
     it(
       "1. Generated CRUD app should work when there are no entities in the page & when there are entities in the current page",
diff --git a/app/client/cypress/fixtures/TestDataSet1.json b/app/client/cypress/fixtures/TestDataSet1.json
index cb390bc6c805..9032f9db78e2 100644
--- a/app/client/cypress/fixtures/TestDataSet1.json
+++ b/app/client/cypress/fixtures/TestDataSet1.json
@@ -441,19 +441,19 @@
   ],
   "TableURLColumnType": [
     {
-      "image": "https://wallpaperaccess.com/full/1376499.jpg",
+      "image": "https://docs.appsmith.com/img/cube-logo_S50__hLNq.jpeg",
       "userName": "Michael Lawson"
     },
     {
-      "image": "https://wallpaperaccess.com/full/1688623.jpg",
+      "image": "https://docs.appsmith.com/img/Appsmith-Login-Screen-Shows-SAML.jpg",
       "userName": "Lindsay Ferguson"
     },
     {
-      "image": "https://wallpaperaccess.com/full/2117775.jpg",
+      "image": "https://docs.appsmith.com/img/zapier-logo_odZ9wZQ3vY.jpeg",
       "userName": "Byron Fields"
     },
     {
-      "image": "https://wallpaperaccess.com/full/812632.jpg",
+      "image": "https://docs.appsmith.com/img/replyto-logo_6yaZHFIeU.jpeg",
       "userName": "Toby William"
     }
   ],
diff --git a/app/client/cypress/fixtures/datasources.json b/app/client/cypress/fixtures/datasources.json
index e9a76ef161d0..040f7503a697 100644
--- a/app/client/cypress/fixtures/datasources.json
+++ b/app/client/cypress/fixtures/datasources.json
@@ -83,7 +83,7 @@
   "mockDatabaseUsername": "fakeapi",
   "mockDatabasePassword": "LimitedAccess123#",
   "readonly": "readonly",
-  "authenticatedApiUrl": "https://fakeapi.com",
+  "authenticatedApiUrl": "http://host.docker.internal:5001",
 
   "GraphqlApiUrl_TED": "http://host.docker.internal:4200/graphql",
   "GITEA_API_BASE_TED": "localhost",
diff --git a/app/client/cypress/fixtures/gitImport.json b/app/client/cypress/fixtures/gitImport.json
index 1e09e17ba447..0e23e769600a 100644
--- a/app/client/cypress/fixtures/gitImport.json
+++ b/app/client/cypress/fixtures/gitImport.json
@@ -743,7 +743,7 @@
           "userPermissions": [],
           "name": "DEFAULT_REST_DATASOURCE",
           "pluginId": "restapi-plugin",
-          "datasourceConfiguration": { "url": "hhttp://host.docker.internal:5001/v1/mock-api" },
+          "datasourceConfiguration": { "url": "http://host.docker.internal:5001/v1/mock-api" },
           "invalids": [],
           "messages": [],
           "isValid": true,
diff --git a/app/client/cypress/fixtures/modalWidgetTestApp.json b/app/client/cypress/fixtures/modalWidgetTestApp.json
index 93186b6d0f2b..3b2f53cf18c4 100644
--- a/app/client/cypress/fixtures/modalWidgetTestApp.json
+++ b/app/client/cypress/fixtures/modalWidgetTestApp.json
@@ -510,7 +510,7 @@
                                           "leftColumn": 0.0,
                                           "defaultImage": "https://assets.appsmith.com/widgets/default.png",
                                           "key": "an3dz32jnz",
-                                          "image": "https://jpeg.org/images/jpegsystems-home.jpg",
+                                          "image": "https://community.appsmith.com/sites/default/files/styles/small_thumbnail/public/2024-03/aws-logo.jpg",
                                           "isDeprecated": false,
                                           "rightColumn": 16.0,
                                           "objectFit": "cover",
@@ -1075,7 +1075,7 @@
                           "imageShape": "RECTANGLE",
                           "leftColumn": 32.0,
                           "dynamicBindingPathList": [{ "key": "borderRadius" }],
-                          "defaultImage": "https://mir-s3-cdn-cf.behance.net/project_modules/max_1200/5eeea355389655.59822ff824b72.gif",
+                          "defaultImage": "https://docs.appsmith.com/img/multi-update-sql.gif",
                           "key": "an3dz32jnz",
                           "image": "",
                           "isDeprecated": false,
@@ -4225,7 +4225,7 @@
                                           "leftColumn": 0.0,
                                           "defaultImage": "https://assets.appsmith.com/widgets/default.png",
                                           "key": "an3dz32jnz",
-                                          "image": "https://jpeg.org/images/jpegsystems-home.jpg",
+                                          "image": "https://community.appsmith.com/sites/default/files/styles/small_thumbnail/public/2024-03/aws-logo.jpg",
                                           "isDeprecated": false,
                                           "rightColumn": 16.0,
                                           "objectFit": "cover",
@@ -4790,7 +4790,7 @@
                           "imageShape": "RECTANGLE",
                           "leftColumn": 32.0,
                           "dynamicBindingPathList": [{ "key": "borderRadius" }],
-                          "defaultImage": "https://mir-s3-cdn-cf.behance.net/project_modules/max_1200/5eeea355389655.59822ff824b72.gif",
+                          "defaultImage": "https://docs.appsmith.com/img/multi-update-sql.gif",
                           "key": "an3dz32jnz",
                           "image": "",
                           "isDeprecated": false,
diff --git a/app/client/cypress/fixtures/onPageLoadActionsDsl.json b/app/client/cypress/fixtures/onPageLoadActionsDsl.json
index fce6d97f48ae..a79f4df7075f 100644
--- a/app/client/cypress/fixtures/onPageLoadActionsDsl.json
+++ b/app/client/cypress/fixtures/onPageLoadActionsDsl.json
@@ -34,7 +34,7 @@
 		"imageShape": "RECTANGLE",
 		"leftColumn": 8,
 		"dynamicBindingPathList": [],
-		"defaultImage": "http://host.docker.internal:4200/clouddefaultImage.png",
+		"defaultImage": "https://www.appsmith.com/favicon.png",
 		"key": "nyx7m0wdr7",
 		"image": "",
 		"rightColumn": 54,
@@ -122,7 +122,7 @@
 		"imageShape": "RECTANGLE",
 		"leftColumn": 8,
 		"dynamicBindingPathList": [],
-		"defaultImage": "http://host.docker.internal:4200/clouddefaultImage.png",
+		"defaultImage": "https://www.appsmith.com/favicon.png",
 		"key": "agtoehwrk0",
 		"image": "",
 		"rightColumn": 27,
diff --git a/app/client/cypress/fixtures/uiBindnewDsl.json b/app/client/cypress/fixtures/uiBindnewDsl.json
new file mode 100644
index 000000000000..6d45729acce7
--- /dev/null
+++ b/app/client/cypress/fixtures/uiBindnewDsl.json
@@ -0,0 +1,540 @@
+{
+    "dsl": {
+      "widgetName": "MainContainer",
+      "backgroundColor": "none",
+      "rightColumn": 4896,
+      "snapColumns": 64,
+      "detachFromLayout": true,
+      "widgetId": "0",
+      "topRow": 0,
+      "bottomRow": 600,
+      "containerStyle": "none",
+      "snapRows": 124,
+      "parentRowSpace": 1,
+      "type": "CANVAS_WIDGET",
+      "canExtend": true,
+      "version": 90,
+      "minHeight": 1292,
+      "parentColumnSpace": 1,
+      "dynamicBindingPathList": [],
+      "leftColumn": 0,
+      "children": [
+        {
+          "boxShadow": "none",
+          "widgetName": "Container1",
+          "topRow": 0,
+          "bottomRow": 60,
+          "parentRowSpace": 38,
+          "type": "CONTAINER_WIDGET",
+          "parentColumnSpace": 75.25,
+          "dynamicBindingPathList": [],
+          "leftColumn": 0,
+          "children": [
+            {
+              "labelTextSize": "0.875rem",
+              "boxShadow": "none",
+              "backgroundColor": "#FFFFFF",
+              "widgetName": "utncsu66ty",
+              "rightColumn": 2408,
+              "orientation": "VERTICAL",
+              "snapColumns": 16,
+              "detachFromLayout": true,
+              "widgetId": "acizsl94my",
+              "containerStyle": "none",
+              "topRow": 0,
+              "bottomRow": 380,
+              "parentRowSpace": 1,
+              "isVisible": true,
+              "type": "CANVAS_WIDGET",
+              "canExtend": false,
+              "version": 1,
+              "isLoading": false,
+              "parentColumnSpace": 1,
+              "leftColumn": 0,
+              "dynamicBindingPathList": [],
+              "borderRadius": "0px",
+              "children": [
+                {
+                  "boxShadow": "none",
+                  "widgetName": "Text5",
+                  "topRow": 28,
+                  "bottomRow": 32,
+                  "parentRowSpace": 38,
+                  "type": "TEXT_WIDGET",
+                  "parentColumnSpace": 62.484375,
+                  "overflow": "NONE",
+                  "fontFamily": "System Default",
+                  "dynamicTriggerPathList": [],
+                  "leftColumn": 16,
+                  "dynamicBindingPathList": [
+                    {
+                      "key": "text"
+                    }
+                  ],
+                  "text": "{{DatePicker1.selectedDate}}",
+                  "labelTextSize": "0.875rem",
+                  "rightColumn": 32,
+                  "textAlign": "LEFT",
+                  "dynamicHeight": "FIXED",
+                  "widgetId": "t7c7i4gv0f",
+                  "isVisible": true,
+                  "fontStyle": "BOLD",
+                  "version": 1,
+                  "textColor": "#231F20",
+                  "parentId": "acizsl94my",
+                  "isLoading": false,
+                  "borderRadius": "0px",
+                  "maxDynamicHeight": 9000,
+                  "fontSize": "0.875rem",
+                  "minDynamicHeight": 4
+                },
+                {
+                  "needsErrorInfo": false,
+                  "boxShadow": "none",
+                  "mobileBottomRow": 12,
+                  "widgetName": "DatePicker1",
+                  "minDate": "1920-12-31T18:30:00.000Z",
+                  "dateFormat": "YYYY-MM-DD HH:mm",
+                  "topRow": 5,
+                  "bottomRow": 12,
+                  "shortcuts": false,
+                  "parentRowSpace": 10,
+                  "labelWidth": 5,
+                  "type": "DATE_PICKER_WIDGET2",
+                  "mobileRightColumn": 30,
+                  "animateLoading": true,
+                  "parentColumnSpace": 7.26171875,
+                  "leftColumn": 10,
+                  "dynamicBindingPathList": [
+                    {
+                      "key": "accentColor"
+                    },
+                    {
+                      "key": "borderRadius"
+                    }
+                  ],
+                  "labelPosition": "Top",
+                  "isDisabled": false,
+                  "key": "frcocd42ul",
+                  "labelTextSize": "0.875rem",
+                  "isRequired": false,
+                  "defaultDate": "2024-10-24T07:39:07.659Z",
+                  "rightColumn": 30,
+                  "dynamicHeight": "FIXED",
+                  "widgetId": "pwo88q4udx",
+                  "accentColor": "{{appsmith.theme.colors.primaryColor}}",
+                  "minWidth": 450,
+                  "isVisible": true,
+                  "datePickerType": "DATE_PICKER",
+                  "label": "Label",
+                  "version": 2,
+                  "parentId": "acizsl94my",
+                  "labelAlignment": "left",
+                  "renderMode": "CANVAS",
+                  "isLoading": false,
+                  "mobileTopRow": 5,
+                  "timePrecision": "minute",
+                  "responsiveBehavior": "fill",
+                  "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
+                  "mobileLeftColumn": 10,
+                  "maxDynamicHeight": 9000,
+                  "firstDayOfWeek": 0,
+                  "closeOnSelection": true,
+                  "maxDate": "2121-12-31T18:29:00.000Z",
+                  "minDynamicHeight": 4
+                },
+                {
+                  "needsErrorInfo": false,
+                  "boxShadow": "none",
+                  "mobileBottomRow": 22,
+                  "widgetName": "DatePicker2",
+                  "minDate": "1920-12-31T18:30:00.000Z",
+                  "dateFormat": "YYYY-MM-DD HH:mm",
+                  "topRow": 14,
+                  "bottomRow": 21,
+                  "shortcuts": false,
+                  "parentRowSpace": 10,
+                  "labelWidth": 5,
+                  "type": "DATE_PICKER_WIDGET2",
+                  "mobileRightColumn": 29,
+                  "animateLoading": true,
+                  "parentColumnSpace": 7.26171875,
+                  "leftColumn": 10,
+                  "dynamicBindingPathList": [
+                    {
+                      "key": "accentColor"
+                    },
+                    {
+                      "key": "borderRadius"
+                    }
+                  ],
+                  "labelPosition": "Top",
+                  "isDisabled": false,
+                  "key": "frcocd42ul",
+                  "labelTextSize": "0.875rem",
+                  "isRequired": false,
+                  "defaultDate": "2024-10-24T07:39:07.659Z",
+                  "rightColumn": 30,
+                  "dynamicHeight": "FIXED",
+                  "widgetId": "gwcu42z6yn",
+                  "accentColor": "{{appsmith.theme.colors.primaryColor}}",
+                  "minWidth": 450,
+                  "isVisible": true,
+                  "datePickerType": "DATE_PICKER",
+                  "label": "Label",
+                  "version": 2,
+                  "parentId": "acizsl94my",
+                  "labelAlignment": "left",
+                  "renderMode": "CANVAS",
+                  "isLoading": false,
+                  "mobileTopRow": 15,
+                  "timePrecision": "minute",
+                  "responsiveBehavior": "fill",
+                  "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
+                  "mobileLeftColumn": 9,
+                  "maxDynamicHeight": 9000,
+                  "firstDayOfWeek": 0,
+                  "closeOnSelection": true,
+                  "maxDate": "2121-12-31T18:29:00.000Z",
+                  "minDynamicHeight": 4
+                }
+              ]
+            }
+          ],
+          "labelTextSize": "0.875rem",
+          "backgroundColor": "#FFFFFF",
+          "rightColumn": 56,
+          "orientation": "VERTICAL",
+          "snapColumns": 16,
+          "dynamicHeight": "FIXED",
+          "widgetId": "mp429a7dl3",
+          "containerStyle": "card",
+          "isVisible": true,
+          "version": 1,
+          "isLoading": false,
+          "borderRadius": "0px",
+          "maxDynamicHeight": 9000,
+          "minDynamicHeight": 4
+        },
+        {
+          "boxShadow": "none",
+          "widgetName": "Modal1",
+          "topRow": 0,
+          "bottomRow": 0,
+          "parentRowSpace": 1,
+          "type": "MODAL_WIDGET",
+          "shouldScrollContents": true,
+          "parentColumnSpace": 1,
+          "leftColumn": 0,
+          "dynamicBindingPathList": [],
+          "children": [
+            {
+              "boxShadow": "none",
+              "widgetName": "Canvas1",
+              "topRow": 0,
+              "bottomRow": 240,
+              "parentRowSpace": 1,
+              "canExtend": true,
+              "type": "CANVAS_WIDGET",
+              "shouldScrollContents": false,
+              "minHeight": 0,
+              "parentColumnSpace": 1,
+              "leftColumn": 0,
+              "dynamicBindingPathList": [],
+              "children": [
+                {
+                  "labelTextSize": "0.875rem",
+                  "isRequired": false,
+                  "boxShadow": "none",
+                  "widgetName": "Icon1",
+                  "rightColumn": 64,
+                  "onClick": "{{closeModal(Modal1.name)}}",
+                  "iconName": "cross",
+                  "buttonColor": "#2E3D49",
+                  "widgetId": "t3sjfihdb1",
+                  "topRow": 0,
+                  "bottomRow": 4,
+                  "isVisible": true,
+                  "type": "ICON_BUTTON_WIDGET",
+                  "version": 1,
+                  "parentId": "cwamdbv44c",
+                  "isLoading": false,
+                  "leftColumn": 60,
+                  "dynamicBindingPathList": [],
+                  "borderRadius": "0px",
+                  "buttonVariant": "TERTIARY",
+                  "iconSize": 24
+                },
+                {
+                  "boxShadow": "none",
+                  "widgetName": "Text4",
+                  "dynamicPropertyPathList": [
+                    {
+                      "key": "fontSize"
+                    }
+                  ],
+                  "topRow": 0,
+                  "bottomRow": 4,
+                  "type": "TEXT_WIDGET",
+                  "overflow": "NONE",
+                  "fontFamily": "System Default",
+                  "leftColumn": 0,
+                  "dynamicBindingPathList": [],
+                  "text": "Modal Title",
+                  "labelTextSize": "0.875rem",
+                  "rightColumn": 60,
+                  "dynamicHeight": "FIXED",
+                  "widgetId": "x893ud3zjh",
+                  "isVisible": true,
+                  "fontStyle": "BOLD",
+                  "version": 1,
+                  "textColor": "#231F20",
+                  "parentId": "cwamdbv44c",
+                  "isLoading": false,
+                  "borderRadius": "0px",
+                  "maxDynamicHeight": 9000,
+                  "fontSize": "1.5rem",
+                  "minDynamicHeight": 4
+                },
+                {
+                  "labelTextSize": "0.875rem",
+                  "boxShadow": "none",
+                  "widgetName": "Button2",
+                  "rightColumn": 52,
+                  "isDefaultClickDisabled": true,
+                  "buttonColor": "#03B365",
+                  "widgetId": "q9snwskqan",
+                  "topRow": 16,
+                  "bottomRow": 20,
+                  "isVisible": true,
+                  "type": "BUTTON_WIDGET",
+                  "version": 1,
+                  "recaptchaType": "V3",
+                  "parentId": "cwamdbv44c",
+                  "isLoading": false,
+                  "leftColumn": 40,
+                  "dynamicBindingPathList": [],
+                  "borderRadius": "0px",
+                  "buttonVariant": "PRIMARY",
+                  "text": "Cancel",
+                  "isDisabled": false
+                },
+                {
+                  "labelTextSize": "0.875rem",
+                  "boxShadow": "none",
+                  "widgetName": "Button3",
+                  "rightColumn": 64,
+                  "isDefaultClickDisabled": true,
+                  "buttonColor": "#03B365",
+                  "widgetId": "tufuj2kdpz",
+                  "topRow": 16,
+                  "bottomRow": 20,
+                  "isVisible": true,
+                  "type": "BUTTON_WIDGET",
+                  "version": 1,
+                  "recaptchaType": "V3",
+                  "parentId": "cwamdbv44c",
+                  "isLoading": false,
+                  "leftColumn": 52,
+                  "dynamicBindingPathList": [],
+                  "borderRadius": "0px",
+                  "buttonVariant": "PRIMARY",
+                  "text": "Confirm",
+                  "isDisabled": false
+                }
+              ],
+              "isDisabled": false,
+              "labelTextSize": "0.875rem",
+              "rightColumn": 0,
+              "detachFromLayout": true,
+              "widgetId": "cwamdbv44c",
+              "isVisible": true,
+              "version": 1,
+              "parentId": "bx9a2jg08o",
+              "blueprint": {
+                "view": [
+                  {
+                    "type": "ICON_WIDGET",
+                    "position": {
+                      "left": 15,
+                      "top": 0
+                    },
+                    "size": {
+                      "rows": 1,
+                      "cols": 1
+                    },
+                    "props": {
+                      "iconName": "cross",
+                      "iconSize": 24,
+                      "color": "#040627"
+                    }
+                  },
+                  {
+                    "type": "TEXT_WIDGET",
+                    "position": {
+                      "left": 0,
+                      "top": 0
+                    },
+                    "size": {
+                      "rows": 1,
+                      "cols": 15
+                    },
+                    "props": {
+                      "text": "Modal Title",
+                      "textStyle": "HEADING"
+                    }
+                  },
+                  {
+                    "type": "BUTTON_WIDGET",
+                    "position": {
+                      "left": 10,
+                      "top": 4
+                    },
+                    "size": {
+                      "rows": 1,
+                      "cols": 3
+                    },
+                    "props": {
+                      "text": "Cancel",
+                      "buttonStyle": "SECONDARY_BUTTON"
+                    }
+                  },
+                  {
+                    "type": "BUTTON_WIDGET",
+                    "position": {
+                      "left": 13,
+                      "top": 4
+                    },
+                    "size": {
+                      "rows": 1,
+                      "cols": 3
+                    },
+                    "props": {
+                      "text": "Confirm",
+                      "buttonStyle": "PRIMARY_BUTTON"
+                    }
+                  }
+                ],
+                "operations": [
+                  {
+                    "type": "MODIFY_PROPS"
+                  }
+                ]
+              },
+              "isLoading": false,
+              "borderRadius": "0px"
+            }
+          ],
+          "height": 240,
+          "labelTextSize": "0.875rem",
+          "rightColumn": 0,
+          "detachFromLayout": true,
+          "dynamicHeight": "FIXED",
+          "widgetId": "bx9a2jg08o",
+          "isVisible": false,
+          "canOutsideClickClose": true,
+          "canEscapeKeyClose": true,
+          "version": 2,
+          "parentId": "0",
+          "blueprint": {
+            "view": [
+              {
+                "type": "CANVAS_WIDGET",
+                "position": {
+                  "left": 0,
+                  "top": 0
+                },
+                "props": {
+                  "detachFromLayout": true,
+                  "canExtend": true,
+                  "isVisible": true,
+                  "isDisabled": false,
+                  "shouldScrollContents": false,
+                  "children": [],
+                  "blueprint": {
+                    "view": [
+                      {
+                        "type": "ICON_WIDGET",
+                        "position": {
+                          "left": 15,
+                          "top": 0
+                        },
+                        "size": {
+                          "rows": 1,
+                          "cols": 1
+                        },
+                        "props": {
+                          "iconName": "cross",
+                          "iconSize": 24,
+                          "color": "#040627"
+                        }
+                      },
+                      {
+                        "type": "TEXT_WIDGET",
+                        "position": {
+                          "left": 0,
+                          "top": 0
+                        },
+                        "size": {
+                          "rows": 1,
+                          "cols": 15
+                        },
+                        "props": {
+                          "text": "Modal Title",
+                          "textStyle": "HEADING"
+                        }
+                      },
+                      {
+                        "type": "BUTTON_WIDGET",
+                        "position": {
+                          "left": 10,
+                          "top": 4
+                        },
+                        "size": {
+                          "rows": 1,
+                          "cols": 3
+                        },
+                        "props": {
+                          "text": "Cancel",
+                          "buttonStyle": "SECONDARY_BUTTON"
+                        }
+                      },
+                      {
+                        "type": "BUTTON_WIDGET",
+                        "position": {
+                          "left": 13,
+                          "top": 4
+                        },
+                        "size": {
+                          "rows": 1,
+                          "cols": 3
+                        },
+                        "props": {
+                          "text": "Confirm",
+                          "buttonStyle": "PRIMARY_BUTTON"
+                        }
+                      }
+                    ],
+                    "operations": [
+                      {
+                        "type": "MODIFY_PROPS"
+                      }
+                    ]
+                  }
+                }
+              }
+            ]
+          },
+          "isLoading": false,
+          "borderRadius": "0px",
+          "maxDynamicHeight": 9000,
+          "width": 456,
+          "minDynamicHeight": 4
+        }
+      ]
+    },
+    "layoutOnLoadActions": [],
+    "layoutOnLoadActionErrors": [],
+    "actionUpdates": [],
+    "messages": []
+}
diff --git a/app/client/cypress/limited-tests.txt b/app/client/cypress/limited-tests.txt
index 31c0c0253fef..aa00835ffb0e 100644
--- a/app/client/cypress/limited-tests.txt
+++ b/app/client/cypress/limited-tests.txt
@@ -1,6 +1,5 @@
 # To run only limited tests - give the spec names in below format:
 cypress/e2e/Regression/ClientSide/Templates/Fork_Template_spec.js
-
 # For running all specs - uncomment below:
 #cypress/e2e/**/**/*
 
diff --git a/app/client/cypress/locators/FormWidgets.json b/app/client/cypress/locators/FormWidgets.json
index db603de7b8c0..43462381c2da 100644
--- a/app/client/cypress/locators/FormWidgets.json
+++ b/app/client/cypress/locators/FormWidgets.json
@@ -78,5 +78,6 @@
   "minDateTextArea" : ".t--property-control-mindate  .CodeMirror textarea",
   "minDateInput" : ".t--property-control-mindate .ads-v2-input__input-section-input",
   "datePickerInput": ".t--widget-datepickerwidget2 .bp3-input",
-  "dayPickerNextButton": ".DayPicker-NavButton--next"
+  "dayPickerNextButton": ".DayPicker-NavButton--next",
+  "dayPickerToday": ".ads-v2-datepicker__calender-today"
 }
diff --git a/app/client/cypress/locators/OneClickBindingLocator.ts b/app/client/cypress/locators/OneClickBindingLocator.ts
index 1d291b4e0478..0902374a4d46 100644
--- a/app/client/cypress/locators/OneClickBindingLocator.ts
+++ b/app/client/cypress/locators/OneClickBindingLocator.ts
@@ -1,33 +1,33 @@
 export default {
-  connectData: '[data-testId="t--one-click-binding-connect-data"]',
+  connectData: '[data-testid="t--one-click-binding-connect-data"]',
   datasourceDropdownSelector:
-    "[data-testId='t--one-click-binding-datasource-selector']",
+    "[data-testid='t--one-click-binding-datasource-selector']",
   datasourceDropdownOptionSelector: (query: string) =>
-    `[data-testId="t--one-click-binding-datasource-trigger"]:contains(${query})`,
+    `[data-testid="t--one-click-binding-datasource-trigger"]:contains(${query})`,
   dropdownOptionSelector: (query: string) =>
-    `[data-testId="t--one-click-binding-datasource-trigger"]:contains(${query})`,
+    `[data-testid="t--one-click-binding-datasource-trigger"]:contains(${query})`,
   datasourceQueryBindHeaderSelector:
-    "[data-testId='t--one-click-binding-datasource-selector--bind-to-query']",
+    "[data-testid='t--one-click-binding-datasource-selector--bind-to-query']",
   datasourceGenerateAQuerySelector:
-    "[data-testId='t--one-click-binding-datasource-selector--generate-a-query']",
+    "[data-testid='t--one-click-binding-datasource-selector--generate-a-query']",
   datasourceOtherActionsSelector:
-    "[data-testId='t--one-click-binding-datasource-selector--other-actions']",
+    "[data-testid='t--one-click-binding-datasource-selector--other-actions']",
   datasourceQuerySelector: (query?: string) =>
-    `[data-testId='t--one-click-binding-datasource-selector--query']${
+    `[data-testid='t--one-click-binding-datasource-selector--query']${
       query ? `:contains(${query})` : ""
     }`,
   datasourceSelector: (datasource?: string) =>
-    `[data-testId="t--one-click-binding-datasource-selector--datasource"]${
+    `[data-testid="t--one-click-binding-datasource-selector--datasource"]${
       datasource ? `:contains(${datasource})` : ""
     }`,
   otherActionSelector: (action?: string) =>
-    `[data-testId='t--one-click-binding-datasource-selector--other-action']${
+    `[data-testid='t--one-click-binding-datasource-selector--other-action']${
       action ? `:contains(${action})` : ""
     }`,
   tableOrSpreadsheetDropdown:
     '[data-testid="t--one-click-binding-table-selector"] .rc-select-selector',
   tableOrSpreadsheetDropdownOption: (table?: string) =>
-    `//div[@data-testId='t--one-click-binding-table-selector--table']//div[text()='${table}']`,
+    `//div[@data-testid='t--one-click-binding-table-selector--table']//div[text()='${table}']`,
   tableOrSpreadsheetSelectedOption: (table?: string) =>
     `[data-testid="t--one-click-binding-table-selector"] .rc-select-selection-item${
       table ? `:contains(${table})` : ""
@@ -35,24 +35,24 @@ export default {
   validTableRowData:
     '.t--widget-tablewidgetv2 [role="rowgroup"] [role="button"]',
   tableError: (error: string) =>
-    `[data-testId="t--one-click-binding-table-selector--error"]:contains(${error})`,
-  dateInput: `[data-testId="datepicker-container"] input`,
+    `[data-testid="t--one-click-binding-table-selector--error"]:contains(${error})`,
+  dateInput: `[data-testid="datepicker-container"] input`,
   dayViewFromDate: ".DayPicker-Day",
-  loadMore: "[data-testId='t--one-click-binding-datasource--load-more']",
-  datasourceSearch: `[data-testId="t--one-click-binding-datasource--search"]`,
+  loadMore: "[data-testid='t--one-click-binding-datasource--load-more']",
+  datasourceSearch: `[data-testid="t--one-click-binding-datasource--search"]`,
   searchableColumn:
-    '[data-testId="t--one-click-binding-column-searchableColumn"]',
-  formType: '[data-testId="t--one-click-binding-column-formType"]',
-  defaultValues: '[data-testId="t--one-click-binding-column-defaultValues"]',
-  dataIdentifier: '[data-testId="t--one-click-binding-column-dataIdentifier"]',
-  label: '[data-testId="t--one-click-binding-column-label"]',
-  value: '[data-testId="t--one-click-binding-column-value"]',
+    '[data-testid="t--one-click-binding-column-searchableColumn"]',
+  formType: '[data-testid="t--one-click-binding-column-formType"]',
+  defaultValues: '[data-testid="t--one-click-binding-column-defaultValues"]',
+  dataIdentifier: '[data-testid="t--one-click-binding-column-dataIdentifier"]',
+  label: '[data-testid="t--one-click-binding-column-label"]',
+  value: '[data-testid="t--one-click-binding-column-value"]',
   columnDropdownOption: (column: string, value?: string) =>
-    `[data-testId='t--one-click-binding-column-${column}--column']${
+    `[data-testid='t--one-click-binding-column-${column}--column']${
       value ? `:contains(${value})` : ""
     }`,
   columnSelectedOption: (column: string, value?: string) =>
-    `[data-testId="t--one-click-binding-column-${column}"] .rc-select-selection-item${
+    `[data-testid="t--one-click-binding-column-${column}"] .rc-select-selection-item${
       value ? `:contains(${value})` : ""
     }`,
   columnSelectorModalTrigger: '[data-testid="t--edit-fields-button"]',
diff --git a/app/client/cypress/locators/Widgets.json b/app/client/cypress/locators/Widgets.json
index 92b161d141b2..4dcb4ce330bf 100644
--- a/app/client/cypress/locators/Widgets.json
+++ b/app/client/cypress/locators/Widgets.json
@@ -234,5 +234,7 @@
   "propertyPaneSaveButton": ".t--property-pane-section-collapse-savebutton",
   "firstEditInput":"[data-colindex=0][data-rowindex=0] .t--inlined-cell-editor input.bp3-input",
   "cellControlSwitch" : ".t--property-control-cellwrapping .ads-v2-switch",
-  "propertyControlLabel" : ".t--property-control-label"
+  "propertyControlLabel" : ".t--property-control-label",
+  "todayText": "span:contains('Today')",
+  "dayPickerToday": ".DayPicker-Day--today"
 }
diff --git a/app/client/cypress/locators/commonlocators.json b/app/client/cypress/locators/commonlocators.json
index 9fe519e15adb..fdac92e3af4e 100644
--- a/app/client/cypress/locators/commonlocators.json
+++ b/app/client/cypress/locators/commonlocators.json
@@ -164,7 +164,7 @@
   "labelSectionTxt": ".CodeMirror-code .cm-variable",
   "lintError": ".CodeMirror-lint-mark-error",
   "debugger": ".t--debugger-count",
-  "errorTab": "[data-testid=t--tab-ERROR]",
+  "errorTab": "[data-testid=t--tab-ERROR_TAB]",
   "debugErrorMsg": "[data-testid=t--debugger-log-message]",
   "tableButtonVariant": ".t--property-control-buttonvariant",
   "debuggerLabel": "span.debugger-label",
diff --git a/app/client/cypress/support/ApiCommands.js b/app/client/cypress/support/ApiCommands.js
index 9c24c425d32a..d0d52ec712b9 100644
--- a/app/client/cypress/support/ApiCommands.js
+++ b/app/client/cypress/support/ApiCommands.js
@@ -94,7 +94,7 @@ Cypress.Commands.add(
     }
     cy.get(".string-value").contains(baseurl.concat(path));
     cy.get(".string-value").contains(verb);
-    cy.get("[data-testid=t--tab-response]").first().click({ force: true });
+    cy.get("[data-testid=t--tab-RESPONSE_TAB]").first().click({ force: true });
   },
 );
 
diff --git a/app/client/cypress/support/Objects/CommonLocators.ts b/app/client/cypress/support/Objects/CommonLocators.ts
index 9bcf7c1cfece..2200d6eb1815 100644
--- a/app/client/cypress/support/Objects/CommonLocators.ts
+++ b/app/client/cypress/support/Objects/CommonLocators.ts
@@ -89,8 +89,8 @@ export class CommonLocators {
   _createNew = ".t--add-item";
   _uploadFiles = "div.uppy-Dashboard-AddFiles input";
   _uploadBtn = "button.uppy-StatusBar-actionBtn--upload";
-  _errorTab = "[data-testid=t--tab-ERROR]";
-  _responseTab = "[data-testid=t--tab-response]";
+  _errorTab = "[data-testid=t--tab-ERROR_TAB]";
+  _responseTab = "[data-testid=t--tab-RESPONSE_TAB]";
   _modal = ".t--modal-widget";
   _closeModal = "button:contains('Close')";
   _entityProperties = (entityNameinLeftSidebar: string) =>
@@ -316,12 +316,12 @@ export class CommonLocators {
     `.uppy-Informer p:contains('${msg}')`;
   _fileUploadAddMore = ".uppy-DashboardContent-addMore";
   _buttonText = ".bp3-button-text";
-  _richText_TitleBlock = "[data-mce-name='blocks']";
-  _richText_Heading = "[aria-label='Heading 1']";
+  _richText_TitleBlock = "[aria-label='Block Paragraph']";
+  _richText_Heading = "[title='Heading 1']";
   _richText_Label_Text = ".tox-tbtn__select-label";
-  _richText_Text_Color =
-    '[data-mce-name="forecolor"] .tox-split-button__chevron';
-  _richText_color = (value: string) => `[data-mce-name="${value}"]`;
+  _richText_Text_Color = (color: string) =>
+    `[aria-label="Text color ${color}"] .tox-split-button__chevron`;
+  _richText_color = (value: string) => `[title="${value}"]`;
   _richText_line = "#tinymce p span";
   _treeSelectedContent = ".rc-tree-select-selection-item-content";
   _switcherIcon = ".switcher-icon";
@@ -341,4 +341,5 @@ export class CommonLocators {
   _saveDatasource = `[data-testid='t--store-as-datasource']`;
   _propertyCollapseBody = ".bp3-collapse-body";
   _propertyCollapse = ".bp3-collapse";
+  _widgetBorder = ".t--draggable-tabswidget div div div";
 }
diff --git a/app/client/cypress/support/Objects/DataManager.ts b/app/client/cypress/support/Objects/DataManager.ts
index a54e1162eb30..c4a27a021fb2 100644
--- a/app/client/cypress/support/Objects/DataManager.ts
+++ b/app/client/cypress/support/Objects/DataManager.ts
@@ -97,15 +97,12 @@ export class DataManager {
       firestore_projectID: "appsmith-22e8b",
       firestore_serviceaccountkey: Cypress.env("FIRESTORE_PRIVATE_KEY"),
 
-      restapi_url: "https://my-json-server.typicode.com/typicode/demo/posts",
-      connection_type: "Replica set",
-
       mockHostAddress: "fake_api.cvuydmurdlas.us-east-1.rds.amazonaws.com",
       mockDatabaseName: "fakeapi",
       mockDatabaseUsername: "fakeapi",
       mockDatabasePassword: "LimitedAccess123#",
       readonly: "readonly",
-      authenticatedApiUrl: "https://fakeapi.com",
+      authenticatedApiUrl: "http://host.docker.internal:5001",
 
       GraphqlApiUrl_TED: "http://host.docker.internal:4200/graphql",
 
@@ -192,15 +189,12 @@ export class DataManager {
       firestore_projectID: "appsmith-dummy",
       firestore_serviceaccountkey: "dummy_service_creds_key",
 
-      restapi_url: "https://my-json-server.typicode.com/typicode/demo/posts",
-      connection_type: "Replica set",
-
       mockHostAddress: "fake_api.cvuydmurdlas.us-east-1.rds.amazonaws.com",
       mockDatabaseName: "fakeapi",
       mockDatabaseUsername: "fakeapi",
       mockDatabasePassword: "LimitedAccess123#",
       readonly: "readonly",
-      authenticatedApiUrl: "https://fakeapi.com",
+      authenticatedApiUrl: "http://host.docker.internal:5001",
 
       GraphqlApiUrl_TED: "http://host.docker.internal:4200/graphql",
 
diff --git a/app/client/cypress/support/Objects/FeatureFlags.ts b/app/client/cypress/support/Objects/FeatureFlags.ts
index c7f4b58bdf65..7fdc78d1d580 100644
--- a/app/client/cypress/support/Objects/FeatureFlags.ts
+++ b/app/client/cypress/support/Objects/FeatureFlags.ts
@@ -4,7 +4,6 @@ import produce from "immer";
 
 const defaultFlags = {
   release_side_by_side_ide_enabled: true,
-  ab_learnability_discoverability_collapse_all_except_data_enabled: false, // remove this flag from here when it's removed from code
   rollout_remove_feature_walkthrough_enabled: false, // remove this flag from here when it's removed from code
 };
 
diff --git a/app/client/cypress/support/Pages/AggregateHelper.ts b/app/client/cypress/support/Pages/AggregateHelper.ts
index 82fe2481fbdd..ad5965191c25 100644
--- a/app/client/cypress/support/Pages/AggregateHelper.ts
+++ b/app/client/cypress/support/Pages/AggregateHelper.ts
@@ -1191,11 +1191,12 @@ export class AggregateHelper {
 
   public ActionContextMenuSubItem({
     force = false,
-    index = 0,
     subAction,
     toastToValidate = "",
   }: SubActionParams) {
-    this.GetNClick(this.locator._contextMenuItem(subAction), index, force);
+    cy.xpath(this.locator._contextMenuItem(subAction)).trigger("click", {
+      force: force,
+    });
     this.Sleep(500);
     toastToValidate && this.AssertContains(toastToValidate);
   }
diff --git a/app/client/cypress/support/Pages/ApiPage.ts b/app/client/cypress/support/Pages/ApiPage.ts
index bb394a58287f..57b7d33abbb7 100644
--- a/app/client/cypress/support/Pages/ApiPage.ts
+++ b/app/client/cypress/support/Pages/ApiPage.ts
@@ -82,7 +82,7 @@ export class ApiPage {
   private _paginationTypeLabels = ".t--apiFormPaginationType label";
   _saveAsDS = ".t--store-as-datasource";
   _responseStatus = ".t--response-status-code";
-  public _responseTabHeader = "[data-testid=t--tab-headers]";
+  public _responseTabHeader = "[data-testid=t--tab-HEADERS_TAB]";
   public _headersTabContent = ".t--headers-tab";
   public _autoGeneratedHeaderInfoIcon = (key: string) =>
     `.t--auto-generated-${key}-info`;
diff --git a/app/client/cypress/support/Pages/DataSources.ts b/app/client/cypress/support/Pages/DataSources.ts
index 35777482759a..b56ad7792f35 100644
--- a/app/client/cypress/support/Pages/DataSources.ts
+++ b/app/client/cypress/support/Pages/DataSources.ts
@@ -194,15 +194,15 @@ export class DataSources {
   _globalSearchInput = ".t--global-search-input";
   _gsScopeDropdown =
     "[data-testid^='datasourceStorages.'][data-testid$='.datasourceConfiguration.authentication.scopeString']";
-  _gsScopeOptions = ".ads-v2-select__dropdown .rc-select-item-option";
+  _gsScopeOptions = ".ads-v2-radio-group";
   _queryTimeout = "//input[@name='actionConfiguration.timeoutInMillisecond']";
   _getStructureReq = "/api/v1/datasources/*/structure?ignoreCache=true";
   _editDatasourceFromActiveTab = (dsName: string) =>
     ".t--datasource-name:contains('" + dsName + "')";
   _mandatoryMark = "//span[text()='*']";
   _deleteDSHostPort = ".t--delete-field";
-  _dsTabSchema = "[data-testid='t--tab-schema']";
-  private _pageSelectionMenu = "[data-testId='t--page-selection']";
+  _dsTabSchema = "[data-testid='t--tab-SCHEMA_TAB']";
+  private _pageSelectionMenu = "[data-testid='t--page-selection']";
 
   private _pageSelectMenuItem = ".ads-v2-menu__menu-item";
 
@@ -295,7 +295,7 @@ export class DataSources {
   _imgFireStoreLogo = "//img[contains(@src, 'firestore.svg')]";
   _dsVirtuosoElement = `div .t--schema-virtuoso-container`;
   private _dsVirtuosoList = `[data-test-id="virtuoso-item-list"]`;
-  private _dsSchemaContainer = `[data-testId="datasource-schema-container"]`;
+  private _dsSchemaContainer = `[data-testid="datasource-schema-container"]`;
   private _dsVirtuosoElementTable = (targetTableName: string) =>
     `${this._dsSchemaEntityItem}[data-testid='t--entity-item-${targetTableName}']`;
   private _dsPageTabListItem = (buttonText: string) =>
@@ -325,9 +325,7 @@ export class DataSources {
       datasourceName,
     );
     this.agHelper.GetNClick(this._selectTableDropdown, 0, true);
-    cy.get(
-      `div[role="listbox"] p[kind="span"]:contains("${tableName}")`,
-    ).click();
+    cy.get(`div[role="listbox"] p:contains("${tableName}")`).click();
     this.agHelper.GetNClick(this._generatePageBtn);
     this.assertHelper.AssertNetworkStatus("@replaceLayoutWithCRUDPage", 201);
     this.agHelper.ClickButton("Got it");
@@ -1854,7 +1852,7 @@ export class DataSources {
     cy.intercept("GET", "/api/v1/datasources/*/structure?ignoreCache=*").as(
       `getDatasourceStructureUpdated_${ds_entity_name}`,
     );
-    cy.get("[data-testid=t--tab-schema]").first().click({ force: true });
+    cy.get("[data-testid=t--tab-SCHEMA_TAB]").first().click({ force: true });
     this.RefreshDatasourceSchema();
     this.assertHelper
       .WaitForNetworkCall(`@getDatasourceStructureUpdated_${ds_entity_name}`)
diff --git a/app/client/cypress/support/Pages/GitSync.ts b/app/client/cypress/support/Pages/GitSync.ts
index 1aa7589ba7c7..47f2e8cf70a1 100644
--- a/app/client/cypress/support/Pages/GitSync.ts
+++ b/app/client/cypress/support/Pages/GitSync.ts
@@ -453,4 +453,16 @@ export class GitSync {
     }
     this.CloseGitSyncModal();
   }
+
+  public AssertBranchName(branch: string) {
+    this.agHelper.AssertElementVisibility(this._branchButton);
+    this.agHelper.AssertContains(branch);
+  }
+
+  public AssertBranchNameInUrl(branch: string) {
+    cy.location("search")
+      .then((searchParams) => new URLSearchParams(searchParams))
+      .invoke("get", "branch")
+      .should("equal", branch);
+  }
 }
diff --git a/app/client/cypress/support/Pages/JSEditor.ts b/app/client/cypress/support/Pages/JSEditor.ts
index a8ed3d4fbac3..832c83048d97 100644
--- a/app/client/cypress/support/Pages/JSEditor.ts
+++ b/app/client/cypress/support/Pages/JSEditor.ts
@@ -113,6 +113,7 @@ export class JSEditor {
     );
     //Checking JS object was created successfully
     this.assertHelper.AssertNetworkStatus("@createNewJSCollection", 201);
+    cy.get(this._jsObjName).click({ force: true });
     this.agHelper.AssertElementVisibility(this._jsObjTxt);
     // Assert that the name of the JS Object is focused when newly created
     this.agHelper.PressEnter();
diff --git a/app/client/cypress/support/Pages/PropertyPane.ts b/app/client/cypress/support/Pages/PropertyPane.ts
index daf36e185d6d..5a15ee560a0d 100644
--- a/app/client/cypress/support/Pages/PropertyPane.ts
+++ b/app/client/cypress/support/Pages/PropertyPane.ts
@@ -92,7 +92,7 @@ export class PropertyPane {
     "div.tab-view span:contains('" + type + "')";
 
   _dropdownSelectType = ".t--open-dropdown-Select-type";
-  _selectorViewLabel = '[data-testId="selector-view-label"]';
+  _selectorViewLabel = '[data-testid="selector-view-label"]';
   _textView = ".text-view";
   _selectorView = ".selector-view";
   _dropdownOptions =
@@ -177,6 +177,7 @@ export class PropertyPane {
   _dataIcon = (icon: string) => `[data-icon="${icon}"]`;
   _iconDropdown = "[data-test-id='virtuoso-scroller']";
   _dropdownControlError = "[data-testid='t---dropdown-control-error']";
+  _borderColorCursor = ".t--property-control-bordercolor .bp3-input-group div";
 
   public OpenJsonFormFieldSettings(fieldName: string) {
     this.agHelper.GetNClick(this._jsonFieldEdit(fieldName));
@@ -686,4 +687,20 @@ export class PropertyPane {
       .GetElement(this._propertyToggle(propertyName))
       .should(state === "enabled" ? "be.checked" : "not.be.checked");
   }
+
+  public ExpandIfCollapsedSection(sectionName: string) {
+    cy.get(`.t--property-pane-section-collapse-${sectionName}`)
+      .scrollIntoView()
+      .then(($element) => {
+        cy.wrap($element)
+          .siblings(".bp3-collapse")
+          .then(($sibling) => {
+            const siblingHeight = $sibling.height(); // Get the height of the sibling element
+
+            if (!siblingHeight) {
+              $element.click();
+            }
+          });
+      });
+  }
 }
diff --git a/app/client/cypress/support/Pages/Table.ts b/app/client/cypress/support/Pages/Table.ts
index 45dd2132dedd..d1439a589271 100644
--- a/app/client/cypress/support/Pages/Table.ts
+++ b/app/client/cypress/support/Pages/Table.ts
@@ -854,38 +854,4 @@ export class Table {
     this.agHelper.GetHoverNClick(selector, 1, true);
     verify && cy.get(selector).eq(1).should("be.disabled");
   }
-
-  /**
-   * Helper function to get formatted date strings for tomorrow's date.
-   *
-   * @returns {Object} An object containing:
-   *  - verbose format (e.g., "Sat Sep 21 2024")
-   *  - ISO date format (e.g., "2024-09-21")
-   */
-  public getFormattedTomorrowDates() {
-    // Create a new Date object for today
-    const tomorrow = new Date();
-
-    // Set the date to tomorrow by adding 1 to today's date
-    tomorrow.setDate(tomorrow.getDate() + 1);
-
-    // Format tomorrow's date in verbose form (e.g., "Sat Sep 21 2024")
-    const verboseFormat = tomorrow
-      .toLocaleDateString("en-US", {
-        weekday: "short",
-        year: "numeric",
-        month: "short",
-        day: "2-digit",
-      })
-      .replace(/,/g, ""); // Remove commas from the formatted string
-
-    // Format tomorrow's date in ISO form (e.g., "2024-09-21")
-    const isoFormat = tomorrow.toISOString().split("T")[0]; // Extract the date part only
-
-    // Return both formatted date strings as an object
-    return {
-      verboseFormat,
-      isoFormat,
-    };
-  }
 }
diff --git a/app/client/cypress/support/commands.js b/app/client/cypress/support/commands.js
index eaf1a4c86ca7..4a6887766900 100644
--- a/app/client/cypress/support/commands.js
+++ b/app/client/cypress/support/commands.js
@@ -2,6 +2,7 @@
 /* eslint-disable cypress/no-assigning-return-values */
 /* This file is used to maintain comman methods across tests , refer other *.js files for adding common methods */
 import { ANVIL_EDITOR_TEST } from "./Constants.js";
+import advancedFormat from "dayjs/plugin/advancedFormat";
 
 import EditorNavigation, {
   EntityType,
@@ -18,6 +19,7 @@ import { v4 as uuidv4 } from "uuid";
 const dayjs = require("dayjs");
 const loginPage = require("../locators/LoginPage.json");
 import homePage from "../locators/HomePage";
+dayjs.extend(advancedFormat);
 
 const commonlocators = require("../locators/commonlocators.json");
 const widgetsPage = require("../locators/Widgets.json");
@@ -524,10 +526,17 @@ Cypress.Commands.add("getDate", (date, dateFormate) => {
   return eDate;
 });
 
-Cypress.Commands.add("setDate", (date, dateFormate) => {
-  const expDate = dayjs().add(date, "days").format(dateFormate);
-  const sel = `.DayPicker-Day[aria-label=\"${expDate}\"]`;
-  cy.get(sel).click();
+Cypress.Commands.add("setDate", (date, dateFormate, ver = "v2") => {
+  if (ver == "v2") {
+    const expDate = dayjs().add(date, "days").format("dddd, MMMM D");
+    cy.get(`.react-datepicker__day[aria-label^="Choose ${expDate}"]`)
+      .first()
+      .click();
+  } else if (ver == "v1") {
+    const expDate = dayjs().add(date, "days").format(dateFormate);
+    const sel = `.DayPicker-Day[aria-label=\"${expDate}\"]`;
+    cy.get(sel).click();
+  }
 });
 
 Cypress.Commands.add("validateDisableWidget", (widgetCss, disableCss) => {
@@ -928,9 +937,6 @@ Cypress.Commands.add("SignupFromAPI", (uname, pword) => {
   cy.request({
     method: "POST",
     url: "api/v1/users",
-    headers: {
-      "content-type": "application/json",
-    },
     followRedirect: false,
     form: true,
     body: {
diff --git a/app/client/cypress/support/e2e.js b/app/client/cypress/support/e2e.js
index 166329ed8e0c..a27600f20a20 100644
--- a/app/client/cypress/support/e2e.js
+++ b/app/client/cypress/support/e2e.js
@@ -141,8 +141,6 @@ before(function () {
   if (!Cypress.currentTest.titlePath[0].includes(WALKTHROUGH_TEST_PAGE)) {
     // Adding key FEATURE_WALKTHROUGH (which is used to check if the walkthrough is already shown to the user or not) for non walkthrough cypress tests (to not show walkthrough)
     addIndexedDBKey(FEATURE_WALKTHROUGH_INDEX_KEY, {
-      ab_ds_binding_enabled: true,
-      ab_ds_schema_enabled: true,
       binding_widget: true,
     });
   }
diff --git a/app/client/cypress/support/widgetCommands.js b/app/client/cypress/support/widgetCommands.js
index fd0772748f6f..23d1d828f6a4 100644
--- a/app/client/cypress/support/widgetCommands.js
+++ b/app/client/cypress/support/widgetCommands.js
@@ -837,7 +837,7 @@ Cypress.Commands.add("selectWidgetForReset", (value) => {
 });
 
 Cypress.Commands.add("SetDateToToday", () => {
-  cy.get(".react-datepicker .react-datepicker__day--today").click({
+  cy.get("button:contains('Today')").click({
     force: true,
   });
   agHelper.AssertAutoSave();
diff --git a/app/client/jest.config.js b/app/client/jest.config.js
index abe29d26d8d5..47dc492327d8 100644
--- a/app/client/jest.config.js
+++ b/app/client/jest.config.js
@@ -1,11 +1,15 @@
 function parseConfig() {
   return "";
 }
+
 const LOG_LEVELS = ["debug", "error"];
 const CONFIG_LOG_LEVEL_INDEX = 1;
 
 module.exports = {
-  setupFiles: ["jest-canvas-mock"],
+  setupFiles: [
+    "jest-canvas-mock",
+    "<rootDir>/test/__mocks__/reactMarkdown.tsx",
+  ],
   roots: ["<rootDir>/src"],
   transform: {
     "^.+\\.(png|js|ts|tsx)$": "ts-jest",
@@ -17,7 +21,7 @@ module.exports = {
   moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node", "css"],
   moduleDirectories: ["node_modules", "src", "test"],
   transformIgnorePatterns: [
-    "<rootDir>/node_modules/(?!codemirror|konva|react-dnd|dnd-core|@babel|(@blueprintjs)|@github|lodash-es|@draft-js-plugins|react-documents|linkedom|assert-never|axios)",
+    "<rootDir>/node_modules/(?!codemirror|konva|react-dnd|dnd-core|@babel|(@blueprintjs)|@github|lodash-es|@draft-js-plugins|react-documents|linkedom|assert-never|axios|usehooks-ts|date-fns)",
   ],
   moduleNameMapper: {
     "\\.(css|less)$": "<rootDir>/test/__mocks__/styleMock.js",
@@ -95,10 +99,17 @@ module.exports = {
           "__APPSMITH_NEW_RELIC_OTEL_EXPORTER_OTLP_ENDPOINT__",
         ),
       },
+      observability: {
+        deploymentName: "jest-run",
+        serviceInstanceId: "appsmith-0",
+      },
       fusioncharts: {
         licenseKey: parseConfig("__APPSMITH_FUSIONCHARTS_LICENSE_KEY__"),
       },
-      enableMixpanel: parseConfig("__APPSMITH_SEGMENT_KEY__"),
+      mixpanel: {
+        enabled: parseConfig("__APPSMITH_SEGMENT_KEY__"),
+        apiKey: parseConfig("__APPSMITH_MIXPANEL_KEY__"),
+      },
       algolia: {
         apiId: parseConfig("__APPSMITH_ALGOLIA_API_ID__"),
         apiKey: parseConfig("__APPSMITH_ALGOLIA_API_KEY__"),
diff --git a/app/client/package.json b/app/client/package.json
index 9ce6628afc77..9b822e0f11ae 100644
--- a/app/client/package.json
+++ b/app/client/package.json
@@ -72,6 +72,7 @@
     "@mantine/hooks": "^5.10.1",
     "@newrelic/browser-agent": "^1.255.0",
     "@opentelemetry/api": "^1.9.0",
+    "@opentelemetry/auto-instrumentations-web": "^0.41.0",
     "@opentelemetry/context-zone": "1.25.1",
     "@opentelemetry/core": "^1.26.0",
     "@opentelemetry/exporter-metrics-otlp-http": "0.52.1",
@@ -81,7 +82,7 @@
     "@opentelemetry/sdk-metrics": "1.25.1",
     "@opentelemetry/sdk-trace-base": "1.25.1",
     "@opentelemetry/sdk-trace-web": "1.25.1",
-    "@opentelemetry/semantic-conventions": "1.25.1",
+    "@opentelemetry/semantic-conventions": "^1.27.0",
     "@react-spring/web": "^9.7.4",
     "@react-types/shared": "^3.23.0",
     "@redux-saga/core": "1.1.3",
@@ -125,7 +126,7 @@
     "cypress-log-to-output": "^1.1.2",
     "cypress-repeat-pro": "^1.0.1",
     "d3-geo": "^3.1.0",
-    "date-fns": "2.30.0",
+    "date-fns": "^4.1.0",
     "dayjs": "^1.10.6",
     "deep-diff": "^1.0.2",
     "downloadjs": "^1.4.7",
@@ -156,11 +157,13 @@
     "memoize-one": "^6.0.0",
     "micro-memoize": "^4.0.10",
     "microdiff": "^1.4.0",
+    "mixpanel-browser": "^2.55.1",
     "moment": "2.29.4",
     "moment-timezone": "^0.5.35",
     "nanoid": "^2.0.4",
     "node-forge": "^1.3.0",
     "object-hash": "^3.0.0",
+    "openai": "^4.64.0",
     "path-to-regexp": "^6.3.0",
     "popper.js": "^1.15.0",
     "prismjs": "^1.27.0",
@@ -220,12 +223,13 @@
     "tailwindcss": "^3.3.3",
     "tern": "^0.21.0",
     "tinycolor2": "^1.4.2",
-    "tinymce": "^7.3.0",
+    "tinymce": "6.8.3",
     "toposort": "^2.0.2",
     "tslib": "^2.3.1",
     "typescript": "^5.5.4",
     "unescape-js": "^1.1.4",
     "url-search-params-polyfill": "^8.0.0",
+    "usehooks-ts": "^3.1.0",
     "uuid": "^9.0.0",
     "validate-color": "^2.2.4",
     "web-vitals": "3.5.2",
@@ -259,6 +263,7 @@
     "@types/jest": "^27.4.1",
     "@types/jshint": "^2.12.0",
     "@types/lodash": "^4.14.120",
+    "@types/mixpanel-browser": "^2.50.1",
     "@types/moment-timezone": "^0.5.10",
     "@types/nanoid": "^2.0.0",
     "@types/node": "^10.12.18",
@@ -316,6 +321,7 @@
     "eslint-plugin-jest": "^27.4.2",
     "eslint-plugin-prettier": "^5.0.0",
     "eslint-plugin-react": "^7.33.2",
+    "eslint-plugin-react-compiler": "beta",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-react-perf": "^3.3.2",
     "eslint-plugin-sort-destructure-keys": "^1.5.0",
diff --git a/app/client/packages/design-system/ads/src/Button/Button.styles.tsx b/app/client/packages/design-system/ads/src/Button/Button.styles.tsx
index b5e58e42b28d..1fd71a2ca84f 100644
--- a/app/client/packages/design-system/ads/src/Button/Button.styles.tsx
+++ b/app/client/packages/design-system/ads/src/Button/Button.styles.tsx
@@ -29,6 +29,7 @@ const getSizes = (size: ButtonSizes, isIconButton?: boolean) => {
         ? "var(--ads-v2-spaces-2)"
         : "var(--ads-v2-spaces-2) var(--ads-v2-spaces-3)"};
       --button-gap: var(--ads-v2-spaces-2);
+      --button-min-width: 60px;
     `,
     md: css`
       --button-font-weight: 600;
@@ -37,6 +38,7 @@ const getSizes = (size: ButtonSizes, isIconButton?: boolean) => {
         ? "var(--ads-v2-spaces-3)"
         : "var(--ads-v2-spaces-3) var(--ads-v2-spaces-4)"};
       --button-gap: var(--ads-v2-spaces-3);
+      --button-min-width: 80px;
     `,
   };
 
@@ -175,6 +177,8 @@ export const ButtonContent = styled.div<{
   box-sizing: border-box;
   padding: var(--button-padding);
   border-radius: inherit;
+  min-width: ${({ isIconButton }) =>
+    isIconButton ? "unset" : "var(--button-min-width)"};
 
   & > .${ButtonContentChildrenClassName} {
     display: flex;
diff --git a/app/client/packages/design-system/ads/src/Documentation/components/CodeBlock.tsx b/app/client/packages/design-system/ads/src/Documentation/components/CodeBlock.tsx
index 320d52cda9bb..8672d0f3266b 100644
--- a/app/client/packages/design-system/ads/src/Documentation/components/CodeBlock.tsx
+++ b/app/client/packages/design-system/ads/src/Documentation/components/CodeBlock.tsx
@@ -16,7 +16,7 @@ function CodeBlock({ code }: CodeBlockProps) {
       }}
     >
       <Code>{code}</Code>
-      <Button kind="tertiary" startIcon="copy-control" />
+      <Button isIconButton kind="tertiary" startIcon="copy-control" />
     </Wrapper>
   );
 }
diff --git a/app/client/packages/design-system/ads/src/Icon/Icon.provider.tsx b/app/client/packages/design-system/ads/src/Icon/Icon.provider.tsx
index 964058836cda..b4154a27d2d5 100644
--- a/app/client/packages/design-system/ads/src/Icon/Icon.provider.tsx
+++ b/app/client/packages/design-system/ads/src/Icon/Icon.provider.tsx
@@ -1,6 +1,7 @@
 /* eslint-disable no-console */
 import React from "react";
 import { importRemixIcon, importSvg } from "./loadables";
+
 const AddMoreIcon = importRemixIcon(
   async () => import("remixicon-react/AddCircleLineIcon"),
 );
@@ -1063,6 +1064,14 @@ const MaximizeV3Icon = importSvg(
   async () => import("../__assets__/icons/ads/maximize-v3-icon.svg"),
 );
 
+const ExternalLinkIcon = importRemixIcon(
+  async () => import("remixicon-react/ExternalLinkLineIcon"),
+);
+
+const InputCursorMoveIcon = importSvg(
+  async () => import("../__assets__/icons/ads/input-cursor-move.svg"),
+);
+
 import PlayIconPNG from "../__assets__/icons/control/play-icon.png";
 
 function PlayIconPNGWrapper() {
@@ -1211,6 +1220,7 @@ const ICON_LOOKUP = {
   "link-2": Link2,
   "link-unlink": LinkUnlinkIcon,
   "links-line": LinksLineIcon,
+  "external-link-line": ExternalLinkIcon,
   "lock-2-line": Lock2LineIcon,
   "lock-password-line": LockPasswordLineIcon,
   "lock-unlock-line": LockUnlockLineIcon,
@@ -1357,6 +1367,7 @@ const ICON_LOOKUP = {
   "minimize-v3": MinimizeV3Icon,
   "maximize-v3": MaximizeV3Icon,
   "workflows-mono": WorkflowsMonochromeIcon,
+  "input-cursor-move": InputCursorMoveIcon,
   billing: BillingIcon,
   binding: Binding,
   book: BookIcon,
diff --git a/app/client/packages/design-system/ads/src/Popover/Popover.styles.tsx b/app/client/packages/design-system/ads/src/Popover/Popover.styles.tsx
index 50cb5421ae81..a5a23e329458 100644
--- a/app/client/packages/design-system/ads/src/Popover/Popover.styles.tsx
+++ b/app/client/packages/design-system/ads/src/Popover/Popover.styles.tsx
@@ -65,5 +65,5 @@ export const StyledBody = styled.div`
   max-height: calc(
     var(--popover-max-height) - calc(var(--popover-padding) * 2 + 25.5px)
   );
-  overflow-y: scroll;
+  overflow-y: auto;
 `;
diff --git a/app/client/packages/design-system/ads/src/SegmentedControl/SegmentedControl.styles.tsx b/app/client/packages/design-system/ads/src/SegmentedControl/SegmentedControl.styles.tsx
index 9ab6f42ab00f..d3578c22ba7c 100644
--- a/app/client/packages/design-system/ads/src/SegmentedControl/SegmentedControl.styles.tsx
+++ b/app/client/packages/design-system/ads/src/SegmentedControl/SegmentedControl.styles.tsx
@@ -77,7 +77,9 @@ export const StyledControlContainer = styled.div`
 
   /* Select all segments which is not a selected and last child */
   /* seperator */
-  &:not(:last-child):not([data-selected="true"]):after {
+  &:not(:last-child):not([data-selected="true"]):not(
+      :has(+ [data-selected="true"])
+    ):after {
     content: "";
     position: absolute;
     right: 0;
diff --git a/app/client/packages/design-system/ads/src/Text/Text.stories.tsx b/app/client/packages/design-system/ads/src/Text/Text.stories.tsx
index 640ed86334e1..3eff9aec033a 100644
--- a/app/client/packages/design-system/ads/src/Text/Text.stories.tsx
+++ b/app/client/packages/design-system/ads/src/Text/Text.stories.tsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useMemo } from "react";
 import { Text } from "./Text";
 import type { Meta, StoryObj } from "@storybook/react";
 
@@ -25,15 +25,17 @@ export const EditableTextStory: Story = {
   },
   render: function Render(args) {
     const [text, setText] = React.useState(args.children);
+    const inputProps = useMemo(
+      () => ({
+        onChange: (e: React.ChangeEvent<HTMLInputElement>) => {
+          setText(e.target.value);
+        },
+      }),
+      [],
+    );
 
     return (
-      <Text
-        {...args}
-        onChange={(e) => {
-          // @ts-expect-error type error
-          setText(e.target.value);
-        }}
-      >
+      <Text inputProps={inputProps} {...args}>
         {text}
       </Text>
     );
diff --git a/app/client/packages/design-system/ads/src/Text/Text.styles.tsx b/app/client/packages/design-system/ads/src/Text/Text.styles.tsx
index ec4a7b1f8b92..55f278fa7b1d 100644
--- a/app/client/packages/design-system/ads/src/Text/Text.styles.tsx
+++ b/app/client/packages/design-system/ads/src/Text/Text.styles.tsx
@@ -125,7 +125,7 @@ export const StyledText = styled.span<{
   isBold?: boolean;
   isItalic?: boolean;
   isUnderlined?: boolean;
-  isStriked?: boolean;
+  isStrikethrough?: boolean;
   isEditable?: boolean;
 }>`
   ${TypographyScales}
@@ -160,8 +160,8 @@ export const StyledText = styled.span<{
     text-decoration: underline;
   }
 
-  /* Striked style */
-  &[data-striked="true"] {
+  /* Strikethrough style */
+  &[data-strikethrough="true"] {
     text-decoration: line-through;
   }
 
@@ -191,10 +191,8 @@ export const StyledEditableInput = styled.input`
   border: 1px solid transparent;
   border-radius: var(--ads-v2-border-radius);
   outline: none;
-  padding: 0;
   margin: 0;
   position: absolute;
-  left: -3px;
   top: -3px;
   width: 100%;
   padding: var(--ads-v2-spaces-1);
@@ -205,6 +203,6 @@ export const StyledEditableInput = styled.input`
 
   &:focus,
   &:active {
-    border-color: var(--ads-v2-colors-control-field-default-border);
+    border-color: var(--ads-v2-colors-control-field-active-border);
   }
 `;
diff --git a/app/client/packages/design-system/ads/src/Text/Text.tsx b/app/client/packages/design-system/ads/src/Text/Text.tsx
index 493555010f25..7413380359b2 100644
--- a/app/client/packages/design-system/ads/src/Text/Text.tsx
+++ b/app/client/packages/design-system/ads/src/Text/Text.tsx
@@ -1,6 +1,6 @@
-import React from "react";
+import React, { forwardRef } from "react";
 import clsx from "classnames";
-import type { TextProps } from "./Text.types";
+import type { RenderAsElement, TextProps } from "./Text.types";
 import { StyledEditableInput, StyledText } from "./Text.styles";
 import { TextClassName } from "./Text.constants";
 
@@ -9,17 +9,20 @@ TODO:
  - add segment header style to list of styles
  */
 
-function Text({
-  children,
-  className,
-  color,
-  inputProps,
-  isEditable,
-  kind,
-  onChange,
-  renderAs,
-  ...rest
-}: TextProps) {
+const Text = forwardRef<RenderAsElement, TextProps>(function Text(
+  {
+    children,
+    className,
+    color,
+    inputProps,
+    inputRef,
+    isEditable,
+    kind,
+    renderAs,
+    ...rest
+  }: TextProps,
+  ref,
+) {
   return (
     <StyledText
       as={renderAs}
@@ -27,31 +30,28 @@ function Text({
       color={color}
       data-bold={rest.isBold}
       data-italic={rest.isItalic}
-      data-striked={rest.isStriked}
+      data-strikethrough={rest.isStrikethrough}
       data-underlined={rest.isUnderlined}
       data-value={isEditable && typeof children === "string" ? children : null}
       isEditable={isEditable && typeof children === "string"}
       kind={kind}
+      ref={ref}
       {...rest}
     >
       {isEditable && typeof children === "string" ? (
-        <StyledEditableInput
-          onChange={onChange}
-          value={children}
-          {...inputProps}
-        />
+        <StyledEditableInput ref={inputRef} value={children} {...inputProps} />
       ) : (
         children
       )}
     </StyledText>
   );
-}
+});
 
 Text.displayName = "Text";
 
 Text.defaultProps = {
   renderAs: "span",
-  kind: "span",
+  kind: "body-m",
 };
 
 export { Text };
diff --git a/app/client/packages/design-system/ads/src/Text/Text.types.ts b/app/client/packages/design-system/ads/src/Text/Text.types.ts
index ec105aeaf1dc..76323ede3fea 100644
--- a/app/client/packages/design-system/ads/src/Text/Text.types.ts
+++ b/app/client/packages/design-system/ads/src/Text/Text.types.ts
@@ -1,6 +1,7 @@
 import type { ReactNode } from "react";
 import type React from "react";
 
+/** Text style variant */
 export type TextKind =
   | "heading-xl"
   | "heading-l"
@@ -14,7 +15,14 @@ export type TextKind =
   | "action-s"
   | "code";
 
-// Text props
+/** All possible element types text can be rendered as, matches renderAs prop */
+export type RenderAsElement =
+  | HTMLHeadingElement
+  | HTMLLabelElement
+  | HTMLParagraphElement
+  | HTMLSpanElement;
+
+/** Text component props */
 export type TextProps = {
   /** to change the rendering component */
   renderAs?: "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "p" | "span" | "label";
@@ -32,17 +40,14 @@ export type TextProps = {
   isItalic?: boolean;
   /** whether the text is underlined or not */
   isUnderlined?: boolean;
-  /** whether the text is striked or not */
-  isStriked?: boolean;
+  /** whether the text is strikethrough or not */
+  isStrikethrough?: boolean;
   /** whether the text is editable or not */
   isEditable?: boolean;
-  /** onChange event for editable text */
-  onChange?: (event: React.ChangeEvent<HTMLInputElement>) => void;
   /** input component props while isEditable is true */
-  inputProps?: Omit<
-    React.InputHTMLAttributes<HTMLInputElement>,
-    "value" | "onChange"
-  >;
+  inputProps?: Omit<React.InputHTMLAttributes<HTMLInputElement>, "value">;
+  /** ref for input component */
+  inputRef?: React.RefObject<HTMLInputElement>;
 } & React.HTMLAttributes<HTMLLabelElement> &
   React.HTMLAttributes<HTMLHeadingElement> &
   React.HTMLAttributes<HTMLParagraphElement> &
diff --git a/app/client/packages/design-system/ads/src/__assets__/icons/ads/input-cursor-move.svg b/app/client/packages/design-system/ads/src/__assets__/icons/ads/input-cursor-move.svg
new file mode 100644
index 000000000000..e05a3c4b656a
--- /dev/null
+++ b/app/client/packages/design-system/ads/src/__assets__/icons/ads/input-cursor-move.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+  <g id="input-cursor-move" clip-path="url(#clip0_3192_40313)">
+    <path id="Vector"
+          d="M5.33329 14V12.6667H7.33329V3.33333H5.33329V2H10.6666V3.33333H8.66663V12.6667H10.6666V14H5.33329ZM12.0333 4.7L15.3333 8L12.0333 11.3L11.0906 10.3573L13.448 8L11.0906 5.64267L12.0333 4.7ZM3.96663 4.7L4.90929 5.64267L2.55196 8L4.90929 10.3573L3.96663 11.3L0.666626 8L3.96663 4.7V4.7Z"
+          fill="currentColor"/>
+  </g>
+</svg>
diff --git a/app/client/packages/design-system/ads/src/__assets__/icons/ads/settings-v3-icon.svg b/app/client/packages/design-system/ads/src/__assets__/icons/ads/settings-v3-icon.svg
index df11c445c5b7..0fdaa570ff59 100644
--- a/app/client/packages/design-system/ads/src/__assets__/icons/ads/settings-v3-icon.svg
+++ b/app/client/packages/design-system/ads/src/__assets__/icons/ads/settings-v3-icon.svg
@@ -1,21 +1,3 @@
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:currentColor;}
-	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:currentColor;}
-</style>
-<g>
-	<path class="st0" d="M14,24h-4c-1.1,0-2-0.9-2-2v-1.9c-0.3-0.2-0.7-0.4-1-0.6l-1.7,1c-0.5,0.3-1,0.3-1.5,0.2
-		c-0.5-0.1-0.9-0.5-1.2-0.9l-2-3.5c-0.3-0.5-0.3-1-0.2-1.5c0.1-0.5,0.5-0.9,0.9-1.2l1.7-1c0-0.2,0-0.4,0-0.6s0-0.4,0-0.6l-1.7-1
-		c-1-0.6-1.3-1.8-0.7-2.7l2-3.5c0.3-0.5,0.7-0.8,1.2-0.9c0.5-0.1,1.1-0.1,1.5,0.2l1.7,1c0.3-0.2,0.6-0.4,1-0.6V2c0-1.1,0.9-2,2-2h4
-		c1.1,0,2,0.9,2,2v1.9c0.3,0.2,0.7,0.4,1,0.6l1.7-1c1-0.6,2.2-0.2,2.7,0.7l2,3.5c0.3,0.5,0.3,1,0.2,1.5c-0.1,0.5-0.5,0.9-0.9,1.2
-		l-1.7,1c0,0.2,0,0.4,0,0.6c0,0.2,0,0.4,0,0.6l1.7,1c0.5,0.3,0.8,0.7,0.9,1.2c0.1,0.5,0.1,1.1-0.2,1.5l-2,3.5
-		c-0.3,0.5-0.7,0.8-1.2,0.9c-0.5,0.1-1.1,0.1-1.5-0.2l-1.7-1c-0.3,0.2-0.6,0.4-1,0.6V22C16,23.1,15.1,24,14,24z M7.2,17.1l0.5,0.4
-		c0.5,0.4,1.1,0.7,1.7,1l0.6,0.3V22h4v-3.3l0.6-0.3c0.6-0.2,1.2-0.6,1.7-1l0.5-0.4l2.8,1.6l2-3.5l-2.8-1.6l0.1-0.7
-		c0-0.3,0.1-0.6,0.1-1s0-0.7-0.1-1l-0.1-0.7l2.8-1.6l-2-3.5l-2.8,1.6l-0.5-0.4c-0.5-0.4-1.1-0.7-1.7-1L14,5.3V2h-4v3.3L9.4,5.5
-		c-0.6,0.2-1.2,0.6-1.7,1L7.2,6.9L4.3,5.3l-2,3.5l2.8,1.6L5.1,11C5,11.3,5,11.7,5,12s0,0.7,0.1,1l0.1,0.7l-2.8,1.6l2,3.5L7.2,17.1z"
-		/>
-</g>
-<path class="st1" d="M12,10c-1.1,0-2,0.9-2,2s0.9,2,2,2s2-0.9,2-2S13.1,10,12,10z M8,12c0-2.2,1.8-4,4-4c2.2,0,4,1.8,4,4
-	c0,2.2-1.8,4-4,4C9.8,16,8,14.2,8,12z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M8.65637 1.23949C8.83848 0.511032 9.493 0 10.2439 0H13.7558C14.5066 0 15.1611 0.51103 15.3433 1.23949L15.928 3.57835C15.928 3.57835 15.9306 3.58296 15.9349 3.58789C15.9441 3.59863 15.9619 3.6142 15.9897 3.62747C16.432 3.83857 16.8548 4.08358 17.2547 4.35906C17.2798 4.37639 17.302 4.38399 17.3158 4.38661C17.3221 4.3878 17.3274 4.38778 17.3274 4.38778L19.647 3.72424C20.3689 3.51773 21.1387 3.82905 21.5142 4.47932L23.2701 7.5207C23.6455 8.17097 23.5302 8.99332 22.9904 9.51526L21.2558 11.1925C21.2558 11.1925 21.2531 11.1971 21.251 11.2032C21.2463 11.2164 21.2418 11.2394 21.2442 11.2698C21.263 11.5109 21.2725 11.7545 21.2725 12C21.2725 12.2456 21.263 12.4891 21.2442 12.7302C21.2418 12.7606 21.2463 12.7836 21.251 12.7969C21.2531 12.8029 21.2558 12.8075 21.2558 12.8075L22.9904 14.4847C23.5302 15.0066 23.6455 15.829 23.27 16.4793L21.5141 19.5206C21.1387 20.1709 20.3688 20.4822 19.6469 20.2757L17.3275 19.6122C17.3275 19.6122 17.3222 19.6122 17.3159 19.6134C17.3021 19.616 17.2799 19.6236 17.2547 19.6409C16.8548 19.9164 16.432 20.1614 15.9897 20.3726C15.9619 20.3858 15.9441 20.4014 15.9349 20.4121C15.9306 20.4171 15.928 20.4217 15.928 20.4217L15.3433 22.7605C15.1611 23.489 14.5066 24 13.7558 24H10.2439C9.493 24 8.83848 23.489 8.65637 22.7605L8.07165 20.4217C8.07165 20.4217 8.06902 20.4171 8.06478 20.4121C8.05554 20.4014 8.03773 20.3858 8.00993 20.3726C7.56764 20.1615 7.14487 19.9165 6.74498 19.641C6.71981 19.6236 6.69761 19.616 6.68381 19.6134C6.67749 19.6122 6.67223 19.6122 6.67223 19.6122L4.35265 20.2758C3.63073 20.4823 2.86091 20.171 2.48547 19.5207L0.72953 16.4793C0.354094 15.8291 0.469401 15.0067 1.0092 14.4848L2.74388 12.8075C2.74388 12.8075 2.74653 12.8029 2.74867 12.7969C2.75331 12.7836 2.75785 12.7607 2.75548 12.7303C2.73666 12.4891 2.72709 12.2456 2.72709 12C2.72709 11.7545 2.73666 11.5109 2.75548 11.2698C2.75785 11.2394 2.75331 11.2164 2.74867 11.2032C2.74653 11.1971 2.74387 11.1925 2.74387 11.1925L1.00928 9.51534C0.469476 8.99339 0.354169 8.17105 0.729606 7.52077L2.48555 4.4794C2.86098 3.82912 3.63081 3.51781 4.35273 3.72432L6.67218 4.38782C6.67218 4.38782 6.67744 4.38784 6.68375 4.38665C6.69755 4.38403 6.71975 4.37643 6.74492 4.3591C7.14483 4.0836 7.56762 3.83858 8.00993 3.62747C8.03773 3.6142 8.05554 3.59863 8.06478 3.58789C8.06902 3.58297 8.07165 3.57835 8.07165 3.57835L8.65637 1.23949ZM10.6698 2.18182L10.188 4.10881C10.0142 4.80406 9.52358 5.3226 8.94974 5.5965C8.61193 5.75773 8.2887 5.94503 7.98268 6.15584C7.45811 6.51721 6.7629 6.68311 6.07337 6.48586L4.16212 5.93913L2.83206 8.24286L4.26142 9.62493C4.77592 10.1224 4.98014 10.8057 4.93068 11.4395C4.91627 11.6242 4.90891 11.8112 4.90891 12C4.90891 12.1889 4.91627 12.3758 4.93068 12.5605C4.98014 13.1943 4.77592 13.8776 4.26142 14.3751L2.83198 15.7572L4.16204 18.061L6.07343 17.5142C6.76295 17.317 7.45816 17.4829 7.98272 17.8442C8.28873 18.055 8.61194 18.2423 8.94974 18.4035C9.52357 18.6774 10.0142 19.196 10.188 19.8912L10.6698 21.8182H13.3299L13.8116 19.8912C13.9854 19.196 14.4761 18.6774 15.0499 18.4035C15.3877 18.2423 15.7109 18.055 16.017 17.8442C16.5415 17.4828 17.2367 17.3169 17.9263 17.5142L19.8375 18.0609L21.1676 15.7572L19.7382 14.3751C19.2237 13.8776 19.0195 13.1943 19.069 12.5605C19.0834 12.3758 19.0907 12.1889 19.0907 12C19.0907 11.8112 19.0834 11.6242 19.069 11.4395C19.0195 10.8057 19.2237 10.1224 19.7382 9.62493L21.1677 8.24278L19.8376 5.93905L17.9262 6.48582C17.2367 6.68307 16.5415 6.51717 16.0169 6.15581C15.7109 5.94501 15.3877 5.75773 15.0499 5.5965C14.4761 5.32261 13.9854 4.80406 13.8116 4.10881L13.3299 2.18182H10.6698ZM11.9998 9.8182C10.7948 9.8182 9.818 10.795 9.818 12C9.818 13.205 10.7948 14.1818 11.9998 14.1818C13.2048 14.1818 14.1816 13.205 14.1816 12C14.1816 10.795 13.2048 9.8182 11.9998 9.8182ZM7.63618 12C7.63618 9.59004 9.58985 7.63638 11.9998 7.63638C14.4098 7.63638 16.3635 9.59004 16.3635 12C16.3635 14.41 14.4098 16.3637 11.9998 16.3637C9.58985 16.3637 7.63618 14.41 7.63618 12Z" fill="currentColor"/>
+</svg>
\ No newline at end of file
diff --git a/app/client/packages/design-system/ads/src/__assets__/icons/menu/js-function.svg b/app/client/packages/design-system/ads/src/__assets__/icons/menu/js-function.svg
index da40bfe8effd..af593b9ea104 100644
--- a/app/client/packages/design-system/ads/src/__assets__/icons/menu/js-function.svg
+++ b/app/client/packages/design-system/ads/src/__assets__/icons/menu/js-function.svg
@@ -1 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" fill="none" viewBox="0 0 12 12"><path fill="currentColor" d="M0 11.6667V10.8227H1.21754C1.6746 10.8227 2.02923 10.6977 2.2814 10.4476C2.53358 10.1976 2.65967 9.84591 2.65967 9.39267V4.65714H0.744707V3.81319H2.65967V2.58242C2.65967 2.0823 2.81334 1.69548 3.12067 1.42198C3.42801 1.14066 3.8575 1 4.40914 1H6.28863V1.83223H4.40914C3.87326 1.83223 3.60533 2.0862 3.60533 2.59414V3.81319H6.28863V4.65714H3.60533V9.42784C3.60533 10.1077 3.38861 10.6508 2.95518 11.0571C2.52176 11.4635 1.94254 11.6667 1.21754 11.6667H0Z"/><path fill="currentColor" d="M6.32604 9.55678L8.59563 6.23956L6.46789 3.10989H7.57904L8.90297 5.19634C8.98965 5.337 9.08028 5.5011 9.17484 5.68864C9.26941 5.5011 9.36003 5.337 9.44672 5.19634L10.7706 3.10989H11.87L9.74224 6.25128L12 9.55678H10.8888L9.47036 7.35311C9.38368 7.21245 9.28517 7.03272 9.17484 6.81392L8.85568 7.35311L7.42537 9.55678H6.32604Z"/></svg>
\ No newline at end of file
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.14645 6.14645C8.34171 5.95118 8.65829 5.95118 8.85355 6.14645L10.5 7.79289L12.1464 6.14645C12.3417 5.95118 12.6583 5.95118 12.8536 6.14645C13.0488 6.34171 13.0488 6.65829 12.8536 6.85355L11.2071 8.5L12.8536 10.1464C13.0488 10.3417 13.0488 10.6583 12.8536 10.8536C12.6583 11.0488 12.3417 11.0488 12.1464 10.8536L10.5 9.20711L8.85355 10.8536C8.65829 11.0488 8.34171 11.0488 8.14645 10.8536C7.95118 10.6583 7.95118 10.3417 8.14645 10.1464L9.79289 8.5L8.14645 6.85355C7.95118 6.65829 7.95118 6.34171 8.14645 6.14645Z" fill="currentColor"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.5 3C7.11929 3 6 4.11929 6 5.5V9.5C6 11.433 4.433 13 2.5 13H1.5C1.22386 13 1 12.7761 1 12.5C1 12.2239 1.22386 12 1.5 12H2.5C3.88071 12 5 10.8807 5 9.5V5.5C5 3.567 6.567 2 8.5 2C8.77614 2 9 2.22386 9 2.5C9 2.77614 8.77614 3 8.5 3Z" fill="currentColor"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2 6.5C2 6.22386 2.22386 6 2.5 6H8.5C8.77614 6 9 6.22386 9 6.5C9 6.77614 8.77614 7 8.5 7H2.5C2.22386 7 2 6.77614 2 6.5Z" fill="currentColor"/>
+</svg>
diff --git a/app/client/packages/design-system/headless/src/components/Field/src/Field.tsx b/app/client/packages/design-system/headless/src/components/Field/src/Field.tsx
deleted file mode 100644
index 0671befc430b..000000000000
--- a/app/client/packages/design-system/headless/src/components/Field/src/Field.tsx
+++ /dev/null
@@ -1,123 +0,0 @@
-import type { ReactNode, Ref } from "react";
-import React, { forwardRef } from "react";
-import type { SpectrumFieldProps } from "@react-types/label";
-
-import { Label } from "./Label";
-import { HelpText } from "./HelpText";
-export type FieldProps = Pick<
-  SpectrumFieldProps,
-  | "contextualHelp"
-  | "description"
-  | "descriptionProps"
-  | "elementType"
-  | "errorMessage"
-  | "errorMessageProps"
-  | "includeNecessityIndicatorInAccessibilityName"
-  | "isDisabled"
-  | "isRequired"
-  | "label"
-  | "labelProps"
-  | "necessityIndicator"
-  | "wrapperClassName"
-  | "wrapperProps"
-> & {
-  fieldType?: "field" | "field-group";
-  labelClassName?: string;
-  helpTextClassName?: string;
-  validationState?: ValidationState;
-  children: ReactNode;
-  isReadOnly?: boolean;
-};
-
-import type { ValidationState } from "@react-types/shared";
-
-export type FieldRef = Ref<HTMLDivElement>;
-
-const _Field = (props: FieldProps, ref: FieldRef) => {
-  const {
-    children,
-    contextualHelp,
-    description,
-    descriptionProps,
-    elementType,
-    errorMessage,
-    errorMessageProps = {},
-    fieldType = "field",
-    helpTextClassName,
-    includeNecessityIndicatorInAccessibilityName,
-    isDisabled = false,
-    isReadOnly = false,
-    isRequired,
-    label,
-    labelClassName,
-    labelProps,
-    necessityIndicator,
-    validationState,
-    wrapperClassName,
-    wrapperProps = {},
-  } = props;
-
-  // Readonly has a higher priority than disabled.
-  const getDisabledState = () => Boolean(isDisabled) && !Boolean(isReadOnly);
-
-  const hasHelpText =
-    Boolean(description) ||
-    (Boolean(errorMessage) && validationState === "invalid");
-
-  const renderHelpText = () => {
-    return (
-      <HelpText
-        className={helpTextClassName}
-        description={description}
-        descriptionProps={descriptionProps}
-        errorMessage={errorMessage}
-        errorMessageProps={errorMessageProps}
-        isDisabled={getDisabledState()}
-        validationState={validationState}
-      />
-    );
-  };
-
-  const labelAndContextualHelp = (Boolean(label) ||
-    Boolean(contextualHelp)) && (
-    <div data-field-label-wrapper="">
-      {Boolean(label) && (
-        <Label
-          {...labelProps}
-          className={labelClassName}
-          elementType={elementType}
-          includeNecessityIndicatorInAccessibilityName={
-            includeNecessityIndicatorInAccessibilityName
-          }
-          isRequired={isRequired}
-          necessityIndicator={
-            !Boolean(isReadOnly) ? necessityIndicator : undefined
-          }
-        >
-          <span>{label}</span>
-        </Label>
-      )}
-      {contextualHelp}
-    </div>
-  );
-
-  return (
-    <div
-      {...wrapperProps}
-      className={wrapperClassName}
-      data-disabled={getDisabledState() ? "" : undefined}
-      data-field=""
-      data-field-type={fieldType}
-      data-readonly={Boolean(isReadOnly) ? "" : undefined}
-      ref={ref}
-    >
-      {labelAndContextualHelp}
-      <div data-field-input-wrapper="">
-        {children}
-        {hasHelpText && renderHelpText()}
-      </div>
-    </div>
-  );
-};
-
-export const Field = forwardRef(_Field);
diff --git a/app/client/packages/design-system/headless/src/components/Field/src/HelpText.tsx b/app/client/packages/design-system/headless/src/components/Field/src/HelpText.tsx
deleted file mode 100644
index 9ad277012028..000000000000
--- a/app/client/packages/design-system/headless/src/components/Field/src/HelpText.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import React, { forwardRef } from "react";
-import type { HTMLAttributes } from "react";
-import { useDOMRef } from "@react-spectrum/utils";
-import type {
-  DOMRef,
-  SpectrumHelpTextProps,
-  ValidationState,
-} from "@react-types/shared";
-
-interface HelpTextProps extends Omit<SpectrumHelpTextProps, "showErrorIcon"> {
-  /** Props for the help text description element. */
-  descriptionProps?: HTMLAttributes<HTMLElement>;
-  /** Props for the help text error message element. */
-  errorMessageProps?: HTMLAttributes<HTMLElement>;
-  /** classname  */
-  className?: string;
-  /** validation state for help text */
-  validationState?: ValidationState;
-}
-
-function _HelpText(props: HelpTextProps, ref: DOMRef<HTMLDivElement>) {
-  const {
-    className,
-    description,
-    descriptionProps,
-    errorMessage,
-    errorMessageProps,
-    validationState,
-  } = props;
-  const domRef = useDOMRef(ref);
-  const isErrorMessage = Boolean(errorMessage) && validationState === "invalid";
-
-  return (
-    <div className={className} ref={domRef}>
-      {isErrorMessage ? (
-        <div {...errorMessageProps} data-field-error-text="">
-          {errorMessage}
-        </div>
-      ) : (
-        <div {...descriptionProps} data-field-description-text="">
-          {description}
-        </div>
-      )}
-    </div>
-  );
-}
-
-export const HelpText = forwardRef(_HelpText);
diff --git a/app/client/packages/design-system/headless/src/components/Field/src/Label.tsx b/app/client/packages/design-system/headless/src/components/Field/src/Label.tsx
deleted file mode 100644
index 522763a2c1d2..000000000000
--- a/app/client/packages/design-system/headless/src/components/Field/src/Label.tsx
+++ /dev/null
@@ -1,76 +0,0 @@
-import React, { forwardRef } from "react";
-import { useDOMRef } from "@react-spectrum/utils";
-import { filterDOMProps } from "@react-aria/utils";
-import type { DOMRef, StyleProps } from "@react-types/shared";
-import type { SpectrumLabelProps } from "@react-types/label";
-
-export type LabelProps = Omit<
-  SpectrumLabelProps,
-  keyof StyleProps | "labelPosition" | "labelAlign"
->;
-
-const _Label = (props: LabelProps, ref: DOMRef<HTMLLabelElement>) => {
-  const {
-    children,
-    className,
-    elementType: ElementType = "label",
-    for: labelFor,
-    htmlFor,
-    includeNecessityIndicatorInAccessibilityName,
-    isRequired,
-    necessityIndicator = "icon",
-    onClick,
-    ...otherProps
-  } = props;
-
-  const domRef = useDOMRef(ref);
-
-  const necessityLabel = Boolean(isRequired) ? "(required)" : "(optional)";
-  const icon = (
-    <span
-      aria-label={
-        Boolean(includeNecessityIndicatorInAccessibilityName)
-          ? "(required)"
-          : undefined
-      }
-      data-field-necessity-indicator-icon=""
-    >
-      *
-    </span>
-  );
-
-  return (
-    <ElementType
-      data-field-label=""
-      {...filterDOMProps(otherProps)}
-      className={className}
-      htmlFor={
-        ElementType === "label" ? Boolean(labelFor) || htmlFor : undefined
-      }
-      onClick={onClick}
-      ref={domRef}
-    >
-      {children}
-      {/* necessityLabel is hidden to screen readers if the field is required because
-       * aria-required is set on the field in that case. That will already be announced,
-       * so no need to duplicate it here. If optional, we do want it to be announced here. */}
-      {(necessityIndicator === "label" ||
-        (necessityIndicator === "icon" && Boolean(isRequired))) &&
-        " \u200b"}
-      {necessityIndicator === "label" && (
-        <span
-          aria-hidden={
-            includeNecessityIndicatorInAccessibilityName == null
-              ? isRequired
-              : undefined
-          }
-        >
-          {necessityLabel}
-        </span>
-      )}
-      {necessityIndicator === "icon" && Boolean(isRequired) && icon}
-    </ElementType>
-  );
-};
-
-export const Label = forwardRef(_Label);
diff --git a/app/client/packages/design-system/headless/src/components/Field/src/index.ts b/app/client/packages/design-system/headless/src/components/Field/src/index.ts
deleted file mode 100644
index 7f94c4c65acc..000000000000
--- a/app/client/packages/design-system/headless/src/components/Field/src/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from "./Field";
-export type { LabelProps } from "./Label";
-export type { FieldProps, FieldRef } from "./Field";
diff --git a/app/client/packages/design-system/headless/src/components/TextArea/src/TextArea.tsx b/app/client/packages/design-system/headless/src/components/TextArea/src/TextArea.tsx
deleted file mode 100644
index 691d8d8c7b81..000000000000
--- a/app/client/packages/design-system/headless/src/components/TextArea/src/TextArea.tsx
+++ /dev/null
@@ -1,120 +0,0 @@
-import type { Ref } from "react";
-import React, { useCallback, useRef } from "react";
-import { useTextField } from "@react-aria/textfield";
-import { chain, useLayoutEffect } from "@react-aria/utils";
-import { useControlledState } from "@react-stately/utils";
-
-import type { TextAreaProps } from "./types";
-import { TextInputBase } from "../../TextInputBase";
-
-export type TextAreaRef = Ref<HTMLDivElement>;
-
-function TextArea(props: TextAreaProps, ref: TextAreaRef) {
-  const {
-    defaultValue,
-    isDisabled = false,
-    isReadOnly = false,
-    isRequired = false,
-    onChange,
-    value,
-    ...otherProps
-  } = props;
-
-  const isEmpty = isReadOnly && !Boolean(value) && !Boolean(defaultValue);
-
-  // not in stately because this is so we know when to re-measure, which is a spectrum design
-  const [inputValue, setInputValue] = useControlledState(
-    props.value,
-    props.defaultValue ?? "",
-    () => {
-      //
-    },
-  );
-  const inputRef = useRef<HTMLTextAreaElement>(null);
-
-  const onHeightChange = useCallback(() => {
-    // Quiet textareas always grow based on their text content.
-    // Standard textareas also grow by default, unless an explicit height is set.
-    if (props.height == null && inputRef.current) {
-      const input = inputRef.current;
-      const prevAlignment = input.style.alignSelf;
-      const prevOverflow = input.style.overflow;
-      // Firefox scroll position is lost when overflow: 'hidden' is applied so we skip applying it.
-      // The measure/applied height is also incorrect/reset if we turn on and off
-      // overflow: hidden in Firefox https://bugzilla.mozilla.org/show_bug.cgi?id=1787062
-      const isFirefox = "MozAppearance" in input.style;
-
-      if (!isFirefox) {
-        input.style.overflow = "hidden";
-      }
-
-      input.style.alignSelf = "start";
-      input.style.height = "auto";
-
-      const computedStyle = getComputedStyle(input);
-      const paddingTop = parseFloat(computedStyle.paddingTop);
-      const paddingBottom = parseFloat(computedStyle.paddingBottom);
-
-      input.style.height = `${
-        // subtract comptued padding and border to get the actual content height
-        input.scrollHeight -
-        paddingTop -
-        paddingBottom +
-        // Also, adding 1px to fix a bug in browser where there is a scrolllbar on certain heights
-        1
-      }px`;
-      input.style.overflow = prevOverflow;
-      input.style.alignSelf = prevAlignment;
-    }
-  }, [inputRef, props.height]);
-
-  useLayoutEffect(() => {
-    if (inputRef.current) {
-      onHeightChange();
-    }
-  }, [onHeightChange, inputValue, inputRef.current]);
-
-  if (props.placeholder != null) {
-    // eslint-disable-next-line no-console
-    console.warn(
-      "Placeholders are deprecated due to accessibility issues. Please use help text instead. See the docs for details: https://react-spectrum.adobe.com/react-spectrum/TextArea.html#help-text",
-    );
-  }
-
-  const { descriptionProps, errorMessageProps, inputProps, labelProps } =
-    useTextField(
-      {
-        ...props,
-        value: isEmpty ? "—" : value,
-        defaultValue,
-        onChange: chain(onChange, setInputValue),
-        inputElementType: "textarea",
-      },
-      inputRef,
-    );
-
-  return (
-    <TextInputBase
-      {...otherProps}
-      descriptionProps={descriptionProps}
-      errorMessageProps={errorMessageProps}
-      inputProps={inputProps}
-      inputRef={inputRef}
-      isDisabled={isDisabled}
-      isReadOnly={isReadOnly}
-      isRequired={isRequired}
-      labelProps={labelProps}
-      multiLine
-      ref={ref}
-    />
-  );
-}
-
-/**
- * TextAreas are multiline text inputs, useful for cases where users have
- * a sizable amount of text to enter. They allow for all customizations that
- * are available to text fields.
- */
-const _TextArea = React.forwardRef(TextArea);
-
-export { _TextArea as TextArea };
diff --git a/app/client/packages/design-system/headless/src/components/TextArea/src/index.ts b/app/client/packages/design-system/headless/src/components/TextArea/src/index.ts
deleted file mode 100644
index 5d86eab325ae..000000000000
--- a/app/client/packages/design-system/headless/src/components/TextArea/src/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from "./types";
-export { TextArea } from "./TextArea";
-export type { TextAreaRef } from "./TextArea";
diff --git a/app/client/packages/design-system/headless/src/components/TextArea/src/types.ts b/app/client/packages/design-system/headless/src/components/TextArea/src/types.ts
deleted file mode 100644
index 59c353da581b..000000000000
--- a/app/client/packages/design-system/headless/src/components/TextArea/src/types.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import type { TextInputBaseProps } from "../../TextInputBase";
-import type { OmitedSpectrumTextFieldProps } from "../../TextInput";
-
-export interface TextAreaProps
-  extends OmitedSpectrumTextFieldProps,
-    Pick<TextInputBaseProps, "inputClassName"> {
-  height?: number | string;
-  inputClassName?: string;
-  /** spell check attribute */
-  spellCheck?: boolean;
-  /** classname for label */
-  labelClassName?: string;
-  /** classname for errorMessage or description */
-  helpTextClassName?: string;
-  /** classname for the field */
-  fieldClassName?: string;
-  /** className for the text input. */
-  className?: string;
-}
diff --git a/app/client/packages/design-system/headless/src/components/TextInput/src/TextInput.tsx b/app/client/packages/design-system/headless/src/components/TextInput/src/TextInput.tsx
deleted file mode 100644
index 12687d1c282d..000000000000
--- a/app/client/packages/design-system/headless/src/components/TextInput/src/TextInput.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import type { Ref } from "react";
-import React, { forwardRef, useRef } from "react";
-import { useTextField } from "@react-aria/textfield";
-
-import type { TextInputProps } from "./types";
-import { TextInputBase } from "../../TextInputBase";
-
-export type TextInputRef = Ref<HTMLDivElement>;
-
-function TextInput(props: TextInputProps, ref: TextInputRef) {
-  const inputRef = useRef<HTMLInputElement>(null);
-  const {
-    defaultValue,
-    isReadOnly = false,
-    spellCheck,
-    type: typeProp,
-    value,
-    ...rest
-  } = props;
-
-  const isEmpty = isReadOnly && !Boolean(value) && !Boolean(defaultValue);
-  const type = typeProp === "password" && isEmpty ? "text" : typeProp;
-
-  const { descriptionProps, errorMessageProps, inputProps, labelProps } =
-    useTextField(
-      { ...rest, type, defaultValue, value: isEmpty ? "—" : value },
-      inputRef,
-    );
-
-  if (props.placeholder != null) {
-    // eslint-disable-next-line no-console
-    console.warn(
-      "Placeholders are deprecated due to accessibility issues. Please use help text instead. See the docs for details: https://react-spectrum.adobe.com/react-spectrum/TextField.html#help-text",
-    );
-  }
-
-  return (
-    <TextInputBase
-      {...props}
-      descriptionProps={descriptionProps}
-      errorMessageProps={errorMessageProps}
-      inputProps={{
-        ...inputProps,
-        spellCheck,
-      }}
-      inputRef={inputRef}
-      labelProps={labelProps}
-      ref={ref}
-    />
-  );
-}
-
-const _TextInput = forwardRef(TextInput);
-
-export { _TextInput as TextInput };
diff --git a/app/client/packages/design-system/headless/src/components/TextInput/src/index.ts b/app/client/packages/design-system/headless/src/components/TextInput/src/index.ts
deleted file mode 100644
index f72f0a0c706a..000000000000
--- a/app/client/packages/design-system/headless/src/components/TextInput/src/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from "./types";
-export { TextInput } from "./TextInput";
-export type { TextInputRef } from "./TextInput";
diff --git a/app/client/packages/design-system/headless/src/components/TextInput/src/types.ts b/app/client/packages/design-system/headless/src/components/TextInput/src/types.ts
deleted file mode 100644
index 22eaf29aafb6..000000000000
--- a/app/client/packages/design-system/headless/src/components/TextInput/src/types.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import type { StyleProps } from "@react-types/shared";
-import type { SpectrumTextFieldProps } from "@react-types/textfield";
-
-export type OmitedSpectrumTextFieldProps = Omit<
-  SpectrumTextFieldProps,
-  keyof StyleProps | "icon" | "isQuiet" | "labelPosition" | "labelAlign"
->;
-
-export interface TextInputProps extends OmitedSpectrumTextFieldProps {
-  /** classname for the input element */
-  inputClassName?: string;
-  /** spell check attribute */
-  spellCheck?: boolean;
-  /** classname for label */
-  labelClassName?: string;
-  /** classname for errorMessage or description */
-  helpTextClassName?: string;
-  /** classname for the field */
-  fieldClassName?: string;
-  /** className for the text input. */
-  className?: string;
-  /** indicates loading state of the text input */
-  isLoading?: boolean;
-  /** suffix component  */
-  prefix?: React.ReactNode;
-  /** prefix component */
-  suffix?: React.ReactNode;
-}
diff --git a/app/client/packages/design-system/headless/src/components/TextInput/stories/TextInput.stories.ts b/app/client/packages/design-system/headless/src/components/TextInput/stories/TextInput.stories.ts
deleted file mode 100644
index 454be2714f71..000000000000
--- a/app/client/packages/design-system/headless/src/components/TextInput/stories/TextInput.stories.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import type { Meta, StoryObj } from "@storybook/react";
-import { TextInput } from "@appsmith/wds-headless";
-
-/**
- * TextInput component allows users to input text. It is mostly used in forms.
- */
-const meta: Meta<typeof TextInput> = {
-  component: TextInput,
-  title: "WDS/headless/TextInput",
-  args: {
-    label: "Label",
-    placeholder: "Placeholder",
-  },
-};
-
-export default meta;
-type Story = StoryObj<typeof TextInput>;
-
-export const Main: Story = {};
diff --git a/app/client/packages/design-system/headless/src/components/TextInputBase/src/TextInputBase.tsx b/app/client/packages/design-system/headless/src/components/TextInputBase/src/TextInputBase.tsx
deleted file mode 100644
index 25d0f4016270..000000000000
--- a/app/client/packages/design-system/headless/src/components/TextInputBase/src/TextInputBase.tsx
+++ /dev/null
@@ -1,105 +0,0 @@
-import type { Ref } from "react";
-import { mergeProps } from "@react-aria/utils";
-import React, { forwardRef, useRef } from "react";
-import { useHover } from "@react-aria/interactions";
-import { useFocusRing, useFocusable } from "@react-aria/focus";
-
-import { Field } from "../../Field";
-import type { TextInputBaseProps } from "./types";
-
-function TextInputBase(props: TextInputBaseProps, ref: Ref<HTMLDivElement>) {
-  const {
-    autoFocus,
-    descriptionProps,
-    errorMessageProps,
-    fieldClassName,
-    inputClassName,
-    inputProps,
-    inputRef: userInputRef,
-    isDisabled = false,
-    isLoading = false,
-    isReadOnly = false,
-    labelProps,
-    multiLine = false,
-    onBlur,
-    onFocus,
-    prefix,
-    suffix,
-    validationState,
-  } = props;
-
-  // Readonly has a higher priority than disabled.
-  const getDisabledState = () => isDisabled && !isReadOnly;
-
-  const { hoverProps, isHovered } = useHover({
-    isDisabled: getDisabledState(),
-  });
-  const domRef = useRef<HTMLDivElement>(null);
-  const defaultInputRef = useRef<HTMLInputElement | HTMLTextAreaElement>(null);
-  const inputRef = userInputRef ?? defaultInputRef;
-
-  const ElementType: React.ElementType = Boolean(multiLine)
-    ? "textarea"
-    : "input";
-  const isInvalid =
-    validationState === "invalid" &&
-    !Boolean(isDisabled) &&
-    !Boolean(isReadOnly);
-
-  const { focusProps, isFocused, isFocusVisible } = useFocusRing({
-    isTextInput: true,
-    autoFocus,
-  });
-
-  const { focusableProps } = useFocusable(
-    { isDisabled: getDisabledState(), onFocus: onFocus, onBlur: onBlur },
-    inputRef,
-  );
-
-  // When user clicks on the startIcon or endIcon, we want to focus the input.
-  const focusInput: React.MouseEventHandler = () => {
-    inputRef.current?.focus();
-  };
-
-  return (
-    <Field
-      {...props}
-      descriptionProps={descriptionProps}
-      errorMessageProps={errorMessageProps}
-      labelProps={labelProps}
-      ref={domRef}
-      wrapperClassName={fieldClassName}
-    >
-      <div
-        aria-busy={isLoading ? true : undefined}
-        data-disabled={getDisabledState() ? "" : undefined}
-        data-field-input=""
-        data-focused={
-          isFocusVisible || (isFocused && !isReadOnly) ? "" : undefined
-        }
-        data-hovered={isHovered ? "" : undefined}
-        data-invalid={isInvalid ? "" : undefined}
-        data-loading={isLoading ? "" : undefined}
-        data-readonly={isReadOnly ? "" : undefined}
-        onClick={focusInput}
-        ref={ref}
-      >
-        {Boolean(prefix) && <span data-field-input-prefix>{prefix}</span>}
-        <ElementType
-          {...mergeProps(inputProps, hoverProps, focusProps, focusableProps)}
-          className={inputClassName}
-          disabled={getDisabledState()}
-          readOnly={isReadOnly}
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          ref={inputRef as any}
-          rows={multiLine ? 1 : undefined}
-        />
-        {Boolean(suffix) && <span data-field-input-suffix>{suffix}</span>}
-      </div>
-    </Field>
-  );
-}
-
-const _TextInputBase = forwardRef(TextInputBase);
-
-export { _TextInputBase as TextInputBase };
diff --git a/app/client/packages/design-system/headless/src/components/TextInputBase/src/index.ts b/app/client/packages/design-system/headless/src/components/TextInputBase/src/index.ts
deleted file mode 100644
index 88f7c42bce12..000000000000
--- a/app/client/packages/design-system/headless/src/components/TextInputBase/src/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./types";
-export { TextInputBase } from "./TextInputBase";
diff --git a/app/client/packages/design-system/headless/src/components/TextInputBase/src/types.ts b/app/client/packages/design-system/headless/src/components/TextInputBase/src/types.ts
deleted file mode 100644
index 51f23ee4f581..000000000000
--- a/app/client/packages/design-system/headless/src/components/TextInputBase/src/types.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import type { RefObject } from "react";
-import type { TextFieldAria } from "@react-aria/textfield";
-
-import type { PressEvents } from "@react-types/shared";
-
-import type { TextInputProps } from "../../TextInput";
-
-export interface TextInputBaseProps
-  extends Omit<TextInputProps, "onChange">,
-    PressEvents {
-  /** indicates if the component is textarea */
-  multiLine?: boolean;
-  /** props to be passed to label component */
-  labelProps?: TextFieldAria["labelProps"];
-  /** props to be passed to input component */
-  inputProps: TextFieldAria<"input" | "textarea">["inputProps"];
-  /** props to be passed to description component */
-  descriptionProps?: TextFieldAria["descriptionProps"];
-  /** props to be passed to error component */
-  errorMessageProps?: TextFieldAria["errorMessageProps"];
-  /** ref for input component */
-  inputRef?: RefObject<HTMLInputElement | HTMLTextAreaElement>;
-  /** Whether the input can be selected but not changed by the user. Readonly has a higher priority than disabled. */
-  isReadOnly?: boolean;
-}
diff --git a/app/client/packages/design-system/headless/src/index.ts b/app/client/packages/design-system/headless/src/index.ts
index 579239bb67ec..a6b2628f3f8a 100644
--- a/app/client/packages/design-system/headless/src/index.ts
+++ b/app/client/packages/design-system/headless/src/index.ts
@@ -1,6 +1,2 @@
-// components
-export * from "./components/Field";
-export * from "./components/Tooltip";
-export * from "./components/TextInput";
-export * from "./components/TextArea";
 export * from "./components/Popover";
+export * from "./components/Tooltip";
diff --git a/app/client/packages/design-system/theming/src/color/src/DarkModeTheme.ts b/app/client/packages/design-system/theming/src/color/src/DarkModeTheme.ts
index f4459cc1cddf..844dfb005b76 100644
--- a/app/client/packages/design-system/theming/src/color/src/DarkModeTheme.ts
+++ b/app/client/packages/design-system/theming/src/color/src/DarkModeTheme.ts
@@ -62,6 +62,9 @@ export class DarkModeTheme implements ColorModeTheme {
       bgNeutralSubtle: this.bgNeutralSubtle.to("sRGB").toString(),
       bgNeutralSubtleHover: this.bgNeutralSubtleHover.to("sRGB").toString(),
       bgNeutralSubtleActive: this.bgNeutralSubtleActive.to("sRGB").toString(),
+      bgNeutralSoft: this.bgNeutralSoft.to("sRGB").toString(),
+      bgNeutralSoftHover: this.bgNeutralSoftHover.to("sRGB").toString(),
+      bgNeutralSoftActive: this.bgNeutralSoftActive.to("sRGB").toString(),
       bgPositive: this.bgPositive.to("sRGB").toString(),
       bgPositiveHover: this.bgPositiveHover.to("sRGB").toString(),
       bgPositiveActive: this.bgPositiveActive.to("sRGB").toString(),
@@ -407,8 +410,8 @@ export class DarkModeTheme implements ColorModeTheme {
       color.oklch.l = 0.22;
     }
 
-    if (this.seedChroma > 0.025) {
-      color.oklch.c = 0.025;
+    if (this.seedChroma > 0.005) {
+      color.oklch.c = 0.005;
     }
 
     if (this.seedIsAchromatic) {
@@ -434,6 +437,30 @@ export class DarkModeTheme implements ColorModeTheme {
     return color;
   }
 
+  private get bgNeutralSoft() {
+    const color = this.bgNeutralSubtle.clone();
+
+    color.oklch.l -= 0.03;
+
+    return color;
+  }
+
+  private get bgNeutralSoftHover() {
+    const color = this.bgNeutralSoft.clone();
+
+    color.oklch.l += 0.02;
+
+    return color;
+  }
+
+  private get bgNeutralSoftActive() {
+    const color = this.bgNeutralSoft.clone();
+
+    color.oklch.l -= 0.015;
+
+    return color;
+  }
+
   private get bgPositive() {
     // Positive background, green.
     const color = new Color("oklch", [0.62, 0.17, 145]);
diff --git a/app/client/packages/design-system/theming/src/color/src/LightModeTheme.ts b/app/client/packages/design-system/theming/src/color/src/LightModeTheme.ts
index caef0659aa2f..4322adead1f2 100644
--- a/app/client/packages/design-system/theming/src/color/src/LightModeTheme.ts
+++ b/app/client/packages/design-system/theming/src/color/src/LightModeTheme.ts
@@ -59,6 +59,9 @@ export class LightModeTheme implements ColorModeTheme {
       bgNeutralSubtle: this.bgNeutralSubtle.to("sRGB").toString(),
       bgNeutralSubtleHover: this.bgNeutralSubtleHover.to("sRGB").toString(),
       bgNeutralSubtleActive: this.bgNeutralSubtleActive.to("sRGB").toString(),
+      bgNeutralSoft: this.bgNeutralSoft.to("sRGB").toString(),
+      bgNeutralSoftHover: this.bgNeutralSoftHover.to("sRGB").toString(),
+      bgNeutralSoftActive: this.bgNeutralSoftActive.to("sRGB").toString(),
       bgPositive: this.bgPositive.to("sRGB").toString(),
       bgPositiveHover: this.bgPositiveHover.to("sRGB").toString(),
       bgPositiveActive: this.bgPositiveActive.to("sRGB").toString(),
@@ -426,6 +429,30 @@ export class LightModeTheme implements ColorModeTheme {
     return color;
   }
 
+  private get bgNeutralSoft() {
+    const color = this.bgNeutralSubtle.clone();
+
+    color.oklch.l -= 0.045;
+
+    return color;
+  }
+
+  private get bgNeutralSoftHover() {
+    const color = this.bgNeutralSoft.clone();
+
+    color.oklch.l += 0.015;
+
+    return color;
+  }
+
+  private get bgNeutralSoftActive() {
+    const color = this.bgNeutralSoft.clone();
+
+    color.oklch.l -= 0.015;
+
+    return color;
+  }
+
   private get bgPositive() {
     // Positive background, green.
     const color = new Color("oklch", [0.62, 0.19, 145]);
diff --git a/app/client/packages/design-system/theming/src/token/src/tokensConfigs.json b/app/client/packages/design-system/theming/src/token/src/tokensConfigs.json
index 2c6f2ec9a379..ae7264c82474 100644
--- a/app/client/packages/design-system/theming/src/token/src/tokensConfigs.json
+++ b/app/client/packages/design-system/theming/src/token/src/tokensConfigs.json
@@ -18,12 +18,12 @@
     "userDensityRatio": 2.25
   },
   "innerSpacing": {
-    "V": 1.4,
+    "V": 1.2,
     "R": 2.25,
     "N": 2,
     "stepsUp": 8,
     "stepsDown": 0,
-    "userSizingRatio": 0.5,
+    "userSizingRatio": 1.35,
     "userDensityRatio": 2.5
   },
   "typography": {
diff --git a/app/client/packages/design-system/widgets/jest.config.js b/app/client/packages/design-system/widgets/jest.config.js
index 59574a2a95b4..3043cc942948 100644
--- a/app/client/packages/design-system/widgets/jest.config.js
+++ b/app/client/packages/design-system/widgets/jest.config.js
@@ -1,10 +1,16 @@
+const esModules = ["remark-gfm"].join("|");
+
 module.exports = {
   preset: "ts-jest",
   roots: ["<rootDir>/src"],
+  setupFiles: ["<rootDir>../../../test/__mocks__/reactMarkdown.tsx"],
   testEnvironment: "jsdom",
   moduleNameMapper: {
     "\\.(css)$": "<rootDir>../../../test/__mocks__/styleMock.js",
   },
+  transformIgnorePatterns: [
+    `[/\\\\]node_modules[/\\\\](?!${esModules}).+\\.(js|jsx|mjs|cjs|ts|tsx)$`,
+  ],
   globals: {
     "ts-jest": {
       useESM: true,
diff --git a/app/client/packages/design-system/widgets/package.json b/app/client/packages/design-system/widgets/package.json
index d1069bce6cb6..126c104ff3d7 100644
--- a/app/client/packages/design-system/widgets/package.json
+++ b/app/client/packages/design-system/widgets/package.json
@@ -26,10 +26,16 @@
     "@tabler/icons-react": "^3.10.0",
     "clsx": "^2.0.0",
     "lodash": "*",
-    "react-aria-components": "^1.2.1"
+    "react-aria-components": "^1.2.1",
+    "react-markdown": "^9.0.1",
+    "react-syntax-highlighter": "^15.5.0",
+    "react-transition-group": "^4.4.5",
+    "remark-gfm": "^4.0.0"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
+    "@types/react-syntax-highlighter": "^15.5.13",
+    "@types/react-transition-group": "^4.4.11",
     "eslint-plugin-storybook": "^0.6.10"
   },
   "peerDependencies": {
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 42be29b1ece0..8aeab5dee079 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
@@ -1,14 +1,13 @@
+import clsx from "clsx";
+import type { SIZES } from "@appsmith/wds";
 import type { ForwardedRef } from "react";
 import React, { forwardRef } from "react";
+import { Text, Spinner, Icon } from "@appsmith/wds";
 import { useVisuallyHidden } from "@react-aria/visually-hidden";
 import { Button as HeadlessButton } from "react-aria-components";
-import type { SIZES } from "../../../shared";
-import clsx from "clsx";
-import { Text } from "../../Text";
-import { Spinner } from "../../Spinner";
+
 import styles from "./styles.module.css";
 import type { ButtonProps } from "./types";
-import { Icon } from "../../Icon";
 
 const _Button = (props: ButtonProps, ref: ForwardedRef<HTMLButtonElement>) => {
   props = useVisuallyDisabled(props);
diff --git a/app/client/packages/design-system/widgets/src/components/Button/src/styles.module.css b/app/client/packages/design-system/widgets/src/components/Button/src/styles.module.css
index 6097f308f2d6..2fcae3bec8d4 100644
--- a/app/client/packages/design-system/widgets/src/components/Button/src/styles.module.css
+++ b/app/client/packages/design-system/widgets/src/components/Button/src/styles.module.css
@@ -54,6 +54,36 @@
         background: var(--color-bg-$(color)-subtle-active);
       }
     }
+
+    &[data-variant="subtle"][data-color="$(color)"] {
+      background-color: var(--color-bg-$(color)-subtle);
+      color: var(--color-fg-$(color));
+
+      &[data-hovered]:not([data-loading]) {
+        background-color: var(--color-bg-$(color)-subtle-hover);
+      }
+
+      &[data-pressed]:not([data-loading]) {
+        background-color: var(--color-bg-$(color)-subtle-active);
+      }
+    }
+  }
+
+  /*
+    This is a special case for the "neutral" color for "subtle" variant. The subtle color is lighter than required.
+    So we added the soft token for neutral color which is little more darker than the subtle color tokens.
+  */
+  &[data-variant="subtle"][data-color="neutral"] {
+    background-color: var(--color-bg-neutral-soft);
+    color: var(--color-fg-neutral);
+
+    &[data-hovered]:not([data-loading]) {
+      background-color: var(--color-bg-neutral-soft-hover);
+    }
+
+    &[data-pressed]:not([data-loading]) {
+      background-color: var(--color-bg-neutral-soft-active);
+    }
   }
 
   /**
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 3db4f3ffc99f..1c4e9649ffe2 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
@@ -6,6 +6,7 @@ import type { COLORS, SIZES } from "../../../shared";
 export const BUTTON_VARIANTS = {
   filled: "Filled",
   outlined: "Outlined",
+  subtle: "Subtle",
   ghost: "Ghost",
 } as const;
 
diff --git a/app/client/packages/design-system/widgets/src/components/Checkbox/src/Checkbox.tsx b/app/client/packages/design-system/widgets/src/components/Checkbox/src/Checkbox.tsx
index 5dc843fa84a5..685f7b262349 100644
--- a/app/client/packages/design-system/widgets/src/components/Checkbox/src/Checkbox.tsx
+++ b/app/client/packages/design-system/widgets/src/components/Checkbox/src/Checkbox.tsx
@@ -1,8 +1,9 @@
 import React, { forwardRef } from "react";
-import { Checkbox as HeadlessCheckbox } from "react-aria-components";
+import type { ForwardedRef } from "react";
 import { Text, Icon } from "@appsmith/wds";
+import { Checkbox as HeadlessCheckbox } from "react-aria-components";
+
 import styles from "./styles.module.css";
-import type { ForwardedRef } from "react";
 import type { CheckboxProps } from "./types";
 
 const _Checkbox = (
diff --git a/app/client/packages/design-system/widgets/src/components/ComboBox/src/ComboBox.tsx b/app/client/packages/design-system/widgets/src/components/ComboBox/src/ComboBox.tsx
index 88bbcf7c2299..738432dd4b3e 100644
--- a/app/client/packages/design-system/widgets/src/components/ComboBox/src/ComboBox.tsx
+++ b/app/client/packages/design-system/widgets/src/components/ComboBox/src/ComboBox.tsx
@@ -1,65 +1,59 @@
 import {
-  FieldError,
-  FieldDescription,
+  Popover,
+  ListBox,
   FieldLabel,
-  FieldListPopover,
-  Button,
+  FieldError,
+  inputFieldStyles,
 } from "@appsmith/wds";
-import { getTypographyClassName } from "@appsmith/wds-theming";
-import clsx from "clsx";
 import React from "react";
-import { ComboBox as HeadlessCombobox, Input } from "react-aria-components";
-import styles from "./styles.module.css";
+import { ComboBox as HeadlessCombobox } from "react-aria-components";
+
 import type { ComboBoxProps } from "./types";
+import { ComboBoxTrigger } from "./ComboBoxTrigger";
 
 export const ComboBox = (props: ComboBoxProps) => {
   const {
+    children,
     contextualHelp,
-    description,
     errorMessage,
+    isDisabled,
     isLoading,
     isRequired,
-    items,
     label,
     placeholder,
     size = "medium",
     ...rest
   } = props;
+  const root = document.body.querySelector(
+    "[data-theme-provider]",
+  ) as HTMLButtonElement;
 
   return (
     <HeadlessCombobox
       aria-label={Boolean(label) ? undefined : "ComboBox"}
-      className={styles.formField}
+      className={inputFieldStyles.field}
       data-size={size}
+      isDisabled={isDisabled}
       isRequired={isRequired}
       {...rest}
     >
-      {({ isInvalid }) => (
-        <>
-          <FieldLabel
-            contextualHelp={contextualHelp}
-            isRequired={isRequired}
-            text={label}
-          />
-          <div className={styles.inputWrapper}>
-            <Input
-              className={clsx(styles.input, getTypographyClassName("body"))}
-              placeholder={placeholder}
-            />
-            <Button
-              color={Boolean(isLoading) ? "neutral" : "accent"}
-              icon="chevron-down"
-              isLoading={isLoading}
-              size={size === "medium" ? "small" : "xSmall"}
-              slot={Boolean(isLoading) ? null : ""}
-              variant={Boolean(isLoading) ? "ghost" : "filled"}
-            />
-          </div>
-          <FieldError errorMessage={errorMessage} />
-          <FieldDescription description={description} isInvalid={isInvalid} />
-          <FieldListPopover items={items} />
-        </>
-      )}
+      <FieldLabel
+        contextualHelp={contextualHelp}
+        isDisabled={isDisabled}
+        isRequired={isRequired}
+      >
+        {label}
+      </FieldLabel>
+      <ComboBoxTrigger
+        isDisabled={isDisabled}
+        isLoading={isLoading}
+        placeholder={placeholder}
+        size={size}
+      />
+      <FieldError>{errorMessage}</FieldError>
+      <Popover UNSTABLE_portalContainer={root}>
+        <ListBox shouldFocusWrap>{children}</ListBox>
+      </Popover>
     </HeadlessCombobox>
   );
 };
diff --git a/app/client/packages/design-system/widgets/src/components/ComboBox/src/ComboBoxTrigger.tsx b/app/client/packages/design-system/widgets/src/components/ComboBox/src/ComboBoxTrigger.tsx
new file mode 100644
index 000000000000..c17bcb4cca89
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/ComboBox/src/ComboBoxTrigger.tsx
@@ -0,0 +1,38 @@
+import clsx from "clsx";
+import React, { useMemo } from "react";
+import { getTypographyClassName } from "@appsmith/wds-theming";
+import { Spinner, textInputStyles, Input, IconButton } from "@appsmith/wds";
+
+import type { ComboBoxProps } from "./types";
+
+interface ComboBoxTriggerProps {
+  size?: ComboBoxProps["size"];
+  isLoading?: boolean;
+  isDisabled?: boolean;
+  placeholder?: string;
+}
+
+export const ComboBoxTrigger: React.FC<ComboBoxTriggerProps> = (props) => {
+  const { isDisabled, isLoading, placeholder, size } = props;
+
+  const suffix = useMemo(() => {
+    if (Boolean(isLoading)) return <Spinner />;
+
+    return (
+      <IconButton
+        icon="chevron-down"
+        isDisabled={isDisabled}
+        size={size === "medium" ? "small" : "xSmall"}
+      />
+    );
+  }, [isLoading, size, isDisabled]);
+
+  return (
+    <Input
+      className={clsx(textInputStyles.input, getTypographyClassName("body"))}
+      placeholder={placeholder}
+      size={size}
+      suffix={suffix}
+    />
+  );
+};
diff --git a/app/client/packages/design-system/widgets/src/components/ComboBox/src/styles.module.css b/app/client/packages/design-system/widgets/src/components/ComboBox/src/styles.module.css
deleted file mode 100644
index 7a9ecadc7e33..000000000000
--- a/app/client/packages/design-system/widgets/src/components/ComboBox/src/styles.module.css
+++ /dev/null
@@ -1,84 +0,0 @@
-.formField {
-  display: flex;
-  flex-direction: column;
-  width: 100%;
-}
-
-.inputWrapper {
-  position: relative;
-  display: flex;
-  align-items: center;
-  border-radius: var(--border-radius-elevation-3);
-  background-color: var(--color-bg-neutral-subtle);
-  flex: 1;
-  max-inline-size: 100%;
-  isolation: isolate;
-  box-shadow: inset 0 0 0 1px var(--color-bd-on-neutral-subtle);
-  padding-inline-end: var(--inner-spacing-2);
-}
-
-.input {
-  border: 0;
-  background-color: transparent;
-  font-family: inherit;
-  flex-grow: 1;
-  color: var(--color-fg);
-  text-overflow: ellipsis;
-  max-inline-size: 100%;
-  width: 100%;
-  box-sizing: content-box;
-  padding-block: var(--inner-spacing-1);
-  padding-inline: var(--inner-spacing-2);
-}
-
-.inputWrapper:has([data-hovered]) {
-  background-color: var(--color-bg-neutral-subtle-hover);
-  box-shadow: inset 0 0 0 1px var(--color-bd-on-neutral-subtle-hover);
-}
-
-.inputWrapper:has([data-focused]) {
-  background-color: transparent;
-  box-shadow: none;
-}
-
-.inputWrapper:has([data-focused]):before {
-  content: "";
-  left: 0;
-  width: 100%;
-  height: 100%;
-  position: absolute;
-  box-shadow: 0 0 0 2px var(--color-bd-focus);
-  border-radius: var(--border-radius-elevation-3);
-  z-index: -1;
-}
-
-.inputWrapper:has([data-invalid]) {
-  box-shadow: 0 0 0 1px var(--color-bd-negative);
-}
-
-.inputWrapper:has([data-invalid][data-hovered]) {
-  box-shadow: 0 0 0 1px var(--color-bd-negative-hover);
-}
-
-.formField[data-size="small"] .input {
-  block-size: calc(
-    var(--body-line-height) + var(--body-margin-start) + var(--body-margin-end)
-  );
-  padding-block: var(--inner-spacing-2);
-}
-
-.formField[data-size="small"] .inputWrapper {
-  padding-inline-end: var(--inner-spacing-1);
-}
-
-.formField .inputWrapper [data-button] {
-  border-radius: calc(
-    var(--border-radius-elevation-3) - var(--inner-spacing-1)
-  );
-}
-
-.formField[data-size="small"] .inputWrapper {
-  border-radius: calc(
-    var(--border-radius-elevation-3) - var(--inner-spacing-2)
-  );
-}
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 d2ae2a6341b2..30e4c2de7ec2 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
@@ -1,35 +1,15 @@
-import type { Key } from "@react-types/shared";
-import type {
-  ComboBoxProps as SpectrumComboBoxProps,
-  ValidationResult,
-} from "react-aria-components";
-import type { IconProps, SIZES } from "@appsmith/wds";
+import type { SIZES, FieldProps } from "@appsmith/wds";
+import type { ComboBoxProps as SpectrumComboBoxProps } from "react-aria-components";
 
 export interface ComboBoxProps
-  extends Omit<SpectrumComboBoxProps<ComboBoxItem>, "slot"> {
-  /** Item objects in the collection. */
-  items: ComboBoxItem[];
-  /** The content to display as the label. */
-  label?: string;
-  /** The content to display as the description. */
-  description?: string;
-  /** The content to display as the error message. */
-  errorMessage?: string | ((validation: ValidationResult) => string);
+  extends Omit<SpectrumComboBoxProps<object>, "slot">,
+    FieldProps {
   /** size of the select
    *
    * @default medium
    */
   size?: Omit<keyof typeof SIZES, "xSmall" | "large">;
-  /** loading state for the input */
-  isLoading?: boolean;
-  /** A ContextualHelp element to place next to the label. */
-  contextualHelp?: string;
+
   /** The content to display as the placeholder. */
   placeholder?: string;
 }
-
-export interface ComboBoxItem {
-  id: Key;
-  label: string;
-  icon?: IconProps["name"];
-}
diff --git a/app/client/packages/design-system/widgets/src/components/ComboBox/stories/ComboBox.stories.tsx b/app/client/packages/design-system/widgets/src/components/ComboBox/stories/ComboBox.stories.tsx
index 513dcd42824b..5f01ae804ca7 100644
--- a/app/client/packages/design-system/widgets/src/components/ComboBox/stories/ComboBox.stories.tsx
+++ b/app/client/packages/design-system/widgets/src/components/ComboBox/stories/ComboBox.stories.tsx
@@ -1,14 +1,21 @@
-import { Button, ComboBox, Flex, SIZES } from "@appsmith/wds";
-import type { Meta, StoryObj } from "@storybook/react";
 import React from "react";
-import { items, itemsWithIcons } from "./items";
+import { Form } from "react-aria-components";
+import type { Meta, StoryObj } from "@storybook/react";
+import { ComboBox, ListBoxItem, Flex, Button } from "@appsmith/wds";
+
+import { items } from "./items";
 
-/**
- * A select displays a collapsible list of options and allows a user to select one of them.
- */
 const meta: Meta<typeof ComboBox> = {
-  component: ComboBox,
   title: "WDS/Widgets/ComboBox",
+  component: ComboBox,
+  tags: ["autodocs"],
+  args: {
+    children: items.map((item) => (
+      <ListBoxItem key={item.id} textValue={item.label}>
+        {item.label}
+      </ListBoxItem>
+    )),
+  },
 };
 
 export default meta;
@@ -16,71 +23,60 @@ type Story = StoryObj<typeof ComboBox>;
 
 export const Main: Story = {
   args: {
-    items: items,
+    label: "Select an option",
+    placeholder: "Choose...",
   },
-  render: (args) => (
-    <Flex width="sizing-60">
-      <ComboBox {...args} />
-    </Flex>
-  ),
 };
 
-/**
- * The component supports two sizes `small` and `medium`. Default size is `medium`.
- */
-export const Sizes: Story = {
-  render: () => (
-    <Flex direction="column" gap="spacing-4" width="sizing-60">
-      {Object.keys(SIZES)
-        .filter((size) => !["xSmall", "large"].includes(size))
-        .map((size) => (
-          <ComboBox items={items} key={size} placeholder={size} size={size} />
-        ))}
-    </Flex>
-  ),
+export const WithLabel: Story = {
+  args: {
+    label: "Favorite Fruit",
+  },
+};
+
+export const WithContextualHelp: Story = {
+  args: {
+    label: "Country",
+    contextualHelp: "Select the country you currently reside in",
+  },
+};
+
+export const Disabled: Story = {
+  args: {
+    isDisabled: true,
+    label: "Disabled ComboBox",
+  },
 };
 
 export const Loading: Story = {
   args: {
-    placeholder: "Loading",
     isLoading: true,
-    items: items,
+    label: "Loading ComboBox",
+    placeholder: "Loading options...",
   },
 };
 
+export const Size: Story = {
+  render: (args) => (
+    <Flex direction="column" gap="spacing-4">
+      <ComboBox {...args} label="Small" size="small" />
+      <ComboBox {...args} label="Medium" size="medium" />
+    </Flex>
+  ),
+};
+
 export const Validation: Story = {
-  render: () => (
-    <form
-      onSubmit={(e) => {
-        e.preventDefault();
-        alert("Form submitted");
-      }}
-    >
-      <Flex direction="column" gap="spacing-5" width="sizing-60">
+  render: (args) => (
+    <Form onSubmit={(e) => e.preventDefault()}>
+      <Flex direction="column" gap="spacing-3" width="sizing-60">
         <ComboBox
-          description="description"
+          errorMessage="Please select an option"
           isRequired
-          items={items}
-          label="Validation"
+          label="Required Selection"
+          {...args}
         />
         <Button type="submit">Submit</Button>
       </Flex>
-    </form>
+    </Form>
   ),
 };
-
-export const ContextualHelp: Story = {
-  args: {
-    label: "Label",
-    placeholder: "Contextual Help Text",
-    contextualHelp: "This is a contextual help text",
-    items: items,
-  },
-};
-
-export const WithIcons: Story = {
-  args: {
-    label: "With icons",
-    items: itemsWithIcons,
-  },
-};
diff --git a/app/client/packages/design-system/widgets/src/components/ComboBox/stories/items.ts b/app/client/packages/design-system/widgets/src/components/ComboBox/stories/items.ts
index 7319bf939cb0..3c465f7b8c59 100644
--- a/app/client/packages/design-system/widgets/src/components/ComboBox/stories/items.ts
+++ b/app/client/packages/design-system/widgets/src/components/ComboBox/stories/items.ts
@@ -1,6 +1,4 @@
-import type { ComboBoxItem } from "../src/types";
-
-export const items: ComboBoxItem[] = [
+export const items = [
   { id: 1, label: "Aerospace" },
   {
     id: 2,
@@ -15,7 +13,7 @@ export const items: ComboBoxItem[] = [
   { id: 9, label: "Electrical" },
 ];
 
-export const itemsWithIcons: ComboBoxItem[] = [
+export const itemsWithIcons = [
   { id: 1, label: "Aerospace", icon: "galaxy" },
   {
     id: 2,
diff --git a/app/client/packages/design-system/widgets/src/components/ContextualHelp/src/ContextualHelp.tsx b/app/client/packages/design-system/widgets/src/components/ContextualHelp/src/ContextualHelp.tsx
index bf78d5578b65..b079ad5e3e80 100644
--- a/app/client/packages/design-system/widgets/src/components/ContextualHelp/src/ContextualHelp.tsx
+++ b/app/client/packages/design-system/widgets/src/components/ContextualHelp/src/ContextualHelp.tsx
@@ -1,11 +1,13 @@
 import React from "react";
-import { Tooltip } from "../../Tooltip";
-import { IconButton } from "../../IconButton";
+import { Tooltip, IconButton } from "@appsmith/wds";
+
 import type { ContextualProps } from "./types";
 
 const _ContextualHelp = (props: ContextualProps) => {
   const { contextualHelp } = props;
 
+  if (!Boolean(contextualHelp)) return null;
+
   return (
     <Tooltip interaction="click" tooltip={contextualHelp}>
       <IconButton
diff --git a/app/client/packages/design-system/headless/src/components/Field/index.ts b/app/client/packages/design-system/widgets/src/components/Field/index.ts
similarity index 100%
rename from app/client/packages/design-system/headless/src/components/Field/index.ts
rename to app/client/packages/design-system/widgets/src/components/Field/index.ts
diff --git a/app/client/packages/design-system/widgets/src/components/Field/src/index.ts b/app/client/packages/design-system/widgets/src/components/Field/src/index.ts
new file mode 100644
index 000000000000..e66dacf5aa59
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Field/src/index.ts
@@ -0,0 +1,2 @@
+export type { FieldProps } from "./types";
+export { default as inputFieldStyles } from "./styles.module.css";
diff --git a/app/client/packages/design-system/widgets/src/components/Field/src/styles.module.css b/app/client/packages/design-system/widgets/src/components/Field/src/styles.module.css
new file mode 100644
index 000000000000..ad5a4c14933f
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Field/src/styles.module.css
@@ -0,0 +1,5 @@
+.field {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+}
diff --git a/app/client/packages/design-system/widgets/src/components/Field/src/types.ts b/app/client/packages/design-system/widgets/src/components/Field/src/types.ts
new file mode 100644
index 000000000000..71425fc8d191
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Field/src/types.ts
@@ -0,0 +1,10 @@
+export interface FieldProps {
+  /** Error message to display when the field has an error */
+  errorMessage?: string;
+  /** Label text for the field */
+  label?: string;
+  /** Additional help text that is displayed in a tooltip beside label */
+  contextualHelp?: string;
+  /** Indicates whether the field is in a loading state */
+  isLoading?: boolean;
+}
diff --git a/app/client/packages/design-system/widgets/src/components/FieldDescription/src/FieldDescription.tsx b/app/client/packages/design-system/widgets/src/components/FieldDescription/src/FieldDescription.tsx
deleted file mode 100644
index 68a040adaf1d..000000000000
--- a/app/client/packages/design-system/widgets/src/components/FieldDescription/src/FieldDescription.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import React from "react";
-import { Text } from "../../Text";
-import styles from "./styles.module.css";
-import type { FieldDescriptionProps } from "./types";
-
-export const FieldDescription = (props: FieldDescriptionProps) => {
-  const { description, isInvalid } = props;
-
-  if (!Boolean(description) || Boolean(isInvalid)) return null;
-
-  return (
-    <Text className={styles.description} lineClamp={2} size="footnote">
-      {description}
-    </Text>
-  );
-};
diff --git a/app/client/packages/design-system/widgets/src/components/FieldDescription/src/index.ts b/app/client/packages/design-system/widgets/src/components/FieldDescription/src/index.ts
deleted file mode 100644
index 2c6b2d3578df..000000000000
--- a/app/client/packages/design-system/widgets/src/components/FieldDescription/src/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./FieldDescription";
-export type { FieldDescriptionProps } from "./types";
diff --git a/app/client/packages/design-system/widgets/src/components/FieldDescription/src/styles.module.css b/app/client/packages/design-system/widgets/src/components/FieldDescription/src/styles.module.css
deleted file mode 100644
index 66f4818bdacb..000000000000
--- a/app/client/packages/design-system/widgets/src/components/FieldDescription/src/styles.module.css
+++ /dev/null
@@ -1,4 +0,0 @@
-.description {
-  margin-block-start: var(--inner-spacing-3);
-  color: var(--color-fg-neutral);
-}
diff --git a/app/client/packages/design-system/widgets/src/components/FieldDescription/src/types.ts b/app/client/packages/design-system/widgets/src/components/FieldDescription/src/types.ts
deleted file mode 100644
index 733ea6b20b87..000000000000
--- a/app/client/packages/design-system/widgets/src/components/FieldDescription/src/types.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export interface FieldDescriptionProps {
-  /** The content to display as the description. */
-  description?: string;
-  /** Whether the input value is invalid. */
-  isInvalid?: boolean;
-}
diff --git a/app/client/packages/design-system/widgets/src/components/FieldError/src/FieldError.tsx b/app/client/packages/design-system/widgets/src/components/FieldError/src/FieldError.tsx
index 6b62b21869e0..66548149eb01 100644
--- a/app/client/packages/design-system/widgets/src/components/FieldError/src/FieldError.tsx
+++ b/app/client/packages/design-system/widgets/src/components/FieldError/src/FieldError.tsx
@@ -1,18 +1,20 @@
 import React from "react";
-import { getTypographyClassName } from "@appsmith/wds-theming";
-import clsx from "clsx";
-import { FieldError as HeadlessFieldError } from "react-aria-components";
+import { Text } from "@appsmith/wds";
+import { FieldError as AriaFieldError } from "react-aria-components";
+
 import styles from "./styles.module.css";
 import type { FieldErrorProps } from "./types";
 
 export const FieldError = (props: FieldErrorProps) => {
-  const { errorMessage } = props;
+  const { children } = props;
+
+  if (!Boolean(children)) return null;
 
   return (
-    <HeadlessFieldError
-      className={clsx(styles.errorText, getTypographyClassName("footnote"))}
-    >
-      {errorMessage}
-    </HeadlessFieldError>
+    <AriaFieldError className={styles.errorText}>
+      <Text color="negative" size="caption">
+        {children}
+      </Text>
+    </AriaFieldError>
   );
 };
diff --git a/app/client/packages/design-system/widgets/src/components/FieldError/src/styles.module.css b/app/client/packages/design-system/widgets/src/components/FieldError/src/styles.module.css
index bb2636b64de8..f94e20aaf971 100644
--- a/app/client/packages/design-system/widgets/src/components/FieldError/src/styles.module.css
+++ b/app/client/packages/design-system/widgets/src/components/FieldError/src/styles.module.css
@@ -1,4 +1,3 @@
 .errorText {
-  margin-block-start: var(--inner-spacing-3);
-  color: var(--color-fg-negative);
+  margin-block-start: var(--inner-spacing-2);
 }
diff --git a/app/client/packages/design-system/widgets/src/components/FieldError/src/types.ts b/app/client/packages/design-system/widgets/src/components/FieldError/src/types.ts
index 67de97f9072a..8849a7b5b6d1 100644
--- a/app/client/packages/design-system/widgets/src/components/FieldError/src/types.ts
+++ b/app/client/packages/design-system/widgets/src/components/FieldError/src/types.ts
@@ -2,5 +2,5 @@ import type { ValidationResult } from "react-aria-components";
 
 export interface FieldErrorProps {
   /** The content to display as the error message. */
-  errorMessage?: string | ((validation: ValidationResult) => string);
+  children?: string | ((validation: ValidationResult) => string);
 }
diff --git a/app/client/packages/design-system/widgets/src/components/FieldLabel/src/FieldLabel.tsx b/app/client/packages/design-system/widgets/src/components/FieldLabel/src/FieldLabel.tsx
index 18ce87eee192..85126a123b94 100644
--- a/app/client/packages/design-system/widgets/src/components/FieldLabel/src/FieldLabel.tsx
+++ b/app/client/packages/design-system/widgets/src/components/FieldLabel/src/FieldLabel.tsx
@@ -1,36 +1,37 @@
 import clsx from "clsx";
 import React from "react";
-import { Text, ContextualHelp } from "@appsmith/wds";
-import { Label as HeadlessLabel } from "react-aria-components";
+import { ContextualHelp, Text } from "@appsmith/wds";
+import { Label as HeadlessLabel, Group } from "react-aria-components";
+
 import styles from "./styles.module.css";
 import type { LabelProps } from "./types";
 
-export const FieldLabel = (props: LabelProps) => {
-  const { className, contextualHelp, isDisabled, isRequired, text, ...rest } =
-    props;
+export function FieldLabel(props: LabelProps) {
+  const { children, contextualHelp, isDisabled, isRequired, ...rest } = props;
 
-  if (!Boolean(text) && !Boolean(contextualHelp)) return null;
+  if (!Boolean(children) && !Boolean(contextualHelp)) return null;
 
   return (
-    <HeadlessLabel
-      aria-label={text}
-      className={clsx(className, styles.label)}
-      data-disabled={isDisabled}
-      data-field-label-wrapper
-      elementType="label"
-      {...rest}
+    <Group
+      className={styles.labelGroup}
+      data-field-label-wrapper=""
+      isDisabled={isDisabled}
     >
-      <Text fontWeight={600} lineClamp={1} size="caption">
-        {text}
+      <HeadlessLabel
+        {...rest}
+        className={clsx(styles.label)}
+        elementType="label"
+      >
+        <Text fontWeight={600} size="caption">
+          {children}
+        </Text>
         {Boolean(isRequired) && (
           <span aria-label="(required)" className={styles.necessityIndicator}>
             *
           </span>
         )}
-      </Text>
-      {Boolean(contextualHelp) && (
-        <ContextualHelp contextualHelp={contextualHelp} />
-      )}
-    </HeadlessLabel>
+      </HeadlessLabel>
+      <ContextualHelp contextualHelp={contextualHelp} />
+    </Group>
   );
-};
+}
diff --git a/app/client/packages/design-system/widgets/src/components/FieldLabel/src/styles.module.css b/app/client/packages/design-system/widgets/src/components/FieldLabel/src/styles.module.css
index a41305e0ab9b..e286abff38ce 100644
--- a/app/client/packages/design-system/widgets/src/components/FieldLabel/src/styles.module.css
+++ b/app/client/packages/design-system/widgets/src/components/FieldLabel/src/styles.module.css
@@ -1,17 +1,23 @@
-.label {
+.labelGroup {
   display: flex;
   align-items: center;
+  gap: var(--inner-spacing-1);
   height: var(--sizing-3);
   margin-block-end: var(--inner-spacing-3);
-  gap: var(--inner-spacing-1);
+}
+
+.labelGroup[data-disabled] {
+  opacity: var(--opacity-disabled);
+}
 
-  &[data-disabled="true"] {
-    cursor: not-allowed;
-    opacity: var(--opacity-disabled);
-  }
+.label {
+  display: flex;
+  align-items: center;
+  height: fit-content;
+  max-width: 100%;
+  gap: var(--inner-spacing-1);
 }
 
 .necessityIndicator {
   color: var(--color-fg-negative);
-  margin-inline-start: var(--inner-spacing-1);
 }
diff --git a/app/client/packages/design-system/widgets/src/components/FieldLabel/src/types.ts b/app/client/packages/design-system/widgets/src/components/FieldLabel/src/types.ts
index 1d8f083b7367..10f6d021c0bf 100644
--- a/app/client/packages/design-system/widgets/src/components/FieldLabel/src/types.ts
+++ b/app/client/packages/design-system/widgets/src/components/FieldLabel/src/types.ts
@@ -1,8 +1,7 @@
-import type { LabelProps as HeadlessLabelProps } from "react-aria-components";
+import type { LabelProps as AriaLabelProps } from "react-aria-components";
 
-export interface LabelProps extends HeadlessLabelProps {
-  text?: string;
-  contextualHelp?: string;
+export type LabelProps = AriaLabelProps & {
+  contextualHelp?: React.ReactNode;
   isRequired?: boolean;
   isDisabled?: boolean;
-}
+};
diff --git a/app/client/packages/design-system/widgets/src/components/FieldListPopover/src/FieldListPopover.tsx b/app/client/packages/design-system/widgets/src/components/FieldListPopover/src/FieldListPopover.tsx
deleted file mode 100644
index d9d7921a8278..000000000000
--- a/app/client/packages/design-system/widgets/src/components/FieldListPopover/src/FieldListPopover.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import React from "react";
-import clsx from "clsx";
-import { getTypographyClassName } from "@appsmith/wds-theming";
-import { listItemStyles, Popover, Icon } from "@appsmith/wds";
-import { ListBox, ListBoxItem } from "react-aria-components";
-import styles from "./styles.module.css";
-import type { FieldListPopoverProps } from "./types";
-
-export const FieldListPopover = (props: FieldListPopoverProps) => {
-  const { items } = props;
-
-  // place Popover in the root theme provider to get access to the CSS tokens
-  const root = document.body.querySelector(
-    "[data-theme-provider]",
-  ) as HTMLButtonElement;
-
-  return (
-    <Popover UNSTABLE_portalContainer={root}>
-      <ListBox className={styles.listBox} items={items} shouldFocusWrap>
-        {(item) => (
-          <ListBoxItem
-            className={clsx(
-              listItemStyles.item,
-              getTypographyClassName("body"),
-            )}
-            key={item.id}
-            textValue={item.label}
-          >
-            {item.icon && <Icon name={item.icon} />}
-            {item.label}
-          </ListBoxItem>
-        )}
-      </ListBox>
-    </Popover>
-  );
-};
diff --git a/app/client/packages/design-system/widgets/src/components/FieldListPopover/src/index.ts b/app/client/packages/design-system/widgets/src/components/FieldListPopover/src/index.ts
deleted file mode 100644
index be087d853eb9..000000000000
--- a/app/client/packages/design-system/widgets/src/components/FieldListPopover/src/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./FieldListPopover";
-export type { FieldListPopoverProps, FieldListPopoverItem } from "./types";
diff --git a/app/client/packages/design-system/widgets/src/components/FieldListPopover/src/styles.module.css b/app/client/packages/design-system/widgets/src/components/FieldListPopover/src/styles.module.css
deleted file mode 100644
index 5d7dc5e49ab0..000000000000
--- a/app/client/packages/design-system/widgets/src/components/FieldListPopover/src/styles.module.css
+++ /dev/null
@@ -1,12 +0,0 @@
-.listBox {
-  min-inline-size: var(--trigger-width);
-  max-height: inherit;
-  overflow-y: auto;
-}
-
-/** If at least one select item has an icon, we need to add extra padding for items that doesn't have an icon. */
-.listBox:has([data-icon]) [role="option"]:not(:has([data-icon])) {
-  padding-inline-start: calc(
-    var(--icon-size-4) + var(--inner-spacing-3) + var(--inner-spacing-2)
-  );
-}
diff --git a/app/client/packages/design-system/widgets/src/components/FieldListPopover/src/types.ts b/app/client/packages/design-system/widgets/src/components/FieldListPopover/src/types.ts
deleted file mode 100644
index 3c98ccf204a5..000000000000
--- a/app/client/packages/design-system/widgets/src/components/FieldListPopover/src/types.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import type { Key } from "@react-types/shared";
-import type { IconProps } from "@appsmith/wds";
-
-export interface FieldListPopoverProps {
-  /** Item objects in the collection. */
-  items: FieldListPopoverItem[];
-}
-
-export interface FieldListPopoverItem {
-  id: Key;
-  label: string;
-  icon?: IconProps["name"];
-}
diff --git a/app/client/packages/design-system/headless/src/components/TextArea/index.ts b/app/client/packages/design-system/widgets/src/components/Input/index.ts
similarity index 100%
rename from app/client/packages/design-system/headless/src/components/TextArea/index.ts
rename to app/client/packages/design-system/widgets/src/components/Input/index.ts
diff --git a/app/client/packages/design-system/widgets/src/components/Input/src/Input.tsx b/app/client/packages/design-system/widgets/src/components/Input/src/Input.tsx
new file mode 100644
index 000000000000..3472e2b53ac7
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Input/src/Input.tsx
@@ -0,0 +1,65 @@
+import clsx from "clsx";
+import React, { forwardRef, useState } from "react";
+import { getTypographyClassName } from "@appsmith/wds-theming";
+import { IconButton, Spinner, type IconProps } from "@appsmith/wds";
+import { Group, Input as HeadlessInput } from "react-aria-components";
+
+import styles from "./styles.module.css";
+import type { InputProps } from "./types";
+
+function _Input(props: InputProps, ref: React.Ref<HTMLInputElement>) {
+  const {
+    defaultValue,
+    isLoading,
+    isReadOnly,
+    prefix,
+    size,
+    suffix: suffixProp,
+    type,
+    value,
+    ...rest
+  } = props;
+  const [showPassword, setShowPassword] = useState(false);
+  const togglePasswordVisibility = () => setShowPassword((prev) => !prev);
+  const isEmpty = !Boolean(value) && !Boolean(defaultValue);
+
+  const suffix = (() => {
+    if (Boolean(isLoading)) return <Spinner />;
+
+    if (type === "password") {
+      const icon: IconProps["name"] = showPassword ? "eye-off" : "eye";
+
+      return (
+        <IconButton
+          color="neutral"
+          excludeFromTabOrder
+          icon={icon}
+          onPress={togglePasswordVisibility}
+          size={size === "medium" ? "small" : "xSmall"}
+          variant="ghost"
+        />
+      );
+    }
+
+    return suffixProp;
+  })();
+
+  return (
+    <Group className={styles.inputGroup}>
+      <HeadlessInput
+        {...rest}
+        className={clsx(styles.input, getTypographyClassName("body"))}
+        data-readonly={Boolean(isReadOnly) ? true : undefined}
+        data-size={Boolean(size) ? size : undefined}
+        defaultValue={defaultValue}
+        ref={ref}
+        type={showPassword ? "text" : type}
+        value={isEmpty && Boolean(isReadOnly) ? "—" : value}
+      />
+      {Boolean(prefix) && <span data-input-prefix>{prefix}</span>}
+      {Boolean(suffix) && <span data-input-suffix>{suffix}</span>}
+    </Group>
+  );
+}
+
+export const Input = forwardRef(_Input);
diff --git a/app/client/packages/design-system/widgets/src/components/Input/src/TextAreaInput.tsx b/app/client/packages/design-system/widgets/src/components/Input/src/TextAreaInput.tsx
new file mode 100644
index 000000000000..13dab8294f58
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Input/src/TextAreaInput.tsx
@@ -0,0 +1,51 @@
+import clsx from "clsx";
+import { Spinner } from "@appsmith/wds";
+import React, { forwardRef } from "react";
+import { getTypographyClassName } from "@appsmith/wds-theming";
+import { Group, TextArea as HeadlessTextArea } from "react-aria-components";
+
+import styles from "./styles.module.css";
+import type { TextAreaInputProps } from "./types";
+
+function _TextAreaInput(
+  props: TextAreaInputProps,
+  ref: React.Ref<HTMLTextAreaElement>,
+) {
+  const {
+    defaultValue,
+    isLoading,
+    isReadOnly,
+    prefix,
+    rows,
+    size,
+    suffix: suffixProp,
+    value,
+    ...rest
+  } = props;
+  const isEmpty = !Boolean(value) && !Boolean(defaultValue);
+
+  const suffix = (() => {
+    if (Boolean(isLoading)) return <Spinner />;
+
+    return suffixProp;
+  })();
+
+  return (
+    <Group className={styles.inputGroup}>
+      <HeadlessTextArea
+        {...rest}
+        className={clsx(styles.input, getTypographyClassName("body"))}
+        data-readonly={Boolean(isReadOnly) ? true : undefined}
+        data-size={Boolean(size) ? size : undefined}
+        defaultValue={defaultValue}
+        ref={ref}
+        rows={Boolean(rows) ? rows : undefined}
+        value={isEmpty && Boolean(isReadOnly) ? "—" : value}
+      />
+      {Boolean(prefix) && <span data-input-prefix>{prefix}</span>}
+      {Boolean(suffix) && <span data-input-suffix>{suffix}</span>}
+    </Group>
+  );
+}
+
+export const TextAreaInput = forwardRef(_TextAreaInput);
diff --git a/app/client/packages/design-system/widgets/src/components/Input/src/index.ts b/app/client/packages/design-system/widgets/src/components/Input/src/index.ts
new file mode 100644
index 000000000000..c86287750969
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Input/src/index.ts
@@ -0,0 +1,3 @@
+export * from "./Input";
+export * from "./TextAreaInput";
+export { default as textInputStyles } from "./styles.module.css";
diff --git a/app/client/packages/design-system/widgets/src/components/Input/src/styles.module.css b/app/client/packages/design-system/widgets/src/components/Input/src/styles.module.css
new file mode 100644
index 000000000000..95c1532aedfb
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Input/src/styles.module.css
@@ -0,0 +1,242 @@
+.inputGroup {
+  position: relative;
+  display: flex;
+  align-items: center;
+  gap: var(--inner-spacing-1);
+  width: 100%;
+}
+
+.input {
+  position: relative;
+  display: flex;
+  flex: 1;
+  align-items: center;
+  box-sizing: content-box;
+  max-inline-size: 100%;
+  padding-block: var(--inner-spacing-1);
+  padding-inline: var(--inner-spacing-2);
+  gap: var(--inner-spacing-1);
+  border: 0;
+  border-radius: var(--border-radius-elevation-3);
+  background-color: var(--color-bg-neutral-subtle);
+  box-shadow: inset 0 0 0 1px var(--color-bd-on-neutral-subtle);
+  isolation: isolate;
+}
+
+.input:has(> [data-select-text]) {
+  block-size: var(--body-line-height);
+}
+
+.input:is(textarea) {
+  block-size: auto;
+  min-block-size: var(--sizing-16);
+  align-items: flex-start;
+  resize: none;
+  font-family: inherit;
+}
+
+.input:is(textarea)[rows="1"] {
+  min-block-size: initial;
+}
+
+.input:autofill,
+.input:autofill:hover,
+.input:autofill:focus,
+.input:autofill:active {
+  font-size: initial;
+  -webkit-text-fill-color: var(--color-fg);
+  -webkit-box-shadow: 0 0 0 40rem var(--color-bg-neutral-subtle) inset;
+}
+
+/**
+ * ----------------------------------------------------------------------------
+ * SUFFIX and PREFIX
+ * ----------------------------------------------------------------------------
+ */
+.inputGroup :is([data-input-suffix], [data-input-prefix]) button {
+  border-radius: calc(
+    var(--border-radius-elevation-3) - var(--inner-spacing-1)
+  );
+}
+
+.inputGroup:has(> [data-input-prefix]) .input {
+  padding-left: var(--sizing-8);
+}
+
+.inputGroup:has(> [data-input-prefix]) .input[data-size="large"] {
+  padding-left: var(--sizing-12);
+}
+
+.inputGroup:has(> [data-input-prefix]) .input[data-size="small"] {
+  padding-left: var(--sizing-6);
+}
+
+.inputGroup:has(> [data-input-prefix]) [data-input-prefix] {
+  left: var(--inner-spacing-1);
+  position: absolute;
+}
+
+.inputGroup:has(> [data-input-suffix]) .input {
+  padding-right: var(--sizing-8);
+}
+
+.inputGroup:has(> [data-input-suffix]) .input[data-size="large"] {
+  padding-right: var(--sizing-12);
+}
+
+.inputGroup:has(> [data-input-suffix]) .input[data-size="small"] {
+  padding-right: var(--sizing-6);
+}
+
+.inputGroup:has(> [data-input-suffix]) [data-input-suffix] {
+  right: var(--inner-spacing-1);
+  position: absolute;
+}
+
+/* Note: the following calculations are done so that icon button in chat input is centered vertically */
+.inputGroup:has(.input[rows="1"]) [data-input-suffix] {
+  --icon-size: calc(
+    var(--body-line-height) + var(--body-margin-start) + var(--body-margin-end) +
+      var(--inner-spacing-3) * 2
+  );
+  --icon-offset: calc((var(--input-height) - var(--icon-size)) / 2);
+
+  bottom: round(up, var(--icon-offset), 0.5px);
+  right: var(--icon-offset);
+}
+
+.inputGroup:has(.input[rows="1"]) [data-input-prefix] {
+  --icon-size: calc(
+    var(--body-line-height) + var(--body-margin-start) + var(--body-margin-end) +
+      var(--inner-spacing-3) * 2
+  );
+  --icon-offset: calc((var(--input-height) - var(--icon-size)) / 2);
+
+  bottom: var(--icon-offset);
+  left: var(--icon-offset);
+}
+
+.inputGroup :is([data-input-suffix], [data-input-prefix]) {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+/**
+ * ----------------------------------------------------------------------------
+ * HOVERED
+ * ----------------------------------------------------------------------------
+ */
+.inputGroup[data-hovered]
+  .input:not(:is([data-focused], [data-readonly], [data-disabled])) {
+  background-color: var(--color-bg-neutral-subtle-hover);
+  box-shadow: inset 0 0 0 1px var(--color-bd-on-neutral-subtle-hover);
+}
+
+/**
+ * ----------------------------------------------------------------------------
+ * READONLY
+ * ----------------------------------------------------------------------------
+ */
+.input[data-readonly] {
+  background-color: transparent;
+  box-shadow: none;
+  padding-inline: 0;
+}
+
+/** Reason for doing this is because for readonly inputs, we want focus state to be wider than the component width */
+.inputGroup:has(> .input[data-readonly][data-focus-visible])::before {
+  content: "";
+  left: calc(-0.5 * var(--inner-spacing-1));
+  width: calc(100% + var(--inner-spacing-1));
+  height: 100%;
+  position: absolute;
+  box-shadow: 0 0 0 2px var(--color-bd-focus);
+  border-radius: var(--border-radius-elevation-3);
+}
+
+/**
+ * ----------------------------------------------------------------------------
+ * PLACEHOLDER
+ * ----------------------------------------------------------------------------
+ */
+.input::placeholder {
+  color: var(--color-fg-neutral-subtle) !important;
+  opacity: 1;
+}
+
+.input:placeholder-shown {
+  text-overflow: ellipsis;
+}
+
+/**
+ * ----------------------------------------------------------------------------
+ * DISABLED
+ * ----------------------------------------------------------------------------
+ */
+.input[data-disabled],
+.input[data-disabled] :is(input, textarea),
+.input[data-disabled] label {
+  cursor: not-allowed;
+  box-shadow: none;
+}
+
+/**
+ * ----------------------------------------------------------------------------
+ * INVALID
+ * ----------------------------------------------------------------------------
+ */
+.input[data-invalid] {
+  box-shadow: 0 0 0 1px var(--color-bd-negative);
+}
+
+.inputGroup[data-hovered]
+  .input[data-invalid]:not(
+    :is([data-focused], [data-readonly], [data-disabled])
+  ) {
+  box-shadow: 0 0 0 1px var(--color-bd-negative-hover);
+}
+
+/**
+ * ----------------------------------------------------------------------------
+ * FOCUSSED
+ * ----------------------------------------------------------------------------
+ */
+.input[data-focused]:not([data-readonly]) {
+  background-color: transparent;
+  box-shadow: 0 0 0 2px var(--color-bd-focus);
+}
+
+/**
+ * ----------------------------------------------------------------------------
+ * SIZE
+ * ----------------------------------------------------------------------------
+ */
+.input[data-size="small"] {
+  block-size: calc(
+    var(--body-line-height) + var(--body-margin-start) + var(--body-margin-end)
+  );
+  padding-block: var(--inner-spacing-2);
+}
+
+.input[data-size="large"] {
+  block-size: calc(
+    var(--body-line-height) + var(--body-margin-start) + var(--body-margin-end)
+  );
+  padding-block: var(--inner-spacing-3);
+  padding-inline: var(--inner-spacing-3);
+}
+
+/**
+ * ----------------------------------------------------------------------------
+ * SELECT BUTTON's TEXT
+ * ----------------------------------------------------------------------------
+ */
+.input [data-select-text] {
+  display: flex;
+  align-items: center;
+}
+
+.input [data-select-text] [data-icon] {
+  margin-inline-end: var(--inner-spacing-1);
+}
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
new file mode 100644
index 000000000000..97ce876f1e6b
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Input/src/types.ts
@@ -0,0 +1,24 @@
+import type { SIZES } from "@appsmith/wds";
+import type {
+  InputProps as HeadlessInputProps,
+  TextAreaProps as HeadlessTextAreaProps,
+} from "react-aria-components";
+
+// Common properties for both Input and TextArea
+interface CommonInputProps {
+  prefix?: React.ReactNode;
+  suffix?: React.ReactNode;
+  isLoading?: boolean;
+  isReadOnly?: boolean;
+  size?: Omit<keyof typeof SIZES, "xSmall">;
+}
+
+export interface InputProps
+  extends Omit<HeadlessInputProps, "prefix" | "size">,
+    CommonInputProps {}
+
+export interface TextAreaInputProps
+  extends Omit<HeadlessTextAreaProps, "prefix" | "size">,
+    CommonInputProps {
+  rows?: number;
+}
diff --git a/app/client/packages/design-system/widgets/src/components/Link/src/index.ts b/app/client/packages/design-system/widgets/src/components/Link/src/index.ts
index 3b40a46d8b6b..f5a666c42dc2 100644
--- a/app/client/packages/design-system/widgets/src/components/Link/src/index.ts
+++ b/app/client/packages/design-system/widgets/src/components/Link/src/index.ts
@@ -1 +1,2 @@
 export * from "./Link";
+export { default as linkStyles } from "./styles.module.css";
diff --git a/app/client/packages/design-system/widgets/src/components/Link/src/types.ts b/app/client/packages/design-system/widgets/src/components/Link/src/types.ts
index cc335817b932..ba3d2fe5c1da 100644
--- a/app/client/packages/design-system/widgets/src/components/Link/src/types.ts
+++ b/app/client/packages/design-system/widgets/src/components/Link/src/types.ts
@@ -4,4 +4,15 @@ import type { TextProps } from "../../Text";
 
 export interface LinkProps
   extends Omit<TextProps, "color">,
-    Omit<AriaLinkProps, "style" | "className" | "children" | "isDisabled"> {}
+    Omit<
+      AriaLinkProps,
+      | "style"
+      | "className"
+      | "children"
+      | "isDisabled"
+      | "onBlur"
+      | "onFocus"
+      | "onKeyDown"
+      | "onKeyUp"
+      | "slot"
+    > {}
diff --git a/app/client/packages/design-system/widgets/src/components/Link/stories/Link.stories.tsx b/app/client/packages/design-system/widgets/src/components/Link/stories/Link.stories.tsx
index 11c72b849080..48a4be562673 100644
--- a/app/client/packages/design-system/widgets/src/components/Link/stories/Link.stories.tsx
+++ b/app/client/packages/design-system/widgets/src/components/Link/stories/Link.stories.tsx
@@ -21,7 +21,7 @@ export const Main: Story = {
   args: {
     target: "_blank",
     href: "https://appsmith.com",
-    children: "This is a link.",
+    children: "Appsmith.",
   },
 };
 
diff --git a/app/client/packages/design-system/headless/src/components/TextInput/index.ts b/app/client/packages/design-system/widgets/src/components/ListBox/index.ts
similarity index 100%
rename from app/client/packages/design-system/headless/src/components/TextInput/index.ts
rename to app/client/packages/design-system/widgets/src/components/ListBox/index.ts
diff --git a/app/client/packages/design-system/widgets/src/components/ListBox/src/ListBox.tsx b/app/client/packages/design-system/widgets/src/components/ListBox/src/ListBox.tsx
new file mode 100644
index 000000000000..75876ebaa68f
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/ListBox/src/ListBox.tsx
@@ -0,0 +1,15 @@
+import React from "react";
+import styles from "./styles.module.css";
+import { ListBox as HeadlessListBox } from "react-aria-components";
+
+import type { ListBoxProps } from "./types";
+
+export function ListBox(props: ListBoxProps) {
+  const { children, ...rest } = props;
+
+  return (
+    <HeadlessListBox {...rest} className={styles.listBox}>
+      {children}
+    </HeadlessListBox>
+  );
+}
diff --git a/app/client/packages/design-system/widgets/src/components/ListBox/src/index.ts b/app/client/packages/design-system/widgets/src/components/ListBox/src/index.ts
new file mode 100644
index 000000000000..ae601b28db28
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/ListBox/src/index.ts
@@ -0,0 +1,2 @@
+export { ListBox } from "./ListBox";
+export { default as listStyles } from "./styles.module.css";
diff --git a/app/client/packages/design-system/widgets/src/components/ListBox/src/styles.module.css b/app/client/packages/design-system/widgets/src/components/ListBox/src/styles.module.css
new file mode 100644
index 000000000000..b253d06f7e04
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/ListBox/src/styles.module.css
@@ -0,0 +1,5 @@
+.listBox {
+  min-inline-size: var(--trigger-width);
+  max-height: inherit;
+  overflow-y: auto;
+}
diff --git a/app/client/packages/design-system/widgets/src/components/ListBox/src/types.ts b/app/client/packages/design-system/widgets/src/components/ListBox/src/types.ts
new file mode 100644
index 000000000000..ec7229b2aed9
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/ListBox/src/types.ts
@@ -0,0 +1,3 @@
+import type { ListBoxProps as AriaListBoxProps } from "react-aria-components";
+
+export interface ListBoxProps extends AriaListBoxProps<object> {}
diff --git a/app/client/packages/design-system/headless/src/components/TextInputBase/index.ts b/app/client/packages/design-system/widgets/src/components/ListBoxItem/index.ts
similarity index 100%
rename from app/client/packages/design-system/headless/src/components/TextInputBase/index.ts
rename to app/client/packages/design-system/widgets/src/components/ListBoxItem/index.ts
diff --git a/app/client/packages/design-system/widgets/src/components/ListBoxItem/src/ListBoxItem.tsx b/app/client/packages/design-system/widgets/src/components/ListBoxItem/src/ListBoxItem.tsx
new file mode 100644
index 000000000000..353f2444a92e
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/ListBoxItem/src/ListBoxItem.tsx
@@ -0,0 +1,17 @@
+import React from "react";
+import { Icon, Text } from "@appsmith/wds";
+import { ListBoxItem as HeadlessListBoxItem } from "react-aria-components";
+
+import styles from "./styles.module.css";
+import type { ListBoxItemProps } from "./types";
+
+export function ListBoxItem(props: ListBoxItemProps) {
+  const { children, icon, ...rest } = props;
+
+  return (
+    <HeadlessListBoxItem {...rest} className={styles.listBoxItem}>
+      {icon && <Icon name={icon} />}
+      <Text lineClamp={1}>{children}</Text>
+    </HeadlessListBoxItem>
+  );
+}
diff --git a/app/client/packages/design-system/widgets/src/components/ListBoxItem/src/index.ts b/app/client/packages/design-system/widgets/src/components/ListBoxItem/src/index.ts
new file mode 100644
index 000000000000..9554394e8f40
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/ListBoxItem/src/index.ts
@@ -0,0 +1,2 @@
+export { ListBoxItem } from "./ListBoxItem";
+export { default as listBoxItemStyles } from "./styles.module.css";
diff --git a/app/client/packages/design-system/widgets/src/components/ListBoxItem/src/styles.module.css b/app/client/packages/design-system/widgets/src/components/ListBoxItem/src/styles.module.css
new file mode 100644
index 000000000000..f527b5ddff75
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/ListBoxItem/src/styles.module.css
@@ -0,0 +1,83 @@
+@import "../../../shared/colors/colors.module.css";
+
+.listBoxItem {
+  display: flex;
+  align-items: center;
+  padding-inline: var(--inner-spacing-3);
+  block-size: var(--sizing-11);
+}
+
+.listBoxItem:first-of-type {
+  border-top-left-radius: var(--border-radius-elevation-3);
+  border-top-right-radius: var(--border-radius-elevation-3);
+}
+
+.listBoxItem:last-of-type {
+  border-bottom-left-radius: var(--border-radius-elevation-3);
+  border-bottom-right-radius: var(--border-radius-elevation-3);
+}
+
+/**
+* ----------------------------------------------------------------------------
+* ICON STYLES
+*-----------------------------------------------------------------------------
+*/
+.listBoxItem [data-icon] {
+  margin-inline-end: var(--inner-spacing-2);
+}
+
+.listBoxItem [data-submenu-icon] {
+  margin-inline-end: 0;
+  margin-inline-start: auto;
+}
+
+/**
+* ----------------------------------------------------------------------------
+* HOVER AND ACTIVE STATES
+*-----------------------------------------------------------------------------
+*/
+.listBoxItem:not([data-disabled]) {
+  cursor: pointer;
+}
+
+.listBoxItem[data-hovered] {
+  background-color: var(--color-bg-accent-subtle-hover);
+}
+
+.listBoxItem[data-selected] {
+  background-color: var(--color-bg-accent-subtle-active);
+}
+
+/**
+* ----------------------------------------------------------------------------
+* DISABLED STATE
+*-----------------------------------------------------------------------------
+*/
+.listBoxItem[data-disabled] {
+  opacity: var(--opacity-disabled);
+  cursor: not-allowed;
+}
+
+/**
+* ----------------------------------------------------------------------------
+* FOCUS VISIBLE
+*-----------------------------------------------------------------------------
+*/
+.listBoxItem[data-focus-visible] {
+  box-shadow: inset 0 0 0 2px var(--color-bd-focus);
+}
+
+/**
+* ----------------------------------------------------------------------------
+* SEPARATOR
+*-----------------------------------------------------------------------------
+*/
+.separator {
+  border-top: var(--border-width-1) solid var(--color-bd);
+  padding: 0;
+}
+
+/* making sure the first and last child are not displayed when they have the data-separator attribute */
+.separator:is(:first-child, :last-child) {
+  display: none;
+}
diff --git a/app/client/packages/design-system/widgets/src/components/ListBoxItem/src/types.ts b/app/client/packages/design-system/widgets/src/components/ListBoxItem/src/types.ts
new file mode 100644
index 000000000000..613c3a88bbfb
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/ListBoxItem/src/types.ts
@@ -0,0 +1,6 @@
+import type { ListBoxItemProps as AriaListBoxItemProps } from "react-aria-components";
+import type { IconProps } from "@appsmith/wds";
+
+export interface ListBoxItemProps extends AriaListBoxItemProps<object> {
+  icon?: IconProps["name"];
+}
diff --git a/app/client/packages/design-system/widgets/src/components/FieldDescription/index.ts b/app/client/packages/design-system/widgets/src/components/Markdown/index.ts
similarity index 100%
rename from app/client/packages/design-system/widgets/src/components/FieldDescription/index.ts
rename to app/client/packages/design-system/widgets/src/components/Markdown/index.ts
diff --git a/app/client/packages/design-system/widgets/src/components/Markdown/src/Markdown.tsx b/app/client/packages/design-system/widgets/src/components/Markdown/src/Markdown.tsx
new file mode 100644
index 000000000000..fa9b7710c188
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Markdown/src/Markdown.tsx
@@ -0,0 +1,32 @@
+import React from "react";
+import { clsx } from "clsx";
+import remarkGfm from "remark-gfm";
+import ReactMarkdown from "react-markdown";
+import { getTypographyClassName } from "@appsmith/wds-theming";
+
+import styles from "./styles.module.css";
+import { components } from "./components";
+import type { MarkdownProps } from "./types";
+
+export const Markdown = (props: MarkdownProps) => {
+  const { children, className, options, ...rest } = props;
+
+  return (
+    <div
+      className={clsx(
+        styles.markdown,
+        getTypographyClassName("body"),
+        className,
+      )}
+      {...rest}
+    >
+      <ReactMarkdown
+        components={components}
+        remarkPlugins={[remarkGfm]}
+        {...options}
+      >
+        {children}
+      </ReactMarkdown>
+    </div>
+  );
+};
diff --git a/app/client/packages/design-system/widgets/src/components/Markdown/src/components.tsx b/app/client/packages/design-system/widgets/src/components/Markdown/src/components.tsx
new file mode 100644
index 000000000000..e74321e4aa94
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Markdown/src/components.tsx
@@ -0,0 +1,16 @@
+import type { Components } from "react-markdown";
+
+import { a } from "./mdComponents/Link";
+import { code } from "./mdComponents/Code";
+import { h1, h2, h3, h4, h5, h6 } from "./mdComponents/Heading";
+
+export const components: Components = {
+  a,
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6,
+  code,
+};
diff --git a/app/client/packages/design-system/widgets/src/components/Markdown/src/index.ts b/app/client/packages/design-system/widgets/src/components/Markdown/src/index.ts
new file mode 100644
index 000000000000..e58086caabf3
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Markdown/src/index.ts
@@ -0,0 +1,2 @@
+export * from "./types";
+export * from "./Markdown";
diff --git a/app/client/packages/design-system/widgets/src/components/Markdown/src/mdComponents/Code.tsx b/app/client/packages/design-system/widgets/src/components/Markdown/src/mdComponents/Code.tsx
new file mode 100644
index 000000000000..e4f4fb3c3775
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Markdown/src/mdComponents/Code.tsx
@@ -0,0 +1,57 @@
+import type { ExtraProps } from "react-markdown";
+import { Button, Flex, Text } from "@appsmith/wds";
+import React, { useState, useCallback } from "react";
+import { useThemeContext } from "@appsmith/wds-theming";
+import {
+  atomOneDark as darkTheme,
+  atomOneLight as lightTheme,
+} from "react-syntax-highlighter/dist/cjs/styles/hljs";
+import SyntaxHighlighter from "react-syntax-highlighter";
+
+type CodeProps = React.ClassAttributes<HTMLElement> &
+  React.HTMLAttributes<HTMLElement> &
+  ExtraProps;
+
+export const Code = (props: CodeProps) => {
+  const { children, className } = props;
+  const match = /language-(\w+)/.exec(className ?? "");
+  const theme = useThemeContext();
+  const [copied, setCopied] = useState(false);
+
+  const handleCopy = useCallback(() => {
+    navigator.clipboard.writeText(String(children)).then(() => {
+      setCopied(true);
+      setTimeout(() => setCopied(false), 2000);
+    });
+  }, [children]);
+
+  return match ? (
+    <div data-component="code">
+      <Flex
+        alignItems="center"
+        justifyContent="space-between"
+        padding="spacing-1"
+      >
+        <Text size="caption">{match[1]}</Text>
+        <Button icon="copy" onPress={handleCopy} size="small" variant="ghost">
+          {copied ? "Copied!" : "Copy"}
+        </Button>
+      </Flex>
+      <SyntaxHighlighter
+        PreTag="div"
+        customStyle={{
+          backgroundColor: "var(--color-bg-neutral-subtle)",
+        }}
+        language={match[1]}
+        style={theme.colorMode === "dark" ? darkTheme : lightTheme}
+        useInlineStyles
+      >
+        {String(children).replace(/\n$/, "")}
+      </SyntaxHighlighter>
+    </div>
+  ) : (
+    <code className={className}>{children}</code>
+  );
+};
+
+export { Code as code };
diff --git a/app/client/packages/design-system/widgets/src/components/Markdown/src/mdComponents/Heading.tsx b/app/client/packages/design-system/widgets/src/components/Markdown/src/mdComponents/Heading.tsx
new file mode 100644
index 000000000000..55ff67d953cc
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Markdown/src/mdComponents/Heading.tsx
@@ -0,0 +1,38 @@
+import React from "react";
+import type { Ref } from "react";
+import type { ExtraProps } from "react-markdown";
+import { Text, type TextProps } from "@appsmith/wds";
+
+type HeadingProps = React.ClassAttributes<HTMLDivElement> &
+  React.HTMLAttributes<HTMLDivElement> &
+  ExtraProps;
+
+const createHeading = (
+  size: TextProps["size"],
+  level: 1 | 2 | 3 | 4 | 5 | 6,
+  fontWeight: TextProps["fontWeight"] = 700,
+) => {
+  const HeadingComponent = ({ children, ref }: HeadingProps) => (
+    <Text
+      color="neutral"
+      data-component={`h${level}`}
+      fontWeight={fontWeight}
+      ref={ref as Ref<HTMLDivElement>}
+      size={size}
+      wordBreak="break-word"
+    >
+      {children}
+    </Text>
+  );
+
+  HeadingComponent.displayName = `Heading${level}`;
+
+  return HeadingComponent;
+};
+
+export const h1 = createHeading("heading", 1);
+export const h2 = createHeading("title", 2);
+export const h3 = createHeading("subtitle", 3);
+export const h4 = createHeading("body", 4);
+export const h5 = createHeading("body", 5, 500);
+export const h6 = createHeading("body", 6, 300);
diff --git a/app/client/packages/design-system/widgets/src/components/Markdown/src/mdComponents/Link.tsx b/app/client/packages/design-system/widgets/src/components/Markdown/src/mdComponents/Link.tsx
new file mode 100644
index 000000000000..b90e52e11014
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Markdown/src/mdComponents/Link.tsx
@@ -0,0 +1,23 @@
+import React from "react";
+import { Link } from "@appsmith/wds";
+import type { ExtraProps } from "react-markdown";
+
+type LinkProps = React.ClassAttributes<HTMLAnchorElement> &
+  React.AnchorHTMLAttributes<HTMLAnchorElement> &
+  ExtraProps;
+
+export const a = (props: LinkProps) => {
+  const { children, href } = props;
+
+  return (
+    <Link
+      data-component="a"
+      href={href}
+      rel="noreferrer"
+      target="_blank"
+      wordBreak="break-word"
+    >
+      {children}
+    </Link>
+  );
+};
diff --git a/app/client/packages/design-system/widgets/src/components/Markdown/src/styles.module.css b/app/client/packages/design-system/widgets/src/components/Markdown/src/styles.module.css
new file mode 100644
index 000000000000..6d83b09410cd
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Markdown/src/styles.module.css
@@ -0,0 +1,119 @@
+.markdown {
+  color: var(--color-fg);
+
+  table {
+    border: var(--border-width-1) solid var(--color-bd);
+    border-collapse: separate;
+    border-radius: var(--border-radius-elevation-3);
+    border-spacing: 0px;
+    overflow: hidden;
+  }
+
+  tr {
+    display: table-row;
+    vertical-align: inherit;
+    border-color: inherit;
+  }
+
+  th,
+  td {
+    padding: var(--inner-spacing-1) var(--inner-spacing-2);
+    text-align: left;
+    vertical-align: top;
+    border-bottom: var(--border-width-1) solid var(--color-bd);
+    border-right: var(--border-width-1) solid var(--color-bd);
+  }
+
+  :is(td, th):last-child {
+    border-right: none;
+  }
+
+  th {
+    background-color: var(--color-bg-neutral-subtle);
+  }
+
+  thead:last-child tr:last-child th,
+  tbody:last-child tr:last-child td {
+    border-bottom: none;
+  }
+
+  /* Headings */
+  [data-component="h1"] {
+    margin-top: var(--inner-spacing-7);
+    margin-bottom: var(--inner-spacing-4);
+  }
+
+  [data-component="h2"] {
+    margin-top: var(--inner-spacing-6);
+    margin-bottom: var(--inner-spacing-3);
+  }
+
+  [data-component="h3"] {
+    margin-top: var(--inner-spacing-5);
+    margin-bottom: var(--inner-spacing-3);
+  }
+
+  [data-component="h4"] {
+    margin-top: var(--inner-spacing-4);
+    margin-bottom: var(--inner-spacing-2);
+  }
+
+  [data-component="h5"] {
+    margin-top: var(--inner-spacing-3);
+    margin-bottom: var(--inner-spacing-2);
+  }
+
+  [data-component="h6"] {
+    margin-top: var(--inner-spacing-2);
+    margin-bottom: var(--inner-spacing-1);
+  }
+
+  /* Lists */
+  :is(ul, ol) {
+    margin-top: var(--inner-spacing-2);
+    margin-bottom: var(--inner-spacing-3);
+    padding-left: 0;
+    list-style: initial;
+  }
+
+  li {
+    margin-bottom: var(--inner-spacing-2);
+    margin-left: 1em;
+    position: relative;
+    list-style-type: auto;
+  }
+
+  a {
+    display: inline-block;
+  }
+
+  [data-component="code"] {
+    background-color: var(--color-bg-elevation-2);
+    border-radius: var(--border-radius-elevation-3);
+    outline: var(--border-width-1) solid var(--color-bg-neutral-subtle);
+    margin-bottom: var(--inner-spacing-2);
+    overflow: auto;
+  }
+
+  code:not([class*="language-"]) {
+    padding-inline: var(--inner-spacing-1);
+    background: var(--color-bg-neutral-subtle);
+    color: var(--color-fg-negative);
+    border-radius: var(--border-radius-elevation-3);
+    word-break: break-word;
+    white-space: normal;
+    outline: var(--border-width-1) solid var(--color-bg-neutral-soft);
+  }
+
+  pre {
+    margin-top: var(--inner-spacing-4);
+    margin-bottom: var(--inner-spacing-4);
+  }
+
+  blockquote {
+    padding-left: var(--inner-spacing-3);
+    padding-right: var(--inner-spacing-3);
+    margin-left: 0;
+    border-left: var(--border-width-2) solid var(--color-bd-neutral);
+  }
+}
diff --git a/app/client/packages/design-system/widgets/src/components/Markdown/src/types.ts b/app/client/packages/design-system/widgets/src/components/Markdown/src/types.ts
new file mode 100644
index 000000000000..ae16bf203b76
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Markdown/src/types.ts
@@ -0,0 +1,10 @@
+import type { Options } from "react-markdown";
+
+export interface MarkdownProps {
+  /** The markdown content to render */
+  children: string;
+  /** Options for react-markdown */
+  options?: Options;
+  /** Additional CSS classes to apply to the component */
+  className?: string;
+}
diff --git a/app/client/packages/design-system/widgets/src/components/Markdown/stories/Markdown.stories.ts b/app/client/packages/design-system/widgets/src/components/Markdown/stories/Markdown.stories.ts
new file mode 100644
index 000000000000..4f00c9834fb4
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Markdown/stories/Markdown.stories.ts
@@ -0,0 +1,62 @@
+import { Markdown } from "@appsmith/wds";
+import type { Meta, StoryObj } from "@storybook/react";
+
+const meta: Meta<typeof Markdown> = {
+  title: "WDS/Widgets/Markdown",
+  component: Markdown,
+};
+
+export default meta;
+type Story = StoryObj<typeof Markdown>;
+
+export const Default: Story = {
+  args: {
+    children: `# Hello, Markdown!
+
+This is a \`paragraph\` with **bold** and *italic* text.
+
+## Code Example
+
+\`\`\`javascript
+const greeting = "Hello, World!";
+console.log(greeting);
+\`\`\`
+
+- List item 1
+- List item 2
+- List item 3
+    - List item 3.1
+    - List item 3.2
+    - List item 3.3
+      - List item 3.3.1
+      - List item 3.3.2
+
+1. List item 1
+2. List item 2
+3. List item 3
+
+[Visit Appsmith](https://www.appsmith.com)
+
+# Heading 1
+## Heading 2
+### Heading 3
+#### Heading 4
+##### Heading 5
+###### Heading 6
+
+## Table Example
+
+| Column 1 | Column 2 | Column 3 |
+|----------|----------|----------|
+| Row 1, Cell 1 | Row 1, Cell 2 | Row 1, Cell 3 |
+| Row 2, Cell 1 | Row 2, Cell 2 | Row 2, Cell 3 |
+| Row 3, Cell 1 | Row 3, Cell 2 | Row 3, Cell 3 |
+
+## Blockquote Example
+
+> This is a blockquote.
+>
+> It can span multiple lines.
+`,
+  },
+};
diff --git a/app/client/packages/design-system/widgets/src/components/Menu/src/Menu.tsx b/app/client/packages/design-system/widgets/src/components/Menu/src/Menu.tsx
index 830d838d02b5..223ed03d7c17 100644
--- a/app/client/packages/design-system/widgets/src/components/Menu/src/Menu.tsx
+++ b/app/client/packages/design-system/widgets/src/components/Menu/src/Menu.tsx
@@ -1,71 +1,28 @@
-import React from "react";
-import { Icon, listItemStyles, Popover, Text } from "@appsmith/wds";
-import {
-  Menu as HeadlessMenu,
-  MenuItem,
-  Separator,
-  SubmenuTrigger,
-} from "react-aria-components";
-import styles from "./styles.module.css";
-import type { MenuProps, MenuItemProps } from "./types";
-import type { Key } from "@react-types/shared";
+import React, { createContext, useContext } from "react";
+import { listStyles, Popover } from "@appsmith/wds";
+import { Menu as HeadlessMenu } from "react-aria-components";
+
+import type { MenuProps } from "./types";
+
+const MenuNestingContext = createContext(0);
 
 export const Menu = (props: MenuProps) => {
-  const { hasSubmenu = false } = props;
-  // place Popover in the root theme provider to get access to the CSS tokens
+  const { children } = props;
   const root = document.body.querySelector(
     "[data-theme-provider]",
   ) as HTMLButtonElement;
 
-  return (
-    // We should put only parent Popover in the root, if we put the child ones, then Menu will work incorrectly
-    <Popover UNSTABLE_portalContainer={hasSubmenu ? undefined : root}>
-      <HeadlessMenu className={styles.menu} {...props}>
-        {(item) => renderFunc(item, props)}
-      </HeadlessMenu>
-    </Popover>
-  );
-};
-
-const renderFunc = (item: MenuItemProps, props: MenuProps) => {
-  const { childItems, icon, id, isDisabled, isSeparator = false, label } = item;
-
-  const isItemDisabled = () =>
-    Boolean((props.disabledKeys as Key[])?.includes(id)) || isDisabled;
-
-  if (childItems != null)
-    return (
-      <SubmenuTrigger {...props}>
-        <MenuItem
-          className={listItemStyles.item}
-          isDisabled={isItemDisabled()}
-          key={id}
-        >
-          {icon && <Icon name={icon} />}
-          <Text className={listItemStyles.text} lineClamp={1}>
-            {label}
-          </Text>
-          <Icon data-chevron name="chevron-right" size="small" />
-        </MenuItem>
-        <Menu hasSubmenu items={childItems}>
-          {(item) => renderFunc(item, props)}
-        </Menu>
-      </SubmenuTrigger>
-    );
-
-  if (isSeparator)
-    return <Separator className={listItemStyles.separator} key={id} />;
+  const nestingLevel = useContext(MenuNestingContext);
+  const isRootMenu = nestingLevel === 0;
 
   return (
-    <MenuItem
-      className={listItemStyles.item}
-      isDisabled={isItemDisabled()}
-      key={id}
-    >
-      {icon && <Icon name={icon} />}
-      <Text className={listItemStyles.text} lineClamp={1}>
-        {label}
-      </Text>
-    </MenuItem>
+    <MenuNestingContext.Provider value={nestingLevel + 1}>
+      {/* Only the parent Popover should be placed in the root. Placing child popoves in root would cause the menu to function incorrectly */}
+      <Popover UNSTABLE_portalContainer={isRootMenu ? root : undefined}>
+        <HeadlessMenu className={listStyles.listBox} {...props}>
+          {children}
+        </HeadlessMenu>
+      </Popover>
+    </MenuNestingContext.Provider>
   );
 };
diff --git a/app/client/packages/design-system/widgets/src/components/Menu/src/index.ts b/app/client/packages/design-system/widgets/src/components/Menu/src/index.ts
index 6fd1d55a3c6e..8c312410b43e 100644
--- a/app/client/packages/design-system/widgets/src/components/Menu/src/index.ts
+++ b/app/client/packages/design-system/widgets/src/components/Menu/src/index.ts
@@ -1,3 +1,3 @@
 export * from "./Menu";
-export { MenuTrigger } from "react-aria-components";
 export * from "./types";
+export { MenuTrigger, SubmenuTrigger } from "react-aria-components";
diff --git a/app/client/packages/design-system/widgets/src/components/Menu/src/types.ts b/app/client/packages/design-system/widgets/src/components/Menu/src/types.ts
index 057600671d37..4c7b10e72f2d 100644
--- a/app/client/packages/design-system/widgets/src/components/Menu/src/types.ts
+++ b/app/client/packages/design-system/widgets/src/components/Menu/src/types.ts
@@ -1,31 +1,7 @@
-import type {
-  MenuProps as HeadlessMenuProps,
-  MenuItemProps as HeadlessMenuItemProps,
-} from "react-aria-components";
-import type { Key } from "@react-types/shared";
-import type { IconProps } from "../../Icon";
+import type { MenuProps as AriaMenuProps } from "react-aria-components";
 
 export interface MenuProps
   extends Omit<
-    HeadlessMenuProps<MenuItem>,
+    AriaMenuProps<object>,
     "slot" | "selectionMode" | "selectedKeys"
-  > {
-  /**
-   * Whether the item has a submenu.
-   */
-  hasSubmenu?: boolean;
-}
-
-export interface MenuItem {
-  id: Key;
-  label?: string;
-  icon?: IconProps["name"];
-  isDisabled?: boolean;
-  isSeparator?: boolean;
-  childItems?: Iterable<MenuItem>;
-  hasSubmenu?: boolean;
-}
-
-export interface MenuItemProps
-  extends Omit<HeadlessMenuItemProps, "id">,
-    MenuItem {}
+  > {}
diff --git a/app/client/packages/design-system/widgets/src/components/Menu/stories/Menu.stories.tsx b/app/client/packages/design-system/widgets/src/components/Menu/stories/Menu.stories.tsx
index 4c741b9c6c9a..1e635bc377be 100644
--- a/app/client/packages/design-system/widgets/src/components/Menu/stories/Menu.stories.tsx
+++ b/app/client/packages/design-system/widgets/src/components/Menu/stories/Menu.stories.tsx
@@ -1,7 +1,12 @@
 import React from "react";
-import { Button, Menu, MenuTrigger } from "@appsmith/wds";
+import {
+  Button,
+  Menu,
+  MenuTrigger,
+  MenuItem,
+  SubmenuTrigger,
+} from "@appsmith/wds";
 import type { Meta, StoryObj } from "@storybook/react";
-import { menuItems, submenusItems, submenusItemsWithIcons } from "./menuData";
 
 /**
  * A menu displays a list of actions or options that a user can choose.
@@ -17,14 +22,24 @@ export default meta;
 type Story = StoryObj<typeof Menu>;
 
 export const Main: Story = {
-  render: (args) => (
+  render: () => (
     <MenuTrigger>
       <Button>Open The Menu…</Button>
-      <Menu
-        items={menuItems}
-        onAction={(key) => alert(`Selected key: ${key}`)}
-        {...args}
-      />
+      <Menu>
+        <MenuItem id="1">Item 1</MenuItem>
+        <MenuItem id="2">Item 2</MenuItem>
+        <MenuItem id="3">Item 3</MenuItem>
+        <MenuItem id="4">Item 4</MenuItem>
+        <SubmenuTrigger>
+          <MenuItem id="5">Submenu</MenuItem>
+          <Menu>
+            <MenuItem id="6">Submenu Item 1</MenuItem>
+            <MenuItem id="7">Submenu Item 2</MenuItem>
+            <MenuItem id="8">Submenu Item 3</MenuItem>
+            <MenuItem id="9">Submenu Item 4</MenuItem>
+          </Menu>
+        </SubmenuTrigger>
+      </Menu>
     </MenuTrigger>
   ),
 };
@@ -33,20 +48,38 @@ export const Submenus: Story = {
   render: () => (
     <MenuTrigger>
       <Button>Open The Menu…</Button>
-      <Menu items={submenusItems} />
+      <Menu>
+        <MenuItem id="1">Item 1</MenuItem>
+        <MenuItem id="2">Item 2</MenuItem>
+        <SubmenuTrigger>
+          <MenuItem id="3">Submenu 1</MenuItem>
+          <Menu>
+            <MenuItem id="4">Submenu 1 Item 1</MenuItem>
+            <MenuItem id="5">Submenu 1 Item 2</MenuItem>
+            <SubmenuTrigger>
+              <MenuItem id="6">Submenu 2</MenuItem>
+              <Menu>
+                <MenuItem id="7">Submenu 2 Item 1</MenuItem>
+                <MenuItem id="8">Submenu 2 Item 2</MenuItem>
+              </Menu>
+            </SubmenuTrigger>
+          </Menu>
+        </SubmenuTrigger>
+      </Menu>
     </MenuTrigger>
   ),
 };
 
-/**
- * The items can be disabled by passing `disabledKeys` or `isDisabled` in the item configuration.
- */
-
 export const DisabledItems: Story = {
   render: () => (
     <MenuTrigger>
       <Button>Open The Menu…</Button>
-      <Menu disabledKeys={[1, 2]} items={submenusItems} />
+      <Menu disabledKeys={["2", "3"]}>
+        <MenuItem id="1">Enabled Item</MenuItem>
+        <MenuItem id="2">Disabled Item 1</MenuItem>
+        <MenuItem id="3">Disabled Item 2</MenuItem>
+        <MenuItem id="4">Enabled Item</MenuItem>
+      </Menu>
     </MenuTrigger>
   ),
 };
@@ -55,7 +88,12 @@ export const WithIcons: Story = {
   render: () => (
     <MenuTrigger>
       <Button>Open The Menu…</Button>
-      <Menu items={submenusItemsWithIcons} />
+      <Menu>
+        <MenuItem icon="home">Home</MenuItem>
+        <MenuItem icon="file">Files</MenuItem>
+        <MenuItem icon="settings">Settings</MenuItem>
+        <MenuItem icon="question-mark">Help</MenuItem>
+      </Menu>
     </MenuTrigger>
   ),
 };
diff --git a/app/client/packages/design-system/widgets/src/components/Menu/stories/menuData.ts b/app/client/packages/design-system/widgets/src/components/Menu/stories/menuData.ts
index 1ed8598cd4b3..b15083cbfa82 100644
--- a/app/client/packages/design-system/widgets/src/components/Menu/stories/menuData.ts
+++ b/app/client/packages/design-system/widgets/src/components/Menu/stories/menuData.ts
@@ -1,6 +1,4 @@
-import type { MenuItem } from "../src";
-
-export const menuItems: MenuItem[] = [
+export const menuItems = [
   { id: 1, label: "Aerospace" },
   { id: 2, label: "Mechanical" },
   { id: 3, label: "Civil" },
@@ -12,7 +10,7 @@ export const menuItems: MenuItem[] = [
   { id: 9, label: "Electrical" },
 ];
 
-export const submenusItems: MenuItem[] = [
+export const submenusItems = [
   { id: 1, label: "Level 1-1" },
   {
     id: 2,
@@ -37,7 +35,7 @@ export const submenusItems: MenuItem[] = [
   { id: 8, label: "Level 1-8" },
 ];
 
-export const submenusItemsWithIcons: MenuItem[] = [
+export const submenusItemsWithIcons = [
   { id: 1, label: "Level 1-1", icon: "galaxy" },
   {
     id: 2,
diff --git a/app/client/packages/design-system/widgets/src/components/FieldListPopover/index.ts b/app/client/packages/design-system/widgets/src/components/MenuItem/index.ts
similarity index 100%
rename from app/client/packages/design-system/widgets/src/components/FieldListPopover/index.ts
rename to app/client/packages/design-system/widgets/src/components/MenuItem/index.ts
diff --git a/app/client/packages/design-system/widgets/src/components/MenuItem/src/MenuItem.tsx b/app/client/packages/design-system/widgets/src/components/MenuItem/src/MenuItem.tsx
new file mode 100644
index 000000000000..edd690856695
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/MenuItem/src/MenuItem.tsx
@@ -0,0 +1,26 @@
+import React from "react";
+import {
+  composeRenderProps,
+  MenuItem as HeadlessMenuItem,
+} from "react-aria-components";
+import { Icon, Text, listBoxItemStyles } from "@appsmith/wds";
+
+import type { MenuItemProps } from "./types";
+
+export function MenuItem(props: MenuItemProps) {
+  const { children, icon, ...rest } = props;
+
+  return (
+    <HeadlessMenuItem {...rest} className={listBoxItemStyles.listBoxItem}>
+      {composeRenderProps(children, (children, { hasSubmenu }) => (
+        <>
+          {icon && <Icon name={icon} />}
+          <Text lineClamp={1}>{children}</Text>
+          {Boolean(hasSubmenu) && (
+            <Icon data-submenu-icon="" name="chevron-right" />
+          )}
+        </>
+      ))}
+    </HeadlessMenuItem>
+  );
+}
diff --git a/app/client/packages/design-system/widgets/src/components/MenuItem/src/index.ts b/app/client/packages/design-system/widgets/src/components/MenuItem/src/index.ts
new file mode 100644
index 000000000000..4ab04ea84cd9
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/MenuItem/src/index.ts
@@ -0,0 +1 @@
+export { MenuItem } from "./MenuItem";
diff --git a/app/client/packages/design-system/widgets/src/components/MenuItem/src/types.ts b/app/client/packages/design-system/widgets/src/components/MenuItem/src/types.ts
new file mode 100644
index 000000000000..0d52e93be02c
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/MenuItem/src/types.ts
@@ -0,0 +1,7 @@
+import type { IconProps } from "@appsmith/wds";
+import type { MenuItemProps as AriaMenuItemProps } from "react-aria-components";
+
+export interface MenuItemProps extends AriaMenuItemProps<object> {
+  icon?: IconProps["name"];
+  isSubMenuItem?: boolean;
+}
diff --git a/app/client/packages/design-system/widgets/src/components/Modal/src/Modal.tsx b/app/client/packages/design-system/widgets/src/components/Modal/src/Modal.tsx
index 46226b8d962c..fc3764d1dc9b 100644
--- a/app/client/packages/design-system/widgets/src/components/Modal/src/Modal.tsx
+++ b/app/client/packages/design-system/widgets/src/components/Modal/src/Modal.tsx
@@ -1,14 +1,16 @@
+import clsx from "clsx";
 import React from "react";
 import { Popover, PopoverModalContent } from "@appsmith/wds-headless";
-import styles from "./styles.module.css";
+
 import type { ModalProps } from "./types";
-import clsx from "clsx";
+import styles from "./styles.module.css";
 
 export const Modal = (props: ModalProps) => {
   const {
     children,
-    dataAttributes = {},
     overlayClassName,
+    overlayProps = {},
+    size = "medium",
     triggerRef,
     ...rest
   } = props;
@@ -17,7 +19,8 @@ export const Modal = (props: ModalProps) => {
     // don't forget to change the transition-duration CSS as well
     <Popover duration={200} modal triggerRef={triggerRef} {...rest}>
       <PopoverModalContent
-        {...dataAttributes}
+        data-size={size}
+        {...overlayProps}
         overlayClassName={clsx(styles.overlay, overlayClassName)}
       >
         {children}
diff --git a/app/client/packages/design-system/widgets/src/components/Modal/src/index.ts b/app/client/packages/design-system/widgets/src/components/Modal/src/index.ts
index 8f811e192d44..d92e4cafc9c6 100644
--- a/app/client/packages/design-system/widgets/src/components/Modal/src/index.ts
+++ b/app/client/packages/design-system/widgets/src/components/Modal/src/index.ts
@@ -3,3 +3,4 @@ export * from "./ModalHeader";
 export * from "./ModalFooter";
 export * from "./ModalBody";
 export * from "./ModalContent";
+export * from "./types";
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 ac0629904be3..df2b3fe57291 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
@@ -3,6 +3,7 @@ import type {
   PopoverProps,
 } from "@appsmith/wds-headless";
 import type { ReactNode } from "react";
+import type { SIZES } from "@appsmith/wds";
 
 export interface ModalProps
   extends Pick<
@@ -15,9 +16,14 @@ export interface ModalProps
       | "dismissClickOutside"
     >,
     Pick<PopoverModalContentProps, "overlayClassName"> {
-  dataAttributes?: Record<string, string>;
+  /** size of the modal
+   * @default medium
+   */
+  size?: Omit<keyof typeof SIZES, "xSmall">;
   /** The children of the component. */
   children: ReactNode;
+  /** Additional props to be passed to the overlay */
+  overlayProps?: Record<string, string>;
 }
 
 export interface ModalContentProps {
diff --git a/app/client/packages/design-system/widgets/src/components/Modal/stories/ModalExamples.tsx b/app/client/packages/design-system/widgets/src/components/Modal/stories/ModalExamples.tsx
index 9a4f72f0c974..79f5189c57b0 100644
--- a/app/client/packages/design-system/widgets/src/components/Modal/stories/ModalExamples.tsx
+++ b/app/client/packages/design-system/widgets/src/components/Modal/stories/ModalExamples.tsx
@@ -51,10 +51,10 @@ export const ModalExamples = () => {
         }}
       />
       <Modal
-        dataAttributes={{ "data-size": "large" }}
         initialFocus={2}
         isOpen={isLargeOpen}
         setOpen={setLargeOpen}
+        size="large"
         triggerRef={largeRef}
       >
         <Unstyled>
@@ -121,10 +121,10 @@ export const ModalExamples = () => {
         </Unstyled>
       </Modal>
       <Modal
-        dataAttributes={{ "data-size": "small" }}
         initialFocus={2}
         isOpen={isSmallOpen}
         setOpen={setSmallOpen}
+        size="small"
         triggerRef={smallRef}
       >
         <Unstyled>
diff --git a/app/client/packages/design-system/widgets/src/components/Popover/src/Popover.tsx b/app/client/packages/design-system/widgets/src/components/Popover/src/Popover.tsx
index d09ecdef0842..2eb2a15e2121 100644
--- a/app/client/packages/design-system/widgets/src/components/Popover/src/Popover.tsx
+++ b/app/client/packages/design-system/widgets/src/components/Popover/src/Popover.tsx
@@ -1,13 +1,14 @@
 import React from "react";
+import type { PopoverProps } from "react-aria-components";
 import { Popover as HeadlessPopover } from "react-aria-components";
+
 import styles from "./styles.module.css";
-import type { PopoverProps } from "react-aria-components";
 
 export const Popover = (props: PopoverProps) => {
   const { children, ...rest } = props;
 
   return (
-    <HeadlessPopover className={styles.popover} {...rest}>
+    <HeadlessPopover {...rest} className={styles.popover}>
       {children}
     </HeadlessPopover>
   );
diff --git a/app/client/packages/design-system/widgets/src/styles/index.ts b/app/client/packages/design-system/widgets/src/components/Radio/index.ts
similarity index 100%
rename from app/client/packages/design-system/widgets/src/styles/index.ts
rename to app/client/packages/design-system/widgets/src/components/Radio/index.ts
diff --git a/app/client/packages/design-system/widgets/src/components/Radio/src/Radio.tsx b/app/client/packages/design-system/widgets/src/components/Radio/src/Radio.tsx
new file mode 100644
index 000000000000..e3dfd8668c8f
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Radio/src/Radio.tsx
@@ -0,0 +1,24 @@
+import { Text } from "@appsmith/wds";
+import React, { forwardRef } from "react";
+import type { ForwardedRef } from "react";
+import { Radio as AriaRadio } from "react-aria-components";
+
+import styles from "./styles.module.css";
+import type { RadioProps } from "./types";
+
+const _Radio = (props: RadioProps, ref: ForwardedRef<HTMLLabelElement>) => {
+  const { children, labelPosition = "end", ...rest } = props;
+
+  return (
+    <AriaRadio
+      ref={ref}
+      {...rest}
+      className={styles.radio}
+      data-label-position={labelPosition}
+    >
+      {Boolean(children) && <Text lineClamp={1}>{children}</Text>}
+    </AriaRadio>
+  );
+};
+
+export const Radio = forwardRef(_Radio);
diff --git a/app/client/packages/design-system/widgets/src/components/Radio/src/index.ts b/app/client/packages/design-system/widgets/src/components/Radio/src/index.ts
new file mode 100644
index 000000000000..867c7ecaa657
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Radio/src/index.ts
@@ -0,0 +1,2 @@
+export { Radio } from "./Radio";
+export type { RadioProps } from "./types";
diff --git a/app/client/packages/design-system/widgets/src/components/RadioGroup/src/styles.module.css b/app/client/packages/design-system/widgets/src/components/Radio/src/styles.module.css
similarity index 92%
rename from app/client/packages/design-system/widgets/src/components/RadioGroup/src/styles.module.css
rename to app/client/packages/design-system/widgets/src/components/Radio/src/styles.module.css
index 4da345ac742d..0b1d214eb27c 100644
--- a/app/client/packages/design-system/widgets/src/components/RadioGroup/src/styles.module.css
+++ b/app/client/packages/design-system/widgets/src/components/Radio/src/styles.module.css
@@ -1,21 +1,3 @@
-.radioGroup {
-  display: flex;
-  flex-direction: column;
-  width: 100%;
-
-  &[data-orientation="vertical"] {
-    align-items: start;
-
-    .radio {
-      margin-inline-end: auto;
-    }
-  }
-
-  &[data-disabled] {
-    cursor: not-allowed;
-  }
-}
-
 .radio {
   display: flex;
   align-items: center;
diff --git a/app/client/packages/design-system/widgets/src/components/Radio/src/types.ts b/app/client/packages/design-system/widgets/src/components/Radio/src/types.ts
new file mode 100644
index 000000000000..243ee62cf730
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Radio/src/types.ts
@@ -0,0 +1,6 @@
+import type { POSITION } from "@appsmith/wds";
+import type { RadioProps as AriaRadioProps } from "react-aria-components";
+
+export interface RadioProps extends AriaRadioProps {
+  labelPosition?: keyof typeof POSITION;
+}
diff --git a/app/client/packages/design-system/widgets/src/components/RadioGroup/chromatic/RadioGroup.chromatic.stories.tsx b/app/client/packages/design-system/widgets/src/components/RadioGroup/chromatic/RadioGroup.chromatic.stories.tsx
index 685d5750ad30..2225cc3f1e01 100644
--- a/app/client/packages/design-system/widgets/src/components/RadioGroup/chromatic/RadioGroup.chromatic.stories.tsx
+++ b/app/client/packages/design-system/widgets/src/components/RadioGroup/chromatic/RadioGroup.chromatic.stories.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import type { Checkbox } from "@appsmith/wds";
-import { RadioGroup } from "@appsmith/wds";
+import { Radio, RadioGroup } from "@appsmith/wds";
 import type { Meta, StoryObj } from "@storybook/react";
 import { StoryGrid, DataAttrWrapper } from "@design-system/storybook";
 
@@ -22,12 +22,24 @@ export const LightMode: Story = {
     <StoryGrid>
       {states.map((state) => (
         <DataAttrWrapper attr={state} key={state} target="label">
-          <RadioGroup items={items} />
+          <RadioGroup>
+            {items.map(({ label, value }) => (
+              <Radio key={value} value={value}>
+                {label}
+              </Radio>
+            ))}
+          </RadioGroup>
         </DataAttrWrapper>
       ))}
       {states.map((state) => (
         <DataAttrWrapper attr={state} key={state} target="label">
-          <RadioGroup defaultValue="value-1" items={items} />
+          <RadioGroup defaultValue="value-1">
+            {items.map(({ label, value }) => (
+              <Radio key={value} value={value}>
+                {label}
+              </Radio>
+            ))}
+          </RadioGroup>
         </DataAttrWrapper>
       ))}
     </StoryGrid>
diff --git a/app/client/packages/design-system/widgets/src/components/RadioGroup/src/RadioGroup.tsx b/app/client/packages/design-system/widgets/src/components/RadioGroup/src/RadioGroup.tsx
index a06bceee6c3d..de3da32c4e9b 100644
--- a/app/client/packages/design-system/widgets/src/components/RadioGroup/src/RadioGroup.tsx
+++ b/app/client/packages/design-system/widgets/src/components/RadioGroup/src/RadioGroup.tsx
@@ -1,14 +1,14 @@
+import type { ForwardedRef } from "react";
 import React, { forwardRef, useRef } from "react";
-import { RadioGroup as HeadlessRadioGroup, Radio } from "react-aria-components";
 import {
-  FieldLabel,
-  Flex,
-  Text,
   useGroupOrientation,
+  inputFieldStyles,
+  FieldLabel,
   FieldError,
+  toggleGroupStyles,
 } from "@appsmith/wds";
-import styles from "./styles.module.css";
-import type { ForwardedRef } from "react";
+import { RadioGroup as HeadlessRadioGroup, Group } from "react-aria-components";
+
 import type { RadioGroupProps } from "./types";
 
 const _RadioGroup = (
@@ -16,11 +16,12 @@ const _RadioGroup = (
   ref: ForwardedRef<HTMLDivElement>,
 ) => {
   const {
+    children,
     contextualHelp,
     errorMessage,
     isDisabled,
+    isReadOnly,
     isRequired,
-    items,
     label,
     ...rest
   } = props;
@@ -32,31 +33,30 @@ const _RadioGroup = (
 
   return (
     <HeadlessRadioGroup
-      className={styles.radioGroup}
+      {...rest}
+      className={inputFieldStyles.field}
       isDisabled={isDisabled}
+      isReadOnly={isReadOnly}
+      isRequired={isRequired}
       ref={ref}
-      {...rest}
     >
-      <FieldLabel
-        contextualHelp={contextualHelp}
-        isDisabled={isDisabled}
-        isRequired={isRequired}
-        text={label}
-      />
-      <Flex
-        direction={orientation === "vertical" ? "column" : "row"}
-        gap={orientation === "vertical" ? "spacing-2" : "spacing-4"}
-        isInner
+      {Boolean(label) && (
+        <FieldLabel
+          contextualHelp={contextualHelp}
+          isDisabled={isDisabled}
+          isRequired={isRequired}
+        >
+          {label}
+        </FieldLabel>
+      )}
+      <Group
+        className={toggleGroupStyles.toggleGroup}
+        data-orientation={orientation}
         ref={containerRef}
-        wrap="wrap"
       >
-        {items.map(({ label, value, ...rest }, index) => (
-          <Radio className={styles.radio} key={index} value={value} {...rest}>
-            <Text lineClamp={1}>{label}</Text>
-          </Radio>
-        ))}
-      </Flex>
-      <FieldError errorMessage={errorMessage} />
+        {children}
+      </Group>
+      <FieldError>{errorMessage}</FieldError>
     </HeadlessRadioGroup>
   );
 };
diff --git a/app/client/packages/design-system/widgets/src/components/RadioGroup/src/types.ts b/app/client/packages/design-system/widgets/src/components/RadioGroup/src/types.ts
index dd2260c32ec0..7929aca5d62f 100644
--- a/app/client/packages/design-system/widgets/src/components/RadioGroup/src/types.ts
+++ b/app/client/packages/design-system/widgets/src/components/RadioGroup/src/types.ts
@@ -1,34 +1,13 @@
+import type { FieldProps, ORIENTATION } from "@appsmith/wds";
 import type { RadioGroupProps as HeadlessRadioGroupProps } from "react-aria-components";
-import type { ORIENTATION } from "../../../shared";
 
-interface RadioGroupItemProps {
-  value: string;
-  label?: string;
-  isSelected?: boolean;
-  isDisabled?: boolean;
-  index?: number;
-}
-
-export interface RadioGroupProps extends HeadlessRadioGroupProps {
-  /**
-   * A ContextualHelp element to place next to the label.
-   */
-  contextualHelp?: string;
-  /**
-   * The content to display as the label.
-   */
-  label?: string;
-  /**
-   * Radio that belong to this group.
-   */
-  items: RadioGroupItemProps[];
+export interface RadioGroupProps extends HeadlessRadioGroupProps, FieldProps {
   /**
-   * The axis the checkboxes should align with.
-   * @default 'horizontal'
+   * The orientation of the radio group.
    */
   orientation?: keyof typeof ORIENTATION;
   /**
-   * An error message for the field.
+   * children for the radio group
    */
-  errorMessage?: string;
+  children?: React.ReactNode;
 }
diff --git a/app/client/packages/design-system/widgets/src/components/RadioGroup/stories/RadioGroup.stories.tsx b/app/client/packages/design-system/widgets/src/components/RadioGroup/stories/RadioGroup.stories.tsx
index 036110269402..e16fdfbc1874 100644
--- a/app/client/packages/design-system/widgets/src/components/RadioGroup/stories/RadioGroup.stories.tsx
+++ b/app/client/packages/design-system/widgets/src/components/RadioGroup/stories/RadioGroup.stories.tsx
@@ -1,70 +1,89 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { RadioGroup, Flex } from "@appsmith/wds";
+import { RadioGroup, Flex, Radio } from "@appsmith/wds";
+
+const items = [
+  { label: "Value 1", value: "value-1" },
+  { label: "Value 2", value: "value-2" },
+];
 
-/**
- * Radio group is a component that allows users to select one option from a set of options.
- */
 const meta: Meta<typeof RadioGroup> = {
-  component: RadioGroup,
   title: "WDS/Widgets/RadioGroup",
+  component: RadioGroup,
+  tags: ["autodocs"],
+  args: {
+    defaultValue: "value-1",
+    children: items.map((item) => (
+      <Radio key={item.value} value={item.value}>
+        {item.label}
+      </Radio>
+    )),
+  },
 };
 
 export default meta;
 type Story = StoryObj<typeof RadioGroup>;
 
-const items = [
-  { label: "Value 1", value: "value-1" },
-  { label: "Value 2", value: "value-2" },
-];
-
 export const Main: Story = {
   args: {
-    label: "Radio Group",
-    defaultValue: "value-1",
-    items: items,
+    label: "Label",
+  },
+};
+
+export const WithLabel: Story = {
+  args: {
+    label: "Description",
+  },
+};
+
+export const WithContextualHelp: Story = {
+  args: {
+    label: "Label",
+    contextualHelp: "Contextual help",
   },
-  render: (args) => <RadioGroup {...args} />,
 };
 
-/**
- * The component supports two label orientations `vertical` and `horizontal`. Default size is `horizontal`.
- */
 export const Orientation: Story = {
-  render: () => (
-    <Flex direction="column" gap="spacing-4">
-      <RadioGroup items={items} />
-      <RadioGroup items={items} orientation="vertical" />
-    </Flex>
-  ),
+  render: () => {
+    return (
+      <Flex direction="column" gap="spacing-4">
+        <RadioGroup label="Vertical" orientation="vertical">
+          {items.map((item) => (
+            <Radio key={item.value} value={item.value}>
+              {item.label}
+            </Radio>
+          ))}
+        </RadioGroup>
+        <RadioGroup label="Horizontal" orientation="horizontal">
+          {items.map((item) => (
+            <Radio key={item.value} value={item.value}>
+              {item.label}
+            </Radio>
+          ))}
+        </RadioGroup>
+      </Flex>
+    );
+  },
 };
 
 export const Disabled: Story = {
   args: {
-    label: "Radio Group",
-    defaultValue: "value-1",
     isDisabled: true,
-    items: items,
+    label: "Disabled",
   },
-  render: (args) => <RadioGroup {...args} />,
 };
 
 export const Required: Story = {
   args: {
-    label: "Radio Group",
-    defaultValue: "value-1",
     isRequired: true,
-    items: items,
+    label: "Required",
   },
-  render: (args) => <RadioGroup {...args} />,
 };
 
 export const Invalid: Story = {
   args: {
-    label: "Radio Group",
+    errorMessage: "There is an error",
+    label: "Invalid",
     isInvalid: true,
-    errorMessage: "This is a error message",
-    items: items,
   },
-  render: (args) => <RadioGroup {...args} />,
 };
diff --git a/app/client/packages/design-system/widgets/src/components/RadioGroup/tests/RadioGroup.test.tsx b/app/client/packages/design-system/widgets/src/components/RadioGroup/tests/RadioGroup.test.tsx
index 6be7f2578795..cc5512573a9e 100644
--- a/app/client/packages/design-system/widgets/src/components/RadioGroup/tests/RadioGroup.test.tsx
+++ b/app/client/packages/design-system/widgets/src/components/RadioGroup/tests/RadioGroup.test.tsx
@@ -2,7 +2,7 @@ import React from "react";
 import "@testing-library/jest-dom";
 import userEvent from "@testing-library/user-event";
 import { render, screen } from "@testing-library/react";
-import { RadioGroup } from "@appsmith/wds";
+import { Radio, RadioGroup } from "@appsmith/wds";
 
 describe("@appsmith/wds/RadioGroup", () => {
   const items = [
@@ -12,7 +12,13 @@ describe("@appsmith/wds/RadioGroup", () => {
 
   it("should render the Radio group", async () => {
     const { container } = render(
-      <RadioGroup items={items} label="Radio Group" />,
+      <RadioGroup label="Radio Group">
+        {items.map(({ label, value }) => (
+          <Radio key={value} value={value}>
+            {label}
+          </Radio>
+        ))}
+      </RadioGroup>,
     );
 
     expect(screen.getByText("Value 1")).toBeInTheDocument();
@@ -46,11 +52,13 @@ describe("@appsmith/wds/RadioGroup", () => {
 
   it("should support custom props", () => {
     render(
-      <RadioGroup
-        data-testid="t--radio-group"
-        items={items}
-        label="Radio Group Label"
-      />,
+      <RadioGroup data-testid="t--radio-group" label="Radio Group Label">
+        {items.map(({ label, value }) => (
+          <Radio key={value} value={value}>
+            {label}
+          </Radio>
+        ))}
+      </RadioGroup>,
     );
 
     const radioGroup = screen.getByTestId("t--radio-group");
@@ -60,7 +68,13 @@ describe("@appsmith/wds/RadioGroup", () => {
 
   it("should render checked checkboxes when value is passed", () => {
     render(
-      <RadioGroup items={items} label="Radio  Group Label" value="value-1" />,
+      <RadioGroup label="Radio  Group Label" value="value-1">
+        {items.map(({ label, value }) => (
+          <Radio key={value} value={value}>
+            {label}
+          </Radio>
+        ))}
+      </RadioGroup>,
     );
 
     const options = screen.getAllByRole("radio");
@@ -73,11 +87,13 @@ describe("@appsmith/wds/RadioGroup", () => {
     const onChangeSpy = jest.fn();
 
     render(
-      <RadioGroup
-        items={items}
-        label="Radio  Group Label"
-        onChange={onChangeSpy}
-      />,
+      <RadioGroup label="Radio  Group Label" onChange={onChangeSpy}>
+        {items.map(({ label, value }) => (
+          <Radio key={value} value={value}>
+            {label}
+          </Radio>
+        ))}
+      </RadioGroup>,
     );
 
     const options = screen.getAllByRole("radio");
@@ -87,7 +103,15 @@ describe("@appsmith/wds/RadioGroup", () => {
   });
 
   it("should be able to render disabled checkboxes", () => {
-    render(<RadioGroup isDisabled items={items} label="Radio  Group Label" />);
+    render(
+      <RadioGroup isDisabled label="Radio  Group Label">
+        {items.map(({ label, value }) => (
+          <Radio key={value} value={value}>
+            {label}
+          </Radio>
+        ))}
+      </RadioGroup>,
+    );
 
     const options = screen.getAllByRole("radio");
 
diff --git a/app/client/packages/design-system/widgets/src/components/Select/src/Select.tsx b/app/client/packages/design-system/widgets/src/components/Select/src/Select.tsx
index 092c31243454..0337fd709ad9 100644
--- a/app/client/packages/design-system/widgets/src/components/Select/src/Select.tsx
+++ b/app/client/packages/design-system/widgets/src/components/Select/src/Select.tsx
@@ -1,40 +1,36 @@
-import React, { useRef } from "react";
+import React from "react";
 import {
-  FieldDescription,
   FieldError,
-  Icon,
   FieldLabel,
-  Spinner,
-  FieldListPopover,
+  ListBox,
+  inputFieldStyles,
+  Popover,
 } from "@appsmith/wds";
-import { getTypographyClassName } from "@appsmith/wds-theming";
-import clsx from "clsx";
-import {
-  Button,
-  Select as HeadlessSelect,
-  SelectValue,
-} from "react-aria-components";
-import styles from "./styles.module.css";
+import { Select as HeadlessSelect } from "react-aria-components";
+
 import type { SelectProps } from "./types";
+import { SelectTrigger } from "./SelectTrigger";
 
 export const Select = (props: SelectProps) => {
   const {
+    children,
     contextualHelp,
-    description,
     errorMessage,
+    isDisabled,
     isLoading,
     isRequired,
-    items,
     label,
+    placeholder,
     size = "medium",
     ...rest
   } = props;
-  const triggerRef = useRef<HTMLButtonElement>(null);
+  const root = document.body.querySelector(
+    "[data-theme-provider]",
+  ) as HTMLButtonElement;
 
   return (
     <HeadlessSelect
-      aria-label={Boolean(label) ? undefined : "Select"}
-      className={styles.formField}
+      className={inputFieldStyles.field}
       data-size={size}
       isRequired={isRequired}
       {...rest}
@@ -43,30 +39,22 @@ export const Select = (props: SelectProps) => {
         <>
           <FieldLabel
             contextualHelp={contextualHelp}
+            isDisabled={isDisabled}
             isRequired={isRequired}
-            text={label}
+          >
+            {label}
+          </FieldLabel>
+          <SelectTrigger
+            isDisabled={isDisabled}
+            isInvalid={isInvalid}
+            isLoading={isLoading}
+            placeholder={placeholder}
+            size={size}
           />
-          <Button className={styles.textField} ref={triggerRef}>
-            <SelectValue
-              className={clsx(
-                styles.fieldValue,
-                getTypographyClassName("body"),
-              )}
-            >
-              {({ defaultChildren, isPlaceholder }) => {
-                if (isPlaceholder) {
-                  return props.placeholder;
-                }
-
-                return defaultChildren;
-              }}
-            </SelectValue>
-            {!Boolean(isLoading) && <Icon name="chevron-down" />}
-            {Boolean(isLoading) && <Spinner />}
-          </Button>
-          <FieldError errorMessage={errorMessage} />
-          <FieldDescription description={description} isInvalid={isInvalid} />
-          <FieldListPopover items={items} />
+          <FieldError>{errorMessage}</FieldError>
+          <Popover UNSTABLE_portalContainer={root}>
+            <ListBox shouldFocusWrap>{children}</ListBox>
+          </Popover>
         </>
       )}
     </HeadlessSelect>
diff --git a/app/client/packages/design-system/widgets/src/components/Select/src/SelectTrigger.tsx b/app/client/packages/design-system/widgets/src/components/Select/src/SelectTrigger.tsx
new file mode 100644
index 000000000000..5fcd5ca50f4d
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Select/src/SelectTrigger.tsx
@@ -0,0 +1,41 @@
+import React from "react";
+import { Icon, Spinner, textInputStyles } from "@appsmith/wds";
+import { getTypographyClassName } from "@appsmith/wds-theming";
+import { Button, Group, SelectValue } from "react-aria-components";
+
+import type { SelectProps } from "./types";
+
+interface SelectTriggerProps {
+  size?: SelectProps["size"];
+  isLoading?: boolean;
+  isInvalid?: boolean;
+  placeholder?: string;
+  isDisabled?: boolean;
+}
+
+export const SelectTrigger: React.FC<SelectTriggerProps> = (props) => {
+  const { isDisabled, isInvalid, isLoading, placeholder, size } = props;
+
+  return (
+    <Group className={textInputStyles.inputGroup}>
+      <Button
+        className={textInputStyles.input}
+        data-invalid={Boolean(isInvalid) ? "" : undefined}
+        data-size={size}
+        isDisabled={isDisabled}
+      >
+        <SelectValue
+          className={getTypographyClassName("body")}
+          data-select-text=""
+        >
+          {({ defaultChildren, isPlaceholder }) =>
+            isPlaceholder ? placeholder : defaultChildren
+          }
+        </SelectValue>
+      </Button>
+      <span data-input-suffix>
+        {Boolean(isLoading) ? <Spinner /> : <Icon name="chevron-down" />}
+      </span>
+    </Group>
+  );
+};
diff --git a/app/client/packages/design-system/widgets/src/components/Select/src/styles.module.css b/app/client/packages/design-system/widgets/src/components/Select/src/styles.module.css
deleted file mode 100644
index f3d0aee824ba..000000000000
--- a/app/client/packages/design-system/widgets/src/components/Select/src/styles.module.css
+++ /dev/null
@@ -1,61 +0,0 @@
-.formField {
-  display: flex;
-  flex-direction: column;
-  width: 100%;
-}
-
-.textField {
-  display: flex;
-  position: relative;
-  padding: 0;
-  height: var(--sizing-9);
-  border: none;
-  align-items: center;
-  border-radius: var(--border-radius-elevation-3);
-  background-color: var(--color-bg-neutral-subtle);
-  max-inline-size: 100%;
-  padding-inline-start: var(--inner-spacing-2);
-  padding-inline-end: calc(var(--inner-spacing-3) + var(--icon-size-4));
-  padding-block: var(--inner-spacing-3);
-  box-shadow: inset 0 0 0 var(--border-width-1)
-    var(--color-bd-on-neutral-subtle);
-  cursor: pointer;
-}
-
-.formField[data-invalid] .textField {
-  box-shadow: 0 0 0 var(--border-width-1) var(--color-bd-negative);
-}
-
-.formField[data-size="small"] .textField {
-  padding-block: var(--inner-spacing-2);
-}
-
-.textField[data-focus-visible] {
-  box-shadow:
-    0 0 0 2px var(--color-bg),
-    0 0 0 4px var(--color-bd-focus);
-}
-
-.textField[data-hovered] {
-  background-color: var(--color-bg-neutral-subtle-hover);
-  box-shadow: inset 0 0 0 var(--border-width-1)
-    var(--color-bd-on-neutral-subtle-hover);
-}
-
-.textField [data-icon] {
-  position: absolute;
-  right: var(--inner-spacing-1);
-}
-
-.fieldValue {
-  text-align: left;
-  flex: 1;
-}
-
-.fieldValue[data-placeholder] {
-  color: var(--color-fg-neutral-subtle);
-}
-
-.fieldValue [data-icon] {
-  display: none;
-}
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 1d500e536657..d2d57a905713 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
@@ -1,26 +1,12 @@
-import type {
-  SelectProps as SpectrumSelectProps,
-  ValidationResult,
-} from "react-aria-components";
-import type { SIZES, FieldListPopoverItem } from "@appsmith/wds";
+import type { SIZES, FieldProps } from "@appsmith/wds";
+import type { SelectProps as SpectrumSelectProps } from "react-aria-components";
 
 export interface SelectProps
-  extends Omit<SpectrumSelectProps<FieldListPopoverItem>, "slot"> {
-  /** Item objects in the collection. */
-  items: FieldListPopoverItem[];
-  /** The content to display as the label. */
-  label?: string;
-  /** The content to display as the description. */
-  description?: string;
-  /** The content to display as the error message. */
-  errorMessage?: string | ((validation: ValidationResult) => string);
+  extends Omit<SpectrumSelectProps<object>, "slot">,
+    FieldProps {
   /** size of the select
    *
    * @default medium
    */
   size?: Omit<keyof typeof SIZES, "xSmall" | "large">;
-  /** loading state for the input */
-  isLoading?: boolean;
-  /** A ContextualHelp element to place next to the label. */
-  contextualHelp?: string;
 }
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 a7b963f96042..84b1ae3e8742 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,7 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { Select, Button, Flex, SIZES } from "@appsmith/wds";
+import { Select, Button, Flex, SIZES, ListBoxItem } from "@appsmith/wds";
+
 import { selectItems, selectItemsWithIcons } from "./selectData";
 
 /**
@@ -9,6 +10,13 @@ import { selectItems, selectItemsWithIcons } from "./selectData";
 const meta: Meta<typeof Select> = {
   component: Select,
   title: "WDS/Widgets/Select",
+  args: {
+    children: selectItems.map((item) => (
+      <ListBoxItem key={item.id} textValue={item.label}>
+        {item.label}
+      </ListBoxItem>
+    )),
+  },
 };
 
 export default meta;
@@ -16,13 +24,13 @@ type Story = StoryObj<typeof Select>;
 
 export const Main: Story = {
   args: {
-    items: selectItems,
+    label: "Label",
+    children: selectItems.map((item) => (
+      <ListBoxItem key={item.id} textValue={item.label}>
+        {item.label}
+      </ListBoxItem>
+    )),
   },
-  render: (args) => (
-    <Flex width="sizing-60">
-      <Select {...args} />
-    </Flex>
-  ),
 };
 
 /**
@@ -34,12 +42,13 @@ export const Sizes: Story = {
       {Object.keys(SIZES)
         .filter((size) => !["xSmall", "large"].includes(size))
         .map((size) => (
-          <Select
-            items={selectItems}
-            key={size}
-            placeholder={size}
-            size={size}
-          />
+          <Select key={size} label={size} placeholder={size} size={size}>
+            {selectItems.map((item) => (
+              <ListBoxItem key={item.id} textValue={item.label}>
+                {item.label}
+              </ListBoxItem>
+            ))}
+          </Select>
         ))}
     </Flex>
   ),
@@ -49,7 +58,13 @@ export const Loading: Story = {
   args: {
     placeholder: "Loading",
     isLoading: true,
-    items: selectItems,
+  },
+};
+
+export const Disabled: Story = {
+  args: {
+    placeholder: "Disabled",
+    isDisabled: true,
   },
 };
 
@@ -63,9 +78,8 @@ export const Validation: Story = {
     >
       <Flex direction="column" gap="spacing-5" width="sizing-60">
         <Select
-          description="description"
+          errorMessage="There is an error"
           isRequired
-          items={selectItems}
           label="Validation"
         />
         <Button type="submit">Submit</Button>
@@ -79,13 +93,16 @@ export const ContextualHelp: Story = {
     label: "Label",
     placeholder: "Contextual Help Text",
     contextualHelp: "This is a contextual help text",
-    items: selectItems,
   },
 };
 
 export const WithIcons: Story = {
   args: {
     label: "With icons",
-    items: selectItemsWithIcons,
+    children: selectItemsWithIcons.map((item) => (
+      <ListBoxItem icon={item.icon} key={item.id} textValue={item.label}>
+        {item.label}
+      </ListBoxItem>
+    )),
   },
 };
diff --git a/app/client/packages/design-system/widgets/src/components/Select/stories/selectData.ts b/app/client/packages/design-system/widgets/src/components/Select/stories/selectData.ts
index 09743d9fe1bf..0abd67da5aee 100644
--- a/app/client/packages/design-system/widgets/src/components/Select/stories/selectData.ts
+++ b/app/client/packages/design-system/widgets/src/components/Select/stories/selectData.ts
@@ -1,6 +1,4 @@
-import type { FieldListPopoverItem } from "@appsmith/wds";
-
-export const selectItems: FieldListPopoverItem[] = [
+export const selectItems = [
   { id: 1, label: "Aerospace" },
   {
     id: 2,
@@ -15,7 +13,7 @@ export const selectItems: FieldListPopoverItem[] = [
   { id: 9, label: "Electrical" },
 ];
 
-export const selectItemsWithIcons: FieldListPopoverItem[] = [
+export const selectItemsWithIcons = [
   { id: 1, label: "Aerospace", icon: "galaxy" },
   {
     id: 2,
@@ -25,4 +23,4 @@ export const selectItemsWithIcons: FieldListPopoverItem[] = [
   { id: 3, label: "Civil", icon: "circuit-ground" },
   { id: 4, label: "Biomedical", icon: "biohazard" },
   { id: 5, label: "Nuclear", icon: "atom" },
-];
+] as const;
diff --git a/app/client/packages/design-system/widgets/src/components/Sheet/index.ts b/app/client/packages/design-system/widgets/src/components/Sheet/index.ts
new file mode 100644
index 000000000000..3bd16e178a03
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sheet/index.ts
@@ -0,0 +1 @@
+export * from "./src";
diff --git a/app/client/packages/design-system/widgets/src/components/Sheet/src/Sheet.tsx b/app/client/packages/design-system/widgets/src/components/Sheet/src/Sheet.tsx
new file mode 100644
index 000000000000..3b5261f223a8
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sheet/src/Sheet.tsx
@@ -0,0 +1,62 @@
+import clsx from "clsx";
+import React, { forwardRef, type Ref, useRef } from "react";
+import {
+  Modal as HeadlessModal,
+  Dialog as HeadlessDialog,
+  ModalOverlay as HeadlessModalOverlay,
+} from "react-aria-components";
+import { CSSTransition } from "react-transition-group";
+
+import styles from "./styles.module.css";
+import type { SheetProps } from "./types";
+
+export function _Sheet(props: SheetProps, ref: Ref<HTMLDivElement>) {
+  const {
+    children,
+    className,
+    isOpen,
+    onEntered,
+    onExited,
+    onOpenChange,
+    position = "start",
+    ...rest
+  } = props;
+  const root = document.body.querySelector(
+    "[data-theme-provider]",
+  ) as HTMLButtonElement;
+
+  const overlayRef = useRef<HTMLDivElement>();
+
+  return (
+    <CSSTransition
+      in={isOpen}
+      nodeRef={overlayRef}
+      onEntered={onEntered}
+      onExited={onExited}
+      timeout={300}
+      unmountOnExit
+    >
+      <HeadlessModalOverlay
+        UNSTABLE_portalContainer={root}
+        className={clsx(styles.overlay, className)}
+        isDismissable
+        isOpen={isOpen}
+        onOpenChange={onOpenChange}
+        // @ts-expect-error TS is unable to infer the correct type for the render prop
+        ref={overlayRef}
+      >
+        <HeadlessModal
+          className={clsx(styles.sheet, styles[position])}
+          ref={ref}
+          {...rest}
+        >
+          <HeadlessDialog aria-label="Sheet" className={styles.dialog}>
+            {children}
+          </HeadlessDialog>
+        </HeadlessModal>
+      </HeadlessModalOverlay>
+    </CSSTransition>
+  );
+}
+
+export const Sheet = forwardRef(_Sheet);
diff --git a/app/client/packages/design-system/widgets/src/components/Sheet/src/index.ts b/app/client/packages/design-system/widgets/src/components/Sheet/src/index.ts
new file mode 100644
index 000000000000..c415d8b0d501
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sheet/src/index.ts
@@ -0,0 +1,2 @@
+export { Sheet } from "./Sheet";
+export { DialogTrigger as SheetTrigger } from "react-aria-components";
diff --git a/app/client/packages/design-system/widgets/src/components/Sheet/src/styles.module.css b/app/client/packages/design-system/widgets/src/components/Sheet/src/styles.module.css
new file mode 100644
index 000000000000..27dfe571139d
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sheet/src/styles.module.css
@@ -0,0 +1,117 @@
+.sheet {
+  position: fixed;
+  background: var(--color-bg-elevation-3);
+  width: 80%;
+}
+
+.overlay {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: var(--color-bg-neutral-opacity);
+  z-index: var(--z-index-99);
+  contain: strict;
+  position: fixed;
+  top: 0;
+  left: 0;
+  height: 100%;
+  width: 100%;
+}
+
+.dialog {
+  height: 100%;
+}
+
+.overlay[data-entering] {
+  animation: fade-in 0.3s ease-in-out;
+}
+
+.overlay[data-exiting] {
+  animation: fade-out 0.3s ease-in-out;
+}
+
+@keyframes fade-in {
+  from {
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
+}
+
+@keyframes fade-out {
+  from {
+    opacity: 1;
+  }
+  to {
+    opacity: 0;
+  }
+}
+
+.start {
+  top: 0;
+  left: 0;
+  bottom: 0;
+  max-width: 90%;
+  height: 100%;
+}
+
+.start[data-entering] {
+  animation: slide-in-start 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+}
+
+.start[data-exiting] {
+  animation: slide-out-start 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+}
+
+.end {
+  top: 0;
+  right: 0;
+  bottom: 0;
+  max-width: 90%;
+  height: 100%;
+}
+
+.end[data-entering] {
+  animation: slide-in-end 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+}
+
+.end[data-exiting] {
+  animation: slide-out-end 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+}
+
+@keyframes slide-in-start {
+  from {
+    transform: translateX(-100%);
+  }
+  to {
+    transform: translateX(0);
+  }
+}
+
+@keyframes slide-out-start {
+  from {
+    transform: translateX(0);
+  }
+  to {
+    transform: translateX(-100%);
+  }
+}
+
+@keyframes slide-in-end {
+  from {
+    transform: translateX(100%);
+  }
+  to {
+    transform: translateX(0);
+  }
+}
+
+@keyframes slide-out-end {
+  from {
+    transform: translateX(0);
+  }
+  to {
+    transform: translateX(100%);
+  }
+}
diff --git a/app/client/packages/design-system/widgets/src/components/Sheet/src/types.ts b/app/client/packages/design-system/widgets/src/components/Sheet/src/types.ts
new file mode 100644
index 000000000000..d66e9d5a8906
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sheet/src/types.ts
@@ -0,0 +1,12 @@
+import type { ModalOverlayProps as HeadlessModalOverlayProps } from "react-aria-components";
+
+export interface SheetProps
+  extends Omit<HeadlessModalOverlayProps, "position"> {
+  /**
+   * The position from which the sheet slides in
+   * @default 'start'
+   */
+  position?: "start" | "end";
+  onEntered?: () => void;
+  onExited?: () => void;
+}
diff --git a/app/client/packages/design-system/widgets/src/components/Sheet/stories/Sheet.stories.tsx b/app/client/packages/design-system/widgets/src/components/Sheet/stories/Sheet.stories.tsx
new file mode 100644
index 000000000000..ab336257e155
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sheet/stories/Sheet.stories.tsx
@@ -0,0 +1,27 @@
+import React from "react";
+import type { Meta, StoryObj } from "@storybook/react";
+import { Sheet } from "../index";
+import { SimpleSheet } from "./SimpleSheet";
+
+const meta: Meta<typeof Sheet> = {
+  title: "WDS/Widgets/Sheet",
+  component: Sheet,
+  render: (args) => <SimpleSheet {...args} />,
+};
+
+export default meta;
+type Story = StoryObj<typeof Sheet>;
+
+// Default story with left position (start)
+export const Default: Story = {
+  args: {
+    position: "start",
+  },
+};
+
+// Right position (end)
+export const RightPositioned: Story = {
+  args: {
+    position: "end",
+  },
+};
diff --git a/app/client/packages/design-system/widgets/src/components/Sheet/stories/SimpleSheet.tsx b/app/client/packages/design-system/widgets/src/components/Sheet/stories/SimpleSheet.tsx
new file mode 100644
index 000000000000..200e37d00841
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sheet/stories/SimpleSheet.tsx
@@ -0,0 +1,20 @@
+import React, { useState } from "react";
+import { Button } from "../../Button";
+import { Sheet } from "../index";
+import type { SheetProps } from "../src/types";
+
+export const SimpleSheet = (props: Omit<SheetProps, "children">) => {
+  const [isOpen, setIsOpen] = useState(props.isOpen);
+
+  return (
+    <>
+      <Button onPress={() => setIsOpen(!Boolean(isOpen))}>Sheet trigger</Button>
+      <Sheet {...props} isOpen={isOpen} onOpenChange={setIsOpen}>
+        <div style={{ padding: "1rem" } as React.CSSProperties}>
+          <h3>Sheet Content</h3>
+          <p>This is an example of sheet content.</p>
+        </div>
+      </Sheet>
+    </>
+  );
+};
diff --git a/app/client/packages/design-system/widgets/src/components/Sidebar/index.ts b/app/client/packages/design-system/widgets/src/components/Sidebar/index.ts
new file mode 100644
index 000000000000..3bd16e178a03
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sidebar/index.ts
@@ -0,0 +1 @@
+export * from "./src";
diff --git a/app/client/packages/design-system/widgets/src/components/Sidebar/src/Sidebar.tsx b/app/client/packages/design-system/widgets/src/components/Sidebar/src/Sidebar.tsx
new file mode 100644
index 000000000000..c8b231cef3cb
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sidebar/src/Sidebar.tsx
@@ -0,0 +1,72 @@
+import clsx from "clsx";
+import * as React from "react";
+import { type Ref, useRef } from "react";
+import { Sheet } from "../../Sheet";
+import { useSidebar } from "./use-sidebar";
+import styles from "./styles.module.css";
+import type { SidebarProps } from "./types";
+import { CSSTransition } from "react-transition-group";
+
+const _Sidebar = (props: SidebarProps, ref: Ref<HTMLDivElement>) => {
+  const {
+    children,
+    className,
+    collapsible = "offcanvas",
+    onEntered,
+    onExited,
+    side = "start",
+    variant = "sidebar",
+    ...rest
+  } = props;
+  const { isMobile, setOpen, state } = useSidebar();
+  const sidebarRef = useRef<HTMLDivElement>();
+
+  if (collapsible === "none") {
+    return (
+      <div className={clsx(className)} ref={ref} {...props}>
+        {children}
+      </div>
+    );
+  }
+
+  if (Boolean(isMobile)) {
+    return (
+      <Sheet
+        isOpen={state === "expanded"}
+        onEntered={onEntered}
+        onExited={onExited}
+        onOpenChange={setOpen}
+        position={side}
+      >
+        {children}
+      </Sheet>
+    );
+  }
+
+  return (
+    <CSSTransition
+      in={state === "expanded"}
+      nodeRef={sidebarRef}
+      onEntered={onEntered}
+      onExited={onExited}
+      timeout={300}
+    >
+      <div
+        className={clsx(styles.mainSidebar)}
+        data-collapsible={state === "collapsed" ? collapsible : ""}
+        data-side={side}
+        data-state={state}
+        data-variant={variant}
+        // @ts-expect-error TS is unable to infer the correct type for the render prop
+        ref={sidebarRef}
+      >
+        <div className={styles.fakeSidebar} />
+        <div className={clsx(styles.sidebar, className)} ref={ref} {...rest}>
+          <div className={styles.sidebarContainer}>{children}</div>
+        </div>
+      </div>
+    </CSSTransition>
+  );
+};
+
+export const Sidebar = React.forwardRef(_Sidebar);
diff --git a/app/client/packages/design-system/widgets/src/components/Sidebar/src/SidebarContent.tsx b/app/client/packages/design-system/widgets/src/components/Sidebar/src/SidebarContent.tsx
new file mode 100644
index 000000000000..bb90417a91b1
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sidebar/src/SidebarContent.tsx
@@ -0,0 +1,22 @@
+import clsx from "clsx";
+import React, { type ComponentProps, type Ref } from "react";
+
+import styles from "./styles.module.css";
+
+const _SidebarContent = (
+  props: ComponentProps<"div">,
+  ref: Ref<HTMLDivElement>,
+) => {
+  const { className, ...rest } = props;
+
+  return (
+    <div
+      className={clsx(styles.sidebarContent, className)}
+      data-sidebar="content"
+      ref={ref}
+      {...rest}
+    />
+  );
+};
+
+export const SidebarContent = React.forwardRef(_SidebarContent);
diff --git a/app/client/packages/design-system/widgets/src/components/Sidebar/src/SidebarInset.tsx b/app/client/packages/design-system/widgets/src/components/Sidebar/src/SidebarInset.tsx
new file mode 100644
index 000000000000..f6c3a1d0bc57
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sidebar/src/SidebarInset.tsx
@@ -0,0 +1,22 @@
+import clsx from "clsx";
+import * as React from "react";
+import type { ComponentProps, Ref } from "react";
+
+import styles from "./styles.module.css";
+
+export const _SidebarInset = (
+  props: ComponentProps<"main">,
+  ref: Ref<HTMLDivElement>,
+) => {
+  const { className, ...rest } = props;
+
+  return (
+    <main
+      className={clsx(styles.sidebarInset, className)}
+      ref={ref}
+      {...rest}
+    />
+  );
+};
+
+export const SidebarInset = React.forwardRef(_SidebarInset);
diff --git a/app/client/packages/design-system/widgets/src/components/Sidebar/src/SidebarProvider.tsx b/app/client/packages/design-system/widgets/src/components/Sidebar/src/SidebarProvider.tsx
new file mode 100644
index 000000000000..35d688f23837
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sidebar/src/SidebarProvider.tsx
@@ -0,0 +1,96 @@
+import clsx from "clsx";
+import React, { type Ref, useCallback, useState } from "react";
+
+import styles from "./styles.module.css";
+import { SidebarContext } from "./context";
+import { useIsMobile } from "./use-mobile";
+import { SIDEBAR_CONSTANTS } from "./constants";
+import type { SidebarContextType, SidebarProviderProps } from "./types";
+
+export const _SidebarProvider = (
+  props: SidebarProviderProps,
+  ref: Ref<HTMLDivElement>,
+) => {
+  const {
+    children,
+    className,
+    defaultOpen = true,
+    isOpen: openProp,
+    onOpen: setOpenProp,
+    style,
+    ...rest
+  } = props;
+  const isMobile = useIsMobile();
+
+  const [_open, _setOpen] = useState(defaultOpen);
+  const open = openProp ?? _open;
+  const setOpen = useCallback(
+    (value: boolean | ((value: boolean) => boolean)) => {
+      const openState = typeof value === "function" ? value(open) : value;
+
+      if (setOpenProp) {
+        setOpenProp(openState);
+      } else {
+        _setOpen(openState);
+      }
+    },
+    [setOpenProp, open],
+  );
+
+  const toggleSidebar = React.useCallback(() => {
+    return isMobile ? setOpen((open) => !open) : setOpen((open) => !open);
+  }, [isMobile, setOpen]);
+
+  React.useEffect(
+    function handleKeyboardShortcuts() {
+      const handleKeyDown = (event: KeyboardEvent) => {
+        if (
+          event.key === SIDEBAR_CONSTANTS.KEYBOARD_SHORTCUT &&
+          (event.metaKey || event.ctrlKey)
+        ) {
+          event.preventDefault();
+          toggleSidebar();
+        }
+      };
+
+      window.addEventListener("keydown", handleKeyDown);
+
+      return () => window.removeEventListener("keydown", handleKeyDown);
+    },
+    [toggleSidebar, isMobile],
+  );
+
+  const state = open ? "expanded" : "collapsed";
+
+  const contextValue = React.useMemo<SidebarContextType>(
+    () => ({
+      state,
+      open,
+      setOpen,
+      isMobile,
+      toggleSidebar,
+    }),
+    [state, open, setOpen, isMobile, toggleSidebar],
+  );
+
+  return (
+    <SidebarContext.Provider value={contextValue}>
+      <div
+        className={clsx(styles.sidebarWrapper, className)}
+        ref={ref}
+        style={
+          {
+            "--sidebar-width": SIDEBAR_CONSTANTS.WIDTH.DESKTOP,
+            "--sidebar-width-icon": SIDEBAR_CONSTANTS.WIDTH.ICON,
+            ...style,
+          } as React.CSSProperties
+        }
+        {...rest}
+      >
+        {children}
+      </div>
+    </SidebarContext.Provider>
+  );
+};
+
+export const SidebarProvider = React.forwardRef(_SidebarProvider);
diff --git a/app/client/packages/design-system/widgets/src/components/Sidebar/src/SidebarTrigger.tsx b/app/client/packages/design-system/widgets/src/components/Sidebar/src/SidebarTrigger.tsx
new file mode 100644
index 000000000000..4649d3ae877c
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sidebar/src/SidebarTrigger.tsx
@@ -0,0 +1,29 @@
+import * as React from "react";
+import { Button } from "@appsmith/wds";
+
+import { useSidebar } from "./use-sidebar";
+
+interface SidebarTriggerProps {
+  onPress?: () => void;
+}
+
+export const SidebarTrigger = (props: SidebarTriggerProps) => {
+  const { onPress } = props;
+  const { state, toggleSidebar } = useSidebar();
+
+  return (
+    <Button
+      color="neutral"
+      icon={
+        state === "expanded"
+          ? "layout-sidebar-right-collapse"
+          : "layout-sidebar-left-collapse"
+      }
+      onPress={() => {
+        onPress?.();
+        toggleSidebar();
+      }}
+      variant="ghost"
+    />
+  );
+};
diff --git a/app/client/packages/design-system/widgets/src/components/Sidebar/src/constants.ts b/app/client/packages/design-system/widgets/src/components/Sidebar/src/constants.ts
new file mode 100644
index 000000000000..9633b7ebf41a
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sidebar/src/constants.ts
@@ -0,0 +1,8 @@
+export const SIDEBAR_CONSTANTS = {
+  WIDTH: {
+    DESKTOP: "16rem",
+    ICON: "var(--sizing-14)",
+  },
+  KEYBOARD_SHORTCUT: "b",
+  MOBILE_BREAKPOINT: 768,
+} as const;
diff --git a/app/client/packages/design-system/widgets/src/components/Sidebar/src/context.tsx b/app/client/packages/design-system/widgets/src/components/Sidebar/src/context.tsx
new file mode 100644
index 000000000000..aba1700f141e
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sidebar/src/context.tsx
@@ -0,0 +1,6 @@
+import * as React from "react";
+import type { SidebarContextType } from "./types";
+
+export const SidebarContext = React.createContext<SidebarContextType | null>(
+  null,
+);
diff --git a/app/client/packages/design-system/widgets/src/components/Sidebar/src/index.ts b/app/client/packages/design-system/widgets/src/components/Sidebar/src/index.ts
new file mode 100644
index 000000000000..7a7b66a4ebe1
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sidebar/src/index.ts
@@ -0,0 +1,9 @@
+export { Sidebar } from "./Sidebar";
+export { SidebarProvider } from "./SidebarProvider";
+export { SidebarInset } from "./SidebarInset";
+export { SidebarTrigger } from "./SidebarTrigger";
+export { SidebarContent } from "./SidebarContent";
+export { useSidebar } from "./use-sidebar";
+export { useIsMobile } from "./use-mobile";
+
+export type * from "./types";
diff --git a/app/client/packages/design-system/widgets/src/components/Sidebar/src/styles.module.css b/app/client/packages/design-system/widgets/src/components/Sidebar/src/styles.module.css
new file mode 100644
index 000000000000..e3fe71fce134
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sidebar/src/styles.module.css
@@ -0,0 +1,203 @@
+.sidebarWrapper {
+  display: flex;
+  min-height: 100%;
+  width: 100%;
+  position: relative;
+  contain: strict;
+  container-type: inline-size;
+}
+
+/**
+ *-----------------------------------------------------
+ * MAIN SIDEBAR
+ *-----------------------------------------------------
+ */
+.mainSidebar {
+  display: none;
+  color: var(--color-fg);
+}
+
+@container (min-width: 768px) {
+  .mainSidebar {
+    display: block;
+  }
+}
+
+.mainSidebar[data-collapsible="icon"] {
+  overflow: hidden;
+}
+
+/**
+ *-----------------------------------------------------
+ * FAKE SIDEBAR
+ *-----------------------------------------------------
+ */
+.fakeSidebar {
+  position: relative;
+  height: 100%;
+  width: var(--sidebar-width);
+  background-color: transparent;
+  transition: width 300ms linear;
+}
+
+.mainSidebar[data-side="right"] .fakeSidebar {
+  transform: rotate(180deg);
+}
+
+/* Handle collapsible states for fakeSidebar */
+[data-collapsible="offcanvas"] .fakeSidebar {
+  width: 0;
+}
+
+[data-side="right"] .fakeSidebar {
+  transform: rotate(180deg);
+}
+
+[data-collapsible="icon"] .fakeSidebar {
+  width: var(--sidebar-width-icon);
+}
+
+.mainSidebar[data-variant="floating"][data-collapsible="icon"] .fakeSidebar,
+.mainSidebar[data-variant="inset"][data-collapsible="icon"] .fakeSidebar {
+  width: calc(var(--sidebar-width-icon) + var(--inner-spacing-2));
+}
+
+/**
+ *-----------------------------------------------------
+ * SIDEBAR
+ *-----------------------------------------------------
+ */
+.sidebar {
+  position: fixed;
+  top: 0;
+  bottom: 0;
+  z-index: 10;
+  display: none;
+  height: 100%;
+  width: var(--sidebar-width);
+  transition:
+    left 300ms linear,
+    right 300ms linear,
+    width 300ms linear;
+}
+
+@container (min-width: 768px) {
+  .sidebar {
+    display: flex;
+  }
+}
+
+.mainSidebar[data-side="start"] .sidebar {
+  left: 0;
+}
+
+.mainSidebar[data-side="end"] .sidebar {
+  right: 0;
+}
+
+.mainSidebar[data-collapsible="offcanvas"][data-side="start"] .sidebar {
+  left: calc(var(--sidebar-width) * -1);
+}
+
+.mainSidebar[data-collapsible="offcanvas"][data-side="end"] .sidebar {
+  right: calc(var(--sidebar-width) * -1);
+}
+
+.mainSidebar[data-variant="floating"] .sidebar,
+.mainSidebar[data-variant="inset"] .sidebar {
+  padding: var(--inner-spacing-2);
+}
+
+.mainSidebar[data-collapsible="icon"] .sidebar {
+  width: calc(var(--sidebar-width-icon));
+}
+
+.mainSidebar[data-variant="floating"][data-collapsible="icon"] .sidebar,
+.mainSidebar[data-variant="inset"][data-collapsible="icon"] .sidebar {
+  width: calc(var(--sidebar-width-icon) + var(--inner-spacing-2) + 2px);
+}
+
+.mainSidebar[data-side="start"]:not([data-variant="floating"]):not(
+    [data-variant="inset"]
+  )
+  .sidebar {
+  border-inline-end: var(--border-width-1) solid var(--color-bd-elevation-1);
+}
+
+.mainSidebar[data-side="end"]:not([data-variant="floating"]):not(
+    [data-variant="inset"]
+  )
+  .sidebar {
+  border-inline-start: var(--border-width-1) solid var(--color-bd-elevation-1);
+}
+
+/**
+ *-----------------------------------------------------
+ * SIDEBAR CONTAINER
+ *-----------------------------------------------------
+ */
+.sidebarContainer {
+  display: flex;
+  height: 100%;
+  width: 100%;
+  flex-direction: column;
+}
+
+[data-side="end"] .sidebarContainer {
+  border-inline-start: var(--border-width-1) solid var(--color-bd-subtle);
+}
+
+[data-side="start"] .sidebarContainer {
+  border-inline-end: var(--border-width-1) solid var(--color-bd-subtle);
+}
+
+.mainSidebar[data-variant="floating"] .sidebarContainer {
+  border-radius: var(--border-radius-elevation-3);
+  border: var(--border-width-1) solid var(--color-bd);
+  box-shadow: var(--box-shadow-1);
+}
+
+/**
+ *-----------------------------------------------------
+ * SIDEBAR CONTENT
+ *-----------------------------------------------------
+ */
+.sidebarContent {
+  height: 100%;
+}
+
+/**
+ *-----------------------------------------------------
+ * SIDEBAR INSET
+ *-----------------------------------------------------
+ */
+.sidebarInset {
+  position: relative;
+  display: flex;
+  min-height: 100%;
+  flex: 1;
+  flex-direction: column;
+  background-color: var(--background);
+}
+
+[data-variant="inset"] ~ .sidebarInset {
+  min-height: calc(100% - var(--inner-spacing-2) * 2);
+}
+
+@container (min-width: 768px) {
+  [data-variant="inset"] ~ .sidebarInset {
+    margin: var(--inner-spacing-2);
+    border-radius: var(--border-radius-elevation-3);
+    box-shadow: var(--box-shadow-1);
+    border: var(--border-width-1) solid var(--color-bd);
+  }
+
+  /* Handle margin when sidebar is collapsed */
+  [data-state="collapsed"][data-variant="inset"] ~ .sidebarInset {
+    margin-left: var(--inner-spacing-2);
+  }
+
+  [data-variant="inset"] ~ .sidebarInset {
+    margin-left: 0;
+  }
+}
diff --git a/app/client/packages/design-system/widgets/src/components/Sidebar/src/types.ts b/app/client/packages/design-system/widgets/src/components/Sidebar/src/types.ts
new file mode 100644
index 000000000000..1d4e130126e5
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sidebar/src/types.ts
@@ -0,0 +1,28 @@
+import type { ReactNode } from "react";
+
+export interface SidebarContextType {
+  state: "expanded" | "collapsed";
+  open: boolean;
+  setOpen: (open: boolean) => void;
+  isMobile: boolean;
+  toggleSidebar: () => void;
+}
+
+export interface SidebarProviderProps {
+  defaultOpen?: boolean;
+  isOpen?: boolean;
+  onOpen?: (open: boolean) => void;
+  children: ReactNode;
+  className?: string;
+  style?: React.CSSProperties;
+}
+
+export interface SidebarProps {
+  side?: "start" | "end";
+  variant?: "sidebar" | "floating" | "inset";
+  collapsible?: "offcanvas" | "icon" | "none";
+  onEntered?: () => void;
+  onExited?: () => void;
+  children: ReactNode;
+  className?: string;
+}
diff --git a/app/client/packages/design-system/widgets/src/components/Sidebar/src/use-mobile.tsx b/app/client/packages/design-system/widgets/src/components/Sidebar/src/use-mobile.tsx
new file mode 100644
index 000000000000..067e22a5cd49
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sidebar/src/use-mobile.tsx
@@ -0,0 +1,27 @@
+import { useEffect, useState } from "react";
+
+import { SIDEBAR_CONSTANTS } from "./constants";
+
+export function useIsMobile() {
+  const [isMobile, setIsMobile] = useState<boolean | undefined>(undefined);
+
+  useEffect(() => {
+    const root = document.body.querySelector(
+      "[data-theme-provider]",
+    ) as HTMLButtonElement;
+
+    if (!Boolean(root)) return;
+
+    const resizeObserver = new ResizeObserver(([entry]) => {
+      setIsMobile(
+        entry.contentRect.width < SIDEBAR_CONSTANTS.MOBILE_BREAKPOINT,
+      );
+    });
+
+    resizeObserver.observe(root);
+
+    return () => resizeObserver.disconnect();
+  }, [isMobile]);
+
+  return Boolean(isMobile);
+}
diff --git a/app/client/packages/design-system/widgets/src/components/Sidebar/src/use-sidebar.ts b/app/client/packages/design-system/widgets/src/components/Sidebar/src/use-sidebar.ts
new file mode 100644
index 000000000000..6cb583ef3ef8
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sidebar/src/use-sidebar.ts
@@ -0,0 +1,12 @@
+import * as React from "react";
+import { SidebarContext } from "./context";
+
+export function useSidebar() {
+  const context = React.useContext(SidebarContext);
+
+  if (!context) {
+    throw new Error("useSidebar must be used within a SidebarProvider.");
+  }
+
+  return context;
+}
diff --git a/app/client/packages/design-system/widgets/src/components/Sidebar/stories/Sidebar.stories.tsx b/app/client/packages/design-system/widgets/src/components/Sidebar/stories/Sidebar.stories.tsx
new file mode 100644
index 000000000000..0aa33cfc529e
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sidebar/stories/Sidebar.stories.tsx
@@ -0,0 +1,125 @@
+import React from "react";
+import type { Meta, StoryObj } from "@storybook/react";
+import {
+  Sidebar,
+  SidebarContent,
+  SidebarTrigger,
+  SidebarProvider,
+  SidebarInset,
+} from "../src/index";
+import { Flex } from "../../Flex";
+import { Text, Icon } from "@appsmith/wds";
+
+const meta: Meta<typeof Sidebar> = {
+  component: Sidebar,
+  title: "WDS/Widgets/Sidebar",
+  parameters: {
+    layout: "fullscreen",
+    docs: {
+      description: {
+        component:
+          "A responsive sidebar component that supports different positions, variants, and collapse behaviors.",
+      },
+    },
+  },
+  args: {
+    side: "start",
+    variant: "sidebar",
+  },
+  render: (args) => (
+    <SidebarProvider
+      style={{
+        height: "50vh",
+        border: "1px solid var(--color-bd-elevation-1)",
+      }}
+    >
+      <Sidebar {...args}>
+        <SidebarContent>
+          <DemoContent />
+        </SidebarContent>
+      </Sidebar>
+      <Flex alignItems="start" margin="spacing-4" width="100%">
+        <SidebarTrigger />
+      </Flex>
+    </SidebarProvider>
+  ),
+};
+
+export default meta;
+type Story = StoryObj<typeof Sidebar>;
+
+const DemoContent = () => (
+  <Flex direction="column" gap="spacing-2" padding="spacing-4">
+    <Text color="neutral-subtle" size="caption">
+      Applications
+    </Text>
+    <Flex direction="column" gap="spacing-3" marginTop="spacing-2">
+      <Flex alignItems="center" gap="spacing-2">
+        <Icon name="home" />
+        <Text size="body">Home</Text>
+      </Flex>
+      <Flex alignItems="center" gap="spacing-2">
+        <Icon name="inbox" />
+        <Text size="body">Inbox</Text>
+      </Flex>
+      <Flex alignItems="center" gap="spacing-2">
+        <Icon name="calendar" />
+        <Text size="body">Calendar</Text>
+      </Flex>
+    </Flex>
+  </Flex>
+);
+
+export const Default: Story = {
+  args: {},
+};
+
+export const SideRight: Story = {
+  args: {
+    side: "end",
+  },
+  render: (args) => (
+    <SidebarProvider
+      style={{
+        height: "50vh",
+        border: "1px solid var(--color-bd-elevation-1)",
+      }}
+    >
+      <Flex alignItems="start" margin="spacing-4" width="100%">
+        <SidebarTrigger />
+      </Flex>
+      <Sidebar {...args}>
+        <DemoContent />
+      </Sidebar>
+    </SidebarProvider>
+  ),
+};
+
+export const VariantFloating: Story = {
+  args: {
+    variant: "floating",
+  },
+};
+
+export const VariantInset: Story = {
+  args: {
+    variant: "inset",
+  },
+  render: (args) => (
+    <SidebarProvider
+      style={{
+        height: "50vh",
+        border: "1px solid var(--color-bd-elevation-1)",
+      }}
+    >
+      <Sidebar {...args}>
+        <DemoContent />
+      </Sidebar>
+      <SidebarInset>
+        <Flex alignItems="start" margin="spacing-4" width="100%">
+          <SidebarTrigger />
+        </Flex>
+      </SidebarInset>
+    </SidebarProvider>
+  ),
+};
diff --git a/app/client/packages/design-system/widgets/src/components/Switch/src/Switch.tsx b/app/client/packages/design-system/widgets/src/components/Switch/src/Switch.tsx
index 01dbe68a08ad..eff8e5859c22 100644
--- a/app/client/packages/design-system/widgets/src/components/Switch/src/Switch.tsx
+++ b/app/client/packages/design-system/widgets/src/components/Switch/src/Switch.tsx
@@ -1,8 +1,9 @@
-import React, { forwardRef } from "react";
 import { Text } from "@appsmith/wds";
+import React, { forwardRef } from "react";
+import type { ForwardedRef } from "react";
 import { Checkbox as HeadlessCheckbox } from "react-aria-components";
+
 import styles from "./styles.module.css";
-import type { ForwardedRef } from "react";
 import type { SwitchProps } from "./types";
 
 const _Switch = (props: SwitchProps, ref: ForwardedRef<HTMLLabelElement>) => {
diff --git a/app/client/packages/design-system/widgets/src/components/TagGroup/src/TagGroup.tsx b/app/client/packages/design-system/widgets/src/components/TagGroup/src/TagGroup.tsx
index 3d113108d59f..f4d995ddfb88 100644
--- a/app/client/packages/design-system/widgets/src/components/TagGroup/src/TagGroup.tsx
+++ b/app/client/packages/design-system/widgets/src/components/TagGroup/src/TagGroup.tsx
@@ -18,20 +18,12 @@ export interface TagGroupProps<T>
   extends Omit<HeadlessTagGroupProps, "children">,
     Pick<HeadlessTagListProps<T>, "items" | "children" | "renderEmptyState"> {
   label?: string;
-  description?: string;
   errorMessage?: string;
 }
 
 function TagGroup<T extends object>(props: TagGroupProps<T>) {
-  const {
-    children,
-    description,
-    errorMessage,
-    items,
-    label,
-    renderEmptyState,
-    ...rest
-  } = props;
+  const { children, errorMessage, items, label, renderEmptyState, ...rest } =
+    props;
 
   return (
     <HeadlessTagGroup {...rest} className={styles["tag-group"]}>
@@ -43,14 +35,6 @@ function TagGroup<T extends object>(props: TagGroupProps<T>) {
       >
         {children}
       </HeadlessTagList>
-      {Boolean(description) && (
-        <HeadlessText
-          className={getTypographyClassName("footnote")}
-          slot="description"
-        >
-          {description}
-        </HeadlessText>
-      )}
       {Boolean(errorMessage) && (
         <HeadlessText
           className={getTypographyClassName("footnote")}
diff --git a/app/client/packages/design-system/widgets/src/components/TagGroup/stories/TagGroup.stories.tsx b/app/client/packages/design-system/widgets/src/components/TagGroup/stories/TagGroup.stories.tsx
index 294d9e43cd81..2325e2b81e27 100644
--- a/app/client/packages/design-system/widgets/src/components/TagGroup/stories/TagGroup.stories.tsx
+++ b/app/client/packages/design-system/widgets/src/components/TagGroup/stories/TagGroup.stories.tsx
@@ -85,15 +85,6 @@ export const WithLabel: Story = {
   render: (args) => <TagGroupExample {...args} />,
 };
 
-export const WithDescription: Story = {
-  args: {
-    label: "Categories",
-    description: "Select one or more categories.",
-    selectionMode: "multiple",
-  },
-  render: (args) => <TagGroupExample {...args} />,
-};
-
 export const WithError: Story = {
   args: {
     label: "Categories",
diff --git a/app/client/packages/design-system/widgets/src/components/Text/src/Text.tsx b/app/client/packages/design-system/widgets/src/components/Text/src/Text.tsx
index 03ebdd7d710d..b3366bf915bc 100644
--- a/app/client/packages/design-system/widgets/src/components/Text/src/Text.tsx
+++ b/app/client/packages/design-system/widgets/src/components/Text/src/Text.tsx
@@ -9,7 +9,7 @@ import React, { forwardRef } from "react";
 import type { TextProps } from "./types";
 import styles from "./styles.module.css";
 
-const _Text = (props: TextProps, ref: Ref<HTMLParagraphElement>) => {
+const _Text = (props: TextProps, ref: Ref<HTMLDivElement>) => {
   const {
     children,
     className,
diff --git a/app/client/packages/design-system/widgets/src/components/Text/src/styles.module.css b/app/client/packages/design-system/widgets/src/components/Text/src/styles.module.css
index a6dae07300dd..ca3d6294f792 100644
--- a/app/client/packages/design-system/widgets/src/components/Text/src/styles.module.css
+++ b/app/client/packages/design-system/widgets/src/components/Text/src/styles.module.css
@@ -10,6 +10,11 @@
       color: var(--color-fg-$(color));
     }
   }
+
+  /* Adding as special case as we can't add neutral-subtle to $colors variable, as that variable is used generically for many components ( button ). */
+  &[data-color="neutral-subtle"] {
+    color: var(--color-fg-neutral-subtle);
+  }
 }
 
 .clampedText {
diff --git a/app/client/packages/design-system/widgets/src/components/Text/src/types.ts b/app/client/packages/design-system/widgets/src/components/Text/src/types.ts
index c2aa405326ca..66a4a4c5d5d4 100644
--- a/app/client/packages/design-system/widgets/src/components/Text/src/types.ts
+++ b/app/client/packages/design-system/widgets/src/components/Text/src/types.ts
@@ -13,7 +13,7 @@ export interface TextProps {
   /** Color of the text
    * @default inherit
    */
-  color?: keyof typeof COLORS;
+  color?: keyof typeof COLORS | "neutral-subtle";
   /** Sets the weight (or boldness) of the font
    * @default false
    */
diff --git a/app/client/packages/design-system/widgets/src/components/TextArea/src/TextArea.tsx b/app/client/packages/design-system/widgets/src/components/TextArea/src/TextArea.tsx
index 6f7715118b78..ea5a5e36a6f9 100644
--- a/app/client/packages/design-system/widgets/src/components/TextArea/src/TextArea.tsx
+++ b/app/client/packages/design-system/widgets/src/components/TextArea/src/TextArea.tsx
@@ -1,53 +1,110 @@
 import clsx from "clsx";
-import React, { forwardRef } from "react";
-import type {
-  TextAreaRef as HeadlessTextAreaRef,
-  TextAreaProps as HeadlessTextAreaProps,
-} from "@appsmith/wds-headless";
-import { TextArea as HeadlessTextArea } from "@appsmith/wds-headless";
-
-import textAreaStyles from "./styles.module.css";
-import { textInputStyles, fieldStyles } from "../../../styles";
-import { ContextualHelp } from "../../ContextualHelp";
-import { getTypographyClassName } from "@appsmith/wds-theming";
-
-export interface TextAreaProps extends HeadlessTextAreaProps {
-  /** loading state for the input */
-  isLoading?: boolean;
-}
+import {
+  FieldError,
+  FieldLabel,
+  inputFieldStyles,
+  TextAreaInput,
+} from "@appsmith/wds";
+import React, { useCallback, useRef } from "react";
+import { useControlledState } from "@react-stately/utils";
+import { chain, useLayoutEffect } from "@react-aria/utils";
+import { TextField as HeadlessTextField } from "react-aria-components";
+
+import type { TextAreaProps } from "./types";
 
-const _TextArea = (props: TextAreaProps, ref: HeadlessTextAreaRef) => {
+export function TextArea(props: TextAreaProps) {
   const {
-    contextualHelp: contextualHelpProp,
-    description,
+    contextualHelp,
     errorMessage,
+    isDisabled,
+    isInvalid,
+    isLoading,
+    isReadOnly,
     isRequired,
     label,
+    onChange,
+    suffix,
+    value,
     ...rest
   } = props;
-
-  const contextualHelp = Boolean(contextualHelpProp) && (
-    <ContextualHelp contextualHelp={contextualHelpProp} />
+  const inputRef = useRef<HTMLTextAreaElement>(null);
+  const [inputValue, setInputValue] = useControlledState(
+    props.value,
+    props.defaultValue ?? "",
+    () => {
+      //
+    },
   );
 
+  const onHeightChange = useCallback(() => {
+    // Quiet textareas always grow based on their text content.
+    // Standard textareas also grow by default, unless an explicit height is set.
+    if (props.height == null && inputRef.current) {
+      const input = inputRef.current;
+      const prevAlignment = input.style.alignSelf;
+      const prevOverflow = input.style.overflow;
+      // Firefox scroll position is lost when overflow: 'hidden' is applied so we skip applying it.
+      // The measure/applied height is also incorrect/reset if we turn on and off
+      // overflow: hidden in Firefox https://bugzilla.mozilla.org/show_bug.cgi?id=1787062
+      const isFirefox = "MozAppearance" in input.style;
+
+      if (!isFirefox) {
+        input.style.overflow = "hidden";
+      }
+
+      input.style.alignSelf = "start";
+      input.style.height = "auto";
+
+      const computedStyle = getComputedStyle(input);
+      const paddingTop = parseFloat(computedStyle.paddingTop);
+      const paddingBottom = parseFloat(computedStyle.paddingBottom);
+
+      input.style.height = `${
+        // subtract comptued padding and border to get the actual content height
+        input.scrollHeight -
+        paddingTop -
+        paddingBottom +
+        // Also, adding 1px to fix a bug in browser where there is a scrolllbar on certain heights
+        1
+      }px`;
+      input.style.overflow = prevOverflow;
+      input.style.alignSelf = prevAlignment;
+    }
+  }, [inputRef, props.height]);
+
+  useLayoutEffect(() => {
+    if (inputRef.current) {
+      onHeightChange();
+    }
+  }, [onHeightChange, inputValue]);
+
   return (
-    <HeadlessTextArea
-      contextualHelp={contextualHelp}
-      description={description}
-      errorMessage={errorMessage}
-      fieldClassName={clsx(
-        textInputStyles["text-input"],
-        fieldStyles.field,
-        textAreaStyles["textarea"],
-      )}
-      inputClassName={getTypographyClassName("body")}
-      isRequired={isRequired}
-      label={label}
-      labelClassName={getTypographyClassName("caption")}
-      ref={ref}
+    <HeadlessTextField
       {...rest}
-    />
-  );
-};
+      className={clsx(inputFieldStyles.field)}
+      isDisabled={isDisabled}
+      isInvalid={isInvalid}
+      isReadOnly={isReadOnly}
+      isRequired={isRequired}
+      onChange={chain(onChange, setInputValue)}
+      value={value}
+    >
+      <FieldLabel
+        contextualHelp={contextualHelp}
+        isDisabled={isDisabled}
+        isRequired={isRequired}
+      >
+        {label}
+      </FieldLabel>
+      <TextAreaInput
+        isLoading={isLoading}
+        isReadOnly={isReadOnly}
+        ref={inputRef}
+        suffix={suffix}
+        value={value}
+      />
 
-export const TextArea = forwardRef(_TextArea);
+      <FieldError>{errorMessage}</FieldError>
+    </HeadlessTextField>
+  );
+}
diff --git a/app/client/packages/design-system/widgets/src/components/TextArea/src/index.ts b/app/client/packages/design-system/widgets/src/components/TextArea/src/index.ts
index 48de593e1d85..4eabc9e379fb 100644
--- a/app/client/packages/design-system/widgets/src/components/TextArea/src/index.ts
+++ b/app/client/packages/design-system/widgets/src/components/TextArea/src/index.ts
@@ -1,2 +1,2 @@
 export { TextArea } from "./TextArea";
-export type { TextAreaProps } from "./TextArea";
+export type { TextAreaProps } from "./types";
diff --git a/app/client/packages/design-system/widgets/src/components/TextArea/src/styles.module.css b/app/client/packages/design-system/widgets/src/components/TextArea/src/styles.module.css
deleted file mode 100644
index bd760501b529..000000000000
--- a/app/client/packages/design-system/widgets/src/components/TextArea/src/styles.module.css
+++ /dev/null
@@ -1,12 +0,0 @@
-.textarea {
-  & [data-field-input] {
-    block-size: auto;
-  }
-
-  & [data-field-input] textarea {
-    height: auto;
-    resize: none;
-    min-block-size: var(--sizing-16);
-    align-items: flex-start;
-  }
-}
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
new file mode 100644
index 000000000000..375126fac9b1
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/TextArea/src/types.ts
@@ -0,0 +1,11 @@
+import type { FieldProps } from "@appsmith/wds";
+import type { ReactNode } from "react";
+import type { TextFieldProps as AriaTextFieldProps } from "react-aria-components";
+
+export interface TextAreaProps extends AriaTextFieldProps, FieldProps {
+  placeholder?: string;
+  height?: number | string;
+  suffix?: ReactNode;
+  prefix?: ReactNode;
+  rows?: number;
+}
diff --git a/app/client/packages/design-system/widgets/src/components/TextArea/stories/TextArea.stories.tsx b/app/client/packages/design-system/widgets/src/components/TextArea/stories/TextArea.stories.tsx
index ea7da33fc784..b2b66dc45ae1 100644
--- a/app/client/packages/design-system/widgets/src/components/TextArea/stories/TextArea.stories.tsx
+++ b/app/client/packages/design-system/widgets/src/components/TextArea/stories/TextArea.stories.tsx
@@ -1,65 +1,74 @@
 import React from "react";
+import { Form } from "react-aria-components";
 import type { Meta, StoryObj } from "@storybook/react";
-import { TextArea, Flex } from "@appsmith/wds";
+import { Flex, TextArea, Button } from "@appsmith/wds";
 
-/**
- * TextArea is a component that is similar to the native textarea element, but with a few extra features.
- */
 const meta: Meta<typeof TextArea> = {
-  component: TextArea,
   title: "WDS/Widgets/TextArea",
+  component: TextArea,
+  tags: ["autodocs"],
+  args: {
+    placeholder: "Write something...",
+  },
 };
 
 export default meta;
 type Story = StoryObj<typeof TextArea>;
 
 export const Main: Story = {
+  args: {
+    label: "Description",
+    placeholder: "Write something...",
+  },
+};
+
+export const WithLabel: Story = {
   args: {
     label: "Label",
-    placeholder: "Placeholder",
   },
 };
 
-export const Description: Story = {
+export const WithContextualHelp: Story = {
   args: {
-    placeholder: "Description",
-    description: "This is a description",
+    label: "Description",
+    contextualHelp: "This is a contextual help",
   },
 };
 
 export const Disabled: Story = {
   args: {
-    placeholder: "Disabled",
     isDisabled: true,
+    label: "Disabled",
   },
 };
 
-export const Validation: Story = {
+export const Loading: Story = {
   args: {
-    placeholder: "Validation",
-    validationState: "invalid",
-    errorMessage: "This field is required",
+    isLoading: true,
+    label: "Loading",
+    placeholder: "Loading...",
   },
 };
 
-export const RequiredIndicator: Story = {
-  render: () => (
-    <Flex direction="column" gap="spacing-4" width="100%">
-      <TextArea isRequired label="Required - Icon Indicator" />
-      <TextArea
-        isRequired
-        label="Required - Label Indicator"
-        necessityIndicator="label"
-      />
-      <TextArea label="Required - Label Indicator" necessityIndicator="label" />
-    </Flex>
-  ),
-};
-
-export const ContextualHelp: Story = {
+export const Readonly: Story = {
   args: {
-    label: "Label",
-    placeholder: "Contextual Help Text",
-    contextualHelp: "This is a contextual help text",
+    isReadOnly: true,
+    label: "Readonly",
   },
 };
+
+export const Validation: Story = {
+  render: (args) => (
+    <Form onSubmit={(e) => e.preventDefault()}>
+      <Flex direction="column" gap="spacing-3" width="sizing-60">
+        <TextArea
+          {...args}
+          errorMessage="Please enter at least 10 characters"
+          isRequired
+          label="Description"
+        />
+        <Button type="submit">Submit</Button>
+      </Flex>
+    </Form>
+  ),
+};
diff --git a/app/client/packages/design-system/widgets/src/components/TextInput/src/TextInput.tsx b/app/client/packages/design-system/widgets/src/components/TextInput/src/TextInput.tsx
index 2098ce19432e..b8ce64948627 100644
--- a/app/client/packages/design-system/widgets/src/components/TextInput/src/TextInput.tsx
+++ b/app/client/packages/design-system/widgets/src/components/TextInput/src/TextInput.tsx
@@ -1,93 +1,56 @@
 import clsx from "clsx";
-import type {
-  TextInputRef as HeadlessTextInputRef,
-  TextInputProps as HeadlessTextInputProps,
-} from "@appsmith/wds-headless";
-import React, { forwardRef, useState } from "react";
-import { getTypographyClassName } from "@appsmith/wds-theming";
-import { TextInput as HeadlessTextInput } from "@appsmith/wds-headless";
+import React from "react";
+import { FieldError, FieldLabel, Input, inputFieldStyles } from "@appsmith/wds";
+import { TextField as HeadlessTextField } from "react-aria-components";
 
-import { Spinner } from "../../Spinner";
-import type { IconProps } from "../../Icon";
-import { IconButton } from "../../IconButton";
-import { ContextualHelp } from "../../ContextualHelp";
-import { textInputStyles, fieldStyles } from "../../../styles";
-import type { SIZES } from "../../../shared";
+import type { TextInputProps } from "./types";
 
-export interface TextInputProps extends HeadlessTextInputProps {
-  /** loading state for the input */
-  isLoading?: boolean;
-  /** size of the input
-   *
-   * @default medium
-   */
-  size?: Omit<keyof typeof SIZES, "xSmall" | "large">;
-}
-
-const _TextInput = (props: TextInputProps, ref: HeadlessTextInputRef) => {
+export function TextInput(props: TextInputProps) {
   const {
-    contextualHelp: contextualHelpProp,
-    description,
+    contextualHelp,
     errorMessage,
-    isLoading = false,
+    isDisabled,
+    isInvalid,
+    isLoading,
+    isReadOnly,
     isRequired,
     label,
     prefix,
     size = "medium",
     suffix,
     type,
+    value,
     ...rest
   } = props;
-  const [showPassword, togglePassword] = useState(false);
-
-  const contextualHelp = Boolean(contextualHelpProp) && (
-    <ContextualHelp contextualHelp={contextualHelpProp} />
-  );
-
-  const onPressEyeIcon = () => {
-    togglePassword((prev) => !prev);
-  };
-
-  const renderSuffix = () => {
-    if (isLoading) return <Spinner />;
-
-    if (type === "password") {
-      const icon: IconProps["name"] = showPassword ? "eye-off" : "eye";
-
-      return (
-        <IconButton
-          color="neutral"
-          excludeFromTabOrder
-          icon={icon}
-          onPress={onPressEyeIcon}
-          size={size === "medium" ? "small" : "xSmall"}
-          variant="ghost"
-        />
-      );
-    }
-
-    return suffix;
-  };
 
   return (
-    <HeadlessTextInput
-      contextualHelp={contextualHelp}
-      data-size={Boolean(size) ? size : undefined}
-      description={description}
-      errorMessage={errorMessage}
-      fieldClassName={clsx(textInputStyles["text-input"], fieldStyles.field)}
-      helpTextClassName={getTypographyClassName("footnote")}
-      inputClassName={getTypographyClassName("body")}
-      isRequired={isRequired}
-      label={label}
-      labelClassName={getTypographyClassName("caption")}
-      prefix={prefix}
-      ref={ref}
-      suffix={renderSuffix()}
-      type={showPassword ? "text" : type}
+    <HeadlessTextField
       {...rest}
-    />
+      className={clsx(inputFieldStyles.field)}
+      data-field=""
+      isDisabled={isDisabled}
+      isInvalid={isInvalid}
+      isReadOnly={isReadOnly}
+      isRequired={isRequired}
+      value={value}
+    >
+      <FieldLabel
+        contextualHelp={contextualHelp}
+        isDisabled={isDisabled}
+        isRequired={isRequired}
+      >
+        {label}
+      </FieldLabel>
+      <Input
+        isLoading={isLoading}
+        isReadOnly={isReadOnly}
+        prefix={prefix}
+        size={size}
+        suffix={suffix}
+        type={type}
+        value={value}
+      />
+      <FieldError>{errorMessage}</FieldError>
+    </HeadlessTextField>
   );
-};
-
-export const TextInput = forwardRef(_TextInput);
+}
diff --git a/app/client/packages/design-system/widgets/src/components/TextInput/src/index.ts b/app/client/packages/design-system/widgets/src/components/TextInput/src/index.ts
index 51860debd744..ac6d8d7ecb64 100644
--- a/app/client/packages/design-system/widgets/src/components/TextInput/src/index.ts
+++ b/app/client/packages/design-system/widgets/src/components/TextInput/src/index.ts
@@ -1,2 +1,2 @@
-export { TextInput } from "./TextInput";
-export type { TextInputProps } from "./TextInput";
+export * from "./TextInput";
+export type { TextInputProps } from "./types";
diff --git a/app/client/packages/design-system/widgets/src/components/TextInput/src/types.ts b/app/client/packages/design-system/widgets/src/components/TextInput/src/types.ts
new file mode 100644
index 000000000000..313773233bcb
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/TextInput/src/types.ts
@@ -0,0 +1,10 @@
+import type { ReactNode } from "react";
+import type { FieldProps, SIZES } from "@appsmith/wds";
+import type { TextFieldProps as AriaTextFieldProps } from "react-aria-components";
+
+export interface TextInputProps extends AriaTextFieldProps, FieldProps {
+  placeholder?: string;
+  suffix?: ReactNode;
+  prefix?: ReactNode;
+  size?: Omit<keyof typeof SIZES, "xSmall">;
+}
diff --git a/app/client/packages/design-system/widgets/src/components/TextInput/stories/TextInput.stories.tsx b/app/client/packages/design-system/widgets/src/components/TextInput/stories/TextInput.stories.tsx
index 6cffec499f34..53e64a87255d 100644
--- a/app/client/packages/design-system/widgets/src/components/TextInput/stories/TextInput.stories.tsx
+++ b/app/client/packages/design-system/widgets/src/components/TextInput/stories/TextInput.stories.tsx
@@ -1,21 +1,15 @@
 import React from "react";
+import { Form } from "react-aria-components";
 import type { Meta, StoryObj } from "@storybook/react";
-import {
-  Flex,
-  Icon,
-  SIZES,
-  Button,
-  Menu,
-  MenuTrigger,
-  TextInput,
-} from "@appsmith/wds";
+import { Flex, Icon, TextInput, Button } from "@appsmith/wds";
 
-/**
- * TextInput is a component that allows users to input text.
- */
 const meta: Meta<typeof TextInput> = {
-  component: TextInput,
   title: "WDS/Widgets/TextInput",
+  component: TextInput,
+  tags: ["autodocs"],
+  args: {
+    placeholder: "Write something...",
+  },
 };
 
 export default meta;
@@ -23,143 +17,99 @@ type Story = StoryObj<typeof TextInput>;
 
 export const Main: Story = {
   args: {
+    label: "Email",
     placeholder: "Write something...",
   },
 };
 
-export const Description: Story = {
+export const WithLabel: Story = {
   args: {
-    placeholder: "Description",
-    description: "This is a description",
+    label: "Email",
   },
 };
 
-export const Sizes: Story = {
-  render: () => (
-    <Flex alignItems="start" gap="spacing-4">
-      {Object.keys(SIZES)
-        .filter((size) => !["xSmall", "large"].includes(size))
-        .map((size) => (
-          <TextInput
-            key={size}
-            placeholder={size}
-            prefix={<Icon name="user" size={size as keyof typeof SIZES} />}
-            size={size}
-          />
-        ))}
-    </Flex>
-  ),
+export const WithContextualHelp: Story = {
+  args: {
+    label: "Email",
+    contextualHelp: "This is a contextual help",
+  },
 };
 
-export const PrefixAndSuffix: Story = {
-  render: () => (
+export const WithPrefixAndSuffix: Story = {
+  render: (args) => (
     <Flex direction="column" gap="spacing-4">
-      <TextInput placeholder="prefix" prefix="$" />
-      <TextInput placeholder="suffix" suffix="$" />
+      <TextInput {...args} suffix={<Icon name="user" size="medium" />} />
+      <TextInput {...args} prefix={<Icon name="user" size="medium" />} />
       <TextInput
-        placeholder="prefix and suffix"
-        prefix={<Icon name="user" />}
-        suffix={<Icon name="user" />}
-      />
-      <TextInput
-        placeholder="component as prefix"
-        prefix={
-          <MenuTrigger>
-            <Button
-              color="neutral"
-              icon="chevron-down"
-              size="small"
-              variant="ghost"
-            />
-            <Menu
-              disabledKeys={["cut"]}
-              items={[
-                { id: "copy", label: "Copy" },
-                { id: "cut", label: "Cut" },
-                { id: "paste", label: "Paste" },
-              ]}
-              onAction={(key) => alert(key)}
-            />
-          </MenuTrigger>
-        }
+        {...args}
+        prefix={<Icon name="user" size="medium" />}
+        suffix={<Icon name="user" size="medium" />}
       />
     </Flex>
   ),
 };
 
-/**
- * The icon button for input type password type occupies the same slot as the suffix and has priority.
- */
-export const TypePassword: Story = {
+export const Password: Story = {
   args: {
-    label: "Password",
-    placeholder: "Type Password",
     type: "password",
+    label: "Password",
   },
 };
 
-/**
- * Loading indicator for input occupies the same slot as the password icon and suffix and has priority.
- */
-
-export const Loading: Story = {
+export const Disabled: Story = {
   args: {
-    placeholder: "Loading",
-    isLoading: true,
+    isDisabled: true,
+    label: "Disabled",
   },
 };
 
-export const Disabled: Story = {
+export const Loading: Story = {
   args: {
-    placeholder: "Disabled",
-    isDisabled: true,
+    isLoading: true,
+    label: "Loading",
+    placeholder: "Loading...",
   },
 };
 
 export const Readonly: Story = {
   args: {
-    label: "Readonly",
     isReadOnly: true,
+    label: "Readonly",
   },
 };
 
-export const Validation: Story = {
-  render: () => (
-    <form
-      onSubmit={(e) => {
-        e.preventDefault();
-        alert("Form submitted");
-      }}
-    >
-      <Flex direction="column" gap="spacing-5" width="sizing-60">
-        <TextInput description="description" isRequired label="Validation" />
-        <Button type="submit">Submit</Button>
-      </Flex>
-    </form>
-  ),
-};
-
-export const RequiredIndicator: Story = {
-  render: () => (
-    <Flex direction="column" gap="spacing-4" width="100%">
-      <TextInput isRequired label="Required - Icon Indicator" />
+export const Size: Story = {
+  render: (args) => (
+    <Flex direction="column" gap="spacing-4">
       <TextInput
-        isRequired
-        label="Required - Label Indicator"
-        necessityIndicator="label"
+        {...args}
+        label="Small"
+        prefix={<Icon name="user" size="medium" />}
+        size="small"
       />
       <TextInput
-        label="Required - Label Indicator"
-        necessityIndicator="label"
+        {...args}
+        label="Medium"
+        prefix={<Icon name="user" size="medium" />}
+        size="medium"
       />
     </Flex>
   ),
 };
 
-export const ContextualHelp: Story = {
-  args: {
-    label: "Label",
-    placeholder: "Contextual Help Text",
-    contextualHelp: "This is a contextual help text",
-  },
+export const Validation: Story = {
+  render: (args) => (
+    <Form onSubmit={(e) => e.preventDefault()}>
+      <Flex direction="column" gap="spacing-3" width="sizing-60">
+        <TextInput
+          {...args}
+          errorMessage="Please enter a valid email address"
+          isRequired
+          label="Email"
+          type="email"
+        />
+        <Button type="submit">Submit</Button>
+      </Flex>
+    </Form>
+  ),
 };
diff --git a/app/client/packages/design-system/widgets/src/components/ToggleGroup/chromatic/Group.chromatic.stories.tsx b/app/client/packages/design-system/widgets/src/components/ToggleGroup/chromatic/Group.chromatic.stories.tsx
index c214198bf695..13ea8cc1fde2 100644
--- a/app/client/packages/design-system/widgets/src/components/ToggleGroup/chromatic/Group.chromatic.stories.tsx
+++ b/app/client/packages/design-system/widgets/src/components/ToggleGroup/chromatic/Group.chromatic.stories.tsx
@@ -1,8 +1,13 @@
 import React from "react";
-import type { Meta, StoryObj } from "@storybook/react";
-
-import { ToggleGroup, RadioGroup, Switch, Checkbox } from "@appsmith/wds";
 import { StoryGrid } from "@design-system/storybook";
+import type { Meta, StoryObj } from "@storybook/react";
+import {
+  ToggleGroup,
+  RadioGroup,
+  Switch,
+  Checkbox,
+  Radio,
+} from "@appsmith/wds";
 
 const meta: Meta<typeof Switch> = {
   component: Switch,
@@ -22,20 +27,26 @@ const items = [
 export const LightMode: Story = {
   render: () => (
     <StoryGrid>
-      <RadioGroup defaultValue="1" items={items} />
-      <ToggleGroup defaultValue={["1"]} items={items}>
-        {({ label, value }) => (
+      <RadioGroup defaultValue="1">
+        {items.map(({ label, value }) => (
+          <Radio key={value} value={value}>
+            {label}
+          </Radio>
+        ))}
+      </RadioGroup>
+      <ToggleGroup defaultValue={["1"]}>
+        {items.map(({ label, value }) => (
           <Checkbox key={value} value={value}>
             {label}
           </Checkbox>
-        )}
+        ))}
       </ToggleGroup>
-      <ToggleGroup defaultValue={["1"]} items={items}>
-        {({ label, value }) => (
+      <ToggleGroup defaultValue={["1"]}>
+        {items.map(({ label, value }) => (
           <Switch key={value} value={value}>
             {label}
           </Switch>
-        )}
+        ))}
       </ToggleGroup>
     </StoryGrid>
   ),
diff --git a/app/client/packages/design-system/widgets/src/components/ToggleGroup/src/ToggleGroup.tsx b/app/client/packages/design-system/widgets/src/components/ToggleGroup/src/ToggleGroup.tsx
index 4da77ef1f65d..70469ba2a990 100644
--- a/app/client/packages/design-system/widgets/src/components/ToggleGroup/src/ToggleGroup.tsx
+++ b/app/client/packages/design-system/widgets/src/components/ToggleGroup/src/ToggleGroup.tsx
@@ -1,13 +1,14 @@
+import type { ForwardedRef } from "react";
 import React, { forwardRef, useRef } from "react";
-import { CheckboxGroup as HeadlessToggleGroup } from "react-aria-components";
 import {
-  FieldError,
-  FieldLabel,
-  Flex,
   useGroupOrientation,
+  inputFieldStyles,
+  FieldLabel,
+  FieldError,
 } from "@appsmith/wds";
+import { CheckboxGroup as AriaToggleGroup, Group } from "react-aria-components";
+
 import styles from "./styles.module.css";
-import type { ForwardedRef } from "react";
 import type { ToggleGroupProps } from "./types";
 
 const _ToggleGroup = (
@@ -19,8 +20,8 @@ const _ToggleGroup = (
     contextualHelp,
     errorMessage,
     isDisabled,
+    isReadOnly,
     isRequired,
-    items,
     label,
     ...rest
   } = props;
@@ -31,30 +32,31 @@ const _ToggleGroup = (
   );
 
   return (
-    <HeadlessToggleGroup
-      className={styles.toggleGroup}
-      data-orientation={orientation}
+    <AriaToggleGroup
+      {...rest}
+      className={inputFieldStyles.field}
+      data-field=""
       isDisabled={isDisabled}
+      isReadOnly={isReadOnly}
+      isRequired={isRequired}
       ref={ref}
-      {...rest}
     >
       <FieldLabel
         contextualHelp={contextualHelp}
         isDisabled={isDisabled}
         isRequired={isRequired}
-        text={label}
-      />
-      <Flex
-        direction={orientation === "vertical" ? "column" : "row"}
-        gap={orientation === "vertical" ? "spacing-2" : "spacing-4"}
-        isInner
+      >
+        {label}
+      </FieldLabel>
+      <Group
+        className={styles.toggleGroup}
+        data-orientation={orientation}
         ref={containerRef}
-        wrap="wrap"
       >
-        {items.map((item, index) => children({ ...item, index }))}
-      </Flex>
-      <FieldError errorMessage={errorMessage} />
-    </HeadlessToggleGroup>
+        {children}
+      </Group>
+      <FieldError>{errorMessage}</FieldError>
+    </AriaToggleGroup>
   );
 };
 
diff --git a/app/client/packages/design-system/widgets/src/components/ToggleGroup/src/index.ts b/app/client/packages/design-system/widgets/src/components/ToggleGroup/src/index.ts
index 520c34396c14..51cb4ee2f7c1 100644
--- a/app/client/packages/design-system/widgets/src/components/ToggleGroup/src/index.ts
+++ b/app/client/packages/design-system/widgets/src/components/ToggleGroup/src/index.ts
@@ -1,2 +1,3 @@
 export { ToggleGroup } from "./ToggleGroup";
 export type { ToggleGroupProps } from "./types";
+export { default as toggleGroupStyles } from "./styles.module.css";
diff --git a/app/client/packages/design-system/widgets/src/components/ToggleGroup/src/styles.module.css b/app/client/packages/design-system/widgets/src/components/ToggleGroup/src/styles.module.css
index 63f5af4c3885..7456763c54a1 100644
--- a/app/client/packages/design-system/widgets/src/components/ToggleGroup/src/styles.module.css
+++ b/app/client/packages/design-system/widgets/src/components/ToggleGroup/src/styles.module.css
@@ -1,17 +1,18 @@
 .toggleGroup {
   display: flex;
-  flex-direction: column;
   width: 100%;
+  gap: var(--inner-spacing-4);
+}
 
-  &[data-disabled] {
-    cursor: not-allowed;
-  }
+.toggleGroup[data-orientation="vertical"] {
+  flex-direction: column;
+  gap: var(--inner-spacing-2);
+}
 
-  &[data-orientation="horizontal"] [data-label-position="end"] {
-    margin-inline-end: 0;
-  }
+.toggleGroup[data-orientation="horizontal"] [data-label-position="end"] {
+  margin-inline-end: 0;
+}
 
-  &[data-orientation="horizontal"] [data-label-position="start"] {
-    width: fit-content;
-  }
+.toggleGroup[data-orientation="horizontal"] [data-label-position="start"] {
+  width: fit-content;
 }
diff --git a/app/client/packages/design-system/widgets/src/components/ToggleGroup/src/types.ts b/app/client/packages/design-system/widgets/src/components/ToggleGroup/src/types.ts
index f3e48967bff8..fd57007e3863 100644
--- a/app/client/packages/design-system/widgets/src/components/ToggleGroup/src/types.ts
+++ b/app/client/packages/design-system/widgets/src/components/ToggleGroup/src/types.ts
@@ -1,39 +1,16 @@
 import type { CheckboxGroupProps as HeadlessToggleGroupProps } from "react-aria-components";
-import type { ORIENTATION } from "@appsmith/wds";
-
-interface ToggleGroupItemProps {
-  value: string;
-  label?: string;
-  isSelected?: boolean;
-  isDisabled?: boolean;
-  index?: number;
-}
+import type { FieldProps, ORIENTATION } from "@appsmith/wds";
 
 export interface ToggleGroupProps
-  extends Omit<HeadlessToggleGroupProps, "slot" | "children"> {
-  /**
-   * The content to display as the label.
-   */
-  label?: string;
+  extends Omit<HeadlessToggleGroupProps, "slot" | "children">,
+    FieldProps {
   /**
    * The axis the checkboxes should align with.
    * @default 'horizontal'
    */
   orientation?: keyof typeof ORIENTATION;
   /**
-   * An error message for the field.
-   */
-  errorMessage?: string;
-  /**
-   * Checkboxes that belong to this group.
-   */
-  items: ToggleGroupItemProps[];
-  /**
-   *
-   */
-  children: (props: ToggleGroupItemProps) => JSX.Element;
-  /**
-   * A ContextualHelp element to place next to the label.
+   * The children of the toggle group.
    */
-  contextualHelp?: string;
+  children: React.ReactNode;
 }
diff --git a/app/client/packages/design-system/widgets/src/components/ToggleGroup/stories/ToggleGroup.stories.tsx b/app/client/packages/design-system/widgets/src/components/ToggleGroup/stories/ToggleGroup.stories.tsx
index 8f47cc04690c..5db40b210272 100644
--- a/app/client/packages/design-system/widgets/src/components/ToggleGroup/stories/ToggleGroup.stories.tsx
+++ b/app/client/packages/design-system/widgets/src/components/ToggleGroup/stories/ToggleGroup.stories.tsx
@@ -2,135 +2,99 @@ import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
 import { Checkbox, ToggleGroup, Flex, Switch } from "@appsmith/wds";
 
-/**
- * Toggle Group is a group of Checkboxes or Switches that can be selected together.
- */
+const items = [
+  { label: "Value 1", value: "value-1" },
+  { label: "Value 2", value: "value-2" },
+];
+
 const meta: Meta<typeof ToggleGroup> = {
-  component: ToggleGroup,
   title: "WDS/Widgets/ToggleGroup",
+  component: ToggleGroup,
+  tags: ["autodocs"],
+  args: {
+    defaultValue: ["value-1"],
+    children: items.map((item) => (
+      <Checkbox key={item.value} value={item.value}>
+        {item.label}
+      </Checkbox>
+    )),
+  },
 };
 
 export default meta;
 type Story = StoryObj<typeof ToggleGroup>;
 
-const items = [
-  { label: "Value 1", value: "value-1" },
-  { label: "Value 2", value: "value-2" },
-];
-
 export const Main: Story = {
   args: {
-    label: "Checkbox Group",
-    defaultValue: ["value-1"],
-    items: items,
+    label: "Label",
+  },
+};
+
+export const WithLabel: Story = {
+  args: {
+    label: "Label",
+  },
+};
+
+export const WithContextualHelp: Story = {
+  args: {
+    label: "Label",
+    contextualHelp: "Contextual help",
   },
-  render: (args) => (
-    <ToggleGroup {...args}>
-      {({ label, value }) => (
-        <Checkbox key={value} value={value}>
-          {label}
-        </Checkbox>
-      )}
-    </ToggleGroup>
-  ),
 };
 
-/**
- * The component supports two label orientations `vertical` and `horizontal`. Default size is `horizontal`.
- */
 export const Orientation: Story = {
-  render: () => (
-    <Flex direction="column" gap="spacing-4">
-      <ToggleGroup items={items}>
-        {({ label, value }) => (
-          <Checkbox key={value} value={value}>
-            {label}
-          </Checkbox>
-        )}
-      </ToggleGroup>
-      <ToggleGroup items={items} orientation="vertical">
-        {({ label, value }) => (
-          <Checkbox key={value} value={value}>
-            {label}
-          </Checkbox>
-        )}
-      </ToggleGroup>
-    </Flex>
-  ),
+  render: () => {
+    return (
+      <Flex direction="column" gap="spacing-4">
+        <ToggleGroup label="Vertical" orientation="vertical">
+          {items.map((item) => (
+            <Checkbox key={item.value} value={item.value}>
+              {item.label}
+            </Checkbox>
+          ))}
+        </ToggleGroup>
+        <ToggleGroup label="Horizontal" orientation="horizontal">
+          {items.map((item) => (
+            <Checkbox key={item.value} value={item.value}>
+              {item.label}
+            </Checkbox>
+          ))}
+        </ToggleGroup>
+      </Flex>
+    );
+  },
 };
 
 export const Disabled: Story = {
   args: {
-    label: "Checkbox Group",
-    defaultValue: ["value-1"],
     isDisabled: true,
-    items: items,
+    label: "Disabled",
   },
-  render: (args) => (
-    <ToggleGroup {...args}>
-      {({ label, value }) => (
-        <Checkbox key={value} value={value}>
-          {label}
-        </Checkbox>
-      )}
-    </ToggleGroup>
-  ),
 };
 
 export const Required: Story = {
   args: {
-    label: "Checkbox Group",
-    defaultValue: ["value-1"],
     isRequired: true,
-    items: items,
+    label: "Required",
   },
-  render: (args) => (
-    <ToggleGroup {...args}>
-      {({ label, value }) => (
-        <Checkbox key={value} value={value}>
-          {label}
-        </Checkbox>
-      )}
-    </ToggleGroup>
-  ),
 };
 
 export const Invalid: Story = {
   args: {
-    label: "Checkbox Group",
-    defaultValue: ["value-1"],
+    errorMessage: "There is an error",
+    label: "Invalid",
     isInvalid: true,
-    errorMessage: "This is a error message",
-    items: items,
-    contextualHelp: "Contextual Help",
   },
-  render: (args) => (
-    <ToggleGroup {...args}>
-      {({ label, value }) => (
-        <Checkbox key={value} value={value}>
-          {label}
-        </Checkbox>
-      )}
-    </ToggleGroup>
-  ),
 };
 
-/**
- * All the properties listed above can also be used for a Switch
- */
-export const SwitchGroup: Story = {
+export const WithSwitch: Story = {
   args: {
-    label: "Switch Group",
-    defaultValue: ["value-1"],
-    items: items,
+    label: "With Switch",
+    children: items.map((item) => (
+      <Switch key={item.value} value={item.value}>
+        {item.label}
+      </Switch>
+    )),
   },
-  render: (args) => (
-    <ToggleGroup {...args}>
-      {({ label, value }) => (
-        <Switch key={value} value={value}>
-          {label}
-        </Switch>
-      )}
-    </ToggleGroup>
-  ),
 };
diff --git a/app/client/packages/design-system/widgets/src/components/ToggleGroup/tests/ToggleGroup.test.tsx b/app/client/packages/design-system/widgets/src/components/ToggleGroup/tests/ToggleGroup.test.tsx
index 43960b991848..6f0eacd32f56 100644
--- a/app/client/packages/design-system/widgets/src/components/ToggleGroup/tests/ToggleGroup.test.tsx
+++ b/app/client/packages/design-system/widgets/src/components/ToggleGroup/tests/ToggleGroup.test.tsx
@@ -12,12 +12,12 @@ describe("@appsmith/wds/ToggleGroup", () => {
 
   it("should render the checkbox group", async () => {
     const { container } = render(
-      <ToggleGroup items={items} label="Checkbox Group">
-        {({ label, value }) => (
+      <ToggleGroup label="Checkbox Group">
+        {items.map(({ label, value }) => (
           <Checkbox key={value} value={value}>
             {label}
           </Checkbox>
-        )}
+        ))}
       </ToggleGroup>,
     );
 
@@ -25,11 +25,14 @@ describe("@appsmith/wds/ToggleGroup", () => {
     expect(screen.getByText("Value 2")).toBeInTheDocument();
 
     // eslint-disable-next-line testing-library/no-container,testing-library/no-node-access
-    const label = container.querySelector("label") as HTMLElement;
+    const label = container.querySelector(
+      "[data-field-label-wrapper] label",
+    ) as HTMLElement;
 
     expect(label).toHaveTextContent("Checkbox Group");
 
-    const toggleGroup = screen.getByRole("group");
+    // eslint-disable-next-line testing-library/no-container,testing-library/no-node-access
+    const toggleGroup = container.querySelector("[data-field]") as HTMLElement;
 
     expect(toggleGroup).toHaveAttribute("aria-labelledby");
     expect(toggleGroup.getAttribute("aria-labelledby")).toBe(label.id);
@@ -51,16 +54,12 @@ describe("@appsmith/wds/ToggleGroup", () => {
 
   it("should support custom props", () => {
     render(
-      <ToggleGroup
-        data-testid="t--checkbox-group"
-        items={items}
-        label="Checkbox Group Label"
-      >
-        {({ label, value }) => (
+      <ToggleGroup data-testid="t--checkbox-group" label="Checkbox Group Label">
+        {items.map(({ label, value }) => (
           <Checkbox key={value} value={value}>
             {label}
           </Checkbox>
-        )}
+        ))}
       </ToggleGroup>,
     );
 
@@ -71,16 +70,12 @@ describe("@appsmith/wds/ToggleGroup", () => {
 
   it("should render checked checkboxes when value is passed", () => {
     render(
-      <ToggleGroup
-        items={items}
-        label="Checkbox Group Label"
-        value={["value-1", "value-2"]}
-      >
-        {({ label, value }) => (
+      <ToggleGroup label="Checkbox Group Label" value={["value-1", "value-2"]}>
+        {items.map(({ label, value }) => (
           <Checkbox key={value} value={value}>
             {label}
           </Checkbox>
-        )}
+        ))}
       </ToggleGroup>,
     );
 
@@ -94,16 +89,12 @@ describe("@appsmith/wds/ToggleGroup", () => {
     const onChangeSpy = jest.fn();
 
     render(
-      <ToggleGroup
-        items={items}
-        label="Checkbox Group Label"
-        onChange={onChangeSpy}
-      >
-        {({ label, value }) => (
+      <ToggleGroup label="Checkbox Group Label" onChange={onChangeSpy}>
+        {items.map(({ label, value }) => (
           <Checkbox key={value} value={value}>
             {label}
           </Checkbox>
-        )}
+        ))}
       </ToggleGroup>,
     );
 
@@ -115,12 +106,12 @@ describe("@appsmith/wds/ToggleGroup", () => {
 
   it("should be able to render disabled checkboxes", () => {
     render(
-      <ToggleGroup isDisabled items={items} label="Checkbox Group Label">
-        {({ label, value }) => (
+      <ToggleGroup isDisabled label="Checkbox Group Label">
+        {items.map(({ label, value }) => (
           <Checkbox key={value} value={value}>
             {label}
           </Checkbox>
-        )}
+        ))}
       </ToggleGroup>,
     );
 
diff --git a/app/client/packages/design-system/widgets/src/components/ToolbarButtons/src/ToolbarButtons.tsx b/app/client/packages/design-system/widgets/src/components/ToolbarButtons/src/ToolbarButtons.tsx
index d345941c0740..f0140eac3fcd 100644
--- a/app/client/packages/design-system/widgets/src/components/ToolbarButtons/src/ToolbarButtons.tsx
+++ b/app/client/packages/design-system/widgets/src/components/ToolbarButtons/src/ToolbarButtons.tsx
@@ -1,5 +1,5 @@
 import React, { forwardRef, useMemo } from "react";
-import { Button, Menu } from "@appsmith/wds";
+import { Button, ListBoxItem, Menu } from "@appsmith/wds";
 import { FocusScope } from "@react-aria/focus";
 import { useDOMRef } from "@react-spectrum/utils";
 import { useListState } from "@react-stately/list";
@@ -91,7 +91,15 @@ const _ToolbarButtonsInner = <T extends ToolbarButtonsItem>(
               isDisabled={isDisabled}
               variant={variant}
             />
-            <Menu {...props} items={menuChildren} />
+            <Menu {...props}>
+              {menuChildren.map((item) => {
+                return (
+                  <ListBoxItem key={item.id} textValue={item.label}>
+                    {item.label}
+                  </ListBoxItem>
+                );
+              })}
+            </Menu>
           </MenuTrigger>
         )}
       </div>
diff --git a/app/client/packages/design-system/widgets/src/components/Tooltip/chromatic/Tooltip.chromatic.stories.tsx b/app/client/packages/design-system/widgets/src/components/Tooltip/chromatic/Tooltip.chromatic.stories.tsx
index d29dc5fa4723..7dc2121935c5 100644
--- a/app/client/packages/design-system/widgets/src/components/Tooltip/chromatic/Tooltip.chromatic.stories.tsx
+++ b/app/client/packages/design-system/widgets/src/components/Tooltip/chromatic/Tooltip.chromatic.stories.tsx
@@ -1,10 +1,5 @@
 import React from "react";
-import {
-  Button,
-  TooltipTrigger,
-  TooltipContent,
-  TooltipRoot as Tooltip,
-} from "@appsmith/wds";
+import { Button, Tooltip } from "@appsmith/wds";
 import { StoryGrid } from "@design-system/storybook";
 import type { Meta, StoryObj } from "@storybook/react";
 
@@ -20,29 +15,17 @@ type Story = StoryObj<typeof Tooltip>;
 export const LightMode: Story = {
   render: () => (
     <StoryGrid>
-      <Tooltip open placement="left">
-        <TooltipTrigger>
-          <Button>Button</Button>
-        </TooltipTrigger>
-        <TooltipContent>This is a tooltip</TooltipContent>
+      <Tooltip open placement="left" tooltip="This is a tooltip">
+        <Button>Button</Button>
       </Tooltip>
-      <Tooltip open placement="top">
-        <TooltipTrigger>
-          <Button>Button</Button>
-        </TooltipTrigger>
-        <TooltipContent>This is a tooltip</TooltipContent>
+      <Tooltip open placement="top" tooltip="This is a tooltip">
+        <Button>Button</Button>
       </Tooltip>
-      <Tooltip open placement="bottom">
-        <TooltipTrigger>
-          <Button>Button</Button>
-        </TooltipTrigger>
-        <TooltipContent>This is a tooltip</TooltipContent>
+      <Tooltip open placement="bottom" tooltip="This is a tooltip">
+        <Button>Button</Button>
       </Tooltip>
-      <Tooltip open placement="right">
-        <TooltipTrigger>
-          <Button>Button</Button>
-        </TooltipTrigger>
-        <TooltipContent>This is a tooltip</TooltipContent>
+      <Tooltip open placement="right" tooltip="This is a tooltip">
+        <Button>Button</Button>
       </Tooltip>
     </StoryGrid>
   ),
diff --git a/app/client/packages/design-system/widgets/src/components/Tooltip/src/Tooltip.tsx b/app/client/packages/design-system/widgets/src/components/Tooltip/src/Tooltip.tsx
index f21ed9ac44b6..f1fd4261180e 100644
--- a/app/client/packages/design-system/widgets/src/components/Tooltip/src/Tooltip.tsx
+++ b/app/client/packages/design-system/widgets/src/components/Tooltip/src/Tooltip.tsx
@@ -1,7 +1,11 @@
 import React from "react";
+import {
+  TooltipRoot as HeadlessTooltip,
+  TooltipTrigger as HeadlessTooltipTrigger,
+} from "@appsmith/wds-headless";
 import type { TooltipOptions } from "@appsmith/wds-headless";
 
-import { TooltipRoot, TooltipContent, TooltipTrigger } from "./";
+import { TooltipContent } from "./TooltipContent";
 
 export type TooltipProps = {
   tooltip?: React.ReactNode;
@@ -14,9 +18,9 @@ export function Tooltip(props: TooltipProps) {
   if (!Boolean(tooltip)) return children;
 
   return (
-    <TooltipRoot {...rest}>
-      <TooltipTrigger>{children}</TooltipTrigger>
+    <HeadlessTooltip {...rest}>
+      <HeadlessTooltipTrigger>{children}</HeadlessTooltipTrigger>
       <TooltipContent>{tooltip}</TooltipContent>
-    </TooltipRoot>
+    </HeadlessTooltip>
   );
 }
diff --git a/app/client/packages/design-system/widgets/src/components/Tooltip/src/TooltipContent.tsx b/app/client/packages/design-system/widgets/src/components/Tooltip/src/TooltipContent.tsx
index d25797580890..7e717b84e689 100644
--- a/app/client/packages/design-system/widgets/src/components/Tooltip/src/TooltipContent.tsx
+++ b/app/client/packages/design-system/widgets/src/components/Tooltip/src/TooltipContent.tsx
@@ -1,9 +1,10 @@
+import { Text } from "@appsmith/wds";
 import React, { forwardRef } from "react";
 import { useThemeContext } from "@appsmith/wds-theming";
-import { Text } from "../../Text";
-import styles from "./styles.module.css";
 import { TooltipContent as HeadlessTooltipContent } from "@appsmith/wds-headless";
 
+import styles from "./styles.module.css";
+
 import type {
   TooltipContentRef as HeadlessTooltipContentRef,
   TooltipContentProps as HeadlessTooltipContentProps,
diff --git a/app/client/packages/design-system/widgets/src/components/Tooltip/src/index.ts b/app/client/packages/design-system/widgets/src/components/Tooltip/src/index.ts
index 9a4e90b93fa4..cf5cc016b7f3 100644
--- a/app/client/packages/design-system/widgets/src/components/Tooltip/src/index.ts
+++ b/app/client/packages/design-system/widgets/src/components/Tooltip/src/index.ts
@@ -1,4 +1,2 @@
 export { Tooltip } from "./Tooltip";
-export { TooltipTrigger } from "./TooltipTrigger";
-export { TooltipContent } from "./TooltipContent";
-export { TooltipRoot } from "@appsmith/wds-headless";
+export type { TooltipProps } from "./Tooltip";
diff --git a/app/client/packages/design-system/widgets/src/components/Tooltip/stories/Tooltip.stories.tsx b/app/client/packages/design-system/widgets/src/components/Tooltip/stories/Tooltip.stories.tsx
index ff34496c8132..3d1e2a735762 100644
--- a/app/client/packages/design-system/widgets/src/components/Tooltip/stories/Tooltip.stories.tsx
+++ b/app/client/packages/design-system/widgets/src/components/Tooltip/stories/Tooltip.stories.tsx
@@ -1,12 +1,6 @@
 import React from "react";
+import { Button, Flex, Tooltip } from "@appsmith/wds";
 import type { Meta, StoryObj } from "@storybook/react";
-import {
-  Button,
-  TooltipRoot,
-  TooltipTrigger,
-  TooltipContent,
-  Tooltip,
-} from "@appsmith/wds";
 
 /**
  * A tooltip is a small pop-up that appears when a user places their cursor over an element such as a link or button. Tooltips can be used to provide users with additional information about an element without having to clutter up the UI with additional text.
@@ -14,20 +8,10 @@ import {
 const meta: Meta<typeof Tooltip> = {
   component: Tooltip,
   title: "WDS/Widgets/Tooltip",
-  subcomponents: {
-    //@ts-expect-error: don't need props to pass here
-    TooltipRoot,
-    TooltipTrigger,
-    TooltipContent,
-  },
   args: {
     tooltip: "My tooltip",
+    children: <Button>My trigger</Button>,
   },
-  render: (args) => (
-    <Tooltip {...args}>
-      <Button>My trigger</Button>
-    </Tooltip>
-  ),
 };
 
 export default meta;
@@ -39,9 +23,28 @@ export const Main: Story = {};
  * If the trigger is disabled, the tooltip will still be displayed.
  */
 export const Disabled: Story = {
-  render: () => (
-    <Tooltip tooltip="My tooltip">
-      <Button isDisabled>My trigger</Button>
-    </Tooltip>
-  ),
+  args: {
+    children: <Button isDisabled>My Trigger</Button>,
+  },
+};
+
+export const Placement: Story = {
+  render: () => {
+    return (
+      <Flex direction="column" gap="spacing-4">
+        <Tooltip placement="top" tooltip="Top">
+          <Button>Top</Button>
+        </Tooltip>
+        <Tooltip placement="bottom" tooltip="Bottom">
+          <Button>Bottom</Button>
+        </Tooltip>
+        <Tooltip placement="left" tooltip="Left">
+          <Button>Left</Button>
+        </Tooltip>
+        <Tooltip placement="right" tooltip="Right">
+          <Button>Right</Button>
+        </Tooltip>
+      </Flex>
+    );
+  },
 };
diff --git a/app/client/packages/design-system/widgets/src/index.ts b/app/client/packages/design-system/widgets/src/index.ts
index 5f3084079042..b0236e3a62dd 100644
--- a/app/client/packages/design-system/widgets/src/index.ts
+++ b/app/client/packages/design-system/widgets/src/index.ts
@@ -9,7 +9,6 @@ export * from "./components/Tooltip";
 export * from "./components/Flex";
 export * from "./components/RadioGroup";
 export * from "./components/Switch";
-export * from "./components/TextInput";
 export * from "./components/TextArea";
 export * from "./components/Spinner";
 export * from "./components/Menu";
@@ -21,12 +20,19 @@ export * from "./components/Select";
 export * from "./components/ContextualHelp";
 export * from "./components/Link";
 export * from "./components/Popover";
-export * from "./components/FieldLabel";
 export * from "./components/FieldError";
-export * from "./components/FieldDescription";
-export * from "./components/FieldListPopover";
+export * from "./components/TextInput";
+export * from "./components/FieldLabel";
+export * from "./components/Input";
+export * from "./components/Field";
+export * from "./components/Radio";
+export * from "./components/ListBox";
+export * from "./components/ListBoxItem";
+export * from "./components/MenuItem";
+export * from "./components/Markdown";
+export * from "./components/Sidebar";
+export * from "./components/Sheet";
 
 export * from "./utils";
-export * from "./styles";
 export * from "./hooks";
 export * from "./shared";
diff --git a/app/client/packages/design-system/widgets/src/styles/src/field.module.css b/app/client/packages/design-system/widgets/src/styles/src/field.module.css
deleted file mode 100644
index 59cca9f6205a..000000000000
--- a/app/client/packages/design-system/widgets/src/styles/src/field.module.css
+++ /dev/null
@@ -1,114 +0,0 @@
-/* NOTE: these field styles are used in every input component that has a label
- for e.g input, select, checkbox group, toggle group, radio group, etc */
-.field {
-  display: flex;
-  flex-direction: column;
-  gap: var(--inner-spacing-3);
-  width: 100%;
-
-  /**
-  * ----------------------------------------------------------------------------
-  * FIELD LABEL
-  *-----------------------------------------------------------------------------
-  */
-  & [data-field-label-wrapper] {
-    display: flex;
-    align-items: center;
-    gap: var(--inner-spacing-1);
-    height: var(--sizing-3);
-  }
-
-  & [data-field-label] {
-    display: flex;
-    height: fit-content;
-    color: var(--color-fg);
-    max-width: 100%;
-    font-weight: 600;
-  }
-
-  & [data-field-label] span {
-    webkit-box-orient: vertical;
-    overflow: hidden;
-    -webkit-line-clamp: 1;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-
-  /**
-  * ----------------------------------------------------------------------------
-  * REQUIRED ICON
-  *-----------------------------------------------------------------------------
-  */
-  & [data-field-necessity-indicator-icon] {
-    color: var(--color-fg-negative);
-    margin-inline-start: var(--inner-spacing-1);
-  }
-
-  /**
-  * ----------------------------------------------------------------------------
-  * ERROR TEXT
-  *-----------------------------------------------------------------------------
-  */
-  & [data-field-error-text] {
-    display: flex;
-    align-items: center;
-    color: var(--color-fg-negative);
-  }
-
-  /**
-  * ----------------------------------------------------------------------------
-  * FIELD GROUP
-  * fields group refers group components like checkbox group, radio group, etc
-  *-----------------------------------------------------------------------------
-  */
-  & [data-field-group] {
-    gap: var(--inner-spacing-2);
-    display: flex;
-    flex-wrap: wrap;
-    flex-direction: column;
-  }
-
-  & [data-field-group] [data-icon] {
-    /** In the group components, the checkbox, radio and switch icons are positioned relatively */
-    position: relative;
-  }
-
-  & [data-field-group] [data-label] {
-    padding: 0;
-    gap: var(--inner-spacing-2);
-  }
-
-  &[data-disabled] [data-field-group] {
-    cursor: default;
-  }
-
-  & [data-field-group][data-orientation="horizontal"] {
-    gap: var(--inner-spacing-4);
-    flex-direction: row;
-  }
-
-  & [data-field-group] [data-label-position="start"] {
-    flex-direction: row-reverse;
-  }
-
-  /**
-  * ----------------------------------------------------------------------------
-  * FIELD WRAPPER
-  *-----------------------------------------------------------------------------
-  */
-  & [data-field-input-wrapper] {
-    gap: var(--inner-spacing-2);
-    display: flex;
-    flex-direction: column;
-  }
-
-  /**
-  * ----------------------------------------------------------------------------
-  * DISABLED
-  *-----------------------------------------------------------------------------
-  */
-  &[data-disabled] {
-    opacity: var(--opacity-disabled);
-    cursor: default;
-  }
-}
diff --git a/app/client/packages/design-system/widgets/src/styles/src/index.ts b/app/client/packages/design-system/widgets/src/styles/src/index.ts
deleted file mode 100644
index eb089fb83c71..000000000000
--- a/app/client/packages/design-system/widgets/src/styles/src/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export { default as fieldStyles } from "./field.module.css";
-export { default as textInputStyles } from "./text-input.module.css";
-export { default as inlineLabelStyles } from "./inline-label.module.css";
-export { default as listItemStyles } from "./list-item.module.css";
diff --git a/app/client/packages/design-system/widgets/src/styles/src/inline-label.module.css b/app/client/packages/design-system/widgets/src/styles/src/inline-label.module.css
deleted file mode 100644
index ef34c54a6b21..000000000000
--- a/app/client/packages/design-system/widgets/src/styles/src/inline-label.module.css
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Note: these styles will shared across radio, Radio and toggle components */
-.inline-label {
-  display: flex;
-  align-items: center;
-  position: relative;
-  cursor: pointer;
-  width: fit-content;
-
-  & span {
-    overflow: hidden;
-    display: -webkit-box;
-    -webkit-line-clamp: 1;
-    -webkit-box-orient: vertical;
-  }
-
-  /**
-  * ----------------------------------------------------------------------------
-  * DISABLED
-  *-----------------------------------------------------------------------------
-  */
-  &[data-disabled]:not([data-field-type="field-group"] &) {
-    opacity: var(--opacity-disabled);
-    cursor: default;
-  }
-}
diff --git a/app/client/packages/design-system/widgets/src/styles/src/list-item.module.css b/app/client/packages/design-system/widgets/src/styles/src/list-item.module.css
deleted file mode 100644
index 73864428ff6c..000000000000
--- a/app/client/packages/design-system/widgets/src/styles/src/list-item.module.css
+++ /dev/null
@@ -1,62 +0,0 @@
-@import "../../shared/colors/colors.module.css";
-
-.item {
-  display: flex;
-  align-items: center;
-  padding-inline: var(--inner-spacing-3);
-  block-size: var(--sizing-11);
-}
-
-.item [data-icon] {
-  margin-inline-end: var(--inner-spacing-2);
-}
-
-.item [data-chevron] {
-  margin-inline-end: 0;
-  margin-inline-start: var(--inner-spacing-2);
-}
-
-.item:first-of-type {
-  border-top-left-radius: var(--border-radius-elevation-3);
-  border-top-right-radius: var(--border-radius-elevation-3);
-}
-
-.item:last-of-type {
-  border-bottom-left-radius: var(--border-radius-elevation-3);
-  border-bottom-right-radius: var(--border-radius-elevation-3);
-}
-
-.item:not([data-disabled]) {
-  cursor: pointer;
-}
-
-.item[data-hovered] {
-  background-color: var(--color-bg-accent-subtle-hover);
-}
-
-.item[data-selected] {
-  background-color: var(--color-bg-accent-subtle-active);
-}
-
-.item[data-disabled] {
-  opacity: var(--opacity-disabled);
-  cursor: not-allowed;
-}
-
-.item[data-focus-visible] {
-  box-shadow: inset 0 0 0 2px var(--color-bd-focus);
-}
-
-.separator {
-  border-top: var(--border-width-1) solid var(--color-bd);
-  padding: 0;
-}
-
-.text {
-  flex: 1;
-}
-
-/* making sure the first and last child are not displayed when they have the data-separator attribute */
-.separator:is(:first-child, :last-child) {
-  display: none;
-}
diff --git a/app/client/packages/design-system/widgets/src/styles/src/text-input.module.css b/app/client/packages/design-system/widgets/src/styles/src/text-input.module.css
deleted file mode 100644
index f6d9008d3eef..000000000000
--- a/app/client/packages/design-system/widgets/src/styles/src/text-input.module.css
+++ /dev/null
@@ -1,178 +0,0 @@
-/* NOTE: these input styles are used in text area and text input */
-.text-input {
-  & [data-field-input] {
-    position: relative;
-    display: flex;
-    align-items: center;
-    gap: var(--inner-spacing-1);
-    border-radius: var(--border-radius-elevation-3);
-    background-color: var(--color-bg-neutral-subtle);
-    flex: 1;
-    max-inline-size: 100%;
-    isolation: isolate;
-    padding-inline: var(--inner-spacing-2);
-    box-shadow: inset 0 0 0 1px var(--color-bd-on-neutral-subtle);
-  }
-
-  & [data-field-input] :is(input, textarea) {
-    border: 0;
-    background-color: transparent;
-    font-family: inherit;
-    flex-grow: 1;
-    color: var(--color-fg);
-    text-overflow: ellipsis;
-    max-inline-size: 100%;
-    width: 100%;
-    box-sizing: content-box;
-    padding-block: var(--inner-spacing-1);
-
-    &:autofill,
-    &:autofill:hover,
-    &:autofill:focus,
-    &:autofill:active {
-      font-size: initial;
-      /** Removing browser's autofill styles */
-      -webkit-text-fill-color: var(--color-fg);
-      -webkit-box-shadow: 0 0 0 40rem var(--color-bg-neutral-subtle) inset;
-    }
-
-    &:focus {
-      outline: none;
-    }
-  }
-
-  & [data-field-input][data-hovered] {
-    background-color: var(--color-bg-neutral-subtle-hover);
-    box-shadow: inset 0 0 0 1px var(--color-bd-on-neutral-subtle-hover);
-  }
-
-  /**
-  * ----------------------------------------------------------------------------
-  * READONLY
-  *-----------------------------------------------------------------------------
-  */
-  & [data-readonly][data-field-input] {
-    background-color: transparent;
-    box-shadow: none;
-    padding-inline: 0;
-  }
-
-  /**
-  * ----------------------------------------------------------------------------
-  * FOCUSSED
-  *-----------------------------------------------------------------------------
-  */
-
-  /**
-  * We use an absolutely positioned pseudo element because
-  * we need to make the focus state in read mode a bit wider than the component width
-  */
-
-  & [data-field-input][data-focused] {
-    background-color: transparent;
-    box-shadow: none;
-  }
-
-  & [data-field-input][data-focused]:before {
-    content: "";
-    left: 0;
-    width: 100%;
-    height: 100%;
-    position: absolute;
-    box-shadow: 0 0 0 2px var(--color-bd-focus);
-    border-radius: var(--border-radius-elevation-3);
-    z-index: -1;
-  }
-
-  & [data-readonly][data-field-input][data-focused]:before {
-    left: calc(-0.5 * var(--inner-spacing-1));
-    width: calc(100% + var(--inner-spacing-1));
-  }
-
-  /**
-  * ----------------------------------------------------------------------------
-  * ERROR
-  *-----------------------------------------------------------------------------
-  */
-  & [data-field-input][data-invalid] {
-    box-shadow: 0 0 0 1px var(--color-bd-negative);
-  }
-
-  & [data-field-input][data-invalid][data-hovered] {
-    box-shadow: 0 0 0 1px var(--color-bd-negative-hover);
-  }
-
-  /**
-  * ----------------------------------------------------------------------------
-  * ICON
-  *-----------------------------------------------------------------------------
-  */
-  & [data-icon] {
-    color: var(--color-fg-neutral);
-  }
-
-  /**
-  * ----------------------------------------------------------------------------
-  * DESCRIPTION
-  *-----------------------------------------------------------------------------
-  */
-  & [data-field-description-text] {
-    color: var(--color-fg-neutral);
-  }
-
-  /**
-  * ----------------------------------------------------------------------------
-  * PLACEHOLDER
-  *-----------------------------------------------------------------------------
-  */
-  & [data-field-input] :is(input, textarea)::placeholder {
-    color: var(--color-fg-neutral-subtle) !important;
-    opacity: 1;
-  }
-
-  & [data-field-input] :is(input, textarea):placeholder-shown {
-    text-overflow: ellipsis;
-  }
-
-  /**
-  * ----------------------------------------------------------------------------
-  * DISABLED
-  *-----------------------------------------------------------------------------
-  */
-  & [data-disabled],
-  & [data-disabled] :is(input, textarea),
-  & [data-disabled] label {
-    cursor: not-allowed;
-    box-shadow: none;
-  }
-
-  /**
-  * ----------------------------------------------------------------------------
-  * PREFIX AND SUFFIX
-  *-----------------------------------------------------------------------------
-  */
-  & :is([data-field-input-prefix], [data-field-input-suffix]) {
-    block-size: 0;
-    display: flex;
-    align-items: center;
-  }
-
-  &
-    [data-field-input]:has(textarea)
-    :is([data-field-input-prefix], [data-field-input-suffix]) {
-    display: none;
-  }
-
-  /**
-  * ----------------------------------------------------------------------------
-  * SIZE
-  *-----------------------------------------------------------------------------
-  */
-  & [data-field-input] input[data-size="small"] {
-    block-size: calc(
-      var(--body-line-height) + var(--body-margin-start) +
-        var(--body-margin-end)
-    );
-    padding-block: var(--inner-spacing-2);
-  }
-}
diff --git a/app/client/packages/design-system/widgets/src/testing/ComplexForm.tsx b/app/client/packages/design-system/widgets/src/testing/ComplexForm.tsx
index 9ddfa6d27b00..1b43400a6880 100644
--- a/app/client/packages/design-system/widgets/src/testing/ComplexForm.tsx
+++ b/app/client/packages/design-system/widgets/src/testing/ComplexForm.tsx
@@ -5,9 +5,6 @@ import {
   Text,
   ToggleGroup,
   Checkbox,
-  TooltipRoot,
-  TooltipTrigger,
-  TooltipContent,
   ToolbarButtons,
   Flex,
   Switch,
@@ -21,6 +18,9 @@ import {
   ModalContent,
   TextInput,
   ComboBox,
+  Radio,
+  ListBoxItem,
+  Tooltip,
 } from "@appsmith/wds";
 // This component is used only for testing purpose and is not used in the prod
 
@@ -65,25 +65,25 @@ export const ComplexForm = () => {
           ]}
         />
 
-        <ToggleGroup
-          items={[
+        <ToggleGroup label="Repeat order">
+          {[
             {
-              value: "value-1",
+              value: "Once a week",
               label: "Once a week",
             },
-            { isSelected: true, value: "value-2", label: "Twice a week" },
-          ]}
-          label="Repeat order"
-        >
-          {({ isSelected, label, value }) => (
-            <Switch isSelected={isSelected} key={value} value={value}>
+            {
+              value: "Twice a week",
+              label: "Twice a week",
+            },
+          ].map(({ label, value }) => (
+            <Switch key={value} value={value}>
               {label}
             </Switch>
-          )}
+          ))}
         </ToggleGroup>
 
-        <ToggleGroup
-          items={[
+        <ToggleGroup label="Dishes">
+          {[
             {
               value: "Hamburger",
               label: "Hamburger",
@@ -96,18 +96,15 @@ export const ComplexForm = () => {
               value: "Coca-Cola",
               label: "Coca-Cola",
             },
-          ]}
-          label="Dishes"
-        >
-          {({ isSelected, label, value }) => (
-            <Checkbox isSelected={isSelected} key={value} value={value}>
+          ].map(({ label, value }) => (
+            <Checkbox key={value} value={value}>
               {label}
             </Checkbox>
-          )}
+          ))}
         </ToggleGroup>
 
-        <RadioGroup
-          items={[
+        <RadioGroup label="Portion size">
+          {[
             {
               value: "s",
               label: "S",
@@ -124,9 +121,12 @@ export const ComplexForm = () => {
               value: "xl",
               label: "XL",
             },
-          ]}
-          label="Portion size"
-        />
+          ].map(({ label, value }) => (
+            <Radio key={value} value={value}>
+              {label}
+            </Radio>
+          ))}
+        </RadioGroup>
 
         <Flex direction="column" gap="spacing-3">
           <Flex direction="column" gap="spacing-2">
@@ -140,8 +140,8 @@ export const ComplexForm = () => {
         </Flex>
         <Flex gap="spacing-2">
           <TextInput />
-          <ComboBox
-            items={[
+          <ComboBox>
+            {[
               {
                 id: "s",
                 label: "S",
@@ -158,8 +158,12 @@ export const ComplexForm = () => {
                 id: "xl",
                 label: "XL",
               },
-            ]}
-          />
+            ].map(({ id, label }) => (
+              <ListBoxItem key={id} textValue={label}>
+                {label}
+              </ListBoxItem>
+            ))}
+          </ComboBox>
           <Button>Ok</Button>
         </Flex>
         <Flex gap="spacing-2">
@@ -190,22 +194,18 @@ export const ComplexForm = () => {
       </Flex>
 
       <Flex gap="spacing-2">
-        <TooltipRoot>
-          <TooltipTrigger>
-            <Button variant="outlined">Cancel</Button>
-          </TooltipTrigger>
-          <TooltipContent>
-            If you cancel, you will lose your order
-          </TooltipContent>
-        </TooltipRoot>
+        <Tooltip tooltip="Tooltip">
+          <Button variant="outlined">Cancel</Button>
+        </Tooltip>
+
         <Button onPress={() => setModalOpen(!isModalOpen)} ref={submitRef}>
           Ok
         </Button>
         <Modal
-          dataAttributes={{ "data-size": "small" }}
           initialFocus={2}
           isOpen={isModalOpen}
           setOpen={setModalOpen}
+          size="small"
           triggerRef={submitRef}
         >
           <ModalContent>
diff --git a/app/client/packages/dsl/src/index.ts b/app/client/packages/dsl/src/index.ts
index 6696835075ac..65b82c1f4bf7 100644
--- a/app/client/packages/dsl/src/index.ts
+++ b/app/client/packages/dsl/src/index.ts
@@ -11,3 +11,4 @@ export type {
 export { migrateDSL, LATEST_DSL_VERSION } from "./migrate";
 
 export type { DSLWidget } from "./migrate/types";
+export { isDynamicValue } from "./migrate/utils";
diff --git a/app/client/packages/dsl/src/migrate/helpers/widget-configs.json b/app/client/packages/dsl/src/migrate/helpers/widget-configs.json
index 2aefa6fae959..ddd827e9bfb2 100644
--- a/app/client/packages/dsl/src/migrate/helpers/widget-configs.json
+++ b/app/client/packages/dsl/src/migrate/helpers/widget-configs.json
@@ -7311,7 +7311,7 @@
             "controlType": "OPEN_CONFIG_PANEL",
             "buttonConfig": {
               "label": "Configure",
-              "icon": "settings-2-line"
+              "icon": "settings-v3"
             },
             "label": "Configure menu items",
             "isBindProperty": false,
@@ -47874,7 +47874,7 @@
                       "controlType": "OPEN_CONFIG_PANEL",
                       "buttonConfig": {
                         "label": "Configure",
-                        "icon": "settings-2-line"
+                        "icon": "settings-v3"
                       },
                       "label": "Configure menu items",
                       "isBindProperty": false,
diff --git a/app/client/packages/dsl/src/migrate/index.ts b/app/client/packages/dsl/src/migrate/index.ts
index 811a6059cc5f..738e4ac3e1c9 100644
--- a/app/client/packages/dsl/src/migrate/index.ts
+++ b/app/client/packages/dsl/src/migrate/index.ts
@@ -146,7 +146,7 @@ const migrateUnversionedDSL = (currentDSL: DSLWidget) => {
 // A rudimentary transform function which updates the DSL based on its version.
 // A more modular approach needs to be designed.
 // This needs the widget config to be already built to migrate correctly
-const migrateVersionedDSL = (currentDSL: DSLWidget, newPage = false) => {
+const migrateVersionedDSL = async (currentDSL: DSLWidget, newPage = false) => {
   if (currentDSL.version === 1) {
     if (currentDSL.children && currentDSL.children.length > 0)
       currentDSL.children = currentDSL.children.map(updateContainers);
@@ -205,7 +205,7 @@ const migrateVersionedDSL = (currentDSL: DSLWidget, newPage = false) => {
   }
 
   if (currentDSL.version === 12) {
-    currentDSL = migrateIncorrectDynamicBindingPathLists(currentDSL);
+    currentDSL = await migrateIncorrectDynamicBindingPathLists(currentDSL);
     currentDSL.version = 13;
   }
 
@@ -619,15 +619,15 @@ const migrateVersionedDSL = (currentDSL: DSLWidget, newPage = false) => {
   return currentDSL;
 };
 
-export const migrateDSL = (
+export const migrateDSL = async (
   currentDSL: DSLWidget,
   newPage = false,
-): DSLWidget => {
+): Promise<DSLWidget> => {
   if (currentDSL.version === undefined) {
     const initialDSL = migrateUnversionedDSL(currentDSL);
 
-    return migrateVersionedDSL(initialDSL, newPage) as DSLWidget;
+    return (await migrateVersionedDSL(initialDSL, newPage)) as DSLWidget;
   } else {
-    return migrateVersionedDSL(currentDSL, newPage) as DSLWidget;
+    return (await migrateVersionedDSL(currentDSL, newPage)) as DSLWidget;
   }
 };
diff --git a/app/client/packages/dsl/src/migrate/migrations/012-migrate-incorrect-dynamic-binding-path-lists.ts b/app/client/packages/dsl/src/migrate/migrations/012-migrate-incorrect-dynamic-binding-path-lists.ts
index bc3d32aa9491..9b9effd865d0 100644
--- a/app/client/packages/dsl/src/migrate/migrations/012-migrate-incorrect-dynamic-binding-path-lists.ts
+++ b/app/client/packages/dsl/src/migrate/migrations/012-migrate-incorrect-dynamic-binding-path-lists.ts
@@ -7,7 +7,6 @@ import isString from "lodash/isString";
 import memoize from "micro-memoize";
 import { isObject, isUndefined } from "lodash";
 import { generateReactKey, isDynamicValue } from "../utils";
-import widgetConfigs from "../helpers/widget-configs.json";
 
 export const WidgetHeightLimits = {
   MAX_HEIGHT_IN_ROWS: 9000,
@@ -511,8 +510,33 @@ export function addSearchConfigToPanelConfig(config: readonly any[]) {
     return configItem;
   });
 }
+// Cache for lazy-loaded widget configurations
+let cachedWidgetConfigs: any | null = null;
+
+/*
+ Lazily load this file since it is very large and used in migrations for certain DSL versions. By lazily loading 
+ this large file it can be reduce the main chunk only be loaded for certain limited conditions.
+*/
+const loadWidgetConfig = async () => {
+  if (!cachedWidgetConfigs) {
+    try {
+      const { default: widgetConfigs } = await import(
+        "../helpers/widget-configs.json"
+      );
+
+      cachedWidgetConfigs = widgetConfigs; // Cache the module for future use
+    } catch (e) {
+      log.error("Error loading WidgetConfig", e);
+    }
+  }
 
-const getWidgetPropertyPaneContentConfig = (type: string): readonly any[] => {
+  return cachedWidgetConfigs;
+};
+
+const getWidgetPropertyPaneContentConfig = async (
+  type: string,
+): Promise<readonly any[]> => {
+  const widgetConfigs = await loadWidgetConfig();
   const propertyPaneContentConfig = (widgetConfigs as any)[type]
     .propertyPaneContentConfig;
 
@@ -540,7 +564,11 @@ const getWidgetPropertyPaneContentConfig = (type: string): readonly any[] => {
   }
 };
 
-const getWidgetPropertyPaneStyleConfig = (type: string): readonly any[] => {
+const getWidgetPropertyPaneStyleConfig = async (
+  type: string,
+): Promise<readonly any[]> => {
+  const widgetConfigs = await loadWidgetConfig();
+
   const propertyPaneStyleConfig = (widgetConfigs as any)[type]
     .propertyPaneStyleConfig;
 
@@ -567,14 +595,20 @@ const getWidgetPropertyPaneStyleConfig = (type: string): readonly any[] => {
   }
 };
 
-const getWidgetPropertyPaneCombinedConfig = (type: string): readonly any[] => {
-  const contentConfig = getWidgetPropertyPaneContentConfig(type);
-  const styleConfig = getWidgetPropertyPaneStyleConfig(type);
+const getWidgetPropertyPaneCombinedConfig = async (
+  type: string,
+): Promise<readonly any[]> => {
+  const contentConfig = await getWidgetPropertyPaneContentConfig(type);
+  const styleConfig = await getWidgetPropertyPaneStyleConfig(type);
 
   return [...contentConfig, ...styleConfig];
 };
 
-const getWidgetPropertyPaneConfig = (type: string): readonly any[] => {
+const getWidgetPropertyPaneConfig = async (
+  type: string,
+): Promise<readonly any[]> => {
+  const widgetConfigs = await loadWidgetConfig();
+
   const propertyPaneConfig = (widgetConfigs as any)[type].propertyPaneConfig;
 
   const features = (widgetConfigs as any)[type].features;
@@ -590,7 +624,7 @@ const getWidgetPropertyPaneConfig = (type: string): readonly any[] => {
 
     return enhancedPropertyPaneConfig;
   } else {
-    const config = getWidgetPropertyPaneCombinedConfig(type);
+    const config = await getWidgetPropertyPaneCombinedConfig(type);
 
     if (config === undefined) {
       log.error("Widget property pane config not defined", type);
@@ -957,14 +991,14 @@ const getAllPathsFromPropertyConfig = memoize(
   { maxSize: 1000 },
 );
 
-export const migrateIncorrectDynamicBindingPathLists = (
+export const migrateIncorrectDynamicBindingPathLists = async (
   currentDSL: Readonly<DSLWidget>,
-): DSLWidget => {
+): Promise<DSLWidget> => {
   const migratedDsl = {
     ...currentDSL,
   };
   const dynamicBindingPathList: any[] = [];
-  const propertyPaneConfig = getWidgetPropertyPaneConfig(currentDSL.type);
+  const propertyPaneConfig = await getWidgetPropertyPaneConfig(currentDSL.type);
   const { bindingPaths } = getAllPathsFromPropertyConfig(
     currentDSL,
     propertyPaneConfig,
@@ -984,8 +1018,10 @@ export const migrateIncorrectDynamicBindingPathLists = (
   migratedDsl.dynamicBindingPathList = dynamicBindingPathList;
 
   if (currentDSL.children) {
-    migratedDsl.children = currentDSL.children.map(
-      migrateIncorrectDynamicBindingPathLists,
+    migratedDsl.children = await Promise.all(
+      currentDSL.children.map(async (value) =>
+        migrateIncorrectDynamicBindingPathLists(value),
+      ),
     );
   }
 
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 ae865ac739ef..76b4294ab87a 100644
--- a/app/client/packages/dsl/src/migrate/tests/DSLMigration.test.ts
+++ b/app/client/packages/dsl/src/migrate/tests/DSLMigration.test.ts
@@ -938,85 +938,82 @@ describe("Test all the migrations are running", () => {
   afterAll(() => {
     jest.clearAllMocks();
   });
-  migrations.forEach((migration: Migration) => {
-    /**
-     * Generates mock fucntion for each migration function.
-     * Mocks the implementation
-     */
-    const version = migration.version ?? 0;
+  test("assert migration functions being called when migrate dsl has been called ", async () => {
+    migrations.forEach((migration: Migration) => {
+      /**
+       * Generates mock fucntion for each migration function.
+       * Mocks the implementation
+       */
+      const version = migration.version ?? 0;
 
-    mockFnObj[version] = [];
+      mockFnObj[version] = [];
 
-    migration.functionLookup.forEach((lookup) => {
-      const { functionName, moduleObj } = lookup;
+      migration.functionLookup.forEach((lookup) => {
+        const { functionName, moduleObj } = lookup;
 
-      if (moduleObj) {
-        mockFnObj[version].push({
-          spyOnFunc: jest
-            .spyOn(moduleObj, functionName)
-            .mockImplementation((dsl: any) => {
-              /**
-               * We need to delete the children property on the first migration(calculateDynamicHeight),
-               * to avoid the recursion in the second migration(updateContainers)
-               */
-              dsl && delete dsl.children;
+        if (moduleObj) {
+          mockFnObj[version].push({
+            spyOnFunc: jest
+              .spyOn(moduleObj, functionName)
+              .mockImplementation((dsl: any) => {
+                /**
+                 * We need to delete the children property on the first migration(calculateDynamicHeight),
+                 * to avoid the recursion in the second migration(updateContainers)
+                 */
+                dsl && delete dsl.children;
 
-              return {
-                version: dsl?.version,
-                validationFuncName: functionName,
-              };
-            }),
-        });
-      }
+                return {
+                  version: dsl?.version,
+                  validationFuncName: functionName,
+                };
+              }),
+          });
+        }
+      });
     });
-  });
 
-  // Runs all the migrations
-  DSLMigrations.migrateDSL(originalDSLForDSLMigrations as unknown as DSLWidget);
+    // Runs all the migrations
+    await DSLMigrations.migrateDSL(
+      originalDSLForDSLMigrations as unknown as DSLWidget,
+    );
 
-  migrations.forEach((item: any, testIdx: number) => {
-    const { functionLookup, version } = item;
-    const dslVersion = version ?? 0;
+    migrations.forEach((item: any) => {
+      const { functionLookup, version } = item;
+      const dslVersion = version ?? 0;
 
-    functionLookup.forEach(
-      (lookup: { moduleObj: any; functionName: string }, index: number) => {
-        const { functionName, moduleObj } = lookup;
+      functionLookup.forEach(
+        (lookup: { moduleObj: any; functionName: string }, index: number) => {
+          const { functionName, moduleObj } = lookup;
 
-        if (moduleObj) {
-          const mockObj = mockFnObj[dslVersion][index].spyOnFunc;
-          const calls = mockObj.mock?.calls;
-          const results = mockObj.mock?.results;
-          const resultsLastIdx = mockObj.mock.results.length - 1;
-
-          describe(`Test ${testIdx}:`, () => {
-            test(`Has ${functionName} function executed?`, () => {
-              // Check if the migration function is called
-              expect(results[resultsLastIdx].value.validationFuncName).toEqual(
-                functionName,
-              );
-            });
+          if (moduleObj) {
+            const mockObj = mockFnObj[dslVersion][index].spyOnFunc;
+            const calls = mockObj.mock?.calls;
+            const results = mockObj.mock?.results;
+            const resultsLastIdx = mockObj.mock.results.length - 1;
 
+            // Check if the migration function is called
+            expect(results[resultsLastIdx].value.validationFuncName).toEqual(
+              functionName,
+            );
             // Check if the migration function is called with the current DSL version
             calls.forEach((args: any) => {
-              test(`Does ${functionName} executes with DSL version: ${version}?`, () => {
-                if (args[0]?.version === version) {
-                  expect(args[0]?.version).toEqual(version);
-                }
-              });
-              test(`For ${functionName}, is the ${args[0]?.version} registerd in tests?`, () => {
-                expect(
-                  Object.keys(mockFnObj).includes(
-                    args[0]?.version.toString() ?? "0",
-                  ),
-                ).toBe(true);
-              });
+              // Does functionName executes with the correct DSL version number
+              if (args[0]?.version === version) {
+                expect(args[0]?.version).toEqual(version);
+              }
+
+              // For a functionName is the correct DSL version registed in test cases
+              expect(
+                Object.keys(mockFnObj).includes(
+                  args[0]?.version.toString() ?? "0",
+                ),
+              ).toBe(true);
             });
-          });
-        }
-      },
-    );
+          }
+        },
+      );
+    });
   });
-
   test("Check the migration count matches the lates page version", () => {
     expect(migrations.length).toEqual(DSLMigrations.LATEST_DSL_VERSION);
   });
diff --git a/app/client/packages/dsl/src/migrate/tests/DSLMigrationsUtils.test.ts b/app/client/packages/dsl/src/migrate/tests/DSLMigrationsUtils.test.ts
index 5bd449a9c59a..f79394c90c99 100644
--- a/app/client/packages/dsl/src/migrate/tests/DSLMigrationsUtils.test.ts
+++ b/app/client/packages/dsl/src/migrate/tests/DSLMigrationsUtils.test.ts
@@ -5,7 +5,7 @@ import type { DSLWidget } from "../types";
 const ASSETS_CDN_URL = "https://assets.appsmith.com";
 
 describe("correctly migrate dsl", () => {
-  it("migrateDSL for private widget", () => {
+  it("migrateDSL for private widget", async () => {
     const currentVersion = 49; // before adding privateWidgets to all List widgets
     const nextVersion = LATEST_DSL_VERSION; // It runs Two Migrations, Always Update as migration increases
 
@@ -1229,12 +1229,12 @@ describe("correctly migrate dsl", () => {
       isLoading: false,
     };
 
-    const actualNextDsl = migrateDSL(currentDSL);
+    const actualNextDsl = await migrateDSL(currentDSL);
 
     expect(actualNextDsl).toEqual(expectedNextDSL);
   });
 
-  it("migrateDSL for theming v1", () => {
+  it("migrateDSL for theming v1", async () => {
     const currentVersion = 53;
     const nextVersion = LATEST_DSL_VERSION;
     const currentDSL: DSLWidget = {
@@ -2452,7 +2452,7 @@ describe("correctly migrate dsl", () => {
       isLoading: false,
     };
 
-    const actualNextDsl = migrateDSL(currentDSL);
+    const actualNextDsl = await migrateDSL(currentDSL);
 
     expect(actualNextDsl).toEqual(expectedNextDSL);
   });
@@ -3096,7 +3096,7 @@ describe("correctly migrate dsl", () => {
     expect(actualNextDSL).toEqual(expectedNextDSL);
   });
 
-  it("correctly migrates currentIndex/currentRow properties for validations in table view", () => {
+  it("correctly migrates currentIndex/currentRow properties for validations in table view", async () => {
     const currentVersion = 78;
     const currentDSL: DSLWidget = {
       bottomRow: 740,
@@ -3171,7 +3171,7 @@ describe("correctly migrate dsl", () => {
         },
       ],
     };
-    const nextDSL = migrateDSL(currentDSL);
+    const nextDSL = await migrateDSL(currentDSL);
 
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
     const validations = (nextDSL.children || [])[0].primaryColumns.column1
diff --git a/app/client/packages/eslint-plugin/src/index.ts b/app/client/packages/eslint-plugin/src/index.ts
index e3e454c20e2a..eda6deb6d349 100644
--- a/app/client/packages/eslint-plugin/src/index.ts
+++ b/app/client/packages/eslint-plugin/src/index.ts
@@ -1,13 +1,16 @@
 import { objectKeysRule } from "./object-keys/rule";
+import { namedUseEffectRule } from "./named-use-effect/rule";
 
 const plugin = {
   rules: {
     "object-keys": objectKeysRule,
+    "named-use-effect": namedUseEffectRule,
   },
   configs: {
     recommended: {
       rules: {
         "@appsmith/object-keys": "warn",
+        "@appsmith/named-use-effect": "warn",
       },
     },
   },
diff --git a/app/client/packages/eslint-plugin/src/named-use-effect/rule.test.ts b/app/client/packages/eslint-plugin/src/named-use-effect/rule.test.ts
new file mode 100644
index 000000000000..267997f9e4af
--- /dev/null
+++ b/app/client/packages/eslint-plugin/src/named-use-effect/rule.test.ts
@@ -0,0 +1,25 @@
+import { TSESLint } from "@typescript-eslint/utils";
+import { namedUseEffectRule } from "./rule";
+
+const ruleTester = new TSESLint.RuleTester();
+
+ruleTester.run("named-use-effect", namedUseEffectRule, {
+  valid: [
+    {
+      code: "useEffect(function add(){ }, [])",
+    },
+    {
+      code: "React.useEffect(function add(){ }, [])",
+    },
+  ],
+  invalid: [
+    {
+      code: "useEffect(function (){ }, [])",
+      errors: [{ messageId: "useNamedUseEffect" }],
+    },
+    {
+      code: "React.useEffect(function (){ }, [])",
+      errors: [{ messageId: "useNamedUseEffect" }],
+    },
+  ],
+});
diff --git a/app/client/packages/eslint-plugin/src/named-use-effect/rule.ts b/app/client/packages/eslint-plugin/src/named-use-effect/rule.ts
new file mode 100644
index 000000000000..5732f04c9264
--- /dev/null
+++ b/app/client/packages/eslint-plugin/src/named-use-effect/rule.ts
@@ -0,0 +1,65 @@
+import type { TSESLint } from "@typescript-eslint/utils";
+
+export const namedUseEffectRule: TSESLint.RuleModule<"useNamedUseEffect"> = {
+  defaultOptions: [],
+  meta: {
+    type: "suggestion",
+    docs: {
+      description: "Warns when useEffect hook has an anonymous function",
+      recommended: "warn",
+    },
+    schema: [], // No options
+    messages: {
+      useNamedUseEffect:
+        "The function inside the useEffect should be named for better readability eg: useEffect(function mySideEffect() {...}, [])",
+    },
+  },
+  create(context) {
+    return {
+      CallExpression(node) {
+        // useEffect used directly
+        // eg
+        // import { useEffect } from "react";
+        // ...
+        // useEffect(() => {}, [])
+        const isDirectCall =
+          node.callee.type === "Identifier" && node.callee.name === "useEffect";
+
+        // useEffect used via React object
+        // eg
+        // import React from "react";
+        // ...
+        // React.useEffect(() => {}, [])
+        const isMemberExpressionCall =
+          node.callee.type === "MemberExpression" &&
+          node.callee.object.type === "Identifier" &&
+          node.callee.object.name === "React" &&
+          node.callee.property.type === "Identifier" &&
+          node.callee.property.name === "useEffect";
+
+        if (isDirectCall || isMemberExpressionCall) {
+          // Get the first argument which should be a function
+          const callbackArg = node.arguments[0];
+
+          // Arrow function are never named so it is discouraged
+          if (callbackArg.type === "ArrowFunctionExpression") {
+            context.report({
+              node: callbackArg,
+              messageId: "useNamedUseEffect",
+            });
+          }
+
+          // Function Expressions can be unnamed. This is also discouraged
+          if (callbackArg.type === "FunctionExpression") {
+            if (!callbackArg.id) {
+              context.report({
+                node: callbackArg,
+                messageId: "useNamedUseEffect",
+              });
+            }
+          }
+        }
+      },
+    };
+  },
+};
diff --git a/app/client/packages/icons/package.json b/app/client/packages/icons/package.json
index 351d24c894fc..514eeabb69c5 100644
--- a/app/client/packages/icons/package.json
+++ b/app/client/packages/icons/package.json
@@ -18,6 +18,8 @@
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0"
   },
   "devDependencies": {
+    "@svgr/core": "^8.1.0",
+    "@svgr/plugin-jsx": "^8.1.0",
     "fast-glob": "^3.3.2",
     "figmagic": "^4.5.13",
     "fs-extra": "^11.2.0",
diff --git a/app/client/packages/icons/src/components/CustomIcons/AIAvatarCustomIcon.tsx b/app/client/packages/icons/src/components/CustomIcons/AIAvatarCustomIcon.tsx
new file mode 100644
index 000000000000..2c11db8ee939
--- /dev/null
+++ b/app/client/packages/icons/src/components/CustomIcons/AIAvatarCustomIcon.tsx
@@ -0,0 +1,4 @@
+import * as React from "react";
+import type { SVGProps } from "react";
+const AIAvatarCustomIcon = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={24} height={24} fill="none" {...props}><rect width={23} height={23} x={0.5} y={0.5} fill="#FFF7F4" rx={1.5} /><rect width={23} height={23} x={0.5} y={0.5} stroke="#FFE9E0" rx={1.5} /><path fill="#FF6D2D" d="M4.5 11a2 2 0 1 0 0 4v-4M19.5 11a2 2 0 1 1 0 4v-4" /><rect width={15} height={10} x={4.5} y={8} fill="#fff" stroke="#000" strokeMiterlimit={10} strokeWidth={0.149} rx={3} /><rect width={12} height={7} x={6} y={9.5} fill="#fff" stroke="#000" strokeMiterlimit={10} strokeWidth={0.5} rx={1.5} /><circle cx={9} cy={12} r={1} fill="#000" /><circle cx={15} cy={12} r={1} fill="#000" /><path fill="#000" d="M11.5 5.5h1V8h-1z" /><circle cx={12} cy={4.5} r={1.5} fill="#fff" stroke="#000" strokeMiterlimit={10} strokeWidth={0.149} /><path stroke="#000" strokeLinecap="round" strokeWidth={0.5} d="m10 14 .209.232A2.426 2.426 0 0 0 14 14v0" /></svg>;
+export { AIAvatarCustomIcon };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Icons/AIChatIcon.tsx b/app/client/packages/icons/src/components/Icons/AIChatIcon.tsx
new file mode 100644
index 000000000000..0b8ba3a1e9a9
--- /dev/null
+++ b/app/client/packages/icons/src/components/Icons/AIChatIcon.tsx
@@ -0,0 +1,4 @@
+import * as React from "react";
+import type { SVGProps } from "react";
+const AIChatIcon = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={16} height={17} fill="none" {...props}><path fill="#000" fillOpacity={0.25} fillRule="evenodd" d="M1.5 1A1.5 1.5 0 0 0 0 2.5v8A1.5 1.5 0 0 0 1.5 12H2V4.5A1.5 1.5 0 0 1 3.5 3H13v-.5A1.5 1.5 0 0 0 11.5 1z" clipRule="evenodd" /><mask id="a" fill="#fff"><path fillRule="evenodd" d="M3.5 3A1.5 1.5 0 0 0 2 4.5v8A1.5 1.5 0 0 0 3.5 14H10l2.146 2.146a.5.5 0 0 0 .854-.353V14h.5a1.5 1.5 0 0 0 1.5-1.5v-8A1.5 1.5 0 0 0 13.5 3z" clipRule="evenodd" /></mask><path fill="#000" d="m10 14 .707-.707-.293-.293H10zm3 0v-1h-1v1zM3 4.5a.5.5 0 0 1 .5-.5V2A2.5 2.5 0 0 0 1 4.5zm0 8v-8H1v8zm.5.5a.5.5 0 0 1-.5-.5H1A2.5 2.5 0 0 0 3.5 15zm6.5 0H3.5v2H10zm2.854 2.44-2.147-2.147-1.414 1.414 2.146 2.147zm-.854.353a.5.5 0 0 1 .854-.354l-1.415 1.415c.945.945 2.561.275 2.561-1.061zM12 14v1.793h2V14zm1.5-1H13v2h.5zm.5-.5a.5.5 0 0 1-.5.5v2a2.5 2.5 0 0 0 2.5-2.5zm0-8v8h2v-8zm-.5-.5a.5.5 0 0 1 .5.5h2A2.5 2.5 0 0 0 13.5 2zm-10 0h10V2h-10z" mask="url(#a)" /><path stroke="#000" strokeOpacity={0.75} d="m8.536 6.27.6 1.402.08.184.183.078 1.403.602-1.403.6-.184.08-.078.183-.601 1.403-.602-1.403-.078-.184-.184-.078-1.403-.601 1.403-.602.184-.078.078-.184z" /></svg>;
+export { AIChatIcon };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Icons/ButtonIcon.tsx b/app/client/packages/icons/src/components/Icons/ButtonIcon.tsx
index 1c1db17747a7..fe8d70414dcd 100644
--- a/app/client/packages/icons/src/components/Icons/ButtonIcon.tsx
+++ b/app/client/packages/icons/src/components/Icons/ButtonIcon.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const ButtonIcon = () => <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".25" d="M14.5 8.5v3a2 2 0 0 1-2 2h-10a2 2 0 0 1-2-2v-3"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M12.5 2.5h-10a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2v-6a2 2 0 0 0-2-2"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M8.5 5.5v2m0 2v-2m3-2L9.793 7.207a1 1 0 0 1-.707.293H8.5M8.5 9.5v-4m3 4-2-2M3.5 8V7a1.5 1.5 0 1 1 3 0v1a1.5 1.5 0 1 1-3 0"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const ButtonIcon = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={16} height={16} fill="none" {...props}><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" strokeOpacity={0.25} d="M14.5 8.5v3a2 2 0 0 1-2 2h-10a2 2 0 0 1-2-2v-3" /><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" d="M12.5 2.5h-10a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2v-6a2 2 0 0 0-2-2" /><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" d="M8.5 5.5v2m0 2v-2m3-2L9.793 7.207a1 1 0 0 1-.707.293H8.5M8.5 9.5v-4m3 4-2-2M3.5 8V7a1.5 1.5 0 1 1 3 0v1a1.5 1.5 0 1 1-3 0" /></svg>;
+export { ButtonIcon };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Icons/CheckboxGroupIcon.tsx b/app/client/packages/icons/src/components/Icons/CheckboxGroupIcon.tsx
index f8621332360f..3e9fc735f81b 100644
--- a/app/client/packages/icons/src/components/Icons/CheckboxGroupIcon.tsx
+++ b/app/client/packages/icons/src/components/Icons/CheckboxGroupIcon.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const CheckboxGroupIcon = () => <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M5 6.5H2A1.5 1.5 0 0 1 .5 5V2A1.5 1.5 0 0 1 2 .5h3A1.5 1.5 0 0 1 6.5 2v3A1.5 1.5 0 0 1 5 6.5"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="m2.5 3.5 1 1 1-2M8.5 2.5h6M8.5 12.5h4M5 14.5H2A1.5 1.5 0 0 1 .5 13v-3A1.5 1.5 0 0 1 2 8.5h3A1.5 1.5 0 0 1 6.5 10v3A1.5 1.5 0 0 1 5 14.5M8.5 4.5h4M8.5 10.5h6"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const CheckboxGroupIcon = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={16} height={16} fill="none" {...props}><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" d="M5 6.5H2A1.5 1.5 0 0 1 .5 5V2A1.5 1.5 0 0 1 2 .5h3A1.5 1.5 0 0 1 6.5 2v3A1.5 1.5 0 0 1 5 6.5" /><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" d="m2.5 3.5 1 1 1-2M8.5 2.5h6M8.5 12.5h4M5 14.5H2A1.5 1.5 0 0 1 .5 13v-3A1.5 1.5 0 0 1 2 8.5h3A1.5 1.5 0 0 1 6.5 10v3A1.5 1.5 0 0 1 5 14.5M8.5 4.5h4M8.5 10.5h6" /></svg>;
+export { CheckboxGroupIcon };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Icons/CheckboxIcon.tsx b/app/client/packages/icons/src/components/Icons/CheckboxIcon.tsx
index 29369bcba70b..e3d38ebfefdc 100644
--- a/app/client/packages/icons/src/components/Icons/CheckboxIcon.tsx
+++ b/app/client/packages/icons/src/components/Icons/CheckboxIcon.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const CheckboxIcon = () => <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M11.5 1.5h-8a2 2 0 0 0-2 2v8a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2v-8a2 2 0 0 0-2-2"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="m4.5 7.5 2 2 4-4"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const CheckboxIcon = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={16} height={16} fill="none" {...props}><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" d="M11.5 1.5h-8a2 2 0 0 0-2 2v8a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2v-8a2 2 0 0 0-2-2" /><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" d="m4.5 7.5 2 2 4-4" /></svg>;
+export { CheckboxIcon };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Icons/ComboboxSelectIcon.tsx b/app/client/packages/icons/src/components/Icons/ComboboxSelectIcon.tsx
index 97516278935e..054b78fe28d5 100644
--- a/app/client/packages/icons/src/components/Icons/ComboboxSelectIcon.tsx
+++ b/app/client/packages/icons/src/components/Icons/ComboboxSelectIcon.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const ComboboxSelectIcon = () => <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M14.5 2.5h-12a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h7M14.5 7.5l-1 1-1-1"/><circle cx="5.5" cy="7.5" r="2" stroke="#000"/><path fill="#000" d="M7.354 8.646 7 8.293 6.293 9l.353.354zm.292 1.708a.5.5 0 0 0 .708-.708zm-1-1 1 1 .708-.708-1-1z"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const ComboboxSelectIcon = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={16} height={16} fill="none" {...props}><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" d="M14.5 2.5h-12a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h7M14.5 7.5l-1 1-1-1" /><circle cx={5.5} cy={7.5} r={2.079} stroke="#000" /><path fill="#000" d="m7.534 8.685-.424-.424-.849.849.424.424zm.042 1.74a.6.6 0 0 0 .848-.85zm-.89-.891.89.89.848-.848-.89-.89z" /></svg>;
+export { ComboboxSelectIcon };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Icons/CurrencyInputIcon.tsx b/app/client/packages/icons/src/components/Icons/CurrencyInputIcon.tsx
index 92cfe3cb3aae..56a604bab54f 100644
--- a/app/client/packages/icons/src/components/Icons/CurrencyInputIcon.tsx
+++ b/app/client/packages/icons/src/components/Icons/CurrencyInputIcon.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const CurrencyInputIcon = () => <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M7.5 5.5h-3a1 1 0 0 0-1 1v0a1 1 0 0 0 1 1h2a1 1 0 0 1 1 1v0a1 1 0 0 1-1 1h-3M5.5 10.5v-6"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".25" d="M12.5 6.5h1m1 0h-1m0 0v8m-1 0h2"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M14.5 2.5h-12a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h7"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const CurrencyInputIcon = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={16} height={16} fill="none" {...props}><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" d="M7.5 5.5h-3a1 1 0 0 0-1 1v0a1 1 0 0 0 1 1h2a1 1 0 0 1 1 1v0a1 1 0 0 1-1 1h-3M5.5 10.5v-6" /><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" strokeOpacity={0.25} d="M12.5 6.5h1m1 0h-1m0 0v8m-1 0h2" /><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" d="M14.5 2.5h-12a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h7" /></svg>;
+export { CurrencyInputIcon };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Icons/DatePickerIcon.tsx b/app/client/packages/icons/src/components/Icons/DatePickerIcon.tsx
new file mode 100644
index 000000000000..876c44b6a4b4
--- /dev/null
+++ b/app/client/packages/icons/src/components/Icons/DatePickerIcon.tsx
@@ -0,0 +1,4 @@
+import * as React from "react";
+import type { SVGProps } from "react";
+const DatePickerIcon = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={16} height={16} fill="none" {...props}><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" d="M12.5 1.5h-10a1 1 0 0 0-1 1v10a1 1 0 0 0 1 1h10a1 1 0 0 0 1-1v-10a1 1 0 0 0-1-1M9.5 5.5v8M5.5 5.5v8M1.5 5.5h12M1.5 9.5h12M4.5 3.5v-3m6 3v-3" /></svg>;
+export { DatePickerIcon };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Icons/EmailInputIcon.tsx b/app/client/packages/icons/src/components/Icons/EmailInputIcon.tsx
index e67d33183035..13f5c63190b0 100644
--- a/app/client/packages/icons/src/components/Icons/EmailInputIcon.tsx
+++ b/app/client/packages/icons/src/components/Icons/EmailInputIcon.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const EmailInputIcon = () => <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".25" d="M12.5 6.5h1m1 0h-1m0 0v8m-1 0h2"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M14.5 2.5h-12a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h7"/><path stroke="#000" stroke-linecap="round" d="M6.5 8.5v-1a1 1 0 0 0-1-1v0a1 1 0 0 0-1 1v0a1 1 0 0 0 1 1zm0 0h.667c.736 0 1.333-.597 1.333-1.333v0A2.667 2.667 0 0 0 5.833 4.5H5.5a3 3 0 0 0-3 3v0a3 3 0 0 0 3 3h2"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const EmailInputIcon = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={16} height={16} fill="none" {...props}><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" strokeOpacity={0.25} d="M12.5 6.5h1m1 0h-1m0 0v8m-1 0h2" /><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" d="M14.5 2.5h-12a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h7" /><path stroke="#000" strokeLinecap="round" d="M6.5 8.5v-1a1 1 0 0 0-1-1v0a1 1 0 0 0-1 1v0a1 1 0 0 0 1 1zm0 0h.667c.736 0 1.333-.597 1.333-1.333v0A2.667 2.667 0 0 0 5.833 4.5H5.5a3 3 0 0 0-3 3v0a3 3 0 0 0 3 3h2" /></svg>;
+export { EmailInputIcon };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Icons/HeadingIcon.tsx b/app/client/packages/icons/src/components/Icons/HeadingIcon.tsx
index ce21cb63e153..c6375fb87ef6 100644
--- a/app/client/packages/icons/src/components/Icons/HeadingIcon.tsx
+++ b/app/client/packages/icons/src/components/Icons/HeadingIcon.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const HeadingIcon = () => <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M.5 1.5h2m2 0h-2m0 0v12m-2 0h4M10.5 1.5h2m2 0h-2m0 0v12m-2 0h4M2.5 7.5h10"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const HeadingIcon = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={16} height={16} fill="none" {...props}><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" d="M.5 1.5h2m2 0h-2m0 0v12m-2 0h4M10.5 1.5h2m2 0h-2m0 0v12m-2 0h4M2.5 7.5h10" /></svg>;
+export { HeadingIcon };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Icons/IconButtonIcon.tsx b/app/client/packages/icons/src/components/Icons/IconButtonIcon.tsx
index 510d24d59008..cd9f744dd14b 100644
--- a/app/client/packages/icons/src/components/Icons/IconButtonIcon.tsx
+++ b/app/client/packages/icons/src/components/Icons/IconButtonIcon.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const IconButtonIcon = () => <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M12.5 2.5h-10a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2v-6a2 2 0 0 0-2-2"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".25" d="M14.5 8.5v3a2 2 0 0 1-2 2h-10a2 2 0 0 1-2-2v-3"/><path stroke="#000" stroke-linecap="round" d="M5.5 7.5h4M7.5 9.5v-4"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const IconButtonIcon = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={16} height={16} fill="none" {...props}><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" d="M12.5 2.5h-10a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2v-6a2 2 0 0 0-2-2" /><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" strokeOpacity={0.25} d="M14.5 8.5v3a2 2 0 0 1-2 2h-10a2 2 0 0 1-2-2v-3" /><path stroke="#000" strokeLinecap="round" d="M5.5 7.5h4M7.5 9.5v-4" /></svg>;
+export { IconButtonIcon };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Icons/InlineButtonsIcon.tsx b/app/client/packages/icons/src/components/Icons/InlineButtonsIcon.tsx
index ec89d44edf4a..8cce9902695b 100644
--- a/app/client/packages/icons/src/components/Icons/InlineButtonsIcon.tsx
+++ b/app/client/packages/icons/src/components/Icons/InlineButtonsIcon.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const InlineButtonsIcon = () => <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="m11.5 7.5 1 1 1-2"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".75" d="m3.5 8.5 2-2m0 2-2-2"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M13.5 4.5h-2a2 2 0 0 0-2 2v2a2 2 0 0 0 2 2h2a2 2 0 0 0 2-2v-2a2 2 0 0 0-2-2"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".75" d="M5.5 4.5h-2a2 2 0 0 0-2 2v2a2 2 0 0 0 2 2h2a2 2 0 0 0 2-2v-2a2 2 0 0 0-2-2"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const InlineButtonsIcon = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={16} height={16} fill="none" {...props}><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" d="m11.5 7.5 1 1 1-2" /><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" strokeOpacity={0.75} d="m3.5 8.5 2-2m0 2-2-2" /><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" d="M13.5 4.5h-2a2 2 0 0 0-2 2v2a2 2 0 0 0 2 2h2a2 2 0 0 0 2-2v-2a2 2 0 0 0-2-2" /><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" strokeOpacity={0.75} d="M5.5 4.5h-2a2 2 0 0 0-2 2v2a2 2 0 0 0 2 2h2a2 2 0 0 0 2-2v-2a2 2 0 0 0-2-2" /></svg>;
+export { InlineButtonsIcon };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Icons/InputIcon.tsx b/app/client/packages/icons/src/components/Icons/InputIcon.tsx
index 586c75fc3aee..f6b98a73daf3 100644
--- a/app/client/packages/icons/src/components/Icons/InputIcon.tsx
+++ b/app/client/packages/icons/src/components/Icons/InputIcon.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const InputIcon = () => <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="m7.5 9.5-.5-1m-3.5 1 .5-1m0 0 1.5-3 1.5 3m-3 0h3"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M14.5 2.5h-12a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h7M14.5 7.5l-1 1-1-1"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const InputIcon = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={16} height={16} fill="none" {...props}><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" d="m7.5 9.5-.5-1m-3.5 1 .5-1m0 0 1.5-3 1.5 3m-3 0h3" /><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" strokeOpacity={0.25} d="M12.5 6.5h1m1 0h-1m0 0v8m-1 0h2" /><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" d="M14.5 2.5h-12a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h7" /></svg>;
+export { InputIcon };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Icons/KeyValueIcon.tsx b/app/client/packages/icons/src/components/Icons/KeyValueIcon.tsx
index 09a5bd7321ca..baf2871234d1 100644
--- a/app/client/packages/icons/src/components/Icons/KeyValueIcon.tsx
+++ b/app/client/packages/icons/src/components/Icons/KeyValueIcon.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const KeyValueIcon = () => <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".25" stroke-width="2" d="M2 3h6"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M1.5 11.5h1m1 0h-1m-1-3 1-1v4M8.5 11.5h-3v-1a1 1 0 0 1 1-1h1a1 1 0 0 0 1-1v0a1 1 0 0 0-1-1h-2M10.5 7.5h2a1 1 0 0 1 1 1v0a1 1 0 0 1-1 1h-1M10.5 11.5h2a1 1 0 0 0 1-1v0a1 1 0 0 0-1-1h-1"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const KeyValueIcon = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={16} height={16} fill="none" {...props}><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" strokeOpacity={0.25} strokeWidth={2} d="M2 3h6" /><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" d="M1.5 11.5h1m1 0h-1m-1-3 1-1v4M8.5 11.5h-3v-1a1 1 0 0 1 1-1h1a1 1 0 0 0 1-1v0a1 1 0 0 0-1-1h-2M10.5 7.5h2a1 1 0 0 1 1 1v0a1 1 0 0 1-1 1h-1M10.5 11.5h2a1 1 0 0 0 1-1v0a1 1 0 0 0-1-1h-1" /></svg>;
+export { KeyValueIcon };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Icons/MenuButtonIcon.tsx b/app/client/packages/icons/src/components/Icons/MenuButtonIcon.tsx
index 26470441e927..fabb550194c4 100644
--- a/app/client/packages/icons/src/components/Icons/MenuButtonIcon.tsx
+++ b/app/client/packages/icons/src/components/Icons/MenuButtonIcon.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const MenuButtonIcon = () => <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M12.5 2.5h-10a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2v-6a2 2 0 0 0-2-2"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".25" d="M14.5 8.5v3a2 2 0 0 1-2 2h-10a2 2 0 0 1-2-2v-3"/><path stroke="#000" stroke-linecap="round" d="M5.5 7.5h4M5.5 9.5h4M5.5 5.5h4"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const MenuButtonIcon = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={16} height={16} fill="none" {...props}><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" d="M12.5 2.5h-10a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2v-6a2 2 0 0 0-2-2" /><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" strokeOpacity={0.25} d="M14.5 8.5v3a2 2 0 0 1-2 2h-10a2 2 0 0 1-2-2v-3" /><path stroke="#000" strokeLinecap="round" d="M5.5 7.5h4M5.5 9.5h4M5.5 5.5h4" /></svg>;
+export { MenuButtonIcon };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Icons/ModalIcon.tsx b/app/client/packages/icons/src/components/Icons/ModalIcon.tsx
index 8496db1df687..7358fe43fc86 100644
--- a/app/client/packages/icons/src/components/Icons/ModalIcon.tsx
+++ b/app/client/packages/icons/src/components/Icons/ModalIcon.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const ModalIcon = () => <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".25" d="M12.5 2.5a1 1 0 0 1 1 1v7a3 3 0 0 1-3 3h-7a1 1 0 0 1-1-1v0"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M10.5.5h-8a2 2 0 0 0-2 2v8a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2v-8a2 2 0 0 0-2-2M7.5 5.5l2-2m0 2-2-2"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const ModalIcon = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={16} height={16} fill="none" {...props}><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" strokeOpacity={0.25} d="M12.5 2.5a1 1 0 0 1 1 1v7a3 3 0 0 1-3 3h-7a1 1 0 0 1-1-1v0" /><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" d="M10.5.5h-8a2 2 0 0 0-2 2v8a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2v-8a2 2 0 0 0-2-2M7.5 5.5l2-2m0 2-2-2" /></svg>;
+export { ModalIcon };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Icons/MultilineInputIcon.tsx b/app/client/packages/icons/src/components/Icons/MultilineInputIcon.tsx
index 3401be75a150..f5ffb412de0d 100644
--- a/app/client/packages/icons/src/components/Icons/MultilineInputIcon.tsx
+++ b/app/client/packages/icons/src/components/Icons/MultilineInputIcon.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const MultilineInputIcon = () => <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="m7.5 7.5-.5-1m-3.5 1 .5-1m0 0 1.5-3 1.5 3m-3 0h3"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".25" d="M12.5 6.5h1m1 0h-1m0 0v8m-1 0h2"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M14.5 1.5h-12a2 2 0 0 0-2 2v9a2 2 0 0 0 2 2h7"/><path stroke="#000" stroke-linecap="round" d="M3.5 12v-2a.5.5 0 0 1 .5-.5h2a1.5 1.5 0 0 1 0 3H4a.5.5 0 0 1-.5-.5Z"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const MultilineInputIcon = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={16} height={16} fill="none" {...props}><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" d="m7.5 7.5-.5-1m-3.5 1 .5-1m0 0 1.5-3 1.5 3m-3 0h3" /><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" strokeOpacity={0.25} d="M12.5 6.5h1m1 0h-1m0 0v8m-1 0h2" /><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" d="M14.5 1.5h-12a2 2 0 0 0-2 2v9a2 2 0 0 0 2 2h7" /><path stroke="#000" strokeLinecap="round" d="M3.5 12v-2a.5.5 0 0 1 .5-.5h2a1.5 1.5 0 0 1 0 3H4a.5.5 0 0 1-.5-.5Z" /></svg>;
+export { MultilineInputIcon };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Icons/NumberInputIcon.tsx b/app/client/packages/icons/src/components/Icons/NumberInputIcon.tsx
index 312eb87ee69e..8de60a4c9c4e 100644
--- a/app/client/packages/icons/src/components/Icons/NumberInputIcon.tsx
+++ b/app/client/packages/icons/src/components/Icons/NumberInputIcon.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const NumberInputIcon = () => <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M3.5 9.5h1m1 0h-1m-1-3 1-1v4M9.5 9.5h1m1 0h-1m-1-3 1-1v4"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".25" d="M12.5 6.5h1m1 0h-1m0 0v8m-1 0h2"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M14.5 2.5h-12a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h7"/><path stroke="#000" stroke-linecap="round" d="M7.5 9.5v.01"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const NumberInputIcon = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={16} height={16} fill="none" {...props}><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" d="M3.5 9.5h1m1 0h-1m-1-3 1-1v4M9.5 9.5h1m1 0h-1m-1-3 1-1v4" /><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" strokeOpacity={0.25} d="M12.5 6.5h1m1 0h-1m0 0v8m-1 0h2" /><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" d="M14.5 2.5h-12a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h7" /><path stroke="#000" strokeLinecap="round" d="M7.5 9.5v.01" /></svg>;
+export { NumberInputIcon };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Icons/ParagraphIcon.tsx b/app/client/packages/icons/src/components/Icons/ParagraphIcon.tsx
index fd3d7eb03870..59bb8ce2b762 100644
--- a/app/client/packages/icons/src/components/Icons/ParagraphIcon.tsx
+++ b/app/client/packages/icons/src/components/Icons/ParagraphIcon.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const ParagraphIcon = () => <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M1.5 1.5h1m0 0h2a1 1 0 0 1 1 1v0a1 1 0 0 1-1 1h-2m0-2v2m1 2h-2 1v-2"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".5" d="M7.5 1.5h6M7.5 3.5h6M7.5 5.5h6M1.5 7.5h12M1.5 9.5h12M1.5 11.5h12M1.5 13.5h7"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const ParagraphIcon = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={16} height={16} fill="none" {...props}><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" d="M1.5 1.5h1m0 0h2a1 1 0 0 1 1 1v0a1 1 0 0 1-1 1h-2m0-2v2m1 2h-2 1v-2" /><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" strokeOpacity={0.5} d="M7.5 1.5h6M7.5 3.5h6M7.5 5.5h6M1.5 7.5h12M1.5 9.5h12M1.5 11.5h12M1.5 13.5h7" /></svg>;
+export { ParagraphIcon };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Icons/PasswordInputIcon.tsx b/app/client/packages/icons/src/components/Icons/PasswordInputIcon.tsx
index 133f72e44a80..6a7c7aed2ef1 100644
--- a/app/client/packages/icons/src/components/Icons/PasswordInputIcon.tsx
+++ b/app/client/packages/icons/src/components/Icons/PasswordInputIcon.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const PasswordInputIcon = () => <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".25" d="M12.5 6.5h1m1 0h-1m0 0v8m-1 0h2"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M14.5 2.5h-12a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h7"/><path stroke="#000" stroke-linecap="round" stroke-width="2.1" d="M4 7h.01M7 7h.01M10 7h.01"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const PasswordInputIcon = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={16} height={16} fill="none" {...props}><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" strokeOpacity={0.25} d="M12.5 6.5h1m1 0h-1m0 0v8m-1 0h2" /><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" d="M14.5 2.5h-12a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h7" /><path stroke="#000" strokeLinecap="round" strokeWidth={2.1} d="M4 7h.01M7 7h.01M10 7h.01" /></svg>;
+export { PasswordInputIcon };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Icons/PhoneInputIcon.tsx b/app/client/packages/icons/src/components/Icons/PhoneInputIcon.tsx
index c0c3b77c6bf0..1e8bc9a56367 100644
--- a/app/client/packages/icons/src/components/Icons/PhoneInputIcon.tsx
+++ b/app/client/packages/icons/src/components/Icons/PhoneInputIcon.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const PhoneInputIcon = () => <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M7.5 9.5h1m1 0h-1m-1-3 1-1v4"/><path stroke="#000" stroke-linecap="round" d="M3.5 7.5h2M4.5 8.5v-2"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".25" d="M12.5 6.5h1m1 0h-1m0 0v8m-1 0h2"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M14.5 2.5h-12a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h7"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const PhoneInputIcon = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={16} height={16} fill="none" {...props}><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" d="M7.5 9.5h1m1 0h-1m-1-3 1-1v4" /><path stroke="#000" strokeLinecap="round" d="M3.5 7.5h2M4.5 8.5v-2" /><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" strokeOpacity={0.25} d="M12.5 6.5h1m1 0h-1m0 0v8m-1 0h2" /><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" d="M14.5 2.5h-12a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h7" /></svg>;
+export { PhoneInputIcon };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Icons/RadioGroupIcon.tsx b/app/client/packages/icons/src/components/Icons/RadioGroupIcon.tsx
index 9f24ed327cec..cb9617f69c9a 100644
--- a/app/client/packages/icons/src/components/Icons/RadioGroupIcon.tsx
+++ b/app/client/packages/icons/src/components/Icons/RadioGroupIcon.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const RadioGroupIcon = () => <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M8.5 2.5h6M8.5 10.5h6M8.5 4.5h4M8.5 12.5h4"/><circle cx="3.5" cy="11.5" r="3" stroke="#000" stroke-linejoin="round" transform="rotate(-90 3.5 11.5)"/><path fill="#000" fill-opacity=".1" fill-rule="evenodd" d="M6.5 3.5a3 3 0 1 0-6 0 3 3 0 0 0 6 0M5 3.5a1.5 1.5 0 1 0-3 0 1.5 1.5 0 0 0 3 0" clip-rule="evenodd"/><circle cx="3.5" cy="3.5" r="3" stroke="#000" stroke-linejoin="round" transform="rotate(-90 3.5 3.5)"/><circle cx="3.5" cy="3.5" r="1" stroke="#000" stroke-linejoin="round" transform="rotate(-90 3.5 3.5)"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const RadioGroupIcon = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={16} height={16} fill="none" {...props}><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" d="M8.5 2.5h6M8.5 10.5h6M8.5 4.5h4M8.5 12.5h4" /><circle cx={3.5} cy={11.5} r={3} stroke="#000" strokeLinejoin="round" transform="rotate(-90 3.5 11.5)" /><path fill="#000" fillOpacity={0.1} fillRule="evenodd" d="M6.5 3.5a3 3 0 1 0-6 0 3 3 0 0 0 6 0M5 3.5a1.5 1.5 0 1 0-3 0 1.5 1.5 0 0 0 3 0" clipRule="evenodd" /><circle cx={3.5} cy={3.5} r={3} stroke="#000" strokeLinejoin="round" transform="rotate(-90 3.5 3.5)" /><circle cx={3.5} cy={3.5} r={1} stroke="#000" strokeLinejoin="round" transform="rotate(-90 3.5 3.5)" /></svg>;
+export { RadioGroupIcon };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Icons/SectionIcon.tsx b/app/client/packages/icons/src/components/Icons/SectionIcon.tsx
index e1f08894335e..ca589d7f0508 100644
--- a/app/client/packages/icons/src/components/Icons/SectionIcon.tsx
+++ b/app/client/packages/icons/src/components/Icons/SectionIcon.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const SectionIcon = () => <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M1.5 6v3A1.5 1.5 0 0 0 3 10.5h9A1.5 1.5 0 0 0 13.5 9V6A1.5 1.5 0 0 0 12 4.5H3A1.5 1.5 0 0 0 1.5 6"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".25" d="M13.5.5V1A1.5 1.5 0 0 1 12 2.5H3A1.5 1.5 0 0 1 1.5 1V.5M13.5 14.5V14a1.5 1.5 0 0 0-1.5-1.5H3A1.5 1.5 0 0 0 1.5 14v.5"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const SectionIcon = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={16} height={16} fill="none" {...props}><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" d="M1.5 6v3A1.5 1.5 0 0 0 3 10.5h9A1.5 1.5 0 0 0 13.5 9V6A1.5 1.5 0 0 0 12 4.5H3A1.5 1.5 0 0 0 1.5 6" /><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" strokeOpacity={0.25} d="M13.5.5V1A1.5 1.5 0 0 1 12 2.5H3A1.5 1.5 0 0 1 1.5 1V.5M13.5 14.5V14a1.5 1.5 0 0 0-1.5-1.5H3A1.5 1.5 0 0 0 1.5 14v.5" /></svg>;
+export { SectionIcon };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Icons/StatsBoxIcon.tsx b/app/client/packages/icons/src/components/Icons/StatsBoxIcon.tsx
index 48e9f4f9c9bc..160b937d70c1 100644
--- a/app/client/packages/icons/src/components/Icons/StatsBoxIcon.tsx
+++ b/app/client/packages/icons/src/components/Icons/StatsBoxIcon.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const StatsBoxIcon = () => <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M12.5 1.5h-10a2 2 0 0 0-2 2v8a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2v-8a2 2 0 0 0-2-2"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".25" d="M3.5 4.5h6"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M3.5 10.5h1m1 0h-1m-1-3 1-1v4"/><path stroke="#000" stroke-linecap="round" d="M9.5 10.5V7"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="m7.5 8.5 2-2 2 2"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const StatsBoxIcon = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={16} height={16} fill="none" {...props}><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" d="M12.5 1.5h-10a2 2 0 0 0-2 2v8a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2v-8a2 2 0 0 0-2-2" /><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" strokeOpacity={0.25} d="M3.5 4.5h6" /><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" d="M3.5 10.5h1m1 0h-1m-1-3 1-1v4" /><path stroke="#000" strokeLinecap="round" d="M9.5 10.5V7" /><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" d="m7.5 8.5 2-2 2 2" /></svg>;
+export { StatsBoxIcon };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Icons/SwitchGroupIcon.tsx b/app/client/packages/icons/src/components/Icons/SwitchGroupIcon.tsx
index babbde8020d3..3b151be0fce0 100644
--- a/app/client/packages/icons/src/components/Icons/SwitchGroupIcon.tsx
+++ b/app/client/packages/icons/src/components/Icons/SwitchGroupIcon.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const SwitchGroupIcon = () => <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M10.5 8.5h-6a3 3 0 0 0 0 6h6a3 3 0 1 0 0-6"/><path fill="#000" fill-opacity=".15" fill-rule="evenodd" d="M1.5 3.5a3 3 0 0 1 3-3h6a3 3 0 0 0 0 6h-6a3 3 0 0 1-3-3" clip-rule="evenodd"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M10.5.5h-6a3 3 0 0 0 0 6h6a3 3 0 1 0 0-6"/><circle cx="10.5" cy="3.5" r="3" stroke="#000"/><circle cx="4.5" cy="11.5" r="3" stroke="#000"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const SwitchGroupIcon = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={16} height={16} fill="none" {...props}><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" d="M10.5 8.5h-6a3 3 0 0 0 0 6h6a3 3 0 1 0 0-6" /><path fill="#000" fillOpacity={0.15} fillRule="evenodd" d="M1.5 3.5a3 3 0 0 1 3-3h6a3 3 0 0 0 0 6h-6a3 3 0 0 1-3-3" clipRule="evenodd" /><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" d="M10.5.5h-6a3 3 0 0 0 0 6h6a3 3 0 1 0 0-6" /><circle cx={10.5} cy={3.5} r={3} stroke="#000" /><circle cx={4.5} cy={11.5} r={3} stroke="#000" /></svg>;
+export { SwitchGroupIcon };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Icons/SwitchIcon.tsx b/app/client/packages/icons/src/components/Icons/SwitchIcon.tsx
index e487c66e5009..83a53b7af672 100644
--- a/app/client/packages/icons/src/components/Icons/SwitchIcon.tsx
+++ b/app/client/packages/icons/src/components/Icons/SwitchIcon.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const SwitchIcon = () => <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M10.5 4.5h-6a3 3 0 0 0 0 6h6a3 3 0 1 0 0-6"/><path fill="#000" fill-opacity=".15" fill-rule="evenodd" d="M1.5 7.5a3 3 0 0 1 3-3h6a3 3 0 0 0 0 6h-6a3 3 0 0 1-3-3" clip-rule="evenodd"/><circle cx="10.5" cy="7.5" r="3" stroke="#000"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const SwitchIcon = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={16} height={16} fill="none" {...props}><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" d="M10.5 4.5h-6a3 3 0 0 0 0 6h6a3 3 0 1 0 0-6" /><path fill="#000" fillOpacity={0.15} fillRule="evenodd" d="M1.5 7.5a3 3 0 0 1 3-3h6a3 3 0 0 0 0 6h-6a3 3 0 0 1-3-3" clipRule="evenodd" /><circle cx={10.5} cy={7.5} r={3} stroke="#000" /></svg>;
+export { SwitchIcon };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Icons/TableIcon.tsx b/app/client/packages/icons/src/components/Icons/TableIcon.tsx
index b5f1b5e98c3b..07849ad1cc80 100644
--- a/app/client/packages/icons/src/components/Icons/TableIcon.tsx
+++ b/app/client/packages/icons/src/components/Icons/TableIcon.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const TableIcon = () => <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M11.5 1.5h-8a2 2 0 0 0-2 2v8a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2v-8a2 2 0 0 0-2-2M7.5 5.5v8M1.5 5.5h12M1.5 9.5h12"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const TableIcon = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={16} height={16} fill="none" {...props}><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" d="M11.5 1.5h-8a2 2 0 0 0-2 2v8a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2v-8a2 2 0 0 0-2-2M7.5 5.5v8M1.5 5.5h12M1.5 9.5h12" /></svg>;
+export { TableIcon };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Icons/ToolbarButtonsIcon.tsx b/app/client/packages/icons/src/components/Icons/ToolbarButtonsIcon.tsx
index 2d708cf15643..4ec6487de88e 100644
--- a/app/client/packages/icons/src/components/Icons/ToolbarButtonsIcon.tsx
+++ b/app/client/packages/icons/src/components/Icons/ToolbarButtonsIcon.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const ToolbarButtonsIcon = () => <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path fill="#000" fill-rule="evenodd" d="M5 5.5a.5.5 0 0 0-1 0V7H2.5a.5.5 0 0 0 0 1H4v1.5a.5.5 0 0 0 1 0V8h1.5a.5.5 0 0 0 0-1H5zM13.854 5.854a.5.5 0 0 0-.708-.708l-3 3a.5.5 0 0 0 .708.708zM9.775 9.765a.375.375 0 1 0-.53-.53l-.01.01a.375.375 0 0 0 .53.53z" clip-rule="evenodd"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".5" d="M13.5 3.5h-11a2 2 0 0 0-2 2v4a2 2 0 0 0 2 2h11a2 2 0 0 0 2-2v-4a2 2 0 0 0-2-2"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const ToolbarButtonsIcon = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={16} height={16} fill="none" {...props}><path fill="#000" fillRule="evenodd" d="M5 5.5a.5.5 0 0 0-1 0V7H2.5a.5.5 0 0 0 0 1H4v1.5a.5.5 0 0 0 1 0V8h1.5a.5.5 0 0 0 0-1H5zM13.854 5.854a.5.5 0 0 0-.708-.708l-3 3a.5.5 0 0 0 .708.708zM9.775 9.765a.375.375 0 1 0-.53-.53l-.01.01a.375.375 0 0 0 .53.53z" clipRule="evenodd" /><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" strokeOpacity={0.5} d="M13.5 3.5h-11a2 2 0 0 0-2 2v4a2 2 0 0 0 2 2h11a2 2 0 0 0 2-2v-4a2 2 0 0 0-2-2" /></svg>;
+export { ToolbarButtonsIcon };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Icons/ZoneIcon.tsx b/app/client/packages/icons/src/components/Icons/ZoneIcon.tsx
index 4352f9ad3384..bd1094b89071 100644
--- a/app/client/packages/icons/src/components/Icons/ZoneIcon.tsx
+++ b/app/client/packages/icons/src/components/Icons/ZoneIcon.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const ZoneIcon = () => <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M2.5 4v7A1.5 1.5 0 0 0 4 12.5h7a1.5 1.5 0 0 0 1.5-1.5V4A1.5 1.5 0 0 0 11 2.5H4A1.5 1.5 0 0 0 2.5 4"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".25" d="M.5 4v-.5a3 3 0 0 1 3-3H4M.5 11v.5a3 3 0 0 0 3 3H4M14.5 4v-.5a3 3 0 0 0-3-3H11M14.5 11v.5a3 3 0 0 1-3 3H11M.5 6.5v2M14.5 6.5v2M6.5.5h2M6.5 14.5h2"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const ZoneIcon = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={16} height={16} fill="none" {...props}><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" d="M2.5 4v7A1.5 1.5 0 0 0 4 12.5h7a1.5 1.5 0 0 0 1.5-1.5V4A1.5 1.5 0 0 0 11 2.5H4A1.5 1.5 0 0 0 2.5 4" /><path stroke="#000" strokeLinecap="round" strokeLinejoin="round" strokeOpacity={0.25} d="M.5 4v-.5a3 3 0 0 1 3-3H4M.5 11v.5a3 3 0 0 0 3 3H4M14.5 4v-.5a3 3 0 0 0-3-3H11M14.5 11v.5a3 3 0 0 1-3 3H11M.5 6.5v2M14.5 6.5v2M6.5.5h2M6.5 14.5h2" /></svg>;
+export { ZoneIcon };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Thumbnails/AIChatThumbnail.tsx b/app/client/packages/icons/src/components/Thumbnails/AIChatThumbnail.tsx
new file mode 100644
index 000000000000..69911d23813a
--- /dev/null
+++ b/app/client/packages/icons/src/components/Thumbnails/AIChatThumbnail.tsx
@@ -0,0 +1,4 @@
+import * as React from "react";
+import type { SVGProps } from "react";
+const AIChatThumbnail = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={72} height={76} fill="none" {...props}><mask id="a" fill="#fff"><path fillRule="evenodd" d="M40 21a3 3 0 0 1 3 3v18a3 3 0 0 1-3 3H21l-7.257 8.063c-.613.681-1.743.247-1.743-.669V45H9a3 3 0 0 1-3-3V24a3 3 0 0 1 3-3z" clipRule="evenodd" /></mask><path fill="#fff" fillRule="evenodd" d="M40 21a3 3 0 0 1 3 3v18a3 3 0 0 1-3 3H21l-7.257 8.063c-.613.681-1.743.247-1.743-.669V45H9a3 3 0 0 1-3-3V24a3 3 0 0 1 3-3z" clipRule="evenodd" /><path fill="#CDD5DF" d="m21 45-.743-.669.298-.331H21zm-7.257 8.063.744.669zM12 45v-1h1v1zm30-21a2 2 0 0 0-2-2v-2a4 4 0 0 1 4 4zm0 18V24h2v18zm-2 2a2 2 0 0 0 2-2h2a4 4 0 0 1-4 4zm-19 0h19v2H21zm-8 8.394 7.257-8.063 1.486 1.338-7.256 8.063zm0 0 1.487 1.338C13.26 55.094 11 54.227 11 52.394zM13 45v7.394h-2V45zm-4-1h3v2H9zm-2-2a2 2 0 0 0 2 2v2a4 4 0 0 1-4-4zm0-18v18H5V24zm2-2a2 2 0 0 0-2 2H5a4 4 0 0 1 4-4zm31 0H9v-2h31z" mask="url(#a)" /><mask id="b" fill="#fff"><path fillRule="evenodd" d="M32 29a3 3 0 0 0-3 3v18a3 3 0 0 0 3 3h19l7.257 8.063c.613.681 1.743.247 1.743-.669V53h3a3 3 0 0 0 3-3V32a3 3 0 0 0-3-3z" clipRule="evenodd" /></mask><path fill="#FFBFA1" fillRule="evenodd" d="M32 29a3 3 0 0 0-3 3v18a3 3 0 0 0 3 3h19l7.257 8.063c.613.681 1.743.247 1.743-.669V53h3a3 3 0 0 0 3-3V32a3 3 0 0 0-3-3z" clipRule="evenodd" /><path fill="#CC3D00" d="m51 53 .743-.669-.298-.331H51zm7.257 8.063-.744.669zM60 53v-1h-1v1zM30 32a2 2 0 0 1 2-2v-2a4 4 0 0 0-4 4zm0 18V32h-2v18zm2 2a2 2 0 0 1-2-2h-2a4 4 0 0 0 4 4zm19 0H32v2h19zm8 8.394-7.257-8.063-1.486 1.338 7.256 8.063zm0 0-1.487 1.338C58.74 63.094 61 62.227 61 60.394zM59 53v7.394h2V53zm4-1h-3v2h3zm2-2a2 2 0 0 1-2 2v2a4 4 0 0 0 4-4zm0-18v18h2V32zm-2-2a2 2 0 0 1 2 2h2a4 4 0 0 0-4-4zm-31 0h31v-2H32z" mask="url(#b)" /><path fill="#fff" stroke="#CC3D00" d="M41.434 43.657a8.5 8.5 0 0 0 4.223-4.223 8.5 8.5 0 0 0 4.223 4.223 8.5 8.5 0 0 0-4.223 4.223 8.5 8.5 0 0 0-4.223-4.223ZM51.17 35.263l.073-.145.072.145a6.5 6.5 0 0 0 2.907 2.907l.145.073-.145.072a6.5 6.5 0 0 0-2.907 2.907l-.072.145-.073-.145a6.5 6.5 0 0 0-2.907-2.907l-.145-.072.145-.073a6.5 6.5 0 0 0 2.907-2.907Z" /></svg>;
+export { AIChatThumbnail };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Thumbnails/ButtonThumbnail.tsx b/app/client/packages/icons/src/components/Thumbnails/ButtonThumbnail.tsx
index e094cbfb02d4..2600f39aed32 100644
--- a/app/client/packages/icons/src/components/Thumbnails/ButtonThumbnail.tsx
+++ b/app/client/packages/icons/src/components/Thumbnails/ButtonThumbnail.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const ButtonThumbnail = () => <svg xmlns="http://www.w3.org/2000/svg" width="72" height="76" fill="none"><rect width="55" height="23" x="8.5" y="26.5" fill="#FFEEE5" stroke="#CC3D00" rx="5.5"/><path stroke="#CC3D00" stroke-linecap="round" stroke-linejoin="round" d="M37.5 33.5v4m0 4v-4m6-4-3.414 3.414a2 2 0 0 1-1.414.586H37.5M37.5 41.5v-8m6 8-4-4M28.5 38.5v-2a3 3 0 1 1 6 0v2a3 3 0 1 1-6 0"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const ButtonThumbnail = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={72} height={76} fill="none" {...props}><rect width={55} height={23} x={8.5} y={26.5} fill="#FFEEE5" stroke="#CC3D00" rx={5.5} /><path stroke="#CC3D00" strokeLinecap="round" strokeLinejoin="round" d="M37.5 33.5v4m0 4v-4m6-4-3.414 3.414a2 2 0 0 1-1.414.586H37.5M37.5 41.5v-8m6 8-4-4M28.5 38.5v-2a3 3 0 1 1 6 0v2a3 3 0 1 1-6 0" /></svg>;
+export { ButtonThumbnail };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Thumbnails/CheckboxGroupThumbnail.tsx b/app/client/packages/icons/src/components/Thumbnails/CheckboxGroupThumbnail.tsx
index 89d4c9603555..a6c591374532 100644
--- a/app/client/packages/icons/src/components/Thumbnails/CheckboxGroupThumbnail.tsx
+++ b/app/client/packages/icons/src/components/Thumbnails/CheckboxGroupThumbnail.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const CheckboxGroupThumbnail = () => <svg xmlns="http://www.w3.org/2000/svg" width="72" height="76" fill="none"><path fill="#fff" stroke="#CC3D00" stroke-linecap="square" d="M26.5 23.5h-9a1 1 0 0 0-1 1v9a1 1 0 0 0 1 1h9a1 1 0 0 0 1-1v-9a1 1 0 0 0-1-1Z"/><path fill="#fff" stroke="#CDD5DF" stroke-linecap="square" d="M26.5 41.5h-9a1 1 0 0 0-1 1v9a1 1 0 0 0 1 1h9a1 1 0 0 0 1-1v-9a1 1 0 0 0-1-1Z"/><path stroke="#CC3D00" stroke-linecap="round" stroke-linejoin="round" d="m19 29 2 2 4-4"/><rect width="22" height="8" x="34" y="25" fill="#CDD5DF" rx="1"/><rect width="22" height="8" x="34" y="43" fill="#CDD5DF" rx="1"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const CheckboxGroupThumbnail = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={72} height={76} fill="none" {...props}><path fill="#fff" stroke="#CC3D00" strokeLinecap="square" d="M26.5 23.5h-9a1 1 0 0 0-1 1v9a1 1 0 0 0 1 1h9a1 1 0 0 0 1-1v-9a1 1 0 0 0-1-1Z" /><path fill="#fff" stroke="#CDD5DF" strokeLinecap="square" d="M26.5 41.5h-9a1 1 0 0 0-1 1v9a1 1 0 0 0 1 1h9a1 1 0 0 0 1-1v-9a1 1 0 0 0-1-1Z" /><path stroke="#CC3D00" strokeLinecap="round" strokeLinejoin="round" d="m19 29 2 2 4-4" /><rect width={22} height={8} x={34} y={25} fill="#CDD5DF" rx={1} /><rect width={22} height={8} x={34} y={43} fill="#CDD5DF" rx={1} /></svg>;
+export { CheckboxGroupThumbnail };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Thumbnails/CheckboxThumbnail.tsx b/app/client/packages/icons/src/components/Thumbnails/CheckboxThumbnail.tsx
index 0fb1b6644632..9bd895928167 100644
--- a/app/client/packages/icons/src/components/Thumbnails/CheckboxThumbnail.tsx
+++ b/app/client/packages/icons/src/components/Thumbnails/CheckboxThumbnail.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const CheckboxThumbnail = () => <svg xmlns="http://www.w3.org/2000/svg" width="72" height="76" fill="none"><path fill="#fff" stroke="#CC3D00" stroke-linecap="square" d="M25.5 32.5h-9a1 1 0 0 0-1 1v9a1 1 0 0 0 1 1h9a1 1 0 0 0 1-1v-9a1 1 0 0 0-1-1Z"/><path stroke="#CC3D00" stroke-linecap="round" stroke-linejoin="round" d="m18 38 2 2 4-4"/><rect width="24" height="8" x="33" y="34" fill="#CDD5DF" rx="1"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const CheckboxThumbnail = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={72} height={76} fill="none" {...props}><path fill="#fff" stroke="#CC3D00" strokeLinecap="square" d="M25.5 32.5h-9a1 1 0 0 0-1 1v9a1 1 0 0 0 1 1h9a1 1 0 0 0 1-1v-9a1 1 0 0 0-1-1Z" /><path stroke="#CC3D00" strokeLinecap="round" strokeLinejoin="round" d="m18 38 2 2 4-4" /><rect width={24} height={8} x={33} y={34} fill="#CDD5DF" rx={1} /></svg>;
+export { CheckboxThumbnail };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Thumbnails/ComboboxSelectThumbnail.tsx b/app/client/packages/icons/src/components/Thumbnails/ComboboxSelectThumbnail.tsx
index fbf23f8b14d4..b7517a7bc923 100644
--- a/app/client/packages/icons/src/components/Thumbnails/ComboboxSelectThumbnail.tsx
+++ b/app/client/packages/icons/src/components/Thumbnails/ComboboxSelectThumbnail.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const ComboboxSelectThumbnail = () => <svg xmlns="http://www.w3.org/2000/svg" width="72" height="76" fill="none"><rect width="55" height="23" x="8.5" y="26.5" fill="#fff" stroke="#CDD5DF" rx="2.5"/><path stroke="#6A7585" stroke-linecap="round" stroke-linejoin="round" d="m56.5 36.5-3 3-3-3"/><circle cx="19" cy="37" r="4.5" stroke="#CC3D00"/><path stroke="#CC3D00" stroke-linecap="round" d="m22.5 40.5 2 2"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const ComboboxSelectThumbnail = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={72} height={76} fill="none" {...props}><rect width={55} height={23} x={8.5} y={26.5} fill="#fff" stroke="#CDD5DF" rx={2.5} /><path stroke="#6A7585" strokeLinecap="round" strokeLinejoin="round" d="m56.5 36.5-3 3-3-3" /><circle cx={19} cy={37} r={4.5} stroke="#CC3D00" /><path stroke="#CC3D00" strokeLinecap="round" d="m22.5 40.5 2 2" /></svg>;
+export { ComboboxSelectThumbnail };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Thumbnails/CurrencyInputThumbnail.tsx b/app/client/packages/icons/src/components/Thumbnails/CurrencyInputThumbnail.tsx
index 26ceec3f0499..5c97ee56f66e 100644
--- a/app/client/packages/icons/src/components/Thumbnails/CurrencyInputThumbnail.tsx
+++ b/app/client/packages/icons/src/components/Thumbnails/CurrencyInputThumbnail.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const CurrencyInputThumbnail = () => <svg xmlns="http://www.w3.org/2000/svg" width="72" height="76" fill="none"><rect width="55" height="23" x="8.5" y="26.5" fill="#fff" stroke="#CDD5DF" rx="2.5"/><path stroke="#CC3D00" stroke-linecap="round" stroke-linejoin="round" d="M17 38.5a2.5 2.5 0 0 1 0-5M22 43.5a2.5 2.5 0 0 0 0-5M23.5 35.5a2 2 0 0 0-2-2M14.5 41.5a2 2 0 0 0 2 2M19.5 31.5v14M17 33.5h4.5m-4.5 5h5m-5.5 5H22"/><path stroke="#6A7585" stroke-linecap="round" stroke-linejoin="round" d="M51.5 43.5h2m2 0h-2m0 0v12m-2 0h4"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const CurrencyInputThumbnail = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={72} height={76} fill="none" {...props}><rect width={55} height={23} x={8.5} y={26.5} fill="#fff" stroke="#CDD5DF" rx={2.5} /><path stroke="#CC3D00" strokeLinecap="round" strokeLinejoin="round" d="M17 38.5a2.5 2.5 0 0 1 0-5M22 43.5a2.5 2.5 0 0 0 0-5M23.5 35.5a2 2 0 0 0-2-2M14.5 41.5a2 2 0 0 0 2 2M19.5 31.5v14M17 33.5h4.5m-4.5 5h5m-5.5 5H22" /><path stroke="#6A7585" strokeLinecap="round" strokeLinejoin="round" d="M51.5 43.5h2m2 0h-2m0 0v12m-2 0h4" /></svg>;
+export { CurrencyInputThumbnail };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Thumbnails/DatePickerThumbnail.tsx b/app/client/packages/icons/src/components/Thumbnails/DatePickerThumbnail.tsx
new file mode 100644
index 000000000000..6a68cc72e795
--- /dev/null
+++ b/app/client/packages/icons/src/components/Thumbnails/DatePickerThumbnail.tsx
@@ -0,0 +1,4 @@
+import * as React from "react";
+import type { SVGProps } from "react";
+const DatePickerThumbnail = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={72} height={76} fill="none" {...props}><rect width={55} height={23} x={8.5} y={26.5} fill="#fff" rx={2.5} /><rect width={55} height={23} x={8.5} y={26.5} stroke="#CDD5DF" rx={2.5} /><path stroke="#CC3D00" strokeLinecap="round" strokeLinejoin="round" d="M25.5 32.5h-10a1 1 0 0 0-1 1v10a1 1 0 0 0 1 1h10a1 1 0 0 0 1-1v-10a1 1 0 0 0-1-1M22.5 36.5v8M18.5 36.5v8M14.5 36.5h12M14.5 40.5h12M17.5 34.5v-3m6 3v-3" /><path stroke="#99A4B3" strokeLinecap="round" strokeLinejoin="round" d="m56.5 36.5-3 3-3-3" /></svg>;
+export { DatePickerThumbnail };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Thumbnails/EmailInputThumbnail.tsx b/app/client/packages/icons/src/components/Thumbnails/EmailInputThumbnail.tsx
index aa1f63d557ff..95295be27fe1 100644
--- a/app/client/packages/icons/src/components/Thumbnails/EmailInputThumbnail.tsx
+++ b/app/client/packages/icons/src/components/Thumbnails/EmailInputThumbnail.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const EmailInputThumbnail = () => <svg xmlns="http://www.w3.org/2000/svg" width="72" height="76" fill="none"><rect width="55" height="23" x="8.5" y="26.5" fill="#fff" stroke="#CDD5DF" rx="2.5"/><path stroke="#CC3D00" stroke-linecap="round" d="M21.5 40.5H19a1.5 1.5 0 0 1-1.5-1.5v-2a1.5 1.5 0 0 1 1.5-1.5h1a1.5 1.5 0 0 1 1.5 1.5v3.5Zm0 0 1.026.342a1.5 1.5 0 0 0 1.974-1.423V36.5a4 4 0 0 0-4-4h-2a4 4 0 0 0-4 4v3a4 4 0 0 0 4 4H23"/><path stroke="#6A7585" stroke-linecap="round" stroke-linejoin="round" d="M51.5 43.5h2m2 0h-2m0 0v12m-2 0h4"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const EmailInputThumbnail = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={72} height={76} fill="none" {...props}><rect width={55} height={23} x={8.5} y={26.5} fill="#fff" stroke="#CDD5DF" rx={2.5} /><path stroke="#CC3D00" strokeLinecap="round" d="M21.5 40.5H19a1.5 1.5 0 0 1-1.5-1.5v-2a1.5 1.5 0 0 1 1.5-1.5h1a1.5 1.5 0 0 1 1.5 1.5v3.5Zm0 0 1.026.342a1.5 1.5 0 0 0 1.974-1.423V36.5a4 4 0 0 0-4-4h-2a4 4 0 0 0-4 4v3a4 4 0 0 0 4 4H23" /><path stroke="#6A7585" strokeLinecap="round" strokeLinejoin="round" d="M51.5 43.5h2m2 0h-2m0 0v12m-2 0h4" /></svg>;
+export { EmailInputThumbnail };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Thumbnails/HeadingThumbnail.tsx b/app/client/packages/icons/src/components/Thumbnails/HeadingThumbnail.tsx
index 133f49dea9d8..0fd8497fe275 100644
--- a/app/client/packages/icons/src/components/Thumbnails/HeadingThumbnail.tsx
+++ b/app/client/packages/icons/src/components/Thumbnails/HeadingThumbnail.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const HeadingThumbnail = () => <svg xmlns="http://www.w3.org/2000/svg" width="72" height="76" fill="none"><rect width="56" height="44" x="8" y="16" fill="#fff" rx="3"/><path stroke="#CC3D00" stroke-linecap="round" stroke-linejoin="round" d="M40.5 50.5h9m-9-24h9M22.5 50.5h9m-9-24h9"/><path fill="#FFEEE5" stroke="#CC3D00" stroke-linecap="round" stroke-linejoin="round" d="M42.5 26.5h5v24h-5zM24.5 26.5h5v24h-5z"/><path stroke="#CC3D00" stroke-linecap="round" stroke-linejoin="round" d="M29.5 37.5h13"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const HeadingThumbnail = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={72} height={76} fill="none" {...props}><rect width={56} height={44} x={8} y={16} fill="#fff" rx={3} /><path stroke="#CC3D00" strokeLinecap="round" strokeLinejoin="round" d="M40.5 50.5h9m-9-24h9M22.5 50.5h9m-9-24h9" /><path fill="#FFEEE5" stroke="#CC3D00" strokeLinecap="round" strokeLinejoin="round" d="M42.5 26.5h5v24h-5zM24.5 26.5h5v24h-5z" /><path stroke="#CC3D00" strokeLinecap="round" strokeLinejoin="round" d="M29.5 37.5h13" /></svg>;
+export { HeadingThumbnail };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Thumbnails/IconButtonThumbnail.tsx b/app/client/packages/icons/src/components/Thumbnails/IconButtonThumbnail.tsx
index 7b38c959d43d..ac80a1fbe807 100644
--- a/app/client/packages/icons/src/components/Thumbnails/IconButtonThumbnail.tsx
+++ b/app/client/packages/icons/src/components/Thumbnails/IconButtonThumbnail.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const IconButtonThumbnail = () => <svg xmlns="http://www.w3.org/2000/svg" width="72" height="76" fill="none"><rect width="31" height="23" x="20.5" y="26.5" fill="#FFEEE5" stroke="#CC3D00" rx="5.5"/><path stroke="#CC3D00" stroke-linecap="round" d="M30.5 37.5h12M36.5 43.5v-12"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const IconButtonThumbnail = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={72} height={76} fill="none" {...props}><rect width={31} height={23} x={20.5} y={26.5} fill="#FFEEE5" stroke="#CC3D00" rx={5.5} /><path stroke="#CC3D00" strokeLinecap="round" d="M30.5 37.5h12M36.5 43.5v-12" /></svg>;
+export { IconButtonThumbnail };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Thumbnails/InlineButtonsThumbnail.tsx b/app/client/packages/icons/src/components/Thumbnails/InlineButtonsThumbnail.tsx
index 962f9362bdb5..2012519022b6 100644
--- a/app/client/packages/icons/src/components/Thumbnails/InlineButtonsThumbnail.tsx
+++ b/app/client/packages/icons/src/components/Thumbnails/InlineButtonsThumbnail.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const InlineButtonsThumbnail = () => <svg xmlns="http://www.w3.org/2000/svg" width="72" height="76" fill="none"><rect width="59" height="23" x="6.5" y="26.5" fill="#fff" stroke="#CDD5DF" rx="5.5"/><rect width="24" height="15" x="37.5" y="30.5" fill="#FFEEE5" stroke="#CC3D00" rx="2.5"/><rect width="24" height="15" x="10.5" y="30.5" fill="#E3E8EF" stroke="#6A7585" rx="2.5"/><path stroke="#CC3D00" stroke-linecap="round" stroke-linejoin="round" d="m45.5 37.5 3 3 5-5"/><path stroke="#6A7585" stroke-linecap="round" d="m20 35 6 6m0-6-6 6"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const InlineButtonsThumbnail = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={72} height={76} fill="none" {...props}><rect width={59} height={23} x={6.5} y={26.5} fill="#fff" stroke="#CDD5DF" rx={5.5} /><rect width={24} height={15} x={37.5} y={30.5} fill="#FFEEE5" stroke="#CC3D00" rx={2.5} /><rect width={24} height={15} x={10.5} y={30.5} fill="#E3E8EF" stroke="#6A7585" rx={2.5} /><path stroke="#CC3D00" strokeLinecap="round" strokeLinejoin="round" d="m45.5 37.5 3 3 5-5" /><path stroke="#6A7585" strokeLinecap="round" d="m20 35 6 6m0-6-6 6" /></svg>;
+export { InlineButtonsThumbnail };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Thumbnails/InputThumbnail.tsx b/app/client/packages/icons/src/components/Thumbnails/InputThumbnail.tsx
index 2ec5890f1565..d1de1b7bbaeb 100644
--- a/app/client/packages/icons/src/components/Thumbnails/InputThumbnail.tsx
+++ b/app/client/packages/icons/src/components/Thumbnails/InputThumbnail.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const InputThumbnail = () => <svg xmlns="http://www.w3.org/2000/svg" width="72" height="76" fill="none"><rect width="55" height="23" x="8.5" y="26.5" fill="#fff" stroke="#CDD5DF" rx="2.5"/><path stroke="#CC3D00" stroke-linecap="round" stroke-linejoin="round" d="m14.5 44.5 1.833-4m9.167 4-1.833-4m-7.334 0 3.667-8 3.667 8m-7.334 0h7.334"/><path stroke="#6A7585" stroke-linecap="round" stroke-linejoin="round" d="M51.5 43.5h2m2 0h-2m0 0v12m-2 0h4"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const InputThumbnail = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={72} height={76} fill="none" {...props}><rect width={55} height={23} x={8.5} y={26.5} fill="#fff" stroke="#CDD5DF" rx={2.5} /><path stroke="#CC3D00" strokeLinecap="round" strokeLinejoin="round" d="m14.5 44.5 1.833-4m9.167 4-1.833-4m-7.334 0 3.667-8 3.667 8m-7.334 0h7.334" /><path stroke="#6A7585" strokeLinecap="round" strokeLinejoin="round" d="M51.5 43.5h2m2 0h-2m0 0v12m-2 0h4" /></svg>;
+export { InputThumbnail };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Thumbnails/KeyValueThumbnail.tsx b/app/client/packages/icons/src/components/Thumbnails/KeyValueThumbnail.tsx
index 75c3eaf36fde..c69375213650 100644
--- a/app/client/packages/icons/src/components/Thumbnails/KeyValueThumbnail.tsx
+++ b/app/client/packages/icons/src/components/Thumbnails/KeyValueThumbnail.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const KeyValueThumbnail = () => <svg xmlns="http://www.w3.org/2000/svg" width="72" height="76" fill="none"><rect width="44" height="39" x="14.5" y="19.5" fill="#fff" stroke="#CDD5DF" rx="2.5"/><rect width="16" height="6" x="22" y="27" fill="#CDD5DF" rx="1"/><path stroke="#CC3D00" stroke-linecap="round" stroke-linejoin="round" d="M22 50.5h2.5m2.5 0h-2.5m-2.5-8 2.5-2v10M34.5 50.5h-5v-2.646a2 2 0 0 1 1.257-1.857l2.486-.994a2 2 0 0 0 1.257-1.857V42.5a2 2 0 0 0-2-2h-3M37.5 40.5h3a2 2 0 0 1 2 2v1a2 2 0 0 1-2 2h-1.715M37.5 50.5h3a2 2 0 0 0 2-2v-1a2 2 0 0 0-2-2h-2"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const KeyValueThumbnail = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={72} height={76} fill="none" {...props}><rect width={44} height={39} x={14.5} y={19.5} fill="#fff" stroke="#CDD5DF" rx={2.5} /><rect width={16} height={6} x={22} y={27} fill="#CDD5DF" rx={1} /><path stroke="#CC3D00" strokeLinecap="round" strokeLinejoin="round" d="M22 50.5h2.5m2.5 0h-2.5m-2.5-8 2.5-2v10M34.5 50.5h-5v-2.646a2 2 0 0 1 1.257-1.857l2.486-.994a2 2 0 0 0 1.257-1.857V42.5a2 2 0 0 0-2-2h-3M37.5 40.5h3a2 2 0 0 1 2 2v1a2 2 0 0 1-2 2h-1.715M37.5 50.5h3a2 2 0 0 0 2-2v-1a2 2 0 0 0-2-2h-2" /></svg>;
+export { KeyValueThumbnail };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Thumbnails/MenuButtonThumbnail.tsx b/app/client/packages/icons/src/components/Thumbnails/MenuButtonThumbnail.tsx
index de371e7412f7..322bdbf66e84 100644
--- a/app/client/packages/icons/src/components/Thumbnails/MenuButtonThumbnail.tsx
+++ b/app/client/packages/icons/src/components/Thumbnails/MenuButtonThumbnail.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const MenuButtonThumbnail = () => <svg xmlns="http://www.w3.org/2000/svg" width="72" height="76" fill="none"><rect width="31" height="23" x="20.5" y="26.5" fill="#FFEEE5" stroke="#CC3D00" rx="5.5"/><path stroke="#CC3D00" stroke-linecap="round" d="M30.5 33.5h12M30.5 37.5h12M30.5 41.5h12"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const MenuButtonThumbnail = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={72} height={76} fill="none" {...props}><rect width={31} height={23} x={20.5} y={26.5} fill="#FFEEE5" stroke="#CC3D00" rx={5.5} /><path stroke="#CC3D00" strokeLinecap="round" d="M30.5 33.5h12M30.5 37.5h12M30.5 41.5h12" /></svg>;
+export { MenuButtonThumbnail };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Thumbnails/ModalThumbnail.tsx b/app/client/packages/icons/src/components/Thumbnails/ModalThumbnail.tsx
index 66d31520bd0c..6eb10073b9fb 100644
--- a/app/client/packages/icons/src/components/Thumbnails/ModalThumbnail.tsx
+++ b/app/client/packages/icons/src/components/Thumbnails/ModalThumbnail.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const ModalThumbnail = () => <svg xmlns="http://www.w3.org/2000/svg" width="72" height="76" fill="none"><rect width="56" height="56" x="9" y="12" fill="#E3E8EF" rx="4"/><rect width="56" height="56" x="7" y="10" fill="#fff" rx="3"/><rect width="28" height="9" x="15" y="18" fill="#E3E8EF" rx="1"/><rect width="40" height="6" x="15" y="36" fill="#E3E8EF" rx="1"/><rect width="40" height="6" x="15" y="44" fill="#E3E8EF" rx="1"/><rect width="24" height="6" x="15" y="52" fill="#E3E8EF" rx="1"/><path stroke="#CC3D00" stroke-linecap="round" stroke-width="1.5" d="m48.5 19.5 6 6m0-6-6 6"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const ModalThumbnail = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={72} height={76} fill="none" {...props}><rect width={56} height={56} x={9} y={12} fill="#E3E8EF" rx={4} /><rect width={56} height={56} x={7} y={10} fill="#fff" rx={3} /><rect width={28} height={9} x={15} y={18} fill="#E3E8EF" rx={1} /><rect width={40} height={6} x={15} y={36} fill="#E3E8EF" rx={1} /><rect width={40} height={6} x={15} y={44} fill="#E3E8EF" rx={1} /><rect width={24} height={6} x={15} y={52} fill="#E3E8EF" rx={1} /><path stroke="#CC3D00" strokeLinecap="round" strokeWidth={1.5} d="m48.5 19.5 6 6m0-6-6 6" /></svg>;
+export { ModalThumbnail };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Thumbnails/MultilineInputThumbnail.tsx b/app/client/packages/icons/src/components/Thumbnails/MultilineInputThumbnail.tsx
index 48552883c829..c82f96f2a9e4 100644
--- a/app/client/packages/icons/src/components/Thumbnails/MultilineInputThumbnail.tsx
+++ b/app/client/packages/icons/src/components/Thumbnails/MultilineInputThumbnail.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const MultilineInputThumbnail = () => <svg xmlns="http://www.w3.org/2000/svg" width="72" height="76" fill="none"><rect width="55" height="41" x="8.5" y="14.5" fill="#fff" stroke="#CDD5DF" rx="2.5"/><path stroke="#CC3D00" stroke-linecap="round" d="M49.5 23.5v0a3 3 0 0 0-3-3h-2a3 3 0 0 0-3 3v6a3 3 0 0 0 3 3h2a3 3 0 0 0 3-3v0M14.5 49.5h4a3 3 0 0 0 3-3v-6a3 3 0 0 0-3-3h-4a1 1 0 0 0-1 1v10a1 1 0 0 0 1 1ZM33.5 40.5v0a3 3 0 0 0-3-3h-2a3 3 0 0 0-3 3v3m8 3v0a3 3 0 0 1-3 3h-2a3 3 0 0 1-3-3v-3m0 0h5"/><path stroke="#CC3D00" stroke-linecap="round" stroke-linejoin="round" d="M28.5 20.5h5c1.657 0 3 .843 3 2.5s-1.343 2.5-3 2.5h-4M29.5 25.5h5c1.657 0 3 1.843 3 3.5s-1.343 3.5-3 3.5h-6M29.5 20.5v12M14.5 32.5l1.833-4m9.167 4-1.833-4m-7.334 0 3.667-8 3.667 8m-7.334 0h7.334"/><path stroke="#6A7585" stroke-linecap="round" stroke-linejoin="round" d="M51.5 49.5h2m2 0h-2m0 0v12m-2 0h4"/><path stroke="#CC3D00" stroke-linecap="round" d="M37.5 49.5v-6m7-6h-4a3 3 0 0 0-3 3v3m0 0h4"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const MultilineInputThumbnail = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={72} height={76} fill="none" {...props}><rect width={55} height={41} x={8.5} y={14.5} fill="#fff" stroke="#CDD5DF" rx={2.5} /><path stroke="#CC3D00" strokeLinecap="round" d="M49.5 23.5v0a3 3 0 0 0-3-3h-2a3 3 0 0 0-3 3v6a3 3 0 0 0 3 3h2a3 3 0 0 0 3-3v0M14.5 49.5h4a3 3 0 0 0 3-3v-6a3 3 0 0 0-3-3h-4a1 1 0 0 0-1 1v10a1 1 0 0 0 1 1ZM33.5 40.5v0a3 3 0 0 0-3-3h-2a3 3 0 0 0-3 3v3m8 3v0a3 3 0 0 1-3 3h-2a3 3 0 0 1-3-3v-3m0 0h5" /><path stroke="#CC3D00" strokeLinecap="round" strokeLinejoin="round" d="M28.5 20.5h5c1.657 0 3 .843 3 2.5s-1.343 2.5-3 2.5h-4M29.5 25.5h5c1.657 0 3 1.843 3 3.5s-1.343 3.5-3 3.5h-6M29.5 20.5v12M14.5 32.5l1.833-4m9.167 4-1.833-4m-7.334 0 3.667-8 3.667 8m-7.334 0h7.334" /><path stroke="#6A7585" strokeLinecap="round" strokeLinejoin="round" d="M51.5 49.5h2m2 0h-2m0 0v12m-2 0h4" /><path stroke="#CC3D00" strokeLinecap="round" d="M37.5 49.5v-6m7-6h-4a3 3 0 0 0-3 3v3m0 0h4" /></svg>;
+export { MultilineInputThumbnail };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Thumbnails/NumberInputThumbnail.tsx b/app/client/packages/icons/src/components/Thumbnails/NumberInputThumbnail.tsx
index 2253ba3a9d88..3812ae48c320 100644
--- a/app/client/packages/icons/src/components/Thumbnails/NumberInputThumbnail.tsx
+++ b/app/client/packages/icons/src/components/Thumbnails/NumberInputThumbnail.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const NumberInputThumbnail = () => <svg xmlns="http://www.w3.org/2000/svg" width="72" height="76" fill="none"><rect width="55" height="23" x="8.5" y="26.5" fill="#fff" stroke="#CDD5DF" rx="2.5"/><path stroke="#CC3D00" stroke-linecap="round" stroke-width="1.25" d="M23.5 43.5h.01"/><path stroke="#CC3D00" stroke-linecap="round" stroke-linejoin="round" d="M16 43.5h2.5m2.5 0h-2.5m-2.5-8 2.5-2v10M26 43.5h2.5m2.5 0h-2.5m-2.5-8 2.5-2v10"/><path stroke="#6A7585" stroke-linecap="round" stroke-linejoin="round" d="M51.5 43.5h2m2 0h-2m0 0v12m-2 0h4"/><path stroke="#CC3D00" stroke-linecap="round" stroke-linejoin="round" d="M33.5 33.5h3a2 2 0 0 1 2 2v1a2 2 0 0 1-2 2h-1.715M33.5 43.5h3a2 2 0 0 0 2-2v-1a2 2 0 0 0-2-2h-2"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const NumberInputThumbnail = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={72} height={76} fill="none" {...props}><rect width={55} height={23} x={8.5} y={26.5} fill="#fff" stroke="#CDD5DF" rx={2.5} /><path stroke="#CC3D00" strokeLinecap="round" strokeWidth={1.25} d="M23.5 43.5h.01" /><path stroke="#CC3D00" strokeLinecap="round" strokeLinejoin="round" d="M16 43.5h2.5m2.5 0h-2.5m-2.5-8 2.5-2v10M26 43.5h2.5m2.5 0h-2.5m-2.5-8 2.5-2v10" /><path stroke="#6A7585" strokeLinecap="round" strokeLinejoin="round" d="M51.5 43.5h2m2 0h-2m0 0v12m-2 0h4" /><path stroke="#CC3D00" strokeLinecap="round" strokeLinejoin="round" d="M33.5 33.5h3a2 2 0 0 1 2 2v1a2 2 0 0 1-2 2h-1.715M33.5 43.5h3a2 2 0 0 0 2-2v-1a2 2 0 0 0-2-2h-2" /></svg>;
+export { NumberInputThumbnail };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Thumbnails/ParagraphThumbnail.tsx b/app/client/packages/icons/src/components/Thumbnails/ParagraphThumbnail.tsx
index ceea22e4641f..3297fdf4b390 100644
--- a/app/client/packages/icons/src/components/Thumbnails/ParagraphThumbnail.tsx
+++ b/app/client/packages/icons/src/components/Thumbnails/ParagraphThumbnail.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const ParagraphThumbnail = () => <svg xmlns="http://www.w3.org/2000/svg" width="72" height="76" fill="none"><rect width="56" height="44" x="8" y="16" fill="#fff" rx="3"/><path stroke="#CC3D00" stroke-linecap="round" stroke-linejoin="round" d="M23.5 25.5h1m0 0H29a2.5 2.5 0 0 1 2.5 2.5v0a2.5 2.5 0 0 1-2.5 2.5h-4.5m0-5v5m0 3v-3m-1 3h2M35.5 25.5h12M35.5 29.5h12M35.5 33.5h12M23.5 37.5h24M23.5 41.5h24M23.5 45.5h24M23.5 49.5h14"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const ParagraphThumbnail = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={72} height={76} fill="none" {...props}><rect width={56} height={44} x={8} y={16} fill="#fff" rx={3} /><path stroke="#CC3D00" strokeLinecap="round" strokeLinejoin="round" d="M23.5 25.5h1m0 0H29a2.5 2.5 0 0 1 2.5 2.5v0a2.5 2.5 0 0 1-2.5 2.5h-4.5m0-5v5m0 3v-3m-1 3h2M35.5 25.5h12M35.5 29.5h12M35.5 33.5h12M23.5 37.5h24M23.5 41.5h24M23.5 45.5h24M23.5 49.5h14" /></svg>;
+export { ParagraphThumbnail };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Thumbnails/PasswordInputThumbnail.tsx b/app/client/packages/icons/src/components/Thumbnails/PasswordInputThumbnail.tsx
index 5a96845987b6..da125fa569a0 100644
--- a/app/client/packages/icons/src/components/Thumbnails/PasswordInputThumbnail.tsx
+++ b/app/client/packages/icons/src/components/Thumbnails/PasswordInputThumbnail.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const PasswordInputThumbnail = () => <svg xmlns="http://www.w3.org/2000/svg" width="72" height="76" fill="none"><rect width="55" height="23" x="8.5" y="26.5" fill="#fff" stroke="#CDD5DF" rx="2.5"/><path stroke="#6A7585" stroke-linecap="round" stroke-linejoin="round" d="M51.5 43.5h2m2 0h-2m0 0v12m-2 0h4"/><path fill="#CC3D00" fill-rule="evenodd" d="M17 34.5a.5.5 0 1 0-1 0v2.117l-1.743-1.046a.5.5 0 1 0-.514.858l1.785 1.071-1.785 1.071a.5.5 0 1 0 .514.858L16 38.383V40.5a.5.5 0 0 0 1 0v-2.117l1.743 1.046a.5.5 0 0 0 .514-.858L17.472 37.5l1.785-1.071a.5.5 0 1 0-.514-.858L17 36.617zm8 0a.5.5 0 1 0-1 0v2.117l-1.743-1.046a.5.5 0 1 0-.514.858l1.785 1.071-1.785 1.071a.5.5 0 1 0 .514.858L24 38.383V40.5a.5.5 0 0 0 1 0v-2.117l1.743 1.046a.5.5 0 0 0 .514-.858L25.472 37.5l1.785-1.071a.5.5 0 1 0-.514-.858L25 36.617zm7.5-.5a.5.5 0 0 1 .5.5v2.117l1.743-1.046a.5.5 0 0 1 .514.858L33.472 37.5l1.785 1.071a.5.5 0 1 1-.514.858L33 38.383V40.5a.5.5 0 1 1-1 0v-2.117l-1.743 1.046a.5.5 0 1 1-.514-.858l1.785-1.071-1.785-1.071a.5.5 0 1 1 .514-.858L32 36.617V34.5a.5.5 0 0 1 .5-.5m8.5.5a.5.5 0 1 0-1 0v2.117l-1.743-1.046a.5.5 0 1 0-.514.858l1.785 1.071-1.785 1.071a.5.5 0 1 0 .514.858L40 38.383V40.5a.5.5 0 0 0 1 0v-2.117l1.743 1.046a.5.5 0 0 0 .514-.858L41.472 37.5l1.785-1.071a.5.5 0 1 0-.514-.858L41 36.617z" clip-rule="evenodd"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const PasswordInputThumbnail = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={72} height={76} fill="none" {...props}><rect width={55} height={23} x={8.5} y={26.5} fill="#fff" stroke="#CDD5DF" rx={2.5} /><path stroke="#6A7585" strokeLinecap="round" strokeLinejoin="round" d="M51.5 43.5h2m2 0h-2m0 0v12m-2 0h4" /><path fill="#CC3D00" fillRule="evenodd" d="M17 34.5a.5.5 0 1 0-1 0v2.117l-1.743-1.046a.5.5 0 1 0-.514.858l1.785 1.071-1.785 1.071a.5.5 0 1 0 .514.858L16 38.383V40.5a.5.5 0 0 0 1 0v-2.117l1.743 1.046a.5.5 0 0 0 .514-.858L17.472 37.5l1.785-1.071a.5.5 0 1 0-.514-.858L17 36.617zm8 0a.5.5 0 1 0-1 0v2.117l-1.743-1.046a.5.5 0 1 0-.514.858l1.785 1.071-1.785 1.071a.5.5 0 1 0 .514.858L24 38.383V40.5a.5.5 0 0 0 1 0v-2.117l1.743 1.046a.5.5 0 0 0 .514-.858L25.472 37.5l1.785-1.071a.5.5 0 1 0-.514-.858L25 36.617zm7.5-.5a.5.5 0 0 1 .5.5v2.117l1.743-1.046a.5.5 0 0 1 .514.858L33.472 37.5l1.785 1.071a.5.5 0 1 1-.514.858L33 38.383V40.5a.5.5 0 1 1-1 0v-2.117l-1.743 1.046a.5.5 0 1 1-.514-.858l1.785-1.071-1.785-1.071a.5.5 0 1 1 .514-.858L32 36.617V34.5a.5.5 0 0 1 .5-.5m8.5.5a.5.5 0 1 0-1 0v2.117l-1.743-1.046a.5.5 0 1 0-.514.858l1.785 1.071-1.785 1.071a.5.5 0 1 0 .514.858L40 38.383V40.5a.5.5 0 0 0 1 0v-2.117l1.743 1.046a.5.5 0 0 0 .514-.858L41.472 37.5l1.785-1.071a.5.5 0 1 0-.514-.858L41 36.617z" clipRule="evenodd" /></svg>;
+export { PasswordInputThumbnail };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Thumbnails/PhoneInputThumbnail.tsx b/app/client/packages/icons/src/components/Thumbnails/PhoneInputThumbnail.tsx
index 95d2de69e434..f9be741e4649 100644
--- a/app/client/packages/icons/src/components/Thumbnails/PhoneInputThumbnail.tsx
+++ b/app/client/packages/icons/src/components/Thumbnails/PhoneInputThumbnail.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const PhoneInputThumbnail = () => <svg xmlns="http://www.w3.org/2000/svg" width="72" height="76" fill="none"><rect width="55" height="23" x="8.5" y="26.5" fill="#fff" stroke="#CDD5DF" rx="2.5"/><path stroke="#CC3D00" stroke-linecap="round" d="M15.5 38.5h8M19.5 42.5v-8"/><path stroke="#CC3D00" stroke-linecap="round" stroke-linejoin="round" d="M27 43.5h2.5m2.5 0h-2.5m-2.5-8 2.5-2v10"/><path stroke="#6A7585" stroke-linecap="round" stroke-linejoin="round" d="M51.5 43.5h2m2 0h-2m0 0v12m-2 0h4"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const PhoneInputThumbnail = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={72} height={76} fill="none" {...props}><rect width={55} height={23} x={8.5} y={26.5} fill="#fff" stroke="#CDD5DF" rx={2.5} /><path stroke="#CC3D00" strokeLinecap="round" d="M15.5 38.5h8M19.5 42.5v-8" /><path stroke="#CC3D00" strokeLinecap="round" strokeLinejoin="round" d="M27 43.5h2.5m2.5 0h-2.5m-2.5-8 2.5-2v10" /><path stroke="#6A7585" strokeLinecap="round" strokeLinejoin="round" d="M51.5 43.5h2m2 0h-2m0 0v12m-2 0h4" /></svg>;
+export { PhoneInputThumbnail };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Thumbnails/RadioGroupThumbnail.tsx b/app/client/packages/icons/src/components/Thumbnails/RadioGroupThumbnail.tsx
index 7505b07b6f48..7b8a72a407b5 100644
--- a/app/client/packages/icons/src/components/Thumbnails/RadioGroupThumbnail.tsx
+++ b/app/client/packages/icons/src/components/Thumbnails/RadioGroupThumbnail.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const RadioGroupThumbnail = () => <svg xmlns="http://www.w3.org/2000/svg" width="72" height="76" fill="none"><circle cx="22" cy="29" r="6.5" fill="#FFBFA1" stroke="#CC3D00"/><circle cx="22" cy="29" r="3.5" fill="#fff" stroke="#CC3D00"/><rect width="20" height="8" x="34" y="25" fill="#CDD5DF" rx="1"/><rect width="11" height="11" x="16.5" y="41.5" fill="#fff" stroke="#CDD5DF" rx="5.5"/><rect width="22" height="8" x="34" y="43" fill="#CDD5DF" rx="1"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const RadioGroupThumbnail = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={72} height={76} fill="none" {...props}><circle cx={22} cy={29} r={6.5} fill="#FFBFA1" stroke="#CC3D00" /><circle cx={22} cy={29} r={3.5} fill="#fff" stroke="#CC3D00" /><rect width={20} height={8} x={34} y={25} fill="#CDD5DF" rx={1} /><rect width={11} height={11} x={16.5} y={41.5} fill="#fff" stroke="#CDD5DF" rx={5.5} /><rect width={22} height={8} x={34} y={43} fill="#CDD5DF" rx={1} /></svg>;
+export { RadioGroupThumbnail };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Thumbnails/SectionThumbnail.tsx b/app/client/packages/icons/src/components/Thumbnails/SectionThumbnail.tsx
index 2cd004ba1d2e..f860aa7022d6 100644
--- a/app/client/packages/icons/src/components/Thumbnails/SectionThumbnail.tsx
+++ b/app/client/packages/icons/src/components/Thumbnails/SectionThumbnail.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const SectionThumbnail = () => <svg xmlns="http://www.w3.org/2000/svg" width="72" height="76" fill="none"><rect width="53" height="29" x="9.5" y="23.5" fill="#fff" stroke="#CC3D00" rx="2"/><path stroke="#CC3D00" d="M62.5 9v4.5a2 2 0 0 1-2 2h-49a2 2 0 0 1-2-2V9M62.5 67v-4.5a2 2 0 0 0-2-2h-49a2 2 0 0 0-2 2V67"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const SectionThumbnail = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={72} height={76} fill="none" {...props}><rect width={53} height={29} x={9.5} y={23.5} fill="#fff" stroke="#CC3D00" rx={2} /><path stroke="#CC3D00" d="M62.5 9v4.5a2 2 0 0 1-2 2h-49a2 2 0 0 1-2-2V9M62.5 67v-4.5a2 2 0 0 0-2-2h-49a2 2 0 0 0-2 2V67" /></svg>;
+export { SectionThumbnail };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Thumbnails/SelectThumbnail.tsx b/app/client/packages/icons/src/components/Thumbnails/SelectThumbnail.tsx
index ccd690d38e6f..9800e4c2e9ff 100644
--- a/app/client/packages/icons/src/components/Thumbnails/SelectThumbnail.tsx
+++ b/app/client/packages/icons/src/components/Thumbnails/SelectThumbnail.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const SelectThumbnail = () => <svg xmlns="http://www.w3.org/2000/svg" width="72" height="76" fill="none"><rect width="55" height="23" x="8.5" y="26.5" fill="#fff" stroke="#CDD5DF" rx="2.5"/><path stroke="#CC3D00" stroke-linecap="round" stroke-linejoin="round" d="m14.5 44.5 1.833-4m9.167 4-1.833-4m-7.334 0 3.667-8 3.667 8m-7.334 0h7.334"/><path stroke="#6A7585" stroke-linecap="round" stroke-linejoin="round" d="m56.5 36.5-3 3-3-3"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const SelectThumbnail = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={72} height={76} fill="none" {...props}><rect width={55} height={23} x={8.5} y={26.5} fill="#fff" stroke="#CDD5DF" rx={2.5} /><path stroke="#CC3D00" strokeLinecap="round" strokeLinejoin="round" d="m14.5 44.5 1.833-4m9.167 4-1.833-4m-7.334 0 3.667-8 3.667 8m-7.334 0h7.334" /><path stroke="#6A7585" strokeLinecap="round" strokeLinejoin="round" d="m56.5 36.5-3 3-3-3" /></svg>;
+export { SelectThumbnail };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Thumbnails/StatsBoxThumbnail.tsx b/app/client/packages/icons/src/components/Thumbnails/StatsBoxThumbnail.tsx
index cd43593d6bff..1d34cbf7dbcf 100644
--- a/app/client/packages/icons/src/components/Thumbnails/StatsBoxThumbnail.tsx
+++ b/app/client/packages/icons/src/components/Thumbnails/StatsBoxThumbnail.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const StatsBoxThumbnail = () => <svg xmlns="http://www.w3.org/2000/svg" width="72" height="76" fill="none"><rect width="32" height="6" x="16" y="24" fill="#E3E8EF" rx="1"/><path stroke="#CC3D00" stroke-linecap="round" stroke-linejoin="round" d="M16 50.5h2.5m2.5 0h-2.5m-2.5-8 2.5-2v10M28.5 50.5h-5v-2.646a2 2 0 0 1 1.257-1.857l2.486-.994a2 2 0 0 0 1.257-1.857V42.5a2 2 0 0 0-2-2h-3M31.5 40.5h3a2 2 0 0 1 2 2v1a2 2 0 0 1-2 2h-1.715M31.5 50.5h3a2 2 0 0 0 2-2v-1a2 2 0 0 0-2-2h-2"/><rect width="12" height="12" x="43.5" y="39.5" fill="#FFEEE5" stroke="#CC3D00" rx="1.5"/><path stroke="#CC3D00" stroke-linecap="round" d="m47 48 4-4"/><path stroke="#CC3D00" stroke-linecap="round" stroke-linejoin="round" d="M48.5 43.5h3v3"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const StatsBoxThumbnail = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={72} height={76} fill="none" {...props}><rect width={32} height={6} x={16} y={24} fill="#E3E8EF" rx={1} /><path stroke="#CC3D00" strokeLinecap="round" strokeLinejoin="round" d="M16 50.5h2.5m2.5 0h-2.5m-2.5-8 2.5-2v10M28.5 50.5h-5v-2.646a2 2 0 0 1 1.257-1.857l2.486-.994a2 2 0 0 0 1.257-1.857V42.5a2 2 0 0 0-2-2h-3M31.5 40.5h3a2 2 0 0 1 2 2v1a2 2 0 0 1-2 2h-1.715M31.5 50.5h3a2 2 0 0 0 2-2v-1a2 2 0 0 0-2-2h-2" /><rect width={12} height={12} x={43.5} y={39.5} fill="#FFEEE5" stroke="#CC3D00" rx={1.5} /><path stroke="#CC3D00" strokeLinecap="round" d="m47 48 4-4" /><path stroke="#CC3D00" strokeLinecap="round" strokeLinejoin="round" d="M48.5 43.5h3v3" /></svg>;
+export { StatsBoxThumbnail };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Thumbnails/SwitchGroupThumbnail.tsx b/app/client/packages/icons/src/components/Thumbnails/SwitchGroupThumbnail.tsx
index 48a78b2096ca..2abe405de7ba 100644
--- a/app/client/packages/icons/src/components/Thumbnails/SwitchGroupThumbnail.tsx
+++ b/app/client/packages/icons/src/components/Thumbnails/SwitchGroupThumbnail.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const SwitchGroupThumbnail = () => <svg xmlns="http://www.w3.org/2000/svg" width="72" height="76" fill="none"><rect width="17" height="11" x="40.5" y="23.5" fill="#FFBFA1" stroke="#CC3D00" rx="5.5"/><rect width="17" height="11" x="40.5" y="41.5" fill="#CDD5DF" stroke="#CDD5DF" rx="5.5"/><circle cx="52" cy="29" r="5.5" fill="#fff" stroke="#CC3D00"/><circle cx="46" cy="47" r="5.5" fill="#fff" stroke="#CDD5DF"/><rect width="22" height="8" x="14" y="25" fill="#CDD5DF" rx="1"/><rect width="18" height="8" x="14" y="43" fill="#CDD5DF" rx="1"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const SwitchGroupThumbnail = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={72} height={76} fill="none" {...props}><rect width={17} height={11} x={40.5} y={23.5} fill="#FFBFA1" stroke="#CC3D00" rx={5.5} /><rect width={17} height={11} x={40.5} y={41.5} fill="#CDD5DF" stroke="#CDD5DF" rx={5.5} /><circle cx={52} cy={29} r={5.5} fill="#fff" stroke="#CC3D00" /><circle cx={46} cy={47} r={5.5} fill="#fff" stroke="#CDD5DF" /><rect width={22} height={8} x={14} y={25} fill="#CDD5DF" rx={1} /><rect width={18} height={8} x={14} y={43} fill="#CDD5DF" rx={1} /></svg>;
+export { SwitchGroupThumbnail };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Thumbnails/SwitchThumbnail.tsx b/app/client/packages/icons/src/components/Thumbnails/SwitchThumbnail.tsx
index cebc8d84d579..43c15b85820c 100644
--- a/app/client/packages/icons/src/components/Thumbnails/SwitchThumbnail.tsx
+++ b/app/client/packages/icons/src/components/Thumbnails/SwitchThumbnail.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const SwitchThumbnail = () => <svg xmlns="http://www.w3.org/2000/svg" width="72" height="76" fill="none"><rect width="22" height="8" x="14" y="34" fill="#CDD5DF" rx="1"/><rect width="17" height="11" x="40.5" y="32.5" fill="#FFBFA1" stroke="#CC3D00" rx="5.5"/><circle cx="52" cy="38" r="5.5" fill="#fff" stroke="#CC3D00"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const SwitchThumbnail = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={72} height={76} fill="none" {...props}><rect width={22} height={8} x={14} y={34} fill="#CDD5DF" rx={1} /><rect width={17} height={11} x={40.5} y={32.5} fill="#FFBFA1" stroke="#CC3D00" rx={5.5} /><circle cx={52} cy={38} r={5.5} fill="#fff" stroke="#CC3D00" /></svg>;
+export { SwitchThumbnail };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Thumbnails/TableThumbnail.tsx b/app/client/packages/icons/src/components/Thumbnails/TableThumbnail.tsx
index e30756bff124..7e295987d1eb 100644
--- a/app/client/packages/icons/src/components/Thumbnails/TableThumbnail.tsx
+++ b/app/client/packages/icons/src/components/Thumbnails/TableThumbnail.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const TableThumbnail = () => <svg xmlns="http://www.w3.org/2000/svg" width="72" height="76" fill="none"><rect width="56" height="43" x="7.5" y="16.5" fill="#fff" stroke="#6A7585" rx="1.5"/><path fill="#FFEEE5" d="M22.5 32.5v26a1 1 0 0 1-1 1h-13a1 1 0 0 1-1-1v-41a1 1 0 0 1 1-1h54a1 1 0 0 1 1 1v13a1 1 0 0 1-1 1h-39a1 1 0 0 0-1 1"/><path stroke="#CC3D00" d="M22.5 59.5H9A1.5 1.5 0 0 1 7.5 58V18A1.5 1.5 0 0 1 9 16.5h53a1.5 1.5 0 0 1 1.5 1.5v13.5"/><path stroke="#6A7585" stroke-linecap="round" d="M22.5 45.5h41"/><path stroke="#CC3D00" stroke-linecap="round" d="M22.5 17v28.5m0 14v-14m0 0h-15m.5-14h55.5"/><path fill="#E3E8EF" fill-rule="evenodd" d="M27 35a1 1 0 0 0-1 1v5a1 1 0 0 0 1 1h22a1 1 0 0 0 1-1v-5a1 1 0 0 0-1-1zm0 14a1 1 0 0 0-1 1v5a1 1 0 0 0 1 1h31a1 1 0 0 0 1-1v-5a1 1 0 0 0-1-1z" clip-rule="evenodd"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const TableThumbnail = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={72} height={76} fill="none" {...props}><rect width={56} height={43} x={7.5} y={16.5} fill="#fff" stroke="#6A7585" rx={1.5} /><path fill="#FFEEE5" d="M22.5 32.5v26a1 1 0 0 1-1 1h-13a1 1 0 0 1-1-1v-41a1 1 0 0 1 1-1h54a1 1 0 0 1 1 1v13a1 1 0 0 1-1 1h-39a1 1 0 0 0-1 1" /><path stroke="#CC3D00" d="M22.5 59.5H9A1.5 1.5 0 0 1 7.5 58V18A1.5 1.5 0 0 1 9 16.5h53a1.5 1.5 0 0 1 1.5 1.5v13.5" /><path stroke="#6A7585" strokeLinecap="round" d="M22.5 45.5h41" /><path stroke="#CC3D00" strokeLinecap="round" d="M22.5 17v28.5m0 14v-14m0 0h-15m.5-14h55.5" /><path fill="#E3E8EF" fillRule="evenodd" d="M27 35a1 1 0 0 0-1 1v5a1 1 0 0 0 1 1h22a1 1 0 0 0 1-1v-5a1 1 0 0 0-1-1zm0 14a1 1 0 0 0-1 1v5a1 1 0 0 0 1 1h31a1 1 0 0 0 1-1v-5a1 1 0 0 0-1-1z" clipRule="evenodd" /></svg>;
+export { TableThumbnail };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Thumbnails/ToolbarButtonsThumbnail.tsx b/app/client/packages/icons/src/components/Thumbnails/ToolbarButtonsThumbnail.tsx
index ed1c8efdb09a..02cd07e74f84 100644
--- a/app/client/packages/icons/src/components/Thumbnails/ToolbarButtonsThumbnail.tsx
+++ b/app/client/packages/icons/src/components/Thumbnails/ToolbarButtonsThumbnail.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const ToolbarButtonsThumbnail = () => <svg xmlns="http://www.w3.org/2000/svg" width="72" height="76" fill="none"><rect width="18" height="16" x="5.5" y="30.5" fill="#FFEEE5" stroke="#CC3D00" rx="2.5"/><path stroke="#CC3D00" stroke-linecap="round" d="M10.5 38.5h8M14.5 42.5v-8"/><rect width="18" height="16" x="26.5" y="30.5" fill="#E3E8EF" stroke="#6A7585" rx="2.5"/><path stroke="#6A7585" stroke-linecap="round" stroke-linejoin="round" d="m38 35-5.5 5.5 1 1L39 36a.707.707 0 0 0-1-1"/><rect width="19" height="16" x="48.5" y="30.5" fill="#E3E8EF" stroke="#6A7585" rx="2.5"/><path stroke="#6A7585" stroke-linecap="round" stroke-width="2" d="M54 38h.01M58 38h.01M62 38h.01"/><path fill="#6A7585" stroke="#6A7585" stroke-linecap="round" stroke-linejoin="round" stroke-width=".75" d="m32 41.5.5.5-1 .5z"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const ToolbarButtonsThumbnail = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={72} height={76} fill="none" {...props}><rect width={18} height={16} x={5.5} y={30.5} fill="#FFEEE5" stroke="#CC3D00" rx={2.5} /><path stroke="#CC3D00" strokeLinecap="round" d="M10.5 38.5h8M14.5 42.5v-8" /><rect width={18} height={16} x={26.5} y={30.5} fill="#E3E8EF" stroke="#6A7585" rx={2.5} /><path stroke="#6A7585" strokeLinecap="round" strokeLinejoin="round" d="m38 35-5.5 5.5 1 1L39 36a.707.707 0 0 0-1-1" /><rect width={19} height={16} x={48.5} y={30.5} fill="#E3E8EF" stroke="#6A7585" rx={2.5} /><path stroke="#6A7585" strokeLinecap="round" strokeWidth={2} d="M54 38h.01M58 38h.01M62 38h.01" /><path fill="#6A7585" stroke="#6A7585" strokeLinecap="round" strokeLinejoin="round" strokeWidth={0.75} d="m32 41.5.5.5-1 .5z" /></svg>;
+export { ToolbarButtonsThumbnail };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/components/Thumbnails/ZoneThumbnail.tsx b/app/client/packages/icons/src/components/Thumbnails/ZoneThumbnail.tsx
index e6b81df9b354..d907fd3476a5 100644
--- a/app/client/packages/icons/src/components/Thumbnails/ZoneThumbnail.tsx
+++ b/app/client/packages/icons/src/components/Thumbnails/ZoneThumbnail.tsx
@@ -1,2 +1,4 @@
-import React from "react";
-export const ZoneThumbnail = () => <svg xmlns="http://www.w3.org/2000/svg" width="72" height="76" fill="none"><rect width="43" height="43" x="14.5" y="16.5" fill="#fff" stroke="#CC3D00" stroke-linecap="square" stroke-linejoin="round" rx=".5"/><path stroke="#CC3D00" d="M9.5 59v4a1.5 1.5 0 0 0 1.5 1.5h4M62.5 59v4a1.5 1.5 0 0 1-1.5 1.5h-4M15 11.5h-4A1.5 1.5 0 0 0 9.5 13v4M57 11.5h4a1.5 1.5 0 0 1 1.5 1.5v4M9.5 22v7m0 5.5V42m0 5v7M62.5 22v7m0 5.5V42m0 5v7M20 11.5h7M20 64.5h7M32 11.5h8M32 64.5h8M45 11.5h7M45 64.5h7"/></svg>;
+import * as React from "react";
+import type { SVGProps } from "react";
+const ZoneThumbnail = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={72} height={76} fill="none" {...props}><rect width={43} height={43} x={14.5} y={16.5} fill="#fff" stroke="#CC3D00" strokeLinecap="square" strokeLinejoin="round" rx={0.5} /><path stroke="#CC3D00" d="M9.5 59v4a1.5 1.5 0 0 0 1.5 1.5h4M62.5 59v4a1.5 1.5 0 0 1-1.5 1.5h-4M15 11.5h-4A1.5 1.5 0 0 0 9.5 13v4M57 11.5h4a1.5 1.5 0 0 1 1.5 1.5v4M9.5 22v7m0 5.5V42m0 5v7M62.5 22v7m0 5.5V42m0 5v7M20 11.5h7M20 64.5h7M32 11.5h8M32 64.5h8M45 11.5h7M45 64.5h7" /></svg>;
+export { ZoneThumbnail };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/icons/CustomIcons/AIAvatar.svg b/app/client/packages/icons/src/icons/CustomIcons/AIAvatar.svg
new file mode 100644
index 000000000000..9f1b244b608c
--- /dev/null
+++ b/app/client/packages/icons/src/icons/CustomIcons/AIAvatar.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none"><rect width="23" height="23" x=".5" y=".5" fill="#FFF7F4" rx="1.5"/><rect width="23" height="23" x=".5" y=".5" stroke="#FFE9E0" rx="1.5"/><path fill="#FF6D2D" d="M4.5 11a2 2 0 1 0 0 4v-4M19.5 11a2 2 0 1 1 0 4v-4"/><rect width="15" height="10" x="4.5" y="8" fill="#fff" stroke="#000" stroke-miterlimit="10" stroke-width=".149" rx="3"/><rect width="12" height="7" x="6" y="9.5" fill="#fff" stroke="#000" stroke-miterlimit="10" stroke-width=".5" rx="1.5"/><circle cx="9" cy="12" r="1" fill="#000"/><circle cx="15" cy="12" r="1" fill="#000"/><path fill="#000" d="M11.5 5.5h1V8h-1z"/><circle cx="12" cy="4.5" r="1.5" fill="#fff" stroke="#000" stroke-miterlimit="10" stroke-width=".149"/><path stroke="#000" stroke-linecap="round" stroke-width=".5" d="m10 14 .209.232A2.426 2.426 0 0 0 14 14v0"/></svg>
\ No newline at end of file
diff --git a/app/client/packages/icons/src/icons/Icons/AIChat.svg b/app/client/packages/icons/src/icons/Icons/AIChat.svg
new file mode 100644
index 000000000000..781136197d64
--- /dev/null
+++ b/app/client/packages/icons/src/icons/Icons/AIChat.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="17" fill="none"><path fill="#000" fill-opacity=".25" fill-rule="evenodd" d="M1.5 1A1.5 1.5 0 0 0 0 2.5v8A1.5 1.5 0 0 0 1.5 12H2V4.5A1.5 1.5 0 0 1 3.5 3H13v-.5A1.5 1.5 0 0 0 11.5 1z" clip-rule="evenodd"/><mask id="a" fill="#fff"><path fill-rule="evenodd" d="M3.5 3A1.5 1.5 0 0 0 2 4.5v8A1.5 1.5 0 0 0 3.5 14H10l2.146 2.146a.5.5 0 0 0 .854-.353V14h.5a1.5 1.5 0 0 0 1.5-1.5v-8A1.5 1.5 0 0 0 13.5 3z" clip-rule="evenodd"/></mask><path fill="#000" d="m10 14 .707-.707-.293-.293H10zm3 0v-1h-1v1zM3 4.5a.5.5 0 0 1 .5-.5V2A2.5 2.5 0 0 0 1 4.5zm0 8v-8H1v8zm.5.5a.5.5 0 0 1-.5-.5H1A2.5 2.5 0 0 0 3.5 15zm6.5 0H3.5v2H10zm2.854 2.44-2.147-2.147-1.414 1.414 2.146 2.147zm-.854.353a.5.5 0 0 1 .854-.354l-1.415 1.415c.945.945 2.561.275 2.561-1.061zM12 14v1.793h2V14zm1.5-1H13v2h.5zm.5-.5a.5.5 0 0 1-.5.5v2a2.5 2.5 0 0 0 2.5-2.5zm0-8v8h2v-8zm-.5-.5a.5.5 0 0 1 .5.5h2A2.5 2.5 0 0 0 13.5 2zm-10 0h10V2h-10z" mask="url(#a)"/><path stroke="#000" stroke-opacity=".75" d="m8.536 6.27.6 1.402.08.184.183.078 1.403.602-1.403.6-.184.08-.078.183-.601 1.403-.602-1.403-.078-.184-.184-.078-1.403-.601 1.403-.602.184-.078.078-.184z"/></svg>
\ No newline at end of file
diff --git a/app/client/packages/icons/src/icons/Icons/ComboboxSelect.svg b/app/client/packages/icons/src/icons/Icons/ComboboxSelect.svg
index 3c6cf838139c..10bb6dca5d4f 100644
--- a/app/client/packages/icons/src/icons/Icons/ComboboxSelect.svg
+++ b/app/client/packages/icons/src/icons/Icons/ComboboxSelect.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M14.5 2.5h-12a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h7M14.5 7.5l-1 1-1-1"/><circle cx="5.5" cy="7.5" r="2" stroke="#000"/><path fill="#000" d="M7.354 8.646 7 8.293 6.293 9l.353.354zm.292 1.708a.5.5 0 0 0 .708-.708zm-1-1 1 1 .708-.708-1-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M14.5 2.5h-12a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h7M14.5 7.5l-1 1-1-1"/><circle cx="5.5" cy="7.5" r="2.079" stroke="#000"/><path fill="#000" d="m7.534 8.685-.424-.424-.849.849.424.424zm.042 1.74a.6.6 0 0 0 .848-.85zm-.89-.891.89.89.848-.848-.89-.89z"/></svg>
\ No newline at end of file
diff --git a/app/client/packages/icons/src/icons/Icons/DatePicker.svg b/app/client/packages/icons/src/icons/Icons/DatePicker.svg
new file mode 100644
index 000000000000..063d40f8d30a
--- /dev/null
+++ b/app/client/packages/icons/src/icons/Icons/DatePicker.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M12.5 1.5h-10a1 1 0 0 0-1 1v10a1 1 0 0 0 1 1h10a1 1 0 0 0 1-1v-10a1 1 0 0 0-1-1M9.5 5.5v8M5.5 5.5v8M1.5 5.5h12M1.5 9.5h12M4.5 3.5v-3m6 3v-3"/></svg>
\ No newline at end of file
diff --git a/app/client/packages/icons/src/icons/Icons/Input.svg b/app/client/packages/icons/src/icons/Icons/Input.svg
index 25374e66620f..7b6ecec75593 100644
--- a/app/client/packages/icons/src/icons/Icons/Input.svg
+++ b/app/client/packages/icons/src/icons/Icons/Input.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="m7.5 9.5-.5-1m-3.5 1 .5-1m0 0 1.5-3 1.5 3m-3 0h3"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M14.5 2.5h-12a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h7M14.5 7.5l-1 1-1-1"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="m7.5 9.5-.5-1m-3.5 1 .5-1m0 0 1.5-3 1.5 3m-3 0h3"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".25" d="M12.5 6.5h1m1 0h-1m0 0v8m-1 0h2"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M14.5 2.5h-12a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h7"/></svg>
\ No newline at end of file
diff --git a/app/client/packages/icons/src/icons/Thumbnails/AIChat.svg b/app/client/packages/icons/src/icons/Thumbnails/AIChat.svg
new file mode 100644
index 000000000000..be77ea9768c6
--- /dev/null
+++ b/app/client/packages/icons/src/icons/Thumbnails/AIChat.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="72" height="76" fill="none"><mask id="a" fill="#fff"><path fill-rule="evenodd" d="M40 21a3 3 0 0 1 3 3v18a3 3 0 0 1-3 3H21l-7.257 8.063c-.613.681-1.743.247-1.743-.669V45H9a3 3 0 0 1-3-3V24a3 3 0 0 1 3-3z" clip-rule="evenodd"/></mask><path fill="#fff" fill-rule="evenodd" d="M40 21a3 3 0 0 1 3 3v18a3 3 0 0 1-3 3H21l-7.257 8.063c-.613.681-1.743.247-1.743-.669V45H9a3 3 0 0 1-3-3V24a3 3 0 0 1 3-3z" clip-rule="evenodd"/><path fill="#CDD5DF" d="m21 45-.743-.669.298-.331H21zm-7.257 8.063.744.669zM12 45v-1h1v1zm30-21a2 2 0 0 0-2-2v-2a4 4 0 0 1 4 4zm0 18V24h2v18zm-2 2a2 2 0 0 0 2-2h2a4 4 0 0 1-4 4zm-19 0h19v2H21zm-8 8.394 7.257-8.063 1.486 1.338-7.256 8.063zm0 0 1.487 1.338C13.26 55.094 11 54.227 11 52.394zM13 45v7.394h-2V45zm-4-1h3v2H9zm-2-2a2 2 0 0 0 2 2v2a4 4 0 0 1-4-4zm0-18v18H5V24zm2-2a2 2 0 0 0-2 2H5a4 4 0 0 1 4-4zm31 0H9v-2h31z" mask="url(#a)"/><mask id="b" fill="#fff"><path fill-rule="evenodd" d="M32 29a3 3 0 0 0-3 3v18a3 3 0 0 0 3 3h19l7.257 8.063c.613.681 1.743.247 1.743-.669V53h3a3 3 0 0 0 3-3V32a3 3 0 0 0-3-3z" clip-rule="evenodd"/></mask><path fill="#FFBFA1" fill-rule="evenodd" d="M32 29a3 3 0 0 0-3 3v18a3 3 0 0 0 3 3h19l7.257 8.063c.613.681 1.743.247 1.743-.669V53h3a3 3 0 0 0 3-3V32a3 3 0 0 0-3-3z" clip-rule="evenodd"/><path fill="#CC3D00" d="m51 53 .743-.669-.298-.331H51zm7.257 8.063-.744.669zM60 53v-1h-1v1zM30 32a2 2 0 0 1 2-2v-2a4 4 0 0 0-4 4zm0 18V32h-2v18zm2 2a2 2 0 0 1-2-2h-2a4 4 0 0 0 4 4zm19 0H32v2h19zm8 8.394-7.257-8.063-1.486 1.338 7.256 8.063zm0 0-1.487 1.338C58.74 63.094 61 62.227 61 60.394zM59 53v7.394h2V53zm4-1h-3v2h3zm2-2a2 2 0 0 1-2 2v2a4 4 0 0 0 4-4zm0-18v18h2V32zm-2-2a2 2 0 0 1 2 2h2a4 4 0 0 0-4-4zm-31 0h31v-2H32z" mask="url(#b)"/><path fill="#fff" stroke="#CC3D00" d="M41.434 43.657a8.5 8.5 0 0 0 4.223-4.223 8.5 8.5 0 0 0 4.223 4.223 8.5 8.5 0 0 0-4.223 4.223 8.5 8.5 0 0 0-4.223-4.223ZM51.17 35.263l.073-.145.072.145a6.5 6.5 0 0 0 2.907 2.907l.145.073-.145.072a6.5 6.5 0 0 0-2.907 2.907l-.072.145-.073-.145a6.5 6.5 0 0 0-2.907-2.907l-.145-.072.145-.073a6.5 6.5 0 0 0 2.907-2.907Z"/></svg>
\ No newline at end of file
diff --git a/app/client/packages/icons/src/icons/Thumbnails/DatePicker.svg b/app/client/packages/icons/src/icons/Thumbnails/DatePicker.svg
new file mode 100644
index 000000000000..aef6eac4db91
--- /dev/null
+++ b/app/client/packages/icons/src/icons/Thumbnails/DatePicker.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="72" height="76" fill="none"><rect width="55" height="23" x="8.5" y="26.5" fill="#fff" rx="2.5"/><rect width="55" height="23" x="8.5" y="26.5" stroke="#CDD5DF" rx="2.5"/><path stroke="#CC3D00" stroke-linecap="round" stroke-linejoin="round" d="M25.5 32.5h-10a1 1 0 0 0-1 1v10a1 1 0 0 0 1 1h10a1 1 0 0 0 1-1v-10a1 1 0 0 0-1-1M22.5 36.5v8M18.5 36.5v8M14.5 36.5h12M14.5 40.5h12M17.5 34.5v-3m6 3v-3"/><path stroke="#99A4B3" stroke-linecap="round" stroke-linejoin="round" d="m56.5 36.5-3 3-3-3"/></svg>
\ No newline at end of file
diff --git a/app/client/packages/icons/src/index.ts b/app/client/packages/icons/src/index.ts
index cba21a55375a..628dfc25a4e2 100644
--- a/app/client/packages/icons/src/index.ts
+++ b/app/client/packages/icons/src/index.ts
@@ -1,8 +1,10 @@
+export { AIChatThumbnail } from "./components/Thumbnails/AIChatThumbnail";
 export { ButtonThumbnail } from "./components/Thumbnails/ButtonThumbnail";
 export { CheckboxGroupThumbnail } from "./components/Thumbnails/CheckboxGroupThumbnail";
 export { CheckboxThumbnail } from "./components/Thumbnails/CheckboxThumbnail";
 export { ComboboxSelectThumbnail } from "./components/Thumbnails/ComboboxSelectThumbnail";
 export { CurrencyInputThumbnail } from "./components/Thumbnails/CurrencyInputThumbnail";
+export { DatePickerThumbnail } from "./components/Thumbnails/DatePickerThumbnail";
 export { EmailInputThumbnail } from "./components/Thumbnails/EmailInputThumbnail";
 export { HeadingThumbnail } from "./components/Thumbnails/HeadingThumbnail";
 export { IconButtonThumbnail } from "./components/Thumbnails/IconButtonThumbnail";
@@ -25,11 +27,13 @@ export { SwitchThumbnail } from "./components/Thumbnails/SwitchThumbnail";
 export { TableThumbnail } from "./components/Thumbnails/TableThumbnail";
 export { ToolbarButtonsThumbnail } from "./components/Thumbnails/ToolbarButtonsThumbnail";
 export { ZoneThumbnail } from "./components/Thumbnails/ZoneThumbnail";
+export { AIChatIcon } from "./components/Icons/AIChatIcon";
 export { ButtonIcon } from "./components/Icons/ButtonIcon";
 export { CheckboxGroupIcon } from "./components/Icons/CheckboxGroupIcon";
 export { CheckboxIcon } from "./components/Icons/CheckboxIcon";
 export { ComboboxSelectIcon } from "./components/Icons/ComboboxSelectIcon";
 export { CurrencyInputIcon } from "./components/Icons/CurrencyInputIcon";
+export { DatePickerIcon } from "./components/Icons/DatePickerIcon";
 export { EmailInputIcon } from "./components/Icons/EmailInputIcon";
 export { HeadingIcon } from "./components/Icons/HeadingIcon";
 export { IconButtonIcon } from "./components/Icons/IconButtonIcon";
@@ -51,3 +55,4 @@ export { SwitchIcon } from "./components/Icons/SwitchIcon";
 export { TableIcon } from "./components/Icons/TableIcon";
 export { ToolbarButtonsIcon } from "./components/Icons/ToolbarButtonsIcon";
 export { ZoneIcon } from "./components/Icons/ZoneIcon";
+export { AIAvatarCustomIcon } from "./components/CustomIcons/AIAvatarCustomIcon";
diff --git a/app/client/packages/icons/src/stories/CustomIcons.mdx b/app/client/packages/icons/src/stories/CustomIcons.mdx
new file mode 100644
index 000000000000..ac38a04a2945
--- /dev/null
+++ b/app/client/packages/icons/src/stories/CustomIcons.mdx
@@ -0,0 +1,19 @@
+import { Meta } from "@storybook/addon-docs";
+import { Flex } from "@appsmith/wds";
+import { AIAvatarCustomIcon } from "../components/CustomIcons/AIAvatarCustomIcon";
+
+<Meta title="Appsmith Icons/CustomIcons" />
+
+# CustomIcons
+
+Set of custom icons.
+
+export const Icons = () => {
+  return (
+    <Flex gap="spacing-4" wrap="wrap">
+      <AIAvatarCustomIcon />
+    </Flex>
+  );
+};
+
+<Icons />
diff --git a/app/client/packages/icons/src/stories/Icons.mdx b/app/client/packages/icons/src/stories/Icons.mdx
index 4641a0ee4927..6347cca16ce2 100644
--- a/app/client/packages/icons/src/stories/Icons.mdx
+++ b/app/client/packages/icons/src/stories/Icons.mdx
@@ -1,10 +1,12 @@
 import { Meta } from "@storybook/addon-docs";
 import { Flex } from "@appsmith/wds";
+import { AIChatIcon } from "../components/Icons/AIChatIcon";
 import { ButtonIcon } from "../components/Icons/ButtonIcon";
 import { CheckboxGroupIcon } from "../components/Icons/CheckboxGroupIcon";
 import { CheckboxIcon } from "../components/Icons/CheckboxIcon";
 import { ComboboxSelectIcon } from "../components/Icons/ComboboxSelectIcon";
 import { CurrencyInputIcon } from "../components/Icons/CurrencyInputIcon";
+import { DatePickerIcon } from "../components/Icons/DatePickerIcon";
 import { EmailInputIcon } from "../components/Icons/EmailInputIcon";
 import { HeadingIcon } from "../components/Icons/HeadingIcon";
 import { IconButtonIcon } from "../components/Icons/IconButtonIcon";
@@ -36,11 +38,13 @@ Icon set for Entity Explorer Panel, which provides a visual representation of th
 export const Icons = () => {
   return (
     <Flex gap="spacing-4" wrap="wrap">
+      <AIChatIcon />
       <ButtonIcon />
       <CheckboxGroupIcon />
       <CheckboxIcon />
       <ComboboxSelectIcon />
       <CurrencyInputIcon />
+      <DatePickerIcon />
       <EmailInputIcon />
       <HeadingIcon />
       <IconButtonIcon />
diff --git a/app/client/packages/icons/src/stories/Thumbnails.mdx b/app/client/packages/icons/src/stories/Thumbnails.mdx
index d05e30565d97..c99d1d029ba5 100644
--- a/app/client/packages/icons/src/stories/Thumbnails.mdx
+++ b/app/client/packages/icons/src/stories/Thumbnails.mdx
@@ -1,10 +1,12 @@
 import { Meta } from "@storybook/addon-docs";
 import { Flex } from "@appsmith/wds";
+import { AIChatThumbnail } from "../components/Thumbnails/AIChatThumbnail";
 import { ButtonThumbnail } from "../components/Thumbnails/ButtonThumbnail";
 import { CheckboxGroupThumbnail } from "../components/Thumbnails/CheckboxGroupThumbnail";
 import { CheckboxThumbnail } from "../components/Thumbnails/CheckboxThumbnail";
 import { ComboboxSelectThumbnail } from "../components/Thumbnails/ComboboxSelectThumbnail";
 import { CurrencyInputThumbnail } from "../components/Thumbnails/CurrencyInputThumbnail";
+import { DatePickerThumbnail } from "../components/Thumbnails/DatePickerThumbnail";
 import { EmailInputThumbnail } from "../components/Thumbnails/EmailInputThumbnail";
 import { HeadingThumbnail } from "../components/Thumbnails/HeadingThumbnail";
 import { IconButtonThumbnail } from "../components/Thumbnails/IconButtonThumbnail";
@@ -37,11 +39,13 @@ Icon set for Widget Explorer Panel, which provides a visual representation of th
 export const Icons = () => {
   return (
     <Flex gap="spacing-4" wrap="wrap">
+      <AIChatThumbnail />
       <ButtonThumbnail />
       <CheckboxGroupThumbnail />
       <CheckboxThumbnail />
       <ComboboxSelectThumbnail />
       <CurrencyInputThumbnail />
+      <DatePickerThumbnail />
       <EmailInputThumbnail />
       <HeadingThumbnail />
       <IconButtonThumbnail />
diff --git a/app/client/packages/icons/src/utils/cleanup.ts b/app/client/packages/icons/src/utils/cleanup.ts
index 8deb1ed26f47..6d8f3d141820 100644
--- a/app/client/packages/icons/src/utils/cleanup.ts
+++ b/app/client/packages/icons/src/utils/cleanup.ts
@@ -1,11 +1,13 @@
 import fs from "fs-extra";
 
 async function cleanup() {
-  await fs.emptyDirSync("./src/icons/Icons");
-  await fs.emptyDirSync("./src/icons/Thumbnails");
-  await fs.emptyDirSync("./src/components/Icons");
-  await fs.emptyDirSync("./src/components/Thumbnails");
-  await fs.emptyDirSync("./src/stories");
+  await fs.emptyDir("./src/icons/Icons");
+  await fs.emptyDir("./src/icons/Thumbnails");
+  await fs.emptyDir("./src/icons/CustomIcons");
+  await fs.emptyDir("./src/components/Icons");
+  await fs.emptyDir("./src/components/Thumbnails");
+  await fs.emptyDir("./src/components/CustomIcons");
+  await fs.emptyDir("./src/stories");
   await fs.writeFile(`./src/index.ts`, "");
 }
 
diff --git a/app/client/packages/icons/src/utils/generateComponents.ts b/app/client/packages/icons/src/utils/generateComponents.ts
index ac773967ad80..25c1237f341c 100644
--- a/app/client/packages/icons/src/utils/generateComponents.ts
+++ b/app/client/packages/icons/src/utils/generateComponents.ts
@@ -2,12 +2,7 @@ import fg from "fast-glob";
 import type { PathLike } from "fs";
 import fs from "fs-extra";
 import path from "path";
-
-const createReactComponent = (name: string, svg: string) => {
-  return `import React from "react";
-export const ${name} = () => ${svg};
-`;
-};
+import { transform } from "@svgr/core";
 
 async function generateComponents() {
   const entries = await fg("./src/icons/**/*.svg");
@@ -29,11 +24,23 @@ async function generateComponents() {
         case "Thumbnails":
           name += "Thumbnail";
           break;
+        case "CustomIcons":
+          name += "CustomIcon";
+          break;
       }
 
       await fs.writeFile(
         `./src/components/${dir}/${name}.tsx`,
-        createReactComponent(name, file),
+        await transform(
+          file,
+          {
+            plugins: ["@svgr/plugin-jsx"],
+            typescript: true,
+            exportType: "named",
+            namedExport: name,
+          },
+          { componentName: name },
+        ),
         "utf8",
         function (err) {
           // eslint-disable-next-line no-console
diff --git a/app/client/packages/icons/src/utils/generateIndex.ts b/app/client/packages/icons/src/utils/generateIndex.ts
index 0ebf7adb7393..08a2071178df 100644
--- a/app/client/packages/icons/src/utils/generateIndex.ts
+++ b/app/client/packages/icons/src/utils/generateIndex.ts
@@ -8,6 +8,7 @@ const createImportListString = (name: string, dir: string) => {
 async function generateIndex() {
   await appendExports("Thumbnails");
   await appendExports("Icons");
+  await appendExports("CustomIcons");
 
   // eslint-disable-next-line no-console
   console.error(
@@ -31,8 +32,10 @@ async function appendExports(dir: string) {
     });
 
     await fs.appendFile(`./src/index.ts`, importList, "utf8", function (err) {
-      // eslint-disable-next-line no-console
-      if (err) return console.error(err);
+      if (err) {
+        // eslint-disable-next-line no-console
+        return console.error(err);
+      }
     });
   });
 }
diff --git a/app/client/packages/icons/src/utils/generateStories.ts b/app/client/packages/icons/src/utils/generateStories.ts
index 4aa09b947e45..cb47839119ef 100644
--- a/app/client/packages/icons/src/utils/generateStories.ts
+++ b/app/client/packages/icons/src/utils/generateStories.ts
@@ -45,6 +45,7 @@ async function generateStories() {
     "Icons",
     "Icon set for Entity Explorer Panel, which provides a visual representation of the widgets.",
   );
+  await generateStory("CustomIcons", "Set of custom icons.");
   // eslint-disable-next-line no-console
   console.error("\x1b[32mStories generation completed successfully!\x1b[0m");
 }
diff --git a/app/client/packages/rts/package.json b/app/client/packages/rts/package.json
index e75769c5e5e4..53c429b9e2da 100644
--- a/app/client/packages/rts/package.json
+++ b/app/client/packages/rts/package.json
@@ -15,6 +15,9 @@
     "start": "./start-server.sh"
   },
   "dependencies": {
+    "@opentelemetry/instrumentation-http": "^0.53.0",
+    "@opentelemetry/sdk-trace-node": "^1.26.0",
+    "@opentelemetry/semantic-conventions": "^1.27.0",
     "@shared/ast": "workspace:^",
     "axios": "^1.7.4",
     "express": "^4.20.0",
diff --git a/app/client/packages/rts/src/constants/routes.ts b/app/client/packages/rts/src/constants/routes.ts
new file mode 100644
index 000000000000..d6f275c956c2
--- /dev/null
+++ b/app/client/packages/rts/src/constants/routes.ts
@@ -0,0 +1,9 @@
+const BASE_API_URL = "http://localhost:8091";
+
+export const RTS_BASE_PATH = "/rts";
+export const RTS_BASE_API_PATH = "/rts-api/v1";
+export const RTS_BASE_API_URL = `${BASE_API_URL}${RTS_BASE_API_PATH}`;
+
+export const BASE_APPSMITH_API_URL =
+  process.env.APPSMITH_API_BASE_URL || "http://localhost:8080/api/v1";
+export const INTERNAL_BASE_URL = "http://localhost:8080/internal/v1";
diff --git a/app/client/packages/rts/src/controllers/Dsl/DslController.ts b/app/client/packages/rts/src/controllers/Dsl/DslController.ts
index 6bfc0f5e7f4e..7f0f062d475d 100644
--- a/app/client/packages/rts/src/controllers/Dsl/DslController.ts
+++ b/app/client/packages/rts/src/controllers/Dsl/DslController.ts
@@ -8,9 +8,9 @@ export default class DSLController extends BaseController {
     super();
   }
 
-  migrateDSL(req: Request, res: Response) {
+  async migrateDSL(req: Request, res: Response) {
     try {
-      const latestDSL = migrateDSLToLatest(req.body);
+      const latestDSL = await migrateDSLToLatest(req.body);
 
       super.sendResponse(res, latestDSL);
     } catch (err) {
diff --git a/app/client/packages/rts/src/instrumentation.ts b/app/client/packages/rts/src/instrumentation.ts
new file mode 100644
index 000000000000..24d40d408f98
--- /dev/null
+++ b/app/client/packages/rts/src/instrumentation.ts
@@ -0,0 +1,50 @@
+import {
+  BatchSpanProcessor,
+  NodeTracerProvider,
+} from "@opentelemetry/sdk-trace-node";
+import { Resource } from "@opentelemetry/resources";
+import {
+  ATTR_DEPLOYMENT_NAME,
+  ATTR_SERVICE_INSTANCE_ID,
+} from "@opentelemetry/semantic-conventions/incubating";
+import { ATTR_SERVICE_NAME } from "@opentelemetry/semantic-conventions";
+import { registerInstrumentations } from "@opentelemetry/instrumentation";
+import { HttpInstrumentation } from "@opentelemetry/instrumentation-http";
+import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-proto";
+
+const provider = new NodeTracerProvider({
+  resource: new Resource({
+    [ATTR_DEPLOYMENT_NAME]: `${process.env.APPSMITH_DEPLOYMENT_NAME || "self-hosted"}`,
+    [ATTR_SERVICE_INSTANCE_ID]: `${process.env.HOSTNAME || "appsmith-0"}`,
+    [ATTR_SERVICE_NAME]: "appsmith-rts",
+  }),
+});
+
+const nrTracesExporter = new OTLPTraceExporter({
+  url: `${process.env.APPSMITH_NEW_RELIC_OTEL_EXPORTER_OTLP_ENDPOINT}/v1/traces`,
+  headers: {
+    "api-key": `${process.env.APPSMITH_NEW_RELIC_OTLP_LICENSE_KEY}`,
+  },
+});
+
+registerInstrumentations({
+  instrumentations: [new HttpInstrumentation()],
+});
+
+const batchSpanProcessor = new BatchSpanProcessor(
+  nrTracesExporter,
+  //Optional BatchSpanProcessor Configurations
+  {
+    // The maximum queue size. After the size is reached spans are dropped.
+    maxQueueSize: 100,
+    // The maximum batch size of every export. It must be smaller or equal to maxQueueSize.
+    maxExportBatchSize: 50,
+    // The interval between two consecutive exports
+    scheduledDelayMillis: 500,
+    // How long the export can run before it is cancelled
+    exportTimeoutMillis: 30000,
+  },
+);
+
+provider.addSpanProcessor(batchSpanProcessor);
+provider.register();
diff --git a/app/client/packages/rts/src/middlewares/socket-auth.ts b/app/client/packages/rts/src/middlewares/socket-auth.ts
index 5f2a8f545cd5..353a908f9c18 100644
--- a/app/client/packages/rts/src/middlewares/socket-auth.ts
+++ b/app/client/packages/rts/src/middlewares/socket-auth.ts
@@ -2,7 +2,7 @@ import type { Socket } from "socket.io";
 import log from "loglevel";
 import axios from "axios";
 
-const API_BASE_URL = process.env.APPSMITH_API_BASE_URL;
+import { BASE_APPSMITH_API_URL } from "@constants/routes";
 
 export async function tryAuth(socket: Socket) {
   /* ********************************************************* */
@@ -35,7 +35,7 @@ export async function tryAuth(socket: Socket) {
   try {
     response = await axios.request({
       method: "GET",
-      url: API_BASE_URL + "/users/me",
+      url: BASE_APPSMITH_API_URL + "/users/me",
       headers: {
         Cookie: sessionCookie,
       },
diff --git a/app/client/packages/rts/src/routes/dsl_routes.ts b/app/client/packages/rts/src/routes/dsl_routes.ts
index ada447ac975f..d53c9ea6bcfb 100644
--- a/app/client/packages/rts/src/routes/dsl_routes.ts
+++ b/app/client/packages/rts/src/routes/dsl_routes.ts
@@ -1,6 +1,7 @@
 import DSLController from "@controllers/Dsl/DslController";
 import { Validator } from "@middlewares/Validator";
 import express from "express";
+import type { Response, Request } from "express";
 
 const router = express.Router();
 const dslController = new DSLController();
@@ -12,6 +13,11 @@ router.get(
   dslController.getLatestDSLVersion,
 );
 
-router.post("/migrate", validator.validateRequest, dslController.migrateDSL);
+router.post(
+  "/migrate",
+  validator.validateRequest,
+  async (req: Request, res: Response) =>
+    await dslController.migrateDSL(req, res),
+);
 
 export default router;
diff --git a/app/client/packages/rts/src/server.ts b/app/client/packages/rts/src/server.ts
index e0b0c3765dfd..98c4fdac3418 100644
--- a/app/client/packages/rts/src/server.ts
+++ b/app/client/packages/rts/src/server.ts
@@ -1,3 +1,4 @@
+import "./instrumentation";
 import http from "http";
 import express from "express";
 import { Server } from "socket.io";
@@ -11,9 +12,7 @@ import ast_routes from "./routes/ast_routes";
 import dsl_routes from "./routes/dsl_routes";
 import health_check_routes from "./routes/health_check_routes";
 
-const RTS_BASE_PATH = "/rts";
-
-export const RTS_BASE_API_PATH = "/rts-api/v1";
+import { RTS_BASE_PATH, RTS_BASE_API_PATH } from "@constants/routes";
 
 // Setting the logLevel for all log messages
 const logLevel: LogLevelDesc = (process.env.APPSMITH_LOG_LEVEL ||
@@ -21,13 +20,6 @@ const logLevel: LogLevelDesc = (process.env.APPSMITH_LOG_LEVEL ||
 
 log.setLevel(logLevel);
 
-const API_BASE_URL = process.env.APPSMITH_API_BASE_URL;
-
-if (API_BASE_URL == null || API_BASE_URL === "") {
-  log.error("Please provide a valid value for `APPSMITH_API_BASE_URL`.");
-  process.exit(1);
-}
-
 const APPSMITH_RTS_PORT = process.env.APPSMITH_RTS_PORT || 8091;
 
 //Disable x-powered-by header to prevent information disclosure
diff --git a/app/client/packages/rts/src/services/DslService.ts b/app/client/packages/rts/src/services/DslService.ts
index 0af89b3c6e21..fc06ffc25f8d 100644
--- a/app/client/packages/rts/src/services/DslService.ts
+++ b/app/client/packages/rts/src/services/DslService.ts
@@ -1,7 +1,7 @@
 import { LATEST_DSL_VERSION, migrateDSL } from "@shared/dsl";
 
-export function migrateDSLToLatest(currentDsl) {
-  const latestDSL = migrateDSL(currentDsl);
+export async function migrateDSLToLatest(currentDsl) {
+  const latestDSL = await migrateDSL(currentDsl);
 
   return latestDSL;
 }
diff --git a/app/client/packages/rts/src/test/server.test.ts b/app/client/packages/rts/src/test/server.test.ts
index 65ec4b03d6ad..2088884f899b 100644
--- a/app/client/packages/rts/src/test/server.test.ts
+++ b/app/client/packages/rts/src/test/server.test.ts
@@ -1,4 +1,5 @@
-import app, { RTS_BASE_API_PATH } from "../server";
+import app from "../server";
+import { RTS_BASE_API_PATH } from "@constants/routes";
 import supertest from "supertest";
 
 const singleScript = {
diff --git a/app/client/packages/storybook/.storybook/preview-head.html b/app/client/packages/storybook/.storybook/preview-head.html
index b0d63966ee2f..b42be270e259 100644
--- a/app/client/packages/storybook/.storybook/preview-head.html
+++ b/app/client/packages/storybook/.storybook/preview-head.html
@@ -21,7 +21,7 @@
     background-color: var(--color-bg-elevation-1) !important;
   }
 
-  code,
+  code:not(:has(span)),
   .css-o1d7ko {
     background-color: var(--color-bg-accent-subtle) !important;
     color: var(--color-fg-on-accent-subtle) !important;
diff --git a/app/client/packages/storybook/package.json b/app/client/packages/storybook/package.json
index 7fa338b6eb27..dcc41c52e723 100644
--- a/app/client/packages/storybook/package.json
+++ b/app/client/packages/storybook/package.json
@@ -23,6 +23,7 @@
     "@storybook/addon-viewport": "^8.2.7",
     "@storybook/blocks": "^8.2.7",
     "@storybook/components": "^8.2.7",
+    "@storybook/core-events": "^8.3.2",
     "@storybook/manager-api": "^8.2.7",
     "@storybook/preset-create-react-app": "^8.2.7",
     "@storybook/react-vite": "^8.2.7",
@@ -37,7 +38,6 @@
   "dependencies": {
     "@appsmith/wds": "workspace:^",
     "@appsmith/wds-theming": "workspace:^",
-    "@storybook/core-events": "^8.3.2",
     "glob": "^11.0.0"
   }
 }
diff --git a/app/client/public/index.html b/app/client/public/index.html
index 2618fe294e42..eee6c8123c73 100755
--- a/app/client/public/index.html
+++ b/app/client/public/index.html
@@ -228,6 +228,10 @@
           apiKey: parseConfig('{{env "APPSMITH_SEGMENT_KEY"}}'),
           ceKey: parseConfig('{{env "APPSMITH_SEGMENT_CE_KEY"}}'),
         },
+        observability: {
+          deploymentName: parseConfig('{{env "APPSMITH_DEPLOYMENT_NAME"}}') || "self-hosted",
+          serviceInstanceId: parseConfig('{{env "HOSTNAME"}}') || "appsmith-0",
+        },
         newRelic:{
           enableNewRelic: parseConfig('{{env "APPSMITH_NEW_RELIC_ACCOUNT_ENABLE"}}'),
           accountId: parseConfig('{{env "APPSMITH_NEW_RELIC_ACCOUNT_ID"}}'),
@@ -243,7 +247,10 @@
         fusioncharts: {
           licenseKey: parseConfig('{{env "APPSMITH_FUSIONCHARTS_LICENSE_KEY"}}'),
         },
-        enableMixpanel: parseConfig('{{env "APPSMITH_SEGMENT_KEY"}}'),
+        mixpanel: {
+          enabled: parseConfig('{{env "APPSMITH_SEGMENT_KEY"}}'),
+          apiKey: parseConfig('{{env "APPSMITH_MIXPANEL_KEY"}}'),
+        },
         algolia: {
           apiId: parseConfig('{{env "APPSMITH_ALGOLIA_API_ID"}}'),
           apiKey: parseConfig('{{env "APPSMITH_ALGOLIA_API_KEY"}}'),
diff --git a/app/client/src/IDE/Components/EditableName/EditableName.test.tsx b/app/client/src/IDE/Components/EditableName/EditableName.test.tsx
new file mode 100644
index 000000000000..6dfadcebe2f6
--- /dev/null
+++ b/app/client/src/IDE/Components/EditableName/EditableName.test.tsx
@@ -0,0 +1,208 @@
+import React from "react";
+import { EditableName } from "./EditableName";
+import { render } from "test/testUtils";
+import "@testing-library/jest-dom";
+import { Icon } from "@appsmith/ads";
+import { fireEvent } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+
+describe("EditableName", () => {
+  const mockOnNameSave = jest.fn();
+  const mockOnExitEditing = jest.fn();
+
+  const name = "test_name";
+  const TabIcon = () => <Icon name="js" />;
+  const KEY_CONFIG = {
+    ENTER: { key: "Enter", keyCode: 13 },
+    ESC: { key: "Esc", keyCode: 27 },
+  };
+
+  const setup = ({ isEditing = false, isLoading = false }) => {
+    // Define the props
+    const props = {
+      name,
+      icon: <TabIcon />,
+      isEditing,
+      onNameSave: mockOnNameSave,
+      exitEditing: mockOnExitEditing,
+      isLoading,
+    };
+
+    // Render the component
+    const utils = render(<EditableName {...props} />);
+
+    return {
+      ...props,
+      ...utils,
+    };
+  };
+
+  test("renders component", () => {
+    const utils = setup({});
+    const editableNameElement = utils.getByText(utils.name);
+
+    expect(editableNameElement).toBeInTheDocument();
+    expect(editableNameElement.textContent).toBe(name);
+  });
+
+  test("renders input when editing", () => {
+    const utils = setup({ isEditing: true });
+
+    const editableNameElement = utils.queryByText(utils.name);
+
+    expect(editableNameElement).not.toBeInTheDocument();
+
+    const inputElement = utils.getByRole("textbox");
+
+    expect(inputElement).toBeInTheDocument();
+  });
+
+  describe("valid input actions", () => {
+    test("submit event", async () => {
+      const { exitEditing, getByRole, onNameSave } = setup({
+        isEditing: true,
+      });
+
+      // hit enter
+      const enterTitle = "enter_title";
+
+      fireEvent.change(getByRole("textbox"), {
+        target: { value: enterTitle },
+      });
+      expect(getByRole("textbox")).toHaveValue(enterTitle);
+
+      fireEvent.keyUp(getByRole("textbox"), KEY_CONFIG.ENTER);
+
+      expect(onNameSave).toHaveBeenCalledWith(enterTitle);
+      expect(exitEditing).toHaveBeenCalled();
+    });
+
+    test("outside click event", async () => {
+      const { exitEditing, getByRole, onNameSave } = setup({
+        isEditing: true,
+      });
+
+      const clickOutsideTitle = "click_outside_title";
+
+      fireEvent.change(getByRole("textbox"), {
+        target: { value: clickOutsideTitle },
+      });
+
+      await userEvent.click(document.body);
+
+      expect(onNameSave).toHaveBeenCalledWith(clickOutsideTitle);
+      expect(exitEditing).toHaveBeenCalled();
+    });
+
+    test("esc key event", async () => {
+      const escapeTitle = "escape_title";
+
+      const { exitEditing, getByRole, onNameSave } = setup({
+        isEditing: true,
+      });
+
+      fireEvent.change(getByRole("textbox"), {
+        target: { value: escapeTitle },
+      });
+
+      fireEvent.keyUp(getByRole("textbox"), KEY_CONFIG.ESC);
+
+      expect(exitEditing).toHaveBeenCalled();
+      expect(onNameSave).not.toHaveBeenCalledWith(escapeTitle);
+    });
+
+    test("focus out event", async () => {
+      const focusOutTitle = "focus_out_title";
+
+      const { exitEditing, getByRole, onNameSave } = setup({
+        isEditing: true,
+      });
+
+      const inputElement = getByRole("textbox");
+
+      fireEvent.change(inputElement, {
+        target: { value: focusOutTitle },
+      });
+
+      fireEvent.keyUp(inputElement, KEY_CONFIG.ESC);
+      expect(exitEditing).toHaveBeenCalled();
+      expect(onNameSave).not.toHaveBeenCalledWith(focusOutTitle);
+    });
+  });
+
+  describe("invalid input actions", () => {
+    const invalidTitle = "else";
+    const validationError =
+      "else is already being used or is a restricted keyword.";
+
+    test("click outside", async () => {
+      const { exitEditing, getByRole, onNameSave } = setup({
+        isEditing: true,
+      });
+      const inputElement = getByRole("textbox");
+
+      fireEvent.change(inputElement, {
+        target: { value: invalidTitle },
+      });
+
+      expect(getByRole("tooltip")).toBeInTheDocument();
+
+      expect(getByRole("tooltip").textContent).toEqual(validationError);
+
+      await userEvent.click(document.body);
+
+      expect(getByRole("tooltip").textContent).toEqual(validationError);
+
+      expect(exitEditing).toHaveBeenCalled();
+      expect(onNameSave).not.toHaveBeenCalledWith(invalidTitle);
+    });
+
+    test("esc key", async () => {
+      const { exitEditing, getByRole, onNameSave } = setup({
+        isEditing: true,
+      });
+      const inputElement = getByRole("textbox");
+
+      fireEvent.change(inputElement, {
+        target: { value: invalidTitle },
+      });
+
+      fireEvent.keyUp(inputElement, KEY_CONFIG.ESC);
+
+      expect(getByRole("tooltip")).toBeInTheDocument();
+
+      expect(getByRole("tooltip").textContent).toEqual("");
+      expect(exitEditing).toHaveBeenCalled();
+      expect(onNameSave).not.toHaveBeenCalledWith(invalidTitle);
+    });
+
+    test("focus out event", async () => {
+      const { exitEditing, getByRole, onNameSave } = setup({
+        isEditing: true,
+      });
+      const inputElement = getByRole("textbox");
+
+      fireEvent.change(inputElement, {
+        target: { value: invalidTitle },
+      });
+
+      fireEvent.focusOut(inputElement);
+      expect(getByRole("tooltip").textContent).toEqual(validationError);
+      expect(exitEditing).toHaveBeenCalled();
+      expect(onNameSave).not.toHaveBeenCalledWith(invalidTitle);
+    });
+
+    test("prevents saving empty name", () => {
+      const { getByRole, onNameSave } = setup({ isEditing: true });
+      const input = getByRole("textbox");
+
+      fireEvent.change(input, { target: { value: "" } });
+      expect(getByRole("tooltip")).toHaveTextContent(
+        "Please enter a valid name",
+      );
+      fireEvent.keyUp(input, KEY_CONFIG.ENTER);
+
+      expect(onNameSave).not.toHaveBeenCalledWith("");
+    });
+  });
+});
diff --git a/app/client/src/IDE/Components/EditableName/EditableName.tsx b/app/client/src/IDE/Components/EditableName/EditableName.tsx
new file mode 100644
index 000000000000..1f91d827b801
--- /dev/null
+++ b/app/client/src/IDE/Components/EditableName/EditableName.tsx
@@ -0,0 +1,169 @@
+import React, {
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
+import { Spinner, Text, Tooltip } from "@appsmith/ads";
+import { useEventCallback, useEventListener } from "usehooks-ts";
+import { usePrevious } from "@mantine/hooks";
+import { useNameEditor } from "./useNameEditor";
+
+interface EditableTextProps {
+  name: string;
+  /** isLoading true will show a spinner **/
+  isLoading?: boolean;
+  /** if a valid name is entered, the onNameSave
+   * will be called with the new name */
+  onNameSave: (name: string) => void;
+  /** Used in conjunction with exit editing to control
+   *  this component input editable state  */
+  isEditing: boolean;
+  /** Used in conjunction with exit editing to control this component
+   *  input editable state This function will be called when the
+   *  user is trying to exit the editing mode **/
+  exitEditing: () => void;
+  /** Icon is replaced by spinner when isLoading is shown */
+  icon: React.ReactNode;
+  inputTestId?: string;
+}
+
+export const EditableName = ({
+  exitEditing,
+  icon,
+  inputTestId,
+  isEditing,
+  isLoading = false,
+  name,
+  onNameSave,
+}: EditableTextProps) => {
+  const previousName = usePrevious(name);
+  const [editableName, setEditableName] = useState(name);
+  const [validationError, setValidationError] = useState<string | null>(null);
+  const inputRef = useRef<HTMLInputElement>(null);
+
+  const { normalizeName, validateName } = useNameEditor({
+    entityName: name,
+  });
+
+  const exitWithoutSaving = useCallback(() => {
+    exitEditing();
+    setEditableName(name);
+    setValidationError(null);
+  }, [exitEditing, name]);
+
+  const validate = useCallback(
+    (name: string) => {
+      const nameError = validateName(name);
+
+      if (nameError === null) {
+        setValidationError(null);
+      } else {
+        setValidationError(nameError);
+      }
+
+      return nameError;
+    },
+    [validateName],
+  );
+
+  const attemptSave = useCallback(() => {
+    const nameError = validate(editableName);
+
+    if (editableName === name) {
+      exitWithoutSaving();
+    } else if (nameError === null) {
+      exitEditing();
+      onNameSave(editableName);
+    }
+  }, [
+    editableName,
+    exitEditing,
+    exitWithoutSaving,
+    name,
+    onNameSave,
+    validate,
+  ]);
+
+  const handleKeyUp = useEventCallback(
+    (e: React.KeyboardEvent<HTMLInputElement>) => {
+      if (e.key === "Enter") {
+        attemptSave();
+      } else if (e.key === "Escape") {
+        exitWithoutSaving();
+      }
+    },
+  );
+
+  const handleTitleChange = useEventCallback(
+    (e: React.ChangeEvent<HTMLInputElement>) => {
+      const value = normalizeName(e.target.value);
+
+      setEditableName(value);
+      validate(value);
+    },
+  );
+
+  const inputProps = useMemo(
+    () => ({
+      ["data-testid"]: inputTestId,
+      onKeyUp: handleKeyUp,
+      onChange: handleTitleChange,
+      autoFocus: true,
+      style: { paddingTop: 0, paddingBottom: 0, left: -1, top: -1 },
+    }),
+    [handleKeyUp, handleTitleChange, inputTestId],
+  );
+
+  useEventListener(
+    "focusout",
+    function handleFocusOut() {
+      if (isEditing) {
+        attemptSave();
+      }
+    },
+    inputRef,
+  );
+
+  useEffect(
+    function syncEditableTitle() {
+      if (!isEditing && previousName !== name) {
+        setEditableName(name);
+      }
+    },
+    [name, previousName, isEditing],
+  );
+
+  // TODO: This is a temporary fix to focus the input after context retention applies focus to its target
+  // this is a nasty hack to re-focus the input after context retention applies focus to its target
+  // this will be addressed in a future task, likely by a focus retention modification
+  useEffect(
+    function recaptureFocusInEventOfFocusRetention() {
+      const input = inputRef.current;
+
+      if (isEditing && input) {
+        setTimeout(() => {
+          input.focus();
+        }, 200);
+      }
+    },
+    [isEditing],
+  );
+
+  return (
+    <>
+      {isLoading ? <Spinner size="sm" /> : icon}
+      <Tooltip content={validationError} visible={Boolean(validationError)}>
+        <Text
+          inputProps={inputProps}
+          inputRef={inputRef}
+          isEditable={isEditing}
+          kind="body-s"
+        >
+          {editableName}
+        </Text>
+      </Tooltip>
+    </>
+  );
+};
diff --git a/app/client/src/IDE/Components/EditableName/RenameMenuItem.tsx b/app/client/src/IDE/Components/EditableName/RenameMenuItem.tsx
new file mode 100644
index 000000000000..3c7d6049841a
--- /dev/null
+++ b/app/client/src/IDE/Components/EditableName/RenameMenuItem.tsx
@@ -0,0 +1,30 @@
+import React, { useCallback } from "react";
+import { MenuItem } from "@appsmith/ads";
+import { useDispatch } from "react-redux";
+import { setRenameEntity } from "actions/ideActions";
+
+interface Props {
+  disabled?: boolean;
+  entityId: string;
+}
+
+export const RenameMenuItem = ({ disabled, entityId }: Props) => {
+  const dispatch = useDispatch();
+
+  const setRename = useCallback(() => {
+    // We add a delay to avoid having the focus stuck in the menu trigger
+    setTimeout(() => {
+      dispatch(setRenameEntity(entityId));
+    }, 100);
+  }, [dispatch, entityId]);
+
+  return (
+    <MenuItem
+      disabled={disabled}
+      onSelect={setRename}
+      startIcon="input-cursor-move"
+    >
+      Rename
+    </MenuItem>
+  );
+};
diff --git a/app/client/src/IDE/Components/EditableName/index.ts b/app/client/src/IDE/Components/EditableName/index.ts
new file mode 100644
index 000000000000..f714786de369
--- /dev/null
+++ b/app/client/src/IDE/Components/EditableName/index.ts
@@ -0,0 +1,3 @@
+export { EditableName } from "./EditableName";
+export { RenameMenuItem } from "./RenameMenuItem";
+export { useIsRenaming } from "./useIsRenaming";
diff --git a/app/client/src/IDE/Components/EditableName/useIsRenaming.ts b/app/client/src/IDE/Components/EditableName/useIsRenaming.ts
new file mode 100644
index 000000000000..85bac3e91193
--- /dev/null
+++ b/app/client/src/IDE/Components/EditableName/useIsRenaming.ts
@@ -0,0 +1,35 @@
+import { useDispatch, useSelector } from "react-redux";
+import { getIsRenaming } from "selectors/ideSelectors";
+import { useCallback, useEffect, useState } from "react";
+import { setRenameEntity } from "actions/ideActions";
+
+export const useIsRenaming = (id: string) => {
+  const dispatch = useDispatch();
+  const [isEditing, setIsEditing] = useState(false);
+
+  const isEditingViaExternal = useSelector(getIsRenaming(id));
+
+  useEffect(
+    function onExternalEditEvent() {
+      if (isEditingViaExternal) {
+        setIsEditing(true);
+      }
+
+      return () => {
+        setIsEditing(false);
+      };
+    },
+    [isEditingViaExternal],
+  );
+
+  const enterEditMode = useCallback(() => {
+    setIsEditing(true);
+  }, []);
+
+  const exitEditMode = useCallback(() => {
+    dispatch(setRenameEntity(""));
+    setIsEditing(false);
+  }, [dispatch]);
+
+  return { isEditing, enterEditMode, exitEditMode };
+};
diff --git a/app/client/src/IDE/Components/EditableName/useNameEditor.ts b/app/client/src/IDE/Components/EditableName/useNameEditor.ts
new file mode 100644
index 000000000000..cae166cab481
--- /dev/null
+++ b/app/client/src/IDE/Components/EditableName/useNameEditor.ts
@@ -0,0 +1,45 @@
+import {
+  ACTION_INVALID_NAME_ERROR,
+  ACTION_NAME_CONFLICT_ERROR,
+  createMessage,
+} from "ee/constants/messages";
+import { shallowEqual, useSelector } from "react-redux";
+import type { AppState } from "ee/reducers";
+import { getUsedActionNames } from "selectors/actionSelectors";
+import { isNameValid, removeSpecialChars } from "utils/helpers";
+import { useCallback } from "react";
+
+interface UseNameEditorProps {
+  entityName: string;
+  nameErrorMessage?: (name: string) => string;
+}
+
+/**
+ * Provides a unified way to validate and save entity names.
+ */
+export function useNameEditor(props: UseNameEditorProps) {
+  const { entityName, nameErrorMessage = ACTION_NAME_CONFLICT_ERROR } = props;
+
+  const usedEntityNames = useSelector(
+    (state: AppState) => getUsedActionNames(state, ""),
+    shallowEqual,
+  );
+
+  const validateName = useCallback(
+    (name: string): string | null => {
+      if (!name || name.trim().length === 0) {
+        return createMessage(ACTION_INVALID_NAME_ERROR);
+      } else if (name !== entityName && !isNameValid(name, usedEntityNames)) {
+        return createMessage(nameErrorMessage, name);
+      }
+
+      return null;
+    },
+    [entityName, nameErrorMessage, usedEntityNames],
+  );
+
+  return {
+    validateName,
+    normalizeName: removeSpecialChars,
+  };
+}
diff --git a/app/client/src/IDE/Components/FileTab.tsx b/app/client/src/IDE/Components/FileTab.tsx
deleted file mode 100644
index 9d8912d44b80..000000000000
--- a/app/client/src/IDE/Components/FileTab.tsx
+++ /dev/null
@@ -1,99 +0,0 @@
-import React from "react";
-import styled from "styled-components";
-import clsx from "classnames";
-
-import { Flex, Icon } from "@appsmith/ads";
-import { sanitizeString } from "utils/URLUtils";
-
-interface FileTabProps {
-  isActive: boolean;
-  title: string;
-  onClick: () => void;
-  onClose: (e: React.MouseEvent) => void;
-  icon?: React.ReactNode;
-}
-
-export const StyledTab = styled(Flex)`
-  position: relative;
-  height: 100%;
-  font-size: 12px;
-  color: var(--ads-v2-colors-text-default);
-  cursor: pointer;
-  gap: var(--ads-v2-spaces-2);
-  border-top: 1px solid transparent;
-  border-top-left-radius: var(--ads-v2-border-radius);
-  border-top-right-radius: var(--ads-v2-border-radius);
-  align-items: center;
-  justify-content: center;
-  padding: var(--ads-v2-spaces-3);
-  padding-top: 6px; // to accomodate border and make icons align correctly
-  border-left: 1px solid transparent;
-  border-right: 1px solid transparent;
-  border-top: 2px solid transparent;
-
-  &.active {
-    background: var(--ads-v2-colors-control-field-default-bg);
-    border-top-color: var(--ads-v2-color-bg-brand);
-    border-left-color: var(--ads-v2-color-border-muted);
-    border-right-color: var(--ads-v2-color-border-muted);
-  }
-
-  & > .tab-close {
-    position: relative;
-    right: -2px;
-    visibility: hidden;
-  }
-
-  &:hover > .tab-close {
-    visibility: visible;
-  }
-
-  &.active > .tab-close {
-    visibility: visible;
-  }
-`;
-
-export const TabTextContainer = styled.span`
-  width: 100%;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  overflow: hidden;
-`;
-
-export const TabIconContainer = styled.div`
-  height: 12px;
-  width: 12px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  flex-shrink: 0;
-  img {
-    width: 12px;
-  }
-`;
-
-export const FileTab = ({
-  icon,
-  isActive,
-  onClick,
-  onClose,
-  title,
-}: FileTabProps) => {
-  return (
-    <StyledTab
-      className={clsx("editor-tab", isActive && "active")}
-      data-testid={`t--ide-tab-${sanitizeString(title)}`}
-      onClick={onClick}
-    >
-      {icon ? <TabIconContainer>{icon}</TabIconContainer> : null}
-      <TabTextContainer>{title}</TabTextContainer>
-      {/* not using button component because of the size not matching design */}
-      <Icon
-        className="tab-close rounded-[4px] hover:bg-[var(--ads-v2-colors-action-tertiary-surface-hover-bg)] cursor-pointer p-[2px]"
-        data-testid="t--tab-close-btn"
-        name="close-line"
-        onClick={onClose}
-      />
-    </StyledTab>
-  );
-};
diff --git a/app/client/src/IDE/Components/FileTab/FileTab.test.tsx b/app/client/src/IDE/Components/FileTab/FileTab.test.tsx
new file mode 100644
index 000000000000..6650b2161add
--- /dev/null
+++ b/app/client/src/IDE/Components/FileTab/FileTab.test.tsx
@@ -0,0 +1,64 @@
+/* eslint-disable react-perf/jsx-no-new-object-as-prop */
+/* eslint-disable react-perf/jsx-no-jsx-as-prop */
+import "@testing-library/jest-dom";
+import React from "react";
+import { render, fireEvent } from "@testing-library/react";
+
+import { Icon } from "@appsmith/ads";
+import { FileTab } from "./FileTab";
+import { DATA_TEST_ID } from "./constants";
+
+describe("FileTab", () => {
+  const mockOnClick = jest.fn();
+  const mockOnClose = jest.fn();
+  const mockOnDoubleClick = jest.fn();
+
+  const TITLE = "test_file";
+  const TabIcon = () => <Icon name="js" />;
+
+  const setup = () => {
+    const utils = render(
+      <FileTab
+        isActive
+        onClick={mockOnClick}
+        onClose={mockOnClose}
+        onDoubleClick={mockOnDoubleClick}
+        title={TITLE}
+      >
+        <TabIcon />
+        {TITLE}
+      </FileTab>,
+    );
+    const tabElement = utils.getByText(TITLE);
+
+    return {
+      tabElement,
+      ...utils,
+    };
+  };
+
+  test("renders component", () => {
+    const { getByTestId, tabElement } = setup();
+
+    fireEvent.click(tabElement);
+    expect(mockOnClick).toHaveBeenCalled();
+
+    const closeButton = getByTestId(DATA_TEST_ID.CLOSE_BUTTON);
+
+    fireEvent.click(closeButton);
+    expect(mockOnClose).toHaveBeenCalled();
+  });
+
+  test("double click event is fired", () => {
+    const { getByTestId, tabElement } = setup();
+
+    fireEvent.doubleClick(tabElement);
+
+    expect(mockOnDoubleClick).toHaveBeenCalled();
+
+    const closeButton = getByTestId(DATA_TEST_ID.CLOSE_BUTTON);
+
+    fireEvent.click(closeButton);
+    expect(mockOnClose).toHaveBeenCalled();
+  });
+});
diff --git a/app/client/src/IDE/Components/FileTab/FileTab.tsx b/app/client/src/IDE/Components/FileTab/FileTab.tsx
new file mode 100644
index 000000000000..193b5323b5bd
--- /dev/null
+++ b/app/client/src/IDE/Components/FileTab/FileTab.tsx
@@ -0,0 +1,46 @@
+import React from "react";
+
+import clsx from "classnames";
+
+import { Icon } from "@appsmith/ads";
+import { sanitizeString } from "utils/URLUtils";
+
+import * as Styled from "./styles";
+import { DATA_TEST_ID } from "./constants";
+
+export interface FileTabProps {
+  isActive: boolean;
+  title: string;
+  onClick: () => void;
+  onClose: (e: React.MouseEvent) => void;
+  children: React.ReactNode;
+  onDoubleClick?: () => void;
+}
+
+export const FileTab = ({
+  children,
+  isActive,
+  onClick,
+  onClose,
+  onDoubleClick,
+  title,
+}: FileTabProps) => {
+  return (
+    <Styled.Tab
+      className={clsx("editor-tab", isActive && "active")}
+      data-testid={`t--ide-tab-${sanitizeString(title)}`}
+      onClick={onClick}
+      onDoubleClick={onDoubleClick}
+    >
+      {children}
+      <Styled.CloseButton
+        aria-label="Close tab"
+        className="tab-close"
+        data-testid={DATA_TEST_ID.CLOSE_BUTTON}
+        onClick={onClose}
+      >
+        <Icon name="close-line" />
+      </Styled.CloseButton>
+    </Styled.Tab>
+  );
+};
diff --git a/app/client/src/IDE/Components/FileTab/constants.ts b/app/client/src/IDE/Components/FileTab/constants.ts
new file mode 100644
index 000000000000..4408a5b065a2
--- /dev/null
+++ b/app/client/src/IDE/Components/FileTab/constants.ts
@@ -0,0 +1,5 @@
+export const DATA_TEST_ID = {
+  INPUT: "t--ide-tab-editable-input",
+  CLOSE_BUTTON: "t--tab-close-btn",
+  SPINNER: "t--ide-tab-spinner",
+};
diff --git a/app/client/src/IDE/Components/FileTab/index.ts b/app/client/src/IDE/Components/FileTab/index.ts
new file mode 100644
index 000000000000..3a8ba9834ec7
--- /dev/null
+++ b/app/client/src/IDE/Components/FileTab/index.ts
@@ -0,0 +1,2 @@
+export { FileTab } from "./FileTab";
+export type { FileTabProps } from "./FileTab";
diff --git a/app/client/src/IDE/Components/FileTab/styles.tsx b/app/client/src/IDE/Components/FileTab/styles.tsx
new file mode 100644
index 000000000000..7fd681a6ce74
--- /dev/null
+++ b/app/client/src/IDE/Components/FileTab/styles.tsx
@@ -0,0 +1,68 @@
+import styled from "styled-components";
+
+import { Text as ADSText } from "@appsmith/ads";
+
+export const Tab = styled.div`
+  display: flex;
+  height: 100%;
+  position: relative;
+  font-size: 12px;
+  color: var(--ads-v2-colors-text-default);
+  cursor: pointer;
+  gap: var(--ads-v2-spaces-2);
+  border-top: 1px solid transparent;
+  border-top-left-radius: var(--ads-v2-border-radius);
+  border-top-right-radius: var(--ads-v2-border-radius);
+  align-items: center;
+  justify-content: center;
+  padding: var(--ads-v2-spaces-3);
+  padding-top: 6px; // to accommodate border and make icons align correctly
+  border-left: 1px solid transparent;
+  border-right: 1px solid transparent;
+  border-top: 2px solid transparent;
+
+  &.active {
+    background: var(--ads-v2-colors-control-field-default-bg);
+    border-top-color: var(--ads-v2-color-bg-brand);
+    border-left-color: var(--ads-v2-color-border-muted);
+    border-right-color: var(--ads-v2-color-border-muted);
+  }
+
+  & > .tab-close {
+    position: relative;
+    right: -2px;
+    visibility: hidden;
+  }
+
+  &:hover > .tab-close,
+  &.active > .tab-close {
+    visibility: visible;
+  }
+`;
+
+export const IconContainer = styled.div`
+  height: 12px;
+  width: 12px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-shrink: 0;
+  img {
+    width: 12px;
+  }
+`;
+
+export const Text = styled(ADSText)`
+  min-width: 3ch;
+  padding: 0 var(--ads-v2-spaces-1);
+`;
+
+export const CloseButton = styled.button`
+  border-radius: var(--ads-v2-border-radius);
+  cursor: pointer;
+  padding: var(--ads-v2-spaces-1);
+
+  &:hover {
+    background: var(--ads-v2-colors-action-tertiary-surface-hover-bg);
+  }
+`;
diff --git a/app/client/src/IDE/Components/SidePaneWrapper.tsx b/app/client/src/IDE/Components/SidePaneWrapper.tsx
new file mode 100644
index 000000000000..5c1eaf1d88f7
--- /dev/null
+++ b/app/client/src/IDE/Components/SidePaneWrapper.tsx
@@ -0,0 +1,29 @@
+import { Flex } from "@appsmith/ads";
+import React from "react";
+import type { ReactNode } from "react";
+import styled from "styled-components";
+
+interface SidePaneContainerProps {
+  children?: ReactNode;
+  padded?: boolean;
+}
+
+const StyledContainer = styled(Flex)<Pick<SidePaneContainerProps, "padded">>`
+  padding: ${({ padded }) => padded && "var(--ads-v2-spaces-2)"};
+`;
+
+function SidePaneWrapper({ children, padded = false }: SidePaneContainerProps) {
+  return (
+    <StyledContainer
+      borderRight="1px solid var(--ads-v2-color-border)"
+      flexDirection="column"
+      height="100%"
+      padded={padded}
+      width={"100%"}
+    >
+      {children}
+    </StyledContainer>
+  );
+}
+
+export default SidePaneWrapper;
diff --git a/app/client/src/IDE/Components/ToolbarSettingsPopover.tsx b/app/client/src/IDE/Components/ToolbarSettingsPopover.tsx
new file mode 100644
index 000000000000..3a2e8d266685
--- /dev/null
+++ b/app/client/src/IDE/Components/ToolbarSettingsPopover.tsx
@@ -0,0 +1,64 @@
+import React, { useCallback } from "react";
+import {
+  Popover,
+  PopoverBody,
+  PopoverContent,
+  PopoverHeader,
+  PopoverTrigger,
+  ToggleButton,
+} from "@appsmith/ads";
+import styled, { css } from "styled-components";
+
+interface Props {
+  isOpen: boolean;
+  handleOpenChange: (isOpen: boolean) => void;
+  title: string;
+  children: React.ReactNode;
+  dataTestId?: string;
+  disabled?: boolean;
+}
+
+const Variables = css`
+  --popover-width: 280px;
+`;
+const StyledPopoverHeader = styled(PopoverHeader)`
+  margin-bottom: var(--ads-v2-spaces-5);
+`;
+
+const StyledPopoverContent = styled(PopoverContent)`
+  ${Variables};
+`;
+
+export const ToolbarSettingsPopover = (props: Props) => {
+  const { handleOpenChange, isOpen, title } = props;
+  const handleButtonClick = useCallback(() => {
+    handleOpenChange(true);
+  }, [handleOpenChange]);
+
+  const handleEscapeKeyDown = useCallback(() => {
+    handleOpenChange(false);
+  }, [handleOpenChange]);
+
+  return (
+    <Popover onOpenChange={handleOpenChange} open={isOpen}>
+      <PopoverTrigger>
+        <ToggleButton
+          data-testid={props.dataTestId}
+          disabled={props.disabled}
+          icon="settings-v3"
+          isSelected={isOpen}
+          onClick={handleButtonClick}
+          size="md"
+        />
+      </PopoverTrigger>
+      <StyledPopoverContent
+        align="end"
+        onEscapeKeyDown={handleEscapeKeyDown}
+        size="sm"
+      >
+        <StyledPopoverHeader isClosable>{title}</StyledPopoverHeader>
+        <PopoverBody>{props.children}</PopoverBody>
+      </StyledPopoverContent>
+    </Popover>
+  );
+};
diff --git a/app/client/src/IDE/index.ts b/app/client/src/IDE/index.ts
index c57c8ea1872f..cc69383fab62 100644
--- a/app/client/src/IDE/index.ts
+++ b/app/client/src/IDE/index.ts
@@ -54,6 +54,26 @@ export { default as IDEBottomView } from "./Components/BottomView";
  * It switches between different editor states
  */
 export { default as IDESidebar } from "./Components/Sidebar";
+/**
+ * IDESidePaneWrapper is used as a wrapper for side panes, which provides a border and optional padding
+ * and enforces 100% width and height to the parent.
+ */
+export { default as IDESidePaneWrapper } from "./Components/SidePaneWrapper";
+
+/**
+ * ToolbarSettingsPopover is a popover attached to a settings toggle button in the toolbar
+ */
+export { ToolbarSettingsPopover } from "./Components/ToolbarSettingsPopover";
+
+/**
+ * EditableName is a component that allows the user to edit the name of an entity
+ * It is used in the IDE for renaming pages, actions, queries, etc.
+ */
+export {
+  EditableName,
+  RenameMenuItem,
+  useIsRenaming,
+} from "./Components/EditableName";
 
 /* ====================================================
     **** Interfaces ****
diff --git a/app/client/src/PluginActionEditor/PluginActionContext.tsx b/app/client/src/PluginActionEditor/PluginActionContext.tsx
index 42c0d4e67458..e37882c7d294 100644
--- a/app/client/src/PluginActionEditor/PluginActionContext.tsx
+++ b/app/client/src/PluginActionEditor/PluginActionContext.tsx
@@ -28,19 +28,27 @@ interface ChildrenProps {
 export const PluginActionContextProvider = (
   props: ChildrenProps & PluginActionContextType,
 ) => {
-  const { action, children, datasource, editorConfig, plugin, settingsConfig } =
-    props;
+  const {
+    action,
+    actionResponse,
+    children,
+    datasource,
+    editorConfig,
+    plugin,
+    settingsConfig,
+  } = props;
 
   // using useMemo to avoid unnecessary renders
   const contextValue = useMemo(
     () => ({
       action,
+      actionResponse,
       datasource,
       editorConfig,
       plugin,
       settingsConfig,
     }),
-    [action, datasource, editorConfig, plugin, settingsConfig],
+    [action, actionResponse, datasource, editorConfig, plugin, settingsConfig],
   );
 
   return (
diff --git a/app/client/src/PluginActionEditor/PluginActionEditor.tsx b/app/client/src/PluginActionEditor/PluginActionEditor.tsx
index 8eaa3bc51bac..ec035c0363a4 100644
--- a/app/client/src/PluginActionEditor/PluginActionEditor.tsx
+++ b/app/client/src/PluginActionEditor/PluginActionEditor.tsx
@@ -1,6 +1,4 @@
 import React from "react";
-import { useLocation } from "react-router";
-import { identifyEntityFromPath } from "../navigation/FocusEntity";
 import { useSelector } from "react-redux";
 import {
   getActionByBaseId,
@@ -20,15 +18,15 @@ import { useActionSettingsConfig } from "./hooks";
 
 interface ChildrenProps {
   children: React.ReactNode | React.ReactNode[];
+  actionId: string;
 }
 
 const PluginActionEditor = (props: ChildrenProps) => {
-  const { pathname } = useLocation();
-
   const isEditorInitialized = useIsEditorInitialised();
 
-  const entity = identifyEntityFromPath(pathname);
-  const action = useSelector((state) => getActionByBaseId(state, entity.id));
+  const action = useSelector((state) =>
+    getActionByBaseId(state, props.actionId),
+  );
 
   const pluginId = get(action, "pluginId", "");
   const plugin = useSelector((state) => getPlugin(state, pluginId));
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/PluginActionForm.tsx b/app/client/src/PluginActionEditor/components/PluginActionForm/PluginActionForm.tsx
index 66ab320a3048..e5be9eb367ec 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionForm/PluginActionForm.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/PluginActionForm.tsx
@@ -1,19 +1,28 @@
 import React from "react";
-import APIEditorForm from "./components/APIEditorForm";
 import { Flex } from "@appsmith/ads";
 import { useChangeActionCall } from "./hooks/useChangeActionCall";
 import { usePluginActionContext } from "../../PluginActionContext";
 import { UIComponentTypes } from "api/PluginApi";
+import APIEditorForm from "./components/ApiEditor";
+import GraphQLEditorForm from "./components/GraphQLEditor";
+import UQIEditorForm from "./components/UQIEditor";
 
 const PluginActionForm = () => {
   useChangeActionCall();
   const { plugin } = usePluginActionContext();
 
   return (
-    <Flex p="spaces-2" w="100%">
-      {plugin.uiComponent === UIComponentTypes.ApiEditorForm ? (
+    <Flex flex="1" overflow="hidden" p="spaces-4" w="100%">
+      {plugin.uiComponent === UIComponentTypes.ApiEditorForm && (
         <APIEditorForm />
-      ) : null}
+      )}
+      {plugin.uiComponent === UIComponentTypes.GraphQLEditorForm && (
+        <GraphQLEditorForm />
+      )}
+      {(plugin.uiComponent === UIComponentTypes.DbEditorForm ||
+        plugin.uiComponent === UIComponentTypes.UQIDbEditorForm) && (
+        <UQIEditorForm />
+      )}
     </Flex>
   );
 };
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/ActionForm/Section/index.tsx b/app/client/src/PluginActionEditor/components/PluginActionForm/components/ActionForm/Section/index.tsx
new file mode 100644
index 000000000000..6f81e543e6f3
--- /dev/null
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/ActionForm/Section/index.tsx
@@ -0,0 +1,32 @@
+import React from "react";
+import clsx from "clsx";
+import styles from "./styles.module.css";
+
+interface SectionProps extends React.HTMLAttributes<HTMLDivElement> {
+  children: React.ReactNode;
+  withoutPadding?: boolean;
+  isFullWidth?: boolean;
+}
+
+const Section: React.FC<SectionProps> = ({
+  children,
+  className,
+  isFullWidth = false,
+  withoutPadding = false,
+  ...props
+}) => {
+  const classNames = clsx(styles.section, className);
+
+  return (
+    <div
+      className={classNames}
+      data-fullwidth={isFullWidth.toString()}
+      data-withoutpadding={withoutPadding.toString()}
+      {...props}
+    >
+      {children}
+    </div>
+  );
+};
+
+export { Section };
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/ActionForm/Section/styles.module.css b/app/client/src/PluginActionEditor/components/PluginActionForm/components/ActionForm/Section/styles.module.css
new file mode 100644
index 000000000000..8f1d81293b01
--- /dev/null
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/ActionForm/Section/styles.module.css
@@ -0,0 +1,31 @@
+.section {
+  display: flex;
+  flex-direction: column;
+  gap: var(--ads-v2-spaces-4);
+  width: 100%;
+  max-width: 800px;
+  justify-content: center;
+
+  &[data-withoutpadding="true"] {
+    padding: 0;
+  }
+
+  /* We do not want padding above the first section */
+  &[data-withoutpadding="false"]:first-child {
+    padding-bottom: var(--ads-v2-spaces-6);
+  }
+
+  /* All other sections expect first will have padding top and bottom */
+  &[data-withoutpadding="false"]:not(:first-child) {
+    padding-block: var(--ads-v2-spaces-6);
+  }
+
+  /* We will also render a border below sections expect for the last section */
+  &[data-withoutpadding="false"]:not(:last-child) {
+    border-bottom: 1px solid var(--ads-v2-color-border);
+  }
+
+  &[data-fullwidth="true"] {
+    max-width: none;
+  }
+}
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/ActionForm/Zone/index.tsx b/app/client/src/PluginActionEditor/components/PluginActionForm/components/ActionForm/Zone/index.tsx
new file mode 100644
index 000000000000..98edd19bc009
--- /dev/null
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/ActionForm/Zone/index.tsx
@@ -0,0 +1,25 @@
+import React from "react";
+import clsx from "clsx";
+import styles from "./styles.module.css";
+
+interface ZoneProps extends React.HTMLAttributes<HTMLDivElement> {
+  children: React.ReactNode;
+  layout?: "single_column" | "double_column";
+}
+
+const Zone: React.FC<ZoneProps> = ({
+  children,
+  className,
+  layout = "single_column",
+  ...props
+}) => {
+  const classNames = clsx(styles.zone, className);
+
+  return (
+    <div className={classNames} data-layout={layout} {...props}>
+      {children}
+    </div>
+  );
+};
+
+export { Zone };
diff --git a/app/client/src/pages/Editor/ActionForm/Zone/styles.module.css b/app/client/src/PluginActionEditor/components/PluginActionForm/components/ActionForm/Zone/styles.module.css
similarity index 70%
rename from app/client/src/pages/Editor/ActionForm/Zone/styles.module.css
rename to app/client/src/PluginActionEditor/components/PluginActionForm/components/ActionForm/Zone/styles.module.css
index 8268c1cd02a3..0af35a6d69c7 100644
--- a/app/client/src/pages/Editor/ActionForm/Zone/styles.module.css
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/ActionForm/Zone/styles.module.css
@@ -12,6 +12,10 @@
     grid-template-columns: 1fr;
   }
 
+  & > div:empty {
+    display: none;
+  }
+
   /*
    This section can be removed once the condition abouve each is resolved
   */
@@ -47,35 +51,7 @@
       }
     }
   }
-  /* PaginationControl hardcoded width is removed */
-  & :global(.t--form-control-PAGINATION) {
-    & > div {
-      grid-gap: 1rem !important;
-      grid-template-columns: repeat(auto-fill, minmax(260px, 1fr)) !important;
-
-      & > div {
-        width: unset !important;
-        margin-right: 0 !important;
-      }
-    }
-  }
-  /* SortingControl hardcoded width is removed */
-  & :global(.t--form-control-SORTING) {
-    & :global(.sorting-dropdown-container) {
-      width: unset;
 
-      & > div {
-        width: 100%;
-        flex: 1;
-      }
-    }
-  }
-  /* WhereClauseControl hardcoded width is removed */
-  & :global(.t--form-control-WHERE_CLAUSE) {
-    & > div {
-      padding-right: 0 !important;
-    }
-  }
   /* DynamicInputTextControl min height and width removed */
   & :global(.uqi-dynamic-input-text) {
     width: unset !important;
diff --git a/app/client/src/pages/Editor/ActionForm/index.ts b/app/client/src/PluginActionEditor/components/PluginActionForm/components/ActionForm/index.ts
similarity index 100%
rename from app/client/src/pages/Editor/ActionForm/index.ts
rename to app/client/src/PluginActionEditor/components/PluginActionForm/components/ActionForm/index.ts
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/APIEditorForm.tsx b/app/client/src/PluginActionEditor/components/PluginActionForm/components/ApiEditor/APIEditorForm.tsx
similarity index 62%
rename from app/client/src/PluginActionEditor/components/PluginActionForm/components/APIEditorForm.tsx
rename to app/client/src/PluginActionEditor/components/PluginActionForm/components/ApiEditor/APIEditorForm.tsx
index d8cbdd88eb2f..f76893dc6f9c 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionForm/components/APIEditorForm.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/ApiEditor/APIEditorForm.tsx
@@ -1,21 +1,24 @@
 import React from "react";
-import CommonEditorForm from "./CommonEditorForm";
-import { usePluginActionContext } from "PluginActionEditor";
+import CommonEditorForm from "../CommonEditorForm";
+import { usePluginActionContext } from "../../../../PluginActionContext";
 import { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig";
 import { API_EDITOR_FORM_NAME } from "ee/constants/forms";
-import { HTTP_METHOD_OPTIONS } from "constants/ApiEditorConstants/CommonApiConstants";
-import PostBodyData from "pages/Editor/APIEditor/PostBodyData";
+import { HTTP_METHOD_OPTIONS } from "../../../../constants/CommonApiConstants";
+import PostBodyData from "./PostBodyData";
 import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
 import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
 import { getHasManageActionPermission } from "ee/utils/BusinessFeatures/permissionPageHelpers";
-import Pagination from "pages/Editor/APIEditor/Pagination";
-import { noop } from "lodash";
+import Pagination from "./Pagination";
 import { reduxForm } from "redux-form";
-
-const FORM_NAME = API_EDITOR_FORM_NAME;
+import {
+  useHandleRunClick,
+  useAnalyticsOnRunClick,
+} from "PluginActionEditor/hooks";
 
 const APIEditorForm = () => {
   const { action } = usePluginActionContext();
+  const { handleRunClick } = useHandleRunClick();
+  const { callRunActionAnalytics } = useAnalyticsOnRunClick();
   const theme = EditorTheme.LIGHT;
 
   const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
@@ -24,6 +27,11 @@ const APIEditorForm = () => {
     action.userPermissions,
   );
 
+  const onTestClick = () => {
+    callRunActionAnalytics();
+    handleRunClick();
+  };
+
   return (
     <CommonEditorForm
       action={action}
@@ -33,13 +41,13 @@ const APIEditorForm = () => {
           theme={EditorTheme.LIGHT}
         />
       }
-      formName={FORM_NAME}
+      formName={API_EDITOR_FORM_NAME}
       httpMethodOptions={HTTP_METHOD_OPTIONS}
       isChangePermitted={isChangePermitted}
       paginationUiComponent={
         <Pagination
           actionName={action.name}
-          onTestClick={noop}
+          onTestClick={onTestClick}
           paginationType={action.actionConfiguration.paginationType}
           theme={theme}
         />
@@ -48,6 +56,7 @@ const APIEditorForm = () => {
   );
 };
 
-export default reduxForm({ form: FORM_NAME, enableReinitialize: true })(
-  APIEditorForm,
-);
+export default reduxForm({
+  form: API_EDITOR_FORM_NAME,
+  enableReinitialize: true,
+})(APIEditorForm);
diff --git a/app/client/src/pages/Editor/APIEditor/Pagination.tsx b/app/client/src/PluginActionEditor/components/PluginActionForm/components/ApiEditor/Pagination.tsx
similarity index 97%
rename from app/client/src/pages/Editor/APIEditor/Pagination.tsx
rename to app/client/src/PluginActionEditor/components/PluginActionForm/components/ApiEditor/Pagination.tsx
index d188cd0aa580..ef9bb7321e67 100644
--- a/app/client/src/pages/Editor/APIEditor/Pagination.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/ApiEditor/Pagination.tsx
@@ -7,8 +7,10 @@ import { PaginationType } from "entities/Action";
 import RadioFieldGroup from "components/editorComponents/form/fields/RadioGroupField";
 import { Classes, Text, TextType } from "@appsmith/ads-old";
 import { Button } from "@appsmith/ads";
-import type { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig";
-import { CodeEditorBorder } from "components/editorComponents/CodeEditor/EditorConfig";
+import {
+  CodeEditorBorder,
+  type EditorTheme,
+} from "components/editorComponents/CodeEditor/EditorConfig";
 import { GifPlayer } from "@appsmith/ads-old";
 import thumbnail from "assets/icons/gifs/thumbnail.png";
 import configPagination from "assets/icons/gifs/config_pagination.gif";
diff --git a/app/client/src/pages/Editor/APIEditor/PostBodyData.tsx b/app/client/src/PluginActionEditor/components/PluginActionForm/components/ApiEditor/PostBodyData.tsx
similarity index 76%
rename from app/client/src/pages/Editor/APIEditor/PostBodyData.tsx
rename to app/client/src/PluginActionEditor/components/PluginActionForm/components/ApiEditor/PostBodyData.tsx
index a874d99c8a62..cee26fa60750 100644
--- a/app/client/src/pages/Editor/APIEditor/PostBodyData.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/ApiEditor/PostBodyData.tsx
@@ -1,15 +1,12 @@
-import React from "react";
-import { connect } from "react-redux";
+import React, { useCallback } from "react";
+import { useDispatch, useSelector } from "react-redux";
 import styled from "styled-components";
-import { formValueSelector } from "redux-form";
 import {
   POST_BODY_FORMAT_OPTIONS,
   POST_BODY_FORMAT_TITLES,
-} from "constants/ApiEditorConstants/CommonApiConstants";
-import { API_EDITOR_FORM_NAME } from "ee/constants/forms";
+} from "../../../../constants/CommonApiConstants";
 import KeyValueFieldArray from "components/editorComponents/form/fields/KeyValueFieldArray";
 import DynamicTextField from "components/editorComponents/form/fields/DynamicTextField";
-import type { AppState } from "ee/reducers";
 import FIELD_VALUES from "constants/FieldExpectedValue";
 import type { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig";
 import {
@@ -19,7 +16,10 @@ import {
   TabBehaviour,
 } from "components/editorComponents/CodeEditor/EditorConfig";
 import { Classes } from "@appsmith/ads-old";
-import { updateBodyContentType } from "actions/apiPaneActions";
+import {
+  getPostBodyFormat,
+  updatePostBodyContentType,
+} from "../../../../store";
 import type { CodeEditorExpected } from "components/editorComponents/CodeEditor";
 import { AutocompleteDataType } from "utils/autocomplete/AutocompleteDataType";
 import { createMessage, API_PANE_NO_BODY } from "ee/constants/messages";
@@ -28,7 +28,6 @@ import { Select, Option } from "@appsmith/ads";
 const PostBodyContainer = styled.div`
   display: flex;
   flex-direction: column;
-  padding: 12px 0px 0px;
   background-color: var(--ads-v2-color-bg);
   height: 100%;
   gap: var(--ads-v2-spaces-4);
@@ -58,11 +57,8 @@ const NoBodyMessage = styled.div`
 `;
 
 interface PostDataProps {
-  displayFormat: { label: string; value: string };
   dataTreePath: string;
   theme?: EditorTheme;
-  apiId: string;
-  updateBodyContentType: (contentType: string, apiId: string) => void;
 }
 
 type Props = PostDataProps;
@@ -74,9 +70,13 @@ const expectedPostBody: CodeEditorExpected = {
 };
 
 function PostBodyData(props: Props) {
-  const [selectedTab, setSelectedTab] = React.useState(
-    props.displayFormat?.value,
-  );
+  const postBodyFormat = useSelector(getPostBodyFormat);
+  const dispatch = useDispatch();
+
+  const updateBodyContentType = useCallback((tab: string) => {
+    dispatch(updatePostBodyContentType(tab));
+  }, []);
+
   const { dataTreePath, theme } = props;
 
   const tabComponentsMap = (key: string) => {
@@ -169,18 +169,13 @@ function PostBodyData(props: Props) {
     value: el.key,
   }));
 
-  const postBodyDataOnChangeFn = (key: string) => {
-    setSelectedTab(key);
-    props?.updateBodyContentType(key, props.apiId);
-  };
-
   return (
     <PostBodyContainer>
       <Select
         data-testid="t--api-body-tab-switch"
-        defaultValue={selectedTab}
-        onSelect={(value) => postBodyDataOnChangeFn(value)}
-        value={selectedTab}
+        defaultValue={postBodyFormat.value}
+        onSelect={updateBodyContentType}
+        value={postBodyFormat.value}
       >
         {options.map((option) => (
           <Option key={option.value} value={option.value}>
@@ -188,31 +183,9 @@ function PostBodyData(props: Props) {
           </Option>
         ))}
       </Select>
-      {tabComponentsMap(selectedTab)}
+      {tabComponentsMap(postBodyFormat.value)}
     </PostBodyContainer>
   );
 }
 
-const selector = formValueSelector(API_EDITOR_FORM_NAME);
-
-// TODO: Fix this the next time the file is edited
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const mapDispatchToProps = (dispatch: any) => ({
-  updateBodyContentType: (contentType: string, apiId: string) =>
-    dispatch(updateBodyContentType(contentType, apiId)),
-});
-
-export default connect((state: AppState) => {
-  const apiId = selector(state, "id");
-  const extraFormData = state.ui.apiPane.extraformData[apiId] || {};
-  // Defaults to NONE when extraformData is empty
-  const displayFormat = extraFormData["displayFormat"] || {
-    label: POST_BODY_FORMAT_OPTIONS.NONE,
-    value: POST_BODY_FORMAT_OPTIONS.NONE,
-  };
-
-  return {
-    displayFormat,
-    apiId,
-  };
-}, mapDispatchToProps)(PostBodyData);
+export default PostBodyData;
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/ApiEditor/index.ts b/app/client/src/PluginActionEditor/components/PluginActionForm/components/ApiEditor/index.ts
new file mode 100644
index 000000000000..e244d7c16851
--- /dev/null
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/ApiEditor/index.ts
@@ -0,0 +1 @@
+export { default } from "./APIEditorForm";
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/CommonEditorForm.tsx b/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/CommonEditorForm.tsx
index a9ae550c0ec1..802a5294572c 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/CommonEditorForm.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/CommonEditorForm.tsx
@@ -29,7 +29,13 @@ const CommonEditorForm = (props: Props) => {
   } = useGetFormActionValues();
 
   return (
-    <Flex flexDirection="column" gap="spaces-3" w="100%">
+    <Flex
+      flex="1"
+      flexDirection="column"
+      gap="spaces-3"
+      overflow="hidden"
+      w="100%"
+    >
       <InfoFields
         actionName={action.name}
         changePermitted={props.isChangePermitted}
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/InfoFields.tsx b/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/InfoFields.tsx
index a2f1f7b7fc13..460605ddc063 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/InfoFields.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/InfoFields.tsx
@@ -2,14 +2,9 @@ import React from "react";
 import type { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig";
 import RequestDropdownField from "components/editorComponents/form/fields/RequestDropdownField";
 import { replayHighlightClass } from "globalStyles/portals";
-import EmbeddedDatasourcePathField from "components/editorComponents/form/fields/EmbeddedDatasourcePathField";
-import styled from "styled-components";
+import EmbeddedDatasourcePathField from "./components/EmbeddedDatasourcePathField";
 import { Flex } from "@appsmith/ads";
-
-const DatasourceWrapper = styled.div`
-  margin-left: 8px;
-  width: 100%;
-`;
+import * as Styled from "./styles";
 
 export function InfoFields(props: {
   changePermitted: boolean;
@@ -20,8 +15,8 @@ export function InfoFields(props: {
   theme: EditorTheme.LIGHT;
 }) {
   return (
-    <Flex w="100%">
-      <div>
+    <Flex gap="spaces-4" w="100%">
+      <Styled.RequestMethodSelectContainer>
         <RequestDropdownField
           className={`t--apiFormHttpMethod ${replayHighlightClass}`}
           data-location-id={btoa("actionConfiguration.httpMethod")}
@@ -29,12 +24,11 @@ export function InfoFields(props: {
           name="actionConfiguration.httpMethod"
           options={props.options}
           placeholder="Method"
-          width={"110px"}
         >
           <div />
         </RequestDropdownField>
-      </div>
-      <DatasourceWrapper className="t--dataSourceField">
+      </Styled.RequestMethodSelectContainer>
+      <Styled.DatasourcePathFieldContainer className="t--dataSourceField">
         <EmbeddedDatasourcePathField
           actionName={props.actionName}
           codeEditorVisibleOverflow
@@ -44,7 +38,7 @@ export function InfoFields(props: {
           pluginId={props.pluginId}
           theme={props.theme}
         />
-      </DatasourceWrapper>
+      </Styled.DatasourcePathFieldContainer>
     </Flex>
   );
 }
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/RequestTabs.tsx b/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/RequestTabs.tsx
index eda49d14634b..62b22a18b6c8 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/RequestTabs.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/RequestTabs.tsx
@@ -4,10 +4,10 @@ import FormLabel from "components/editorComponents/FormLabel";
 import type { AutoGeneratedHeader } from "pages/Editor/APIEditor/helpers";
 import type { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig";
 import React from "react";
-import { API_EDITOR_TABS } from "constants/ApiEditorConstants/CommonApiConstants";
+import { API_EDITOR_TABS } from "../../../../constants/CommonApiConstants";
 import { DatasourceConfig } from "./components/DatasourceConfig";
 import KeyValueFieldArray from "components/editorComponents/form/fields/KeyValueFieldArray";
-import ApiAuthentication from "pages/Editor/APIEditor/ApiAuthentication";
+import ApiAuthentication from "./components/ApiAuthentication";
 import ActionSettings from "pages/Editor/ActionSettings";
 import { API_EDITOR_TAB_TITLES, createMessage } from "ee/constants/messages";
 import { useSelectedFormTab } from "./hooks/useSelectedFormTab";
@@ -22,13 +22,9 @@ const SettingsWrapper = styled.div`
     padding: 0;
   }
 `;
-const TabsListWrapper = styled.div`
-  padding: 0 var(--ads-v2-spaces-7);
-`;
 const StyledTabPanel = styled(TabPanel)`
   height: calc(100% - 50px);
   overflow: auto;
-  padding: 0 var(--ads-v2-spaces-7);
 `;
 
 export function RequestTabs(props: {
@@ -61,31 +57,37 @@ export function RequestTabs(props: {
   );
 
   return (
-    <Tabs className="h-full" onValueChange={onValueChange} value={value}>
-      <TabsListWrapper>
-        <TabsList>
-          {Object.values(API_EDITOR_TABS)
-            .filter((tab) => {
-              return !(!props.showSettings && tab === API_EDITOR_TABS.SETTINGS);
-            })
-            .map((tab) => (
-              <Tab
-                data-testid={`t--api-editor-${tab}`}
-                key={tab}
-                notificationCount={
-                  tab == "HEADERS"
-                    ? headersCount
-                    : tab == "PARAMS"
-                      ? paramsCount
-                      : undefined
-                }
-                value={tab}
-              >
-                {createMessage(API_EDITOR_TAB_TITLES[tab])}
-              </Tab>
-            ))}
-        </TabsList>
-      </TabsListWrapper>
+    <Tabs
+      onValueChange={onValueChange}
+      style={{
+        height: "calc(100% - 36px)",
+        overflow: "hidden",
+        maxHeight: "unset",
+      }}
+      value={value}
+    >
+      <TabsList>
+        {Object.values(API_EDITOR_TABS)
+          .filter((tab) => {
+            return !(!props.showSettings && tab === API_EDITOR_TABS.SETTINGS);
+          })
+          .map((tab) => (
+            <Tab
+              data-testid={`t--api-editor-${tab}`}
+              key={tab}
+              notificationCount={
+                tab == "HEADERS"
+                  ? headersCount
+                  : tab == "PARAMS"
+                    ? paramsCount
+                    : undefined
+              }
+              value={tab}
+            >
+              {createMessage(API_EDITOR_TAB_TITLES[tab])}
+            </Tab>
+          ))}
+      </TabsList>
       <StyledTabPanel value={API_EDITOR_TABS.HEADERS}>
         <DatasourceConfig
           attributeName="header"
diff --git a/app/client/src/pages/Editor/APIEditor/ApiAuthentication.tsx b/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/components/ApiAuthentication.tsx
similarity index 98%
rename from app/client/src/pages/Editor/APIEditor/ApiAuthentication.tsx
rename to app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/components/ApiAuthentication.tsx
index 89468ca751b8..dab9c52f0d72 100644
--- a/app/client/src/pages/Editor/APIEditor/ApiAuthentication.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/components/ApiAuthentication.tsx
@@ -13,7 +13,7 @@ import {
   SAVE_DATASOURCE_MESSAGE,
   createMessage,
 } from "ee/constants/messages";
-import StoreAsDatasource from "components/editorComponents/StoreAsDatasource";
+import StoreAsDatasource from "./StoreAsDatasource";
 import { getCurrentAppWorkspace } from "ee/selectors/selectedWorkspaceSelectors";
 import { Icon, Text } from "@appsmith/ads";
 import { getCurrentEnvironmentId } from "ee/selectors/environmentSelectors";
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/components/DatasourceConfig.tsx b/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/components/DatasourceConfig.tsx
index 549112e7f4d0..0b338d669a7e 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/components/DatasourceConfig.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/components/DatasourceConfig.tsx
@@ -93,10 +93,7 @@ const FlexContainer = styled.div`
 const KeyValueStackContainer = styled.div`
   padding: 0;
 `;
-const KeyValueFlexContainer = styled.div`
-  padding: ${(props) => props.theme.spaces[4]}px
-    ${(props) => props.theme.spaces[14]}px 0 0;
-`;
+const KeyValueFlexContainer = styled.div``;
 const FormRowWithLabel = styled(FormRow)`
   flex-wrap: wrap;
 
diff --git a/app/client/src/components/editorComponents/form/fields/EmbeddedDatasourcePathField.tsx b/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/components/EmbeddedDatasourcePathField.tsx
similarity index 98%
rename from app/client/src/components/editorComponents/form/fields/EmbeddedDatasourcePathField.tsx
rename to app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/components/EmbeddedDatasourcePathField.tsx
index 02671a9b06ba..87615cbf7f2f 100644
--- a/app/client/src/components/editorComponents/form/fields/EmbeddedDatasourcePathField.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/components/EmbeddedDatasourcePathField.tsx
@@ -23,7 +23,7 @@ import {
 
 import { entityMarker } from "components/editorComponents/CodeEditor/MarkHelpers/entityMarker";
 import { bindingHintHelper } from "components/editorComponents/CodeEditor/hintHelpers";
-import StoreAsDatasource from "components/editorComponents/StoreAsDatasource";
+import StoreAsDatasource from "./StoreAsDatasource";
 import { DATASOURCE_URL_EXACT_MATCH_REGEX } from "constants/AppsmithActionConstants/ActionConstants";
 import styled from "styled-components";
 import * as FontFamilies from "constants/Fonts";
@@ -42,7 +42,7 @@ import {
   getDatasource,
   getDatasourcesByPluginId,
 } from "ee/selectors/entitiesSelector";
-import { extractApiUrlPath } from "transformers/RestActionTransformer";
+import { extractApiUrlPath } from "../../../../../transformers/RestActionTransformer";
 import { getCurrentAppWorkspace } from "ee/selectors/selectedWorkspaceSelectors";
 import { Text } from "@appsmith/ads";
 import { TEMP_DATASOURCE_ID } from "constants/Datasource";
@@ -50,7 +50,7 @@ import LazyCodeEditor from "components/editorComponents/LazyCodeEditor";
 import { getCodeMirrorNamespaceFromEditor } from "utils/getCodeMirrorNamespace";
 import { isDynamicValue } from "utils/DynamicBindingUtils";
 import { isEnvironmentValid } from "ee/utils/Environments";
-import { DEFAULT_DATASOURCE_NAME } from "constants/ApiEditorConstants/ApiEditorConstants";
+import { DEFAULT_DATASOURCE_NAME } from "../../../../../constants/ApiEditorConstants";
 import { isString } from "lodash";
 import { getCurrentEnvironmentId } from "ee/selectors/environmentSelectors";
 import {
@@ -59,7 +59,7 @@ import {
 } from "ee/utils/BusinessFeatures/permissionPageHelpers";
 import { isGACEnabled } from "ee/utils/planHelpers";
 import { selectFeatureFlags } from "ee/selectors/featureFlagsSelectors";
-import { getDatasourceInfo } from "PluginActionEditor/components/PluginActionForm/utils/getDatasourceInfo";
+import { getDatasourceInfo } from "../utils/getDatasourceInfo";
 
 interface ReduxStateProps {
   workspaceId: string;
@@ -92,6 +92,7 @@ const DatasourceContainer = styled.div`
   position: relative;
   align-items: center;
   height: 36px;
+  gap: var(--ads-v2-spaces-4);
   .t--datasource-editor {
     background-color: var(--ads-v2-color-bg);
     .cm-s-duotone-light.CodeMirror {
@@ -101,10 +102,6 @@ const DatasourceContainer = styled.div`
       z-index: ${Indices.Layer5};
     }
   }
-
-  .t--store-as-datasource {
-    margin-left: 10px;
-  }
 `;
 
 const hintContainerStyles: React.CSSProperties = {
diff --git a/app/client/src/components/editorComponents/StoreAsDatasource.tsx b/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/components/StoreAsDatasource.tsx
similarity index 75%
rename from app/client/src/components/editorComponents/StoreAsDatasource.tsx
rename to app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/components/StoreAsDatasource.tsx
index b605ca26eb38..f85ef45ca3b3 100644
--- a/app/client/src/components/editorComponents/StoreAsDatasource.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/components/StoreAsDatasource.tsx
@@ -11,9 +11,11 @@ import { getCurrentBasePageId } from "selectors/editorSelectors";
 import {
   createMessage,
   EDIT_DATASOURCE,
+  EDIT_DATASOURCE_TOOLTIP,
   SAVE_DATASOURCE,
+  SAVE_DATASOURCE_TOOLTIP,
 } from "ee/constants/messages";
-import { Button } from "@appsmith/ads";
+import { Button, Tooltip } from "@appsmith/ads";
 
 interface storeDataSourceProps {
   datasourceId?: string;
@@ -58,19 +60,26 @@ function StoreAsDatasource(props: storeDataSourceProps) {
   };
 
   return (
-    <Button
-      className="t--store-as-datasource"
-      data-testid="t--store-as-datasource"
-      isDisabled={!props.enable}
-      kind="secondary"
-      onClick={saveOrEditDatasource}
-      size="md"
-      startIcon={props.shouldSave ? "database-2-line" : "pencil-line"}
+    <Tooltip
+      content={
+        props.shouldSave
+          ? createMessage(SAVE_DATASOURCE_TOOLTIP)
+          : createMessage(EDIT_DATASOURCE_TOOLTIP)
+      }
     >
-      {props.shouldSave
-        ? createMessage(SAVE_DATASOURCE)
-        : createMessage(EDIT_DATASOURCE)}
-    </Button>
+      <Button
+        className="t--store-as-datasource"
+        data-testid="t--store-as-datasource"
+        isDisabled={!props.enable}
+        kind="secondary"
+        onClick={saveOrEditDatasource}
+        size="md"
+      >
+        {props.shouldSave
+          ? createMessage(SAVE_DATASOURCE)
+          : createMessage(EDIT_DATASOURCE)}
+      </Button>
+    </Tooltip>
   );
 }
 
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/hooks/useGetFormActionValues.ts b/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/hooks/useGetFormActionValues.ts
index da75a1482a26..8b71a662e410 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/hooks/useGetFormActionValues.ts
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/hooks/useGetFormActionValues.ts
@@ -20,6 +20,7 @@ function useGetFormActionValues() {
   // return empty values to avoid form ui issues
   if (!formValues || !isAPIAction(formValues)) {
     return {
+      actionConfigurationBody: "",
       actionHeaders: [],
       actionParams: [],
       autoGeneratedHeaders: [],
@@ -28,6 +29,12 @@ function useGetFormActionValues() {
     };
   }
 
+  const actionConfigurationBody = get(
+    formValues,
+    "actionConfiguration.body",
+    "",
+  ) as string;
+
   const actionHeaders = get(
     formValues,
     "actionConfiguration.headers",
@@ -67,6 +74,7 @@ function useGetFormActionValues() {
   ) as Property[];
 
   return {
+    actionConfigurationBody,
     actionHeaders,
     autoGeneratedHeaders,
     actionParams,
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/hooks/useSelectedFormTab.ts b/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/hooks/useSelectedFormTab.ts
index b7421a6dfc5d..10da87f2b9f6 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/hooks/useSelectedFormTab.ts
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/hooks/useSelectedFormTab.ts
@@ -1,25 +1,22 @@
 import { useCallback } from "react";
 import { useDispatch, useSelector } from "react-redux";
-import { getApiPaneConfigSelectedTabIndex } from "selectors/apiPaneSelectors";
-import { API_EDITOR_TABS } from "constants/ApiEditorConstants/CommonApiConstants";
-import { setApiPaneConfigSelectedTabIndex } from "actions/apiPaneActions";
+import {
+  getPluginActionConfigSelectedTab,
+  setPluginActionEditorSelectedTab,
+} from "../../../../../store";
 
-export function useSelectedFormTab(): [string, (id: string) => void] {
+export function useSelectedFormTab(): [
+  string | undefined,
+  (id: string) => void,
+] {
   const dispatch = useDispatch();
-  // the redux form has been configured with indexes, but the new ads components need strings to work.
-  // these functions convert them back and forth as needed.
-  const selectedIndex = useSelector(getApiPaneConfigSelectedTabIndex);
-  const selectedValue = Object.values(API_EDITOR_TABS)[selectedIndex];
-  const setSelectedIndex = useCallback(
+  const selectedValue = useSelector(getPluginActionConfigSelectedTab);
+  const setSelectedTab = useCallback(
     (value: string) => {
-      const index = Object.values(API_EDITOR_TABS).indexOf(
-        value as API_EDITOR_TABS,
-      );
-
-      dispatch(setApiPaneConfigSelectedTabIndex(index));
+      dispatch(setPluginActionEditorSelectedTab(value));
     },
     [dispatch],
   );
 
-  return [selectedValue, setSelectedIndex];
+  return [selectedValue, setSelectedTab];
 }
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/index.ts b/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/index.ts
index 46cb3624cb0f..d954cb3129a6 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/index.ts
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/index.ts
@@ -1,5 +1 @@
 export { default } from "./CommonEditorForm";
-
-export { HintMessages } from "./HintMessages";
-export { InfoFields } from "./InfoFields";
-export { RequestTabs } from "./RequestTabs";
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/styles.ts b/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/styles.ts
new file mode 100644
index 000000000000..a60145281e9e
--- /dev/null
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/styles.ts
@@ -0,0 +1,12 @@
+import styled from "styled-components";
+
+export const RequestMethodSelectContainer = styled.div`
+  width: 100px;
+  .ads-v2-select > .rc-select-selector {
+    min-width: 100px;
+  }
+`;
+
+export const DatasourcePathFieldContainer = styled.div`
+  width: 100%;
+`;
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/utils/getDatasourceInfo.ts b/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/utils/getDatasourceInfo.ts
similarity index 100%
rename from app/client/src/PluginActionEditor/components/PluginActionForm/utils/getDatasourceInfo.ts
rename to app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/utils/getDatasourceInfo.ts
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/GraphQLEditor/GraphQLEditorForm.tsx b/app/client/src/PluginActionEditor/components/PluginActionForm/components/GraphQLEditor/GraphQLEditorForm.tsx
new file mode 100644
index 000000000000..35323cbece55
--- /dev/null
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/GraphQLEditor/GraphQLEditorForm.tsx
@@ -0,0 +1,50 @@
+import React from "react";
+import { reduxForm } from "redux-form";
+import { API_EDITOR_FORM_NAME } from "ee/constants/forms";
+import CommonEditorForm from "../CommonEditorForm";
+import Pagination from "./Pagination";
+import { GRAPHQL_HTTP_METHOD_OPTIONS } from "../../../../constants/GraphQLEditorConstants";
+import PostBodyData from "./PostBodyData";
+import { usePluginActionContext } from "../../../../PluginActionContext";
+import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
+import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
+import { getHasManageActionPermission } from "ee/utils/BusinessFeatures/permissionPageHelpers";
+import { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig";
+import useGetFormActionValues from "../CommonEditorForm/hooks/useGetFormActionValues";
+
+function GraphQLEditorForm() {
+  const { action } = usePluginActionContext();
+  const theme = EditorTheme.LIGHT;
+
+  const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
+  const isChangePermitted = getHasManageActionPermission(
+    isFeatureEnabled,
+    action.userPermissions,
+  );
+
+  const { actionConfigurationBody } = useGetFormActionValues();
+
+  return (
+    <CommonEditorForm
+      action={action}
+      bodyUIComponent={<PostBodyData actionName={action.name} />}
+      formName={API_EDITOR_FORM_NAME}
+      httpMethodOptions={GRAPHQL_HTTP_METHOD_OPTIONS}
+      isChangePermitted={isChangePermitted}
+      paginationUiComponent={
+        <Pagination
+          actionName={action.name}
+          formName={API_EDITOR_FORM_NAME}
+          paginationType={action.actionConfiguration.paginationType}
+          query={actionConfigurationBody}
+          theme={theme}
+        />
+      }
+    />
+  );
+}
+
+export default reduxForm({
+  form: API_EDITOR_FORM_NAME,
+  enableReinitialize: true,
+})(GraphQLEditorForm);
diff --git a/app/client/src/pages/Editor/APIEditor/GraphQL/Pagination.tsx b/app/client/src/PluginActionEditor/components/PluginActionForm/components/GraphQLEditor/Pagination.tsx
similarity index 99%
rename from app/client/src/pages/Editor/APIEditor/GraphQL/Pagination.tsx
rename to app/client/src/PluginActionEditor/components/PluginActionForm/components/GraphQLEditor/Pagination.tsx
index 7dafea1a0010..56a62a6f86d6 100644
--- a/app/client/src/pages/Editor/APIEditor/GraphQL/Pagination.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/GraphQLEditor/Pagination.tsx
@@ -12,7 +12,7 @@ import { connect } from "react-redux";
 import type { AppState } from "ee/reducers";
 import { FormLabel } from "components/editorComponents/form/fields/StyledFormComponents";
 import DynamicTextField from "components/editorComponents/form/fields/DynamicTextField";
-import type { GRAPHQL_PAGINATION_TYPE } from "constants/ApiEditorConstants/GraphQLEditorConstants";
+import type { GRAPHQL_PAGINATION_TYPE } from "../../../../constants/GraphQLEditorConstants";
 import {
   LIMITBASED_PREFIX,
   CURSORBASED_PREFIX,
@@ -28,7 +28,6 @@ const PAGINATION_PREFIX =
 
 interface PaginationProps {
   actionName: string;
-  onTestClick: (test?: "PREV" | "NEXT") => void;
   paginationType: PaginationType;
   theme?: EditorTheme;
   query: string;
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/GraphQLEditor/PostBodyData.tsx b/app/client/src/PluginActionEditor/components/PluginActionForm/components/GraphQLEditor/PostBodyData.tsx
new file mode 100644
index 000000000000..aaabc25d70d5
--- /dev/null
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/GraphQLEditor/PostBodyData.tsx
@@ -0,0 +1,89 @@
+import React from "react";
+import styled from "styled-components";
+import {
+  CodeEditorBorder,
+  EditorModes,
+  EditorSize,
+  EditorTheme,
+  TabBehaviour,
+} from "components/editorComponents/CodeEditor/EditorConfig";
+import DynamicTextField from "components/editorComponents/form/fields/DynamicTextField";
+import { Section, Zone } from "../ActionForm";
+import { AutocompleteDataType } from "utils/autocomplete/AutocompleteDataType";
+import FormLabel from "components/editorComponents/FormLabel";
+
+const PostBodyContainer = styled.div`
+  &&&& .CodeMirror {
+    height: auto;
+    min-height: 150px;
+  }
+`;
+
+const StyledFormLabel = styled(FormLabel)`
+  && {
+    margin-bottom: var(--ads-v2-spaces-2);
+    padding: 0;
+  }
+`;
+
+interface Props {
+  actionName: string;
+}
+
+const EXPECTED_VARIABLE = {
+  type: "object",
+  example:
+    '{\n  "name":"{{ inputName.property }}",\n  "preference":"{{ dropdownName.property }}"\n}',
+  autocompleteDataType: AutocompleteDataType.OBJECT,
+};
+
+function PostBodyData(props: Props) {
+  const { actionName } = props;
+  const theme = EditorTheme.LIGHT;
+
+  return (
+    <PostBodyContainer>
+      <Section isFullWidth withoutPadding>
+        <Zone layout="single_column">
+          <div className="t--graphql-query-editor">
+            <StyledFormLabel>Query</StyledFormLabel>
+            <DynamicTextField
+              border={CodeEditorBorder.ALL_SIDE}
+              dataTreePath={`${actionName}.config.body`}
+              evaluatedPopUpLabel={"Query"}
+              mode={EditorModes.GRAPHQL_WITH_BINDING}
+              name="actionConfiguration.body"
+              placeholder={`{{\n\t{name: inputName.property, preference: dropdownName.property}\n}}`}
+              showLineNumbers
+              size={EditorSize.EXTENDED}
+              tabBehaviour={TabBehaviour.INDENT}
+              theme={theme}
+            />
+          </div>
+        </Zone>
+        <Zone layout="single_column">
+          <div className="t--graphql-variable-editor">
+            <StyledFormLabel>Query variables</StyledFormLabel>
+            <DynamicTextField
+              border={CodeEditorBorder.ALL_SIDE}
+              dataTreePath={`${props.actionName}.config.pluginSpecifiedTemplates[1].value`}
+              evaluatedPopUpLabel={"Query variables"}
+              expected={EXPECTED_VARIABLE}
+              height="100%"
+              mode={EditorModes.JSON_WITH_BINDING}
+              name="actionConfiguration.pluginSpecifiedTemplates[1].value"
+              placeholder={`${EXPECTED_VARIABLE.example}\n\n\\\\Take widget inputs using {{ }}`}
+              showLightningMenu={false}
+              showLineNumbers
+              size={EditorSize.EXTENDED}
+              tabBehaviour={TabBehaviour.INDENT}
+              theme={theme}
+            />
+          </div>
+        </Zone>
+      </Section>
+    </PostBodyContainer>
+  );
+}
+
+export default PostBodyData;
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/GraphQLEditor/index.ts b/app/client/src/PluginActionEditor/components/PluginActionForm/components/GraphQLEditor/index.ts
new file mode 100644
index 000000000000..ecf70ec1144c
--- /dev/null
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/GraphQLEditor/index.ts
@@ -0,0 +1 @@
+export { default } from "./GraphQLEditorForm";
diff --git a/app/client/src/pages/Editor/QueryEditor/FormRender.tsx b/app/client/src/PluginActionEditor/components/PluginActionForm/components/UQIEditor/FormRender.tsx
similarity index 96%
rename from app/client/src/pages/Editor/QueryEditor/FormRender.tsx
rename to app/client/src/PluginActionEditor/components/PluginActionForm/components/UQIEditor/FormRender.tsx
index ca9b82a5d46a..faaa00bb1cb1 100644
--- a/app/client/src/pages/Editor/QueryEditor/FormRender.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/UQIEditor/FormRender.tsx
@@ -20,7 +20,7 @@ import {
   updateEvaluatedSectionConfig,
 } from "components/formControls/utils";
 import { isValidFormConfig } from "reducers/evaluationReducers/formEvaluationReducer";
-import FormControl from "../FormControl";
+import FormControl from "pages/Editor/FormControl";
 import type { ControlProps } from "components/formControls/BaseControl";
 import { Spinner } from "@appsmith/ads";
 import type { QueryAction, SaaSAction } from "entities/Action";
@@ -170,7 +170,7 @@ const FormRender = (props: Props) => {
     if (section.hasOwnProperty("controlType")) {
       // If component is type section, render it's children
       if (Object.hasOwn(section, "children")) {
-        return rederNodeWithChildren(section, formName);
+        return renderNodeWithChildren(section, formName);
       }
 
       try {
@@ -201,7 +201,7 @@ const FormRender = (props: Props) => {
   };
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const rederNodeWithChildren = (section: any, formName: string) => {
+  const renderNodeWithChildren = (section: any, formName: string) => {
     if (!Object.hasOwn(section, "children")) return;
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -211,7 +211,7 @@ const FormRender = (props: Props) => {
 
     switch (section.controlType) {
       case "SECTION_V2":
-        return <Section>{children}</Section>;
+        return <Section isFullWidth={section.isFullWidth}>{children}</Section>;
 
       case "SINGLE_COLUMN_ZONE":
       case "DOUBLE_COLUMN_ZONE": {
diff --git a/app/client/src/pages/Editor/QueryEditor/TemplateMenu.tsx b/app/client/src/PluginActionEditor/components/PluginActionForm/components/UQIEditor/TemplateMenu.tsx
similarity index 100%
rename from app/client/src/pages/Editor/QueryEditor/TemplateMenu.tsx
rename to app/client/src/PluginActionEditor/components/PluginActionForm/components/UQIEditor/TemplateMenu.tsx
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/UQIEditor/UQIEditorForm.tsx b/app/client/src/PluginActionEditor/components/PluginActionForm/components/UQIEditor/UQIEditorForm.tsx
new file mode 100644
index 000000000000..44750c91be8a
--- /dev/null
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/UQIEditor/UQIEditorForm.tsx
@@ -0,0 +1,40 @@
+import React from "react";
+import FormRender from "./FormRender";
+import { usePluginActionContext } from "../../../../PluginActionContext";
+import { QUERY_EDITOR_FORM_NAME } from "ee/constants/forms";
+import { reduxForm } from "redux-form";
+import { Flex } from "@appsmith/ads";
+import { useGoogleSheetsSetDefaultProperty } from "./hooks/useGoogleSheetsSetDefaultProperty";
+import { useFormData } from "./hooks/useFormData";
+import { useInitFormEvaluation } from "./hooks/useInitFormEvaluation";
+
+const UQIEditorForm = () => {
+  const {
+    editorConfig,
+    plugin: { uiComponent },
+  } = usePluginActionContext();
+
+  useInitFormEvaluation();
+
+  // Set default values for Google Sheets
+  useGoogleSheetsSetDefaultProperty();
+
+  const { data, evaluationState } = useFormData();
+
+  return (
+    <Flex flexDirection="column" overflowY="scroll" w="100%">
+      <FormRender
+        editorConfig={editorConfig}
+        formData={data}
+        formEvaluationState={evaluationState}
+        formName={QUERY_EDITOR_FORM_NAME}
+        uiComponent={uiComponent}
+      />
+    </Flex>
+  );
+};
+
+export default reduxForm({
+  form: QUERY_EDITOR_FORM_NAME,
+  enableReinitialize: true,
+})(UQIEditorForm);
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/UQIEditor/hooks/useFormData.ts b/app/client/src/PluginActionEditor/components/PluginActionForm/components/UQIEditor/hooks/useFormData.ts
new file mode 100644
index 000000000000..61f798cc093e
--- /dev/null
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/UQIEditor/hooks/useFormData.ts
@@ -0,0 +1,22 @@
+import { useSelector } from "react-redux";
+import { getFormValues } from "redux-form";
+import { QUERY_EDITOR_FORM_NAME } from "ee/constants/forms";
+import type { QueryAction, SaaSAction } from "entities/Action";
+import { getFormEvaluationState } from "selectors/formSelectors";
+
+export const useFormData = () => {
+  const data = useSelector(getFormValues(QUERY_EDITOR_FORM_NAME)) as
+    | QueryAction
+    | SaaSAction;
+
+  const formEvaluation = useSelector(getFormEvaluationState);
+
+  let evaluationState = {};
+
+  // Fetching evaluations state only once the formData is populated
+  if (!!data) {
+    evaluationState = formEvaluation[data.id];
+  }
+
+  return { data, evaluationState };
+};
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/UQIEditor/hooks/useGoogleSheetsSetDefaultProperty.ts b/app/client/src/PluginActionEditor/components/PluginActionForm/components/UQIEditor/hooks/useGoogleSheetsSetDefaultProperty.ts
new file mode 100644
index 000000000000..b888239e3aaf
--- /dev/null
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/UQIEditor/hooks/useGoogleSheetsSetDefaultProperty.ts
@@ -0,0 +1,60 @@
+import { useEffect } from "react";
+import { PluginPackageName } from "entities/Action";
+import { merge } from "lodash";
+import { getConfigInitialValues } from "components/formControls/utils";
+import { diff, type Diff } from "deep-diff";
+import { getPathAndValueFromActionDiffObject } from "utils/getPathAndValueFromActionDiffObject";
+import { setActionProperty } from "actions/pluginActionActions";
+import { usePluginActionContext } from "../../../../../PluginActionContext";
+import { useDispatch } from "react-redux";
+
+export const useGoogleSheetsSetDefaultProperty = () => {
+  const {
+    action,
+    editorConfig,
+    plugin: { packageName },
+    settingsConfig,
+  } = usePluginActionContext();
+
+  const dispatch = useDispatch();
+
+  useEffect(
+    function setDefaultValuesForGoogleSheets() {
+      if (packageName === PluginPackageName.GOOGLE_SHEETS) {
+        const initialValues = {};
+
+        merge(
+          initialValues,
+          getConfigInitialValues(editorConfig as Record<string, unknown>[]),
+        );
+
+        merge(
+          initialValues,
+          getConfigInitialValues(settingsConfig as Record<string, unknown>[]),
+        );
+
+        // initialValues contains merge of action, editorConfig, settingsConfig and will be passed to redux form
+        merge(initialValues, action);
+
+        // @ts-expect-error: Types are not available
+        const actionObjectDiff: undefined | Diff<Action | undefined, Action>[] =
+          diff(action, initialValues);
+
+        const { path = "", value = "" } = {
+          ...getPathAndValueFromActionDiffObject(actionObjectDiff),
+        };
+
+        if (value && path) {
+          dispatch(
+            setActionProperty({
+              actionId: action.id,
+              propertyName: path,
+              value,
+            }),
+          );
+        }
+      }
+    },
+    [action, dispatch, editorConfig, packageName, settingsConfig],
+  );
+};
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/UQIEditor/hooks/useInitFormEvaluation.ts b/app/client/src/PluginActionEditor/components/PluginActionForm/components/UQIEditor/hooks/useInitFormEvaluation.ts
new file mode 100644
index 000000000000..5c52cdfa89d2
--- /dev/null
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/UQIEditor/hooks/useInitFormEvaluation.ts
@@ -0,0 +1,21 @@
+import { useEffect } from "react";
+import { initFormEvaluations } from "actions/evaluationActions";
+import { useDispatch } from "react-redux";
+import { usePluginActionContext } from "../../../../../PluginActionContext";
+
+export const useInitFormEvaluation = () => {
+  const dispatch = useDispatch();
+
+  const {
+    action: { baseId },
+    editorConfig,
+    settingsConfig,
+  } = usePluginActionContext();
+
+  useEffect(
+    function formEvaluationInit() {
+      dispatch(initFormEvaluations(editorConfig, settingsConfig, baseId));
+    },
+    [baseId, dispatch, editorConfig, settingsConfig],
+  );
+};
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/UQIEditor/index.ts b/app/client/src/PluginActionEditor/components/PluginActionForm/components/UQIEditor/index.ts
new file mode 100644
index 000000000000..0aa4780f41b0
--- /dev/null
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/UQIEditor/index.ts
@@ -0,0 +1 @@
+export { default } from "./UQIEditorForm";
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/hooks/useChangeActionCall.test.tsx b/app/client/src/PluginActionEditor/components/PluginActionForm/hooks/useChangeActionCall.test.tsx
index 98c144af91a7..55029fbaefe4 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionForm/hooks/useChangeActionCall.test.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/hooks/useChangeActionCall.test.tsx
@@ -1,9 +1,8 @@
 import { renderHook } from "@testing-library/react-hooks/dom";
 import { useDispatch } from "react-redux";
 import { PluginType } from "entities/Action";
-import { usePluginActionContext } from "PluginActionEditor";
-import { changeApi } from "actions/apiPaneActions";
-import { changeQuery } from "actions/queryPaneActions";
+import { usePluginActionContext } from "../../../PluginActionContext";
+import { changeApi, changeQuery } from "../../../store";
 import usePrevious from "utils/hooks/usePrevious";
 import { useChangeActionCall } from "./useChangeActionCall";
 
@@ -11,15 +10,12 @@ jest.mock("react-redux", () => ({
   useDispatch: jest.fn(),
 }));
 
-jest.mock("actions/apiPaneActions", () => ({
+jest.mock("../../../store", () => ({
   changeApi: jest.fn(),
-}));
-
-jest.mock("actions/queryPaneActions", () => ({
   changeQuery: jest.fn(),
 }));
 
-jest.mock("PluginActionEditor", () => ({
+jest.mock("../../../PluginActionContext", () => ({
   usePluginActionContext: jest.fn(),
 }));
 
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/hooks/useChangeActionCall.ts b/app/client/src/PluginActionEditor/components/PluginActionForm/hooks/useChangeActionCall.ts
index 88a56e14d905..ac1620ddcb1b 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionForm/hooks/useChangeActionCall.ts
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/hooks/useChangeActionCall.ts
@@ -1,9 +1,8 @@
 import { useEffect } from "react";
 import { useDispatch } from "react-redux";
-import { changeApi } from "actions/apiPaneActions";
-import { changeQuery } from "actions/queryPaneActions";
 import { PluginType } from "entities/Action";
-import { usePluginActionContext } from "PluginActionEditor";
+import { usePluginActionContext } from "../../../PluginActionContext";
+import { changeApi, changeQuery } from "../../../store";
 import usePrevious from "utils/hooks/usePrevious";
 
 export const useChangeActionCall = () => {
diff --git a/app/client/src/PluginActionEditor/components/PluginActionNameEditor.tsx b/app/client/src/PluginActionEditor/components/PluginActionNameEditor.tsx
index a51d6006dec0..4fa5020b8da1 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionNameEditor.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionNameEditor.tsx
@@ -1,16 +1,17 @@
-import React from "react";
-import { useSelector } from "react-redux";
-import ActionNameEditor from "components/editorComponents/ActionNameEditor";
-import { usePluginActionContext } from "PluginActionEditor/PluginActionContext";
+import React, { useCallback } from "react";
+import { useDispatch, useSelector } from "react-redux";
+import { usePluginActionContext } from "../PluginActionContext";
 import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
 import { getHasManageActionPermission } from "ee/utils/BusinessFeatures/permissionPageHelpers";
 import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
-import { PluginType } from "entities/Action";
 import type { ReduxAction } from "ee/constants/ReduxActionConstants";
-import styled from "styled-components";
 import { getSavingStatusForActionName } from "selectors/actionSelectors";
 import { getAssetUrl } from "ee/utils/airgapHelpers";
 import { ActionUrlIcon } from "pages/Editor/Explorer/ExplorerIcons";
+import { Flex } from "@appsmith/ads";
+import styled from "styled-components";
+import { noop } from "lodash";
+import { EditableName, useIsRenaming } from "IDE";
 
 export interface SaveActionNameParams {
   id: string;
@@ -23,58 +24,71 @@ export interface PluginActionNameEditorProps {
   ) => ReduxAction<SaveActionNameParams>;
 }
 
-const ActionNameEditorWrapper = styled.div`
-  & .ads-v2-box {
-    gap: var(--ads-v2-spaces-2);
-  }
-
-  && .t--action-name-edit-field {
-    font-size: 12px;
-
-    .bp3-editable-text-content {
-      height: unset !important;
-      line-height: unset !important;
-    }
-  }
+export const NameWrapper = styled(Flex)`
+  height: 100%;
+  position: relative;
+  font-size: 12px;
+  color: var(--ads-v2-color-fg);
+  cursor: pointer;
+  gap: var(--ads-v2-spaces-2);
+  align-items: center;
+  justify-content: center;
+  padding: var(--ads-v2-spaces-3);
+`;
 
-  & .t--plugin-icon-box {
-    height: 12px;
+export const IconContainer = styled.div`
+  height: 12px;
+  width: 12px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-shrink: 0;
+  img {
     width: 12px;
-
-    img {
-      width: 12px;
-      height: auto;
-    }
   }
 `;
 
-const PluginActionNameEditor = (props: PluginActionNameEditorProps) => {
+const PluginActionNameEditor = ({
+  saveActionName,
+}: PluginActionNameEditorProps) => {
   const { action, plugin } = usePluginActionContext();
 
+  const isLoading = useSelector(
+    (state) => getSavingStatusForActionName(state, action.id).isSaving,
+  );
+
+  const { enterEditMode, exitEditMode, isEditing } = useIsRenaming(action.id);
+
   const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
   const isChangePermitted = getHasManageActionPermission(
     isFeatureEnabled,
     action?.userPermissions,
   );
-
-  const saveStatus = useSelector((state) =>
-    getSavingStatusForActionName(state, action?.id || ""),
-  );
-
   const iconUrl = getAssetUrl(plugin?.iconLocation) || "";
   const icon = ActionUrlIcon(iconUrl);
 
+  const handleDoubleClick = isChangePermitted ? enterEditMode : noop;
+
+  const dispatch = useDispatch();
+
+  const handleNameSave = useCallback(
+    (name: string) => {
+      dispatch(saveActionName({ id: action.id, name }));
+    },
+    [action.id, saveActionName],
+  );
+
   return (
-    <ActionNameEditorWrapper>
-      <ActionNameEditor
-        actionConfig={action}
-        disabled={!isChangePermitted}
-        enableFontStyling={plugin?.type === PluginType.API}
-        icon={icon}
-        saveActionName={props.saveActionName}
-        saveStatus={saveStatus}
+    <NameWrapper onDoubleClick={handleDoubleClick}>
+      <EditableName
+        exitEditing={exitEditMode}
+        icon={<IconContainer>{icon}</IconContainer>}
+        isEditing={isEditing}
+        isLoading={isLoading}
+        name={action.name}
+        onNameSave={handleNameSave}
       />
-    </ActionNameEditorWrapper>
+    </NameWrapper>
   );
 };
 
diff --git a/app/client/src/PluginActionEditor/components/PluginActionResponse/PluginActionResponse.tsx b/app/client/src/PluginActionEditor/components/PluginActionResponse/PluginActionResponse.tsx
index 9359c8130f3a..45244f48010c 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionResponse/PluginActionResponse.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionResponse/PluginActionResponse.tsx
@@ -1,26 +1,75 @@
-import React, { useCallback } from "react";
+import React, { useCallback, useEffect } from "react";
 import { IDEBottomView, ViewHideBehaviour } from "IDE";
-import { ActionExecutionResizerHeight } from "pages/Editor/APIEditor/constants";
+import { ActionExecutionResizerHeight } from "./constants";
 import EntityBottomTabs from "components/editorComponents/EntityBottomTabs";
 import { useDispatch, useSelector } from "react-redux";
-import { getApiPaneDebuggerState } from "selectors/apiPaneSelectors";
-import { setApiPaneDebuggerState } from "actions/apiPaneActions";
-import { DEBUGGER_TAB_KEYS } from "components/editorComponents/Debugger/helpers";
+import { setPluginActionEditorDebuggerState } from "../../store";
+import { getPluginActionDebuggerState } from "../../store";
+import { DEBUGGER_TAB_KEYS } from "components/editorComponents/Debugger/constants";
 import AnalyticsUtil from "ee/utils/AnalyticsUtil";
 import { usePluginActionResponseTabs } from "./hooks";
+import { usePluginActionContext } from "../../PluginActionContext";
+import { doesPluginRequireDatasource } from "ee/entities/Engine/actionHelpers";
+import useShowSchema from "./hooks/useShowSchema";
+import { actionResponseDisplayDataFormats } from "pages/Editor/utils";
 
 function PluginActionResponse() {
   const dispatch = useDispatch();
+  const { actionResponse, plugin } = usePluginActionContext();
 
   const tabs = usePluginActionResponseTabs();
+  const pluginRequireDatasource = doesPluginRequireDatasource(plugin);
+
+  const showSchema = useShowSchema(plugin?.id || "") && pluginRequireDatasource;
 
   // TODO combine API and Query Debugger state
   const { open, responseTabHeight, selectedTab } = useSelector(
-    getApiPaneDebuggerState,
+    getPluginActionDebuggerState,
+  );
+
+  const { responseDisplayFormat } =
+    actionResponseDisplayDataFormats(actionResponse);
+
+  // These useEffects are used to open the response tab by default for page load queries
+  // as for page load queries, query response is available and can be shown in response tab
+  useEffect(
+    function openResponseTabForPageLoadQueries() {
+      // actionResponse and responseDisplayFormat is present only when query has response available
+      if (
+        !!responseDisplayFormat?.title &&
+        actionResponse?.isExecutionSuccess
+      ) {
+        dispatch(
+          setPluginActionEditorDebuggerState({
+            open: true,
+            selectedTab: DEBUGGER_TAB_KEYS.RESPONSE_TAB,
+          }),
+        );
+      }
+    },
+    [
+      responseDisplayFormat?.title,
+      actionResponse?.isExecutionSuccess,
+      dispatch,
+    ],
+  );
+
+  useEffect(
+    function openSchemaTabWhenNoTabIsSelected() {
+      if (showSchema && !selectedTab) {
+        dispatch(
+          setPluginActionEditorDebuggerState({
+            open: true,
+            selectedTab: DEBUGGER_TAB_KEYS.SCHEMA_TAB,
+          }),
+        );
+      }
+    },
+    [showSchema, selectedTab, dispatch],
   );
 
   const toggleHide = useCallback(
-    () => dispatch(setApiPaneDebuggerState({ open: !open })),
+    () => dispatch(setPluginActionEditorDebuggerState({ open: !open })),
     [dispatch, open],
   );
 
@@ -32,14 +81,18 @@ function PluginActionResponse() {
         });
       }
 
-      dispatch(setApiPaneDebuggerState({ open: true, selectedTab: tabKey }));
+      dispatch(
+        setPluginActionEditorDebuggerState({ open: true, selectedTab: tabKey }),
+      );
     },
     [dispatch],
   );
 
   const updateResponsePaneHeight = useCallback(
     (height: number) => {
-      dispatch(setApiPaneDebuggerState({ responseTabHeight: height }));
+      dispatch(
+        setPluginActionEditorDebuggerState({ responseTabHeight: height }),
+      );
     },
     [dispatch],
   );
diff --git a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/ApiFormatSegmentedResponse.tsx b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/ApiFormatSegmentedResponse.tsx
index 4fe9f53b9054..d83a11b15f16 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/ApiFormatSegmentedResponse.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/ApiFormatSegmentedResponse.tsx
@@ -7,7 +7,7 @@ import { Flex, SegmentedControl } from "@appsmith/ads";
 import type { ActionResponse } from "api/ActionAPI";
 import { setActionResponseDisplayFormat } from "actions/pluginActionActions";
 import { actionResponseDisplayDataFormats } from "pages/Editor/utils";
-import { ResponseDisplayFormats } from "constants/ApiEditorConstants/CommonApiConstants";
+import { ResponseDisplayFormats } from "../../../constants/CommonApiConstants";
 import { useDispatch } from "react-redux";
 import styled from "styled-components";
 import { ResponseFormatTabs } from "./ResponseFormatTabs";
diff --git a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/ApiResponse.tsx b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/ApiResponse.tsx
index bb32f43ad198..a33f161f4775 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/ApiResponse.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/ApiResponse.tsx
@@ -10,7 +10,7 @@ import {
 import type { ActionResponse } from "api/ActionAPI";
 import type { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig";
 import type { SourceEntity } from "entities/AppsmithConsole";
-import ApiResponseMeta from "components/editorComponents/ApiResponseMeta";
+import ApiResponseMeta from "./ApiResponseMeta";
 import ActionExecutionInProgressView from "components/editorComponents/ActionExecutionInProgressView";
 import LogAdditionalInfo from "components/editorComponents/Debugger/ErrorLogs/components/LogAdditionalInfo";
 import LogHelper from "components/editorComponents/Debugger/ErrorLogs/components/LogHelper";
diff --git a/app/client/src/components/editorComponents/ApiResponseMeta.tsx b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/ApiResponseMeta.tsx
similarity index 96%
rename from app/client/src/components/editorComponents/ApiResponseMeta.tsx
rename to app/client/src/PluginActionEditor/components/PluginActionResponse/components/ApiResponseMeta.tsx
index 928791c971d9..36eea06baa58 100644
--- a/app/client/src/components/editorComponents/ApiResponseMeta.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/ApiResponseMeta.tsx
@@ -2,12 +2,12 @@ import type { PropsWithChildren } from "react";
 import React from "react";
 import { Flex } from "@appsmith/ads";
 import { Text, TextType } from "@appsmith/ads-old";
-import { formatBytes } from "../../utils/helpers";
 import { isEmpty } from "lodash";
-import BindDataButton from "pages/Editor/QueryEditor/BindDataButton";
+import BindDataButton from "./BindDataButton";
 import styled from "styled-components";
 import type { ActionResponse } from "api/ActionAPI";
 import { Text as BlueprintText } from "@blueprintjs/core/lib/esm/components/text/text";
+import { formatBytes } from "../utils/formatBytes";
 
 interface TextStyleProps {
   accent: "primary" | "secondary" | "error";
diff --git a/app/client/src/pages/Editor/QueryEditor/BindDataButton.tsx b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/BindDataButton.tsx
similarity index 99%
rename from app/client/src/pages/Editor/QueryEditor/BindDataButton.tsx
rename to app/client/src/PluginActionEditor/components/PluginActionResponse/components/BindDataButton.tsx
index 56271b6f31db..76cf88936ffb 100644
--- a/app/client/src/pages/Editor/QueryEditor/BindDataButton.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/BindDataButton.tsx
@@ -385,7 +385,7 @@ function BindDataButton(props: BindDataButtonProps) {
       </MenuTrigger>
       <MenuContent
         align={"end"}
-        data-testId={"t--widget-selection"}
+        data-testid={"t--widget-selection"}
         height={pages.length <= 4 ? "fit-content" : "186px"}
         side={"top"}
         width="235px"
diff --git a/app/client/src/pages/Editor/QueryEditor/QueryResponseTab.test.tsx b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/QueryResponseTab.test.tsx
similarity index 100%
rename from app/client/src/pages/Editor/QueryEditor/QueryResponseTab.test.tsx
rename to app/client/src/PluginActionEditor/components/PluginActionResponse/components/QueryResponseTab.test.tsx
diff --git a/app/client/src/pages/Editor/QueryEditor/QueryResponseTab.tsx b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/QueryResponseTab.tsx
similarity index 91%
rename from app/client/src/pages/Editor/QueryEditor/QueryResponseTab.tsx
rename to app/client/src/PluginActionEditor/components/PluginActionResponse/components/QueryResponseTab.tsx
index ba147dc5bb33..e5880bd50320 100644
--- a/app/client/src/pages/Editor/QueryEditor/QueryResponseTab.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/QueryResponseTab.tsx
@@ -6,9 +6,9 @@ import {
   ResponseTabErrorContainer,
   ResponseTabErrorContent,
   ResponseTabErrorDefaultMessage,
-} from "PluginActionEditor/components/PluginActionResponse/components/ApiResponse";
-import { ResponseFormatTabs } from "PluginActionEditor/components/PluginActionResponse/components/ResponseFormatTabs";
-import { NoResponse } from "PluginActionEditor/components/PluginActionResponse/components/NoResponse";
+} from "./ApiResponse";
+import { ResponseFormatTabs } from "./ResponseFormatTabs";
+import { NoResponse } from "./NoResponse";
 import LogAdditionalInfo from "components/editorComponents/Debugger/ErrorLogs/components/LogAdditionalInfo";
 import LogHelper from "components/editorComponents/Debugger/ErrorLogs/components/LogHelper";
 import LOG_TYPE from "entities/AppsmithConsole/logtype";
@@ -20,29 +20,31 @@ import {
   type CalloutLinkProps,
 } from "@appsmith/ads";
 import styled from "styled-components";
-import { DEBUGGER_TAB_KEYS } from "components/editorComponents/Debugger/helpers";
+import { DEBUGGER_TAB_KEYS } from "components/editorComponents/Debugger/constants";
 import AnalyticsUtil from "ee/utils/AnalyticsUtil";
 import { setActionResponseDisplayFormat } from "actions/pluginActionActions";
 import { getUpdateTimestamp } from "components/editorComponents/Debugger/ErrorLogs/ErrorLogItem";
 import type { SourceEntity } from "entities/AppsmithConsole";
 import type { Action } from "entities/Action";
 import { getActionData } from "ee/selectors/entitiesSelector";
-import { actionResponseDisplayDataFormats } from "../utils";
-import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
-import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
-import { getHasExecuteActionPermission } from "ee/utils/BusinessFeatures/permissionPageHelpers";
+import { actionResponseDisplayDataFormats } from "pages/Editor/utils";
 import { getErrorAsString } from "sagas/ActionExecution/errorUtils";
 import { isString } from "lodash";
 import ActionExecutionInProgressView from "components/editorComponents/ActionExecutionInProgressView";
 import { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig";
 import BindDataButton from "./BindDataButton";
-import { getQueryPaneDebuggerState } from "selectors/queryPaneSelectors";
-import { setQueryPaneConfigSelectedTabIndex } from "actions/queryPaneActions";
-import { EDITOR_TABS } from "constants/QueryEditorConstants";
+import {
+  getPluginActionDebuggerState,
+  openPluginActionSettings,
+  setPluginActionEditorSelectedTab,
+} from "../../../store";
 import {
   createMessage,
   PREPARED_STATEMENT_WARNING,
 } from "ee/constants/messages";
+import { EDITOR_TABS } from "constants/QueryEditorConstants";
+import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
+import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
 
 const HelpSection = styled.div``;
 
@@ -64,11 +66,13 @@ const ResponseContentWrapper = styled.div<{ isError: boolean }>`
   ${HelpSection} {
     margin-bottom: 10px;
   }
+
   position: relative;
 `;
 
 interface Props {
   actionSource: SourceEntity;
+  isRunDisabled?: boolean;
   isRunning: boolean;
   onRunClick: () => void;
   currentActionConfig: Action;
@@ -81,23 +85,21 @@ const QueryResponseTab = (props: Props) => {
     actionName,
     actionSource,
     currentActionConfig,
+    isRunDisabled = false,
     isRunning,
     onRunClick,
     runErrorMessage,
   } = props;
   const dispatch = useDispatch();
 
-  const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
-
-  const isExecutePermitted = getHasExecuteActionPermission(
-    isFeatureEnabled,
-    currentActionConfig?.userPermissions,
+  const isActionRedesignEnabled = useFeatureFlag(
+    FEATURE_FLAG.release_actions_redesign_enabled,
   );
 
   const actionResponse = useSelector((state) =>
     getActionData(state, currentActionConfig.id),
   );
-  const { responseTabHeight } = useSelector(getQueryPaneDebuggerState);
+  const { responseTabHeight } = useSelector(getPluginActionDebuggerState);
 
   const { responseDataTypes, responseDisplayFormat } =
     actionResponseDisplayDataFormats(actionResponse);
@@ -216,8 +218,12 @@ const QueryResponseTab = (props: Props) => {
   }
 
   const navigateToSettings = useCallback(() => {
-    dispatch(setQueryPaneConfigSelectedTabIndex(EDITOR_TABS.SETTINGS));
-  }, []);
+    if (isActionRedesignEnabled) {
+      dispatch(openPluginActionSettings(true));
+    } else {
+      dispatch(setPluginActionEditorSelectedTab(EDITOR_TABS.SETTINGS));
+    }
+  }, [dispatch, isActionRedesignEnabled]);
 
   const preparedStatementCalloutLinks: CalloutLinkProps[] = [
     {
@@ -338,7 +344,7 @@ const QueryResponseTab = (props: Props) => {
         )}
       {!output && !error && (
         <NoResponse
-          isRunDisabled={!isExecutePermitted}
+          isRunDisabled={isRunDisabled}
           isRunning={isRunning}
           onRunClick={responseTabOnRunClick}
         />
diff --git a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/ResponseFormatTabs.tsx b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/ResponseFormatTabs.tsx
index eb8dec8a7bf7..ab642d829c71 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/ResponseFormatTabs.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/ResponseFormatTabs.tsx
@@ -1,8 +1,8 @@
 import React from "react";
-import { ResponseDisplayFormats } from "constants/ApiEditorConstants/CommonApiConstants";
+import { ResponseDisplayFormats } from "../../../constants/CommonApiConstants";
 import ReadOnlyEditor from "components/editorComponents/ReadOnlyEditor";
 import { isString } from "lodash";
-import Table from "pages/Editor/QueryEditor/Table";
+import Table from "./Table";
 
 type ResponseData = string | Record<string, unknown>[];
 
diff --git a/app/client/src/components/editorComponents/Debugger/Schema.tsx b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/Schema.tsx
similarity index 51%
rename from app/client/src/components/editorComponents/Debugger/Schema.tsx
rename to app/client/src/PluginActionEditor/components/PluginActionResponse/components/Schema.tsx
index 46e5b3cc366e..7305c7a13927 100644
--- a/app/client/src/components/editorComponents/Debugger/Schema.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/Schema.tsx
@@ -1,18 +1,33 @@
-import { Flex } from "@appsmith/ads";
-import React, { useEffect, useState } from "react";
-import type { DatasourceColumns, DatasourceKeys } from "entities/Datasource";
-import { DatasourceStructureContext } from "entities/Datasource";
+import { Button, Flex, Link } from "@appsmith/ads";
+import React, { useCallback, useEffect, useState } from "react";
+import {
+  DatasourceStructureContext,
+  type DatasourceColumns,
+  type DatasourceKeys,
+} from "entities/Datasource";
 import { DatasourceStructureContainer as DatasourceStructureList } from "pages/Editor/DatasourceInfo/DatasourceStructureContainer";
-import { useSelector } from "react-redux";
+import { useDispatch, useSelector } from "react-redux";
 import {
   getDatasourceStructureById,
   getIsFetchingDatasourceStructure,
+  getPluginImages,
+  getPluginIdFromDatasourceId,
+  getPluginDatasourceComponentFromId,
 } from "ee/selectors/entitiesSelector";
 import DatasourceField from "pages/Editor/DatasourceInfo/DatasourceField";
 import { find } from "lodash";
 import type { AppState } from "ee/reducers";
 import RenderInterimDataState from "pages/Editor/DatasourceInfo/RenderInterimDataState";
-import { getQueryPaneDebuggerState } from "selectors/queryPaneSelectors";
+import { getPluginActionDebuggerState } from "../../../store";
+import {
+  fetchDatasourceStructure,
+  refreshDatasourceStructure,
+} from "actions/datasourceActions";
+import history from "utils/history";
+import { datasourcesEditorIdURL } from "ee/RouteBuilder";
+import { EntityIcon } from "pages/Editor/Explorer/ExplorerIcons";
+import { getAssetUrl } from "ee/utils/airgapHelpers";
+import { DatasourceComponentTypes } from "api/PluginApi";
 
 interface Props {
   datasourceId: string;
@@ -21,10 +36,19 @@ interface Props {
 }
 
 const Schema = (props: Props) => {
+  const dispatch = useDispatch();
+
   const datasourceStructure = useSelector((state) =>
     getDatasourceStructureById(state, props.datasourceId),
   );
-  const { responseTabHeight } = useSelector(getQueryPaneDebuggerState);
+  const { responseTabHeight } = useSelector(getPluginActionDebuggerState);
+
+  const pluginId = useSelector((state) =>
+    getPluginIdFromDatasourceId(state, props.datasourceId),
+  );
+  const pluginImages = useSelector((state) => getPluginImages(state));
+  const datasourceIcon = pluginId ? pluginImages[pluginId] : undefined;
+
   const [selectedTable, setSelectedTable] = useState<string>();
 
   const selectedTableItems = find(datasourceStructure?.tables, [
@@ -46,14 +70,48 @@ const Schema = (props: Props) => {
     getIsFetchingDatasourceStructure(state, props.datasourceId),
   );
 
+  const pluginDatasourceForm = useSelector((state) =>
+    getPluginDatasourceComponentFromId(state, pluginId || ""),
+  );
+
   useEffect(() => {
     setSelectedTable(undefined);
   }, [props.datasourceId]);
+
+  useEffect(() => {
+    if (
+      props.datasourceId &&
+      datasourceStructure === undefined &&
+      pluginDatasourceForm !== DatasourceComponentTypes.RestAPIDatasourceForm
+    ) {
+      dispatch(
+        fetchDatasourceStructure(
+          props.datasourceId,
+          true,
+          DatasourceStructureContext.QUERY_EDITOR,
+        ),
+      );
+    }
+  }, [props.datasourceId, datasourceStructure, dispatch, pluginDatasourceForm]);
+
   useEffect(() => {
     if (!selectedTable && datasourceStructure?.tables?.length && !isLoading) {
       setSelectedTable(datasourceStructure.tables[0].name);
     }
-  }, [selectedTable, props.datasourceId, isLoading]);
+  }, [selectedTable, props.datasourceId, isLoading, datasourceStructure]);
+
+  const refreshStructure = useCallback(() => {
+    dispatch(
+      refreshDatasourceStructure(
+        props.datasourceId,
+        DatasourceStructureContext.QUERY_EDITOR,
+      ),
+    );
+  }, [dispatch, props.datasourceId]);
+
+  const goToDatasource = useCallback(() => {
+    history.push(datasourcesEditorIdURL({ datasourceId: props.datasourceId }));
+  }, [props.datasourceId]);
 
   if (!datasourceStructure) {
     return (
@@ -70,23 +128,50 @@ const Schema = (props: Props) => {
   return (
     <Flex
       flexDirection="row"
-      gap="spaces-2"
+      gap="spaces-3"
       height={`${responseTabHeight - 45}px`}
       maxWidth="70rem"
       overflow="hidden"
     >
       <Flex
-        data-testId="datasource-schema-container"
+        data-testid="datasource-schema-container"
         flex="1"
         flexDirection="column"
+        gap="spaces-3"
         overflow="hidden"
-        px="spaces-3"
+        padding="spaces-3"
+        paddingRight="spaces-0"
       >
+        <Flex
+          alignItems={"center"}
+          gap="spaces-2"
+          justifyContent={"space-between"}
+        >
+          <Link onClick={goToDatasource}>
+            <Flex
+              alignItems={"center"}
+              gap="spaces-1"
+              justifyContent={"center"}
+            >
+              <EntityIcon height={`16px`} width={`16px`}>
+                <img alt="entityIcon" src={getAssetUrl(datasourceIcon)} />
+              </EntityIcon>
+              {props.datasourceName}
+            </Flex>
+          </Link>
+          <Button
+            className="datasourceStructure-refresh"
+            isIconButton
+            kind="tertiary"
+            onClick={refreshStructure}
+            size="sm"
+            startIcon="refresh"
+          />
+        </Flex>
         <DatasourceStructureList
           context={DatasourceStructureContext.QUERY_EDITOR}
           datasourceStructure={datasourceStructure}
           onEntityTableClick={setSelectedTable}
-          showRefresh
           step={0}
           tableName={selectedTable}
           {...props}
diff --git a/app/client/src/pages/Editor/QueryEditor/Table.tsx b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/Table.tsx
similarity index 100%
rename from app/client/src/pages/Editor/QueryEditor/Table.tsx
rename to app/client/src/PluginActionEditor/components/PluginActionResponse/components/Table.tsx
diff --git a/app/client/src/pages/Editor/APIEditor/constants.ts b/app/client/src/PluginActionEditor/components/PluginActionResponse/constants.ts
similarity index 100%
rename from app/client/src/pages/Editor/APIEditor/constants.ts
rename to app/client/src/PluginActionEditor/components/PluginActionResponse/constants.ts
diff --git a/app/client/src/components/editorComponents/ActionRightPane/useShowSchema.ts b/app/client/src/PluginActionEditor/components/PluginActionResponse/hooks/useShowSchema.ts
similarity index 100%
rename from app/client/src/components/editorComponents/ActionRightPane/useShowSchema.ts
rename to app/client/src/PluginActionEditor/components/PluginActionResponse/hooks/useShowSchema.ts
diff --git a/app/client/src/PluginActionEditor/components/PluginActionResponse/utils/formatBytes.ts b/app/client/src/PluginActionEditor/components/PluginActionResponse/utils/formatBytes.ts
new file mode 100644
index 000000000000..dff56245dfae
--- /dev/null
+++ b/app/client/src/PluginActionEditor/components/PluginActionResponse/utils/formatBytes.ts
@@ -0,0 +1,14 @@
+export const formatBytes = (bytes: string | number) => {
+  if (!bytes) return;
+
+  const value = typeof bytes === "string" ? parseInt(bytes) : bytes;
+  const sizes = ["Bytes", "KB", "MB", "GB", "TB"];
+
+  if (value === 0) return "0 bytes";
+
+  const i = parseInt(String(Math.floor(Math.log(value) / Math.log(1024))));
+
+  if (i === 0) return bytes + " " + sizes[i];
+
+  return (value / Math.pow(1024, i)).toFixed(1) + " " + sizes[i];
+};
diff --git a/app/client/src/PluginActionEditor/components/PluginActionSettings/ApiSettings.tsx b/app/client/src/PluginActionEditor/components/PluginActionSettings/ApiSettings.tsx
new file mode 100644
index 000000000000..37ef02e21153
--- /dev/null
+++ b/app/client/src/PluginActionEditor/components/PluginActionSettings/ApiSettings.tsx
@@ -0,0 +1,10 @@
+import { API_EDITOR_FORM_NAME } from "ee/constants/forms";
+import { reduxForm } from "redux-form";
+import PluginActionSettingsPopover, {
+  type SettingsProps,
+} from "./SettingsPopover";
+
+export default reduxForm<unknown, SettingsProps>({
+  form: API_EDITOR_FORM_NAME,
+  enableReinitialize: true,
+})(PluginActionSettingsPopover);
diff --git a/app/client/src/PluginActionEditor/components/PluginActionSettings/QuerySettings.tsx b/app/client/src/PluginActionEditor/components/PluginActionSettings/QuerySettings.tsx
new file mode 100644
index 000000000000..9f8984afb7df
--- /dev/null
+++ b/app/client/src/PluginActionEditor/components/PluginActionSettings/QuerySettings.tsx
@@ -0,0 +1,10 @@
+import { QUERY_EDITOR_FORM_NAME } from "ee/constants/forms";
+import { reduxForm } from "redux-form";
+import PluginActionSettingsPopover, {
+  type SettingsProps,
+} from "./SettingsPopover";
+
+export default reduxForm<unknown, SettingsProps>({
+  form: QUERY_EDITOR_FORM_NAME,
+  enableReinitialize: true,
+})(PluginActionSettingsPopover);
diff --git a/app/client/src/PluginActionEditor/components/PluginActionSettings/SettingsPopover.tsx b/app/client/src/PluginActionEditor/components/PluginActionSettings/SettingsPopover.tsx
new file mode 100644
index 000000000000..0239936dabad
--- /dev/null
+++ b/app/client/src/PluginActionEditor/components/PluginActionSettings/SettingsPopover.tsx
@@ -0,0 +1,103 @@
+import React, { useCallback, useEffect, useState } from "react";
+import { Link } from "@appsmith/ads";
+import ActionSettings from "pages/Editor/ActionSettings";
+import { usePluginActionContext } from "../../PluginActionContext";
+import styled from "styled-components";
+import {
+  createMessage,
+  API_EDITOR_TAB_TITLES,
+  MORE_ON_QUERY_SETTINGS,
+} from "ee/constants/messages";
+import { useDispatch, useSelector } from "react-redux";
+import {
+  isPluginActionSettingsOpen,
+  openPluginActionSettings,
+} from "../../store";
+import { THEME } from "../../constants/PluginActionConstants";
+import { type DocsLink, openDoc } from "constants/DocumentationLinks";
+import { ToolbarSettingsPopover } from "IDE";
+
+export interface SettingsProps {
+  formName: string;
+  docsLink?: DocsLink;
+}
+
+/* TODO: Remove this after removing custom width from server side (Ankita) */
+const SettingsWrapper = styled.div`
+  display: flex;
+  flex-direction: column;
+  gap: var(--ads-v2-spaces-4);
+
+  .t--form-control-INPUT_TEXT,
+  .t--form-control-DROP_DOWN {
+    > div {
+      min-width: unset;
+      width: 100%;
+    }
+  }
+`;
+
+const LearnMoreLink = styled(Link)`
+  span {
+    font-weight: bold;
+  }
+`;
+
+const PluginActionSettingsPopover = (props: SettingsProps) => {
+  const { settingsConfig } = usePluginActionContext();
+  const openSettings = useSelector(isPluginActionSettingsOpen);
+  const [isOpen, setIsOpen] = useState(false);
+  const dispatch = useDispatch();
+
+  const handleOpenChange = useCallback(
+    (open: boolean) => {
+      setIsOpen(open);
+
+      if (openSettings && !open) {
+        dispatch(openPluginActionSettings(false));
+      }
+    },
+    [dispatch, openSettings],
+  );
+
+  useEffect(
+    function syncOpenState() {
+      if (openSettings) {
+        handleOpenChange(true);
+      }
+    },
+    [handleOpenChange, openSettings],
+  );
+
+  const handleLearnMoreClick = useCallback(() => {
+    openDoc(props.docsLink as DocsLink);
+  }, [props.docsLink]);
+
+  return (
+    <ToolbarSettingsPopover
+      handleOpenChange={handleOpenChange}
+      isOpen={isOpen}
+      title={createMessage(API_EDITOR_TAB_TITLES.SETTINGS)}
+    >
+      <SettingsWrapper>
+        <ActionSettings
+          actionSettingsConfig={settingsConfig}
+          formName={props.formName}
+          theme={THEME}
+        />
+        {props.docsLink && (
+          <LearnMoreLink
+            className="t--action-settings-documentation-link"
+            endIcon="external-link-line"
+            kind="secondary"
+            onClick={handleLearnMoreClick}
+          >
+            {createMessage(MORE_ON_QUERY_SETTINGS)}
+          </LearnMoreLink>
+        )}
+      </SettingsWrapper>
+    </ToolbarSettingsPopover>
+  );
+};
+
+export default PluginActionSettingsPopover;
diff --git a/app/client/src/PluginActionEditor/components/PluginActionSettings/index.tsx b/app/client/src/PluginActionEditor/components/PluginActionSettings/index.tsx
new file mode 100644
index 000000000000..7c8a886b7894
--- /dev/null
+++ b/app/client/src/PluginActionEditor/components/PluginActionSettings/index.tsx
@@ -0,0 +1,30 @@
+import React from "react";
+import { UIComponentTypes } from "api/PluginApi";
+import { usePluginActionContext } from "../../PluginActionContext";
+import ApiSettings from "./ApiSettings";
+import QuerySettings from "./QuerySettings";
+import {
+  API_EDITOR_FORM_NAME,
+  QUERY_EDITOR_FORM_NAME,
+} from "ee/constants/forms";
+import { DocsLink } from "constants/DocumentationLinks";
+
+const API_FORM_COMPONENTS = [
+  UIComponentTypes.ApiEditorForm,
+  UIComponentTypes.GraphQLEditorForm,
+];
+
+const PluginActionSettings = () => {
+  const { plugin } = usePluginActionContext();
+
+  return API_FORM_COMPONENTS.includes(plugin.uiComponent) ? (
+    <ApiSettings formName={API_EDITOR_FORM_NAME} />
+  ) : (
+    <QuerySettings
+      docsLink={DocsLink.QUERY_SETTINGS}
+      formName={QUERY_EDITOR_FORM_NAME}
+    />
+  );
+};
+
+export default PluginActionSettings;
diff --git a/app/client/src/PluginActionEditor/components/PluginActionToolbar.tsx b/app/client/src/PluginActionEditor/components/PluginActionToolbar.tsx
index 4a3563f9e4f2..43f3679e78c8 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionToolbar.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionToolbar.tsx
@@ -3,9 +3,15 @@ import { IDEToolbar } from "IDE";
 import { Button, Menu, MenuContent, MenuTrigger, Tooltip } from "@appsmith/ads";
 import { modText } from "utils/helpers";
 import { usePluginActionContext } from "../PluginActionContext";
-import { useDispatch } from "react-redux";
-import AnalyticsUtil from "ee/utils/AnalyticsUtil";
-import { runAction } from "actions/pluginActionActions";
+import {
+  useBlockExecution,
+  useHandleRunClick,
+  useAnalyticsOnRunClick,
+} from "../hooks";
+import { useToggle } from "@mantine/hooks";
+import { useSelector } from "react-redux";
+import { isActionRunning } from "../store";
+import PluginActionSettings from "./PluginActionSettings";
 
 interface PluginActionToolbarProps {
   runOptions?: React.ReactNode;
@@ -14,25 +20,17 @@ interface PluginActionToolbarProps {
 }
 
 const PluginActionToolbar = (props: PluginActionToolbarProps) => {
-  const { action, datasource, plugin } = usePluginActionContext();
-  const dispatch = useDispatch();
-  const handleRunClick = useCallback(() => {
-    AnalyticsUtil.logEvent("RUN_QUERY_CLICK", {
-      actionName: action.name,
-      actionId: action.id,
-      pluginName: plugin.name,
-      datasourceId: datasource?.id,
-      isMock: datasource?.isMock,
-    });
-    dispatch(runAction(action.id));
-  }, [
-    action.id,
-    action.name,
-    datasource?.id,
-    datasource?.isMock,
-    dispatch,
-    plugin.name,
-  ]);
+  const { action } = usePluginActionContext();
+  const { handleRunClick } = useHandleRunClick();
+  const { callRunActionAnalytics } = useAnalyticsOnRunClick();
+  const [isMenuOpen, toggleMenuOpen] = useToggle([false, true]);
+  const blockExecution = useBlockExecution();
+  const isRunning = useSelector(isActionRunning(action.id));
+
+  const onRunClick = useCallback(() => {
+    callRunActionAnalytics();
+    handleRunClick();
+  }, [callRunActionAnalytics, handleRunClick]);
 
   return (
     <IDEToolbar>
@@ -44,17 +42,18 @@ const PluginActionToolbar = (props: PluginActionToolbarProps) => {
           placement="topRight"
           showArrow={false}
         >
-          <Button kind="primary" onClick={handleRunClick} size="sm">
+          <Button
+            isDisabled={blockExecution}
+            isLoading={isRunning}
+            kind="primary"
+            onClick={onRunClick}
+            size="sm"
+          >
             Run
           </Button>
         </Tooltip>
-        <Button
-          isIconButton
-          kind="secondary"
-          size="sm"
-          startIcon="settings-2-line"
-        />
-        <Menu key={action.id}>
+        <PluginActionSettings />
+        <Menu onOpenChange={toggleMenuOpen} open={isMenuOpen}>
           <MenuTrigger>
             <Button
               isIconButton
diff --git a/app/client/src/PluginActionEditor/components/PluginActionToolbar/components/DocsMenuItem.tsx b/app/client/src/PluginActionEditor/components/PluginActionToolbar/components/DocsMenuItem.tsx
new file mode 100644
index 000000000000..a44260d52718
--- /dev/null
+++ b/app/client/src/PluginActionEditor/components/PluginActionToolbar/components/DocsMenuItem.tsx
@@ -0,0 +1,26 @@
+import React, { useCallback } from "react";
+import { MenuItem } from "@appsmith/ads";
+import { createMessage, DOCUMENTATION } from "ee/constants/messages";
+import { DocsLink, openDoc } from "constants/DocumentationLinks";
+import { usePluginActionContext } from "../../../PluginActionContext";
+
+export const DocsMenuItem = () => {
+  const { plugin } = usePluginActionContext();
+  const onDocsClick = useCallback(() => {
+    openDoc(DocsLink.QUERY, plugin.documentationLink, plugin.name);
+  }, [plugin]);
+
+  if (!plugin.documentationLink) {
+    return null;
+  }
+
+  return (
+    <MenuItem
+      className="t--datasource-documentation-link"
+      onSelect={onDocsClick}
+      startIcon="book-line"
+    >
+      {createMessage(DOCUMENTATION)}
+    </MenuItem>
+  );
+};
diff --git a/app/client/src/constants/ApiEditorConstants/ApiEditorConstants.ts b/app/client/src/PluginActionEditor/constants/ApiEditorConstants.ts
similarity index 100%
rename from app/client/src/constants/ApiEditorConstants/ApiEditorConstants.ts
rename to app/client/src/PluginActionEditor/constants/ApiEditorConstants.ts
diff --git a/app/client/src/constants/ApiEditorConstants/AppsmithAIEditorConstants.ts b/app/client/src/PluginActionEditor/constants/AppsmithAIEditorConstants.ts
similarity index 100%
rename from app/client/src/constants/ApiEditorConstants/AppsmithAIEditorConstants.ts
rename to app/client/src/PluginActionEditor/constants/AppsmithAIEditorConstants.ts
diff --git a/app/client/src/constants/ApiEditorConstants/CommonApiConstants.ts b/app/client/src/PluginActionEditor/constants/CommonApiConstants.ts
similarity index 100%
rename from app/client/src/constants/ApiEditorConstants/CommonApiConstants.ts
rename to app/client/src/PluginActionEditor/constants/CommonApiConstants.ts
diff --git a/app/client/src/constants/ApiEditorConstants/GraphQLEditorConstants.ts b/app/client/src/PluginActionEditor/constants/GraphQLEditorConstants.ts
similarity index 100%
rename from app/client/src/constants/ApiEditorConstants/GraphQLEditorConstants.ts
rename to app/client/src/PluginActionEditor/constants/GraphQLEditorConstants.ts
diff --git a/app/client/src/PluginActionEditor/constants/PluginActionConstants.ts b/app/client/src/PluginActionEditor/constants/PluginActionConstants.ts
new file mode 100644
index 000000000000..971f322bc675
--- /dev/null
+++ b/app/client/src/PluginActionEditor/constants/PluginActionConstants.ts
@@ -0,0 +1,3 @@
+import { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig";
+
+export const THEME = EditorTheme.LIGHT;
diff --git a/app/client/src/PluginActionEditor/hooks/index.ts b/app/client/src/PluginActionEditor/hooks/index.ts
index 5af0c9060d3a..c6a483d54fc1 100644
--- a/app/client/src/PluginActionEditor/hooks/index.ts
+++ b/app/client/src/PluginActionEditor/hooks/index.ts
@@ -1 +1,6 @@
 export { useActionSettingsConfig } from "ee/PluginActionEditor/hooks/useActionSettingsConfig";
+export { useHandleDeleteClick } from "ee/PluginActionEditor/hooks/useHandleDeleteClick";
+export { useHandleDuplicateClick } from "./useHandleDuplicateClick";
+export { useHandleRunClick } from "ee/PluginActionEditor/hooks/useHandleRunClick";
+export { useBlockExecution } from "ee/PluginActionEditor/hooks/useBlockExecution";
+export { useAnalyticsOnRunClick } from "ee/PluginActionEditor/hooks/useAnalyticsOnRunClick";
diff --git a/app/client/src/PluginActionEditor/hooks/useHandleDuplicateClick.ts b/app/client/src/PluginActionEditor/hooks/useHandleDuplicateClick.ts
new file mode 100644
index 000000000000..6551d7b9852b
--- /dev/null
+++ b/app/client/src/PluginActionEditor/hooks/useHandleDuplicateClick.ts
@@ -0,0 +1,26 @@
+import { copyActionRequest } from "actions/pluginActionActions";
+import { usePluginActionContext } from "PluginActionEditor/PluginActionContext";
+import { useCallback } from "react";
+import { useDispatch } from "react-redux";
+
+function useHandleDuplicateClick() {
+  const { action } = usePluginActionContext();
+  const dispatch = useDispatch();
+
+  const handleDuplicateClick = useCallback(
+    (destinationEntityId: string) => {
+      dispatch(
+        copyActionRequest({
+          id: action.id,
+          destinationEntityId,
+          name: action.name,
+        }),
+      );
+    },
+    [action.id, action.name, dispatch],
+  );
+
+  return { handleDuplicateClick };
+}
+
+export { useHandleDuplicateClick };
diff --git a/app/client/src/PluginActionEditor/index.ts b/app/client/src/PluginActionEditor/index.ts
index e8083e1b0f06..2cb13d4a5e6d 100644
--- a/app/client/src/PluginActionEditor/index.ts
+++ b/app/client/src/PluginActionEditor/index.ts
@@ -11,3 +11,7 @@ export type {
   PluginActionNameEditorProps,
 } from "./components/PluginActionNameEditor";
 export { default as PluginActionNameEditor } from "./components/PluginActionNameEditor";
+
+export type { PluginActionEditorState } from "./store/pluginEditorReducer";
+
+export { DocsMenuItem } from "./components/PluginActionToolbar/components/DocsMenuItem";
diff --git a/app/client/src/PluginActionEditor/readme.md b/app/client/src/PluginActionEditor/readme.md
new file mode 100644
index 000000000000..8b72c5896f1b
--- /dev/null
+++ b/app/client/src/PluginActionEditor/readme.md
@@ -0,0 +1,102 @@
+## Plugin Action Editor
+
+Appsmith allows its users to connect their UI to various different
+data sources e.g. API end points or SQL Query Databases.
+These data sources are configured using "Plugins" that define various details about
+the configuration and execution. Each data source is a specific connection and
+users can have multiple "Actions" built on top of these data sources.
+
+Actions are implementations that can store and retrieve data from the data source.
+
+The Plugin Action Editor is a module that exposes the UX that is used by the users
+to implement details about these actions, its settings and test them in edit mode.
+
+### Contents
+
+This module is divided into 3 major composable sections.
+
+- **Toolbar**: A row for the tools on top of the Action. Comes with Settings, Run Buttons and an overflow menu CTA to add further management items like copy or delete. Allows to add more items in it
+- **Form**: A preset form based defined by the Plugin config.
+- **Response**: A tabbed bottom view to show the Response and other debugging tools
+
+One can use these 3 sections to define their compose different experiences.
+
+#### Plugin Action Context
+
+All the sections and its children are connected via the "Plugin Action Context" that allows for easy data passing.
+
+The Wrapper "PluginActionEditor" will pass this context down. This includes:
+
+- Action
+- Action Response
+- Plugin
+- Datasource
+- Form Configs
+- Setting Configs
+
+#### UI Store
+
+The UI state is managed via redux, and it is exposed out as well for use
+
+### How to use
+
+Below we illustrate how by using a Composable structure to create the Action Editor
+
+```typescript jsx
+const AppPluginActionEditor = () => {
+  // Define the actionId that needs to be configured via the editor.
+  // In the example we fetch it from the route
+  const actionId = getActionIDFromRoute();
+  return (
+    /** Plugin Action Editor is our wrapper composable fragment.
+     * This will fetch the action and other related info
+     * from state and pass it down to its children via "context".
+     * This will ensure all children have the same way to access the action
+     * i.e. via context. Hence, this component is only responsible for
+     * abstracting the
+     * action state management
+    */
+    <PluginActionEditor actionID={actionID}>
+      <PluginActionToolbar />
+      <PluginActionForm />
+      <PluginActionResponse />
+    </PluginActionEditor>
+  )
+}
+
+```
+
+It is completely possible to mix and match these components, and compose them further to build
+other experiences with them.
+For example if you need to just have the Response view without the form
+you can do the following
+
+```typescript jsx
+const PluginActionResponseView = () => {
+  // Define the actionId that needs to be configured via the editor.
+  // In the example we fetch it from the route
+  const actionId = getActionIDFromRoute();
+  return (
+    <PluginActionEditor actionID={actionID}>
+      <PluginActionResponse />
+    </PluginActionEditor>
+  )
+}
+```
+
+### Update Guide
+
+1. Update an existing functionality to be reflected in all variations
+   - Functionality updates should be done at the point of definition itself.
+   - Prefer having separate files for each functionality if it has a lot of logic or can be extended in EE
+2. Add new functionality for all variations
+   - Add the functionality close to the usage point.
+   - Avoid configuration of functionality via props since it is used for all.
+3. Add an EE variation to a functionality.
+   - Avoid adding any EE logic for this functionality as much as possible
+   - Ideally it should be exposed as a prop that can be updated in the EE usage point
+   - In case it needs to be done in place, make sure the functionality is its own file so that only that functionality
+     needs extension.
+4. Create a specific variance for a certain use case not applicable for all
+   - Avoid adding the logic inside the module instead override via composition
+   - If it affects any feature in the module, expose via prop
diff --git a/app/client/src/PluginActionEditor/store/constants.ts b/app/client/src/PluginActionEditor/store/constants.ts
new file mode 100644
index 000000000000..f11446f8d59e
--- /dev/null
+++ b/app/client/src/PluginActionEditor/store/constants.ts
@@ -0,0 +1,4 @@
+import { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig";
+
+export const POST_BODY_FORM_DATA_KEY = "displayFormat";
+export const THEME = EditorTheme.LIGHT;
diff --git a/app/client/src/PluginActionEditor/store/index.ts b/app/client/src/PluginActionEditor/store/index.ts
new file mode 100644
index 000000000000..e1680cfdbf99
--- /dev/null
+++ b/app/client/src/PluginActionEditor/store/index.ts
@@ -0,0 +1,4 @@
+export { default as pluginActionReducer } from "./pluginEditorReducer";
+
+export * from "./pluginActionEditorActions";
+export * from "./pluginActionEditorSelectors";
diff --git a/app/client/src/PluginActionEditor/store/pluginActionEditorActions.ts b/app/client/src/PluginActionEditor/store/pluginActionEditorActions.ts
new file mode 100644
index 000000000000..da7c065cb558
--- /dev/null
+++ b/app/client/src/PluginActionEditor/store/pluginActionEditorActions.ts
@@ -0,0 +1,70 @@
+import type { PluginEditorDebuggerState } from "./pluginEditorReducer";
+import {
+  type ReduxAction,
+  ReduxActionTypes,
+} from "ee/constants/ReduxActionConstants";
+import type { Action } from "entities/Action";
+
+export const setPluginActionEditorDebuggerState = (
+  payload: Partial<PluginEditorDebuggerState>,
+) => ({
+  type: ReduxActionTypes.SET_PLUGIN_ACTION_EDITOR_DEBUGGER_STATE,
+  payload,
+});
+
+export const setPluginActionEditorSelectedTab = (payload: string) => ({
+  type: ReduxActionTypes.SET_PLUGIN_ACTION_EDITOR_FORM_SELECTED_TAB,
+  payload: {
+    selectedTab: payload,
+  },
+});
+
+export const openPluginActionSettings = (payload: boolean) => ({
+  type: ReduxActionTypes.OPEN_PLUGIN_ACTION_SETTINGS,
+  payload: {
+    settingsOpen: payload,
+  },
+});
+
+export const updatePostBodyContentType = (
+  title: string,
+): ReduxAction<{ title: string }> => ({
+  type: ReduxActionTypes.UPDATE_API_ACTION_BODY_CONTENT_TYPE,
+  payload: { title },
+});
+
+export const setExtraFormData = (
+  values: Record<string, { label: string; value: string }>,
+) => ({
+  type: ReduxActionTypes.SET_EXTRA_FORMDATA,
+  payload: { values },
+});
+
+export const changeApi = (
+  id: string,
+  isSaas: boolean,
+  newApi?: boolean,
+): ReduxAction<{ id: string; isSaas: boolean; newApi?: boolean }> => {
+  return {
+    type: ReduxActionTypes.API_PANE_CHANGE_API,
+    payload: { id, isSaas, newApi },
+  };
+};
+
+export interface ChangeQueryPayload {
+  baseQueryId: string;
+  packageId?: string;
+  applicationId?: string;
+  basePageId?: string;
+  moduleId?: string;
+  workflowId?: string;
+  newQuery?: boolean;
+  action?: Action;
+}
+
+export const changeQuery = (payload: ChangeQueryPayload) => {
+  return {
+    type: ReduxActionTypes.QUERY_PANE_CHANGE,
+    payload,
+  };
+};
diff --git a/app/client/src/PluginActionEditor/store/pluginActionEditorSelectors.ts b/app/client/src/PluginActionEditor/store/pluginActionEditorSelectors.ts
new file mode 100644
index 000000000000..b38e4bd1cc2f
--- /dev/null
+++ b/app/client/src/PluginActionEditor/store/pluginActionEditorSelectors.ts
@@ -0,0 +1,71 @@
+import type { AppState } from "ee/reducers";
+import { createSelector } from "reselect";
+
+import { POST_BODY_FORM_DATA_KEY } from "./constants";
+import { POST_BODY_FORMAT_OPTIONS } from "../constants/CommonApiConstants";
+
+export const getActionEditorSavingMap = (state: AppState) =>
+  state.ui.pluginActionEditor.isSaving;
+
+export const isActionSaving = (id: string) =>
+  createSelector([getActionEditorSavingMap], (savingMap) => {
+    return id in savingMap && savingMap[id];
+  });
+
+const getActionDirtyState = (state: AppState) =>
+  state.ui.pluginActionEditor.isDirty;
+
+export const isActionDirty = (id: string) =>
+  createSelector([getActionDirtyState], (actionDirtyMap) => {
+    return id in actionDirtyMap && actionDirtyMap[id];
+  });
+
+const getActionRunningState = (state: AppState) =>
+  state.ui.pluginActionEditor.isRunning;
+
+export const isActionRunning = (id: string) =>
+  createSelector(
+    [getActionRunningState],
+    (isRunningMap) => id in isRunningMap && isRunningMap[id],
+  );
+
+const getActionDeletingState = (state: AppState) =>
+  state.ui.pluginActionEditor.isDeleting;
+
+export const isActionDeleting = (id: string) =>
+  createSelector(
+    [getActionDeletingState],
+    (deletingMap) => id in deletingMap && deletingMap[id],
+  );
+
+export const getFormData = (state: AppState) =>
+  state.ui.pluginActionEditor.formData;
+
+type GetFormPostBodyFormat = (state: AppState) => {
+  label: string;
+  value: string;
+};
+
+export const getPostBodyFormat: GetFormPostBodyFormat = (state) => {
+  const formData = getFormData(state);
+
+  if (POST_BODY_FORM_DATA_KEY in formData) {
+    return formData[POST_BODY_FORM_DATA_KEY];
+  }
+
+  return {
+    label: POST_BODY_FORMAT_OPTIONS.NONE,
+    value: POST_BODY_FORMAT_OPTIONS.NONE,
+  };
+};
+export const getPluginActionConfigSelectedTab = (state: AppState) =>
+  state.ui.pluginActionEditor.selectedConfigTab;
+
+export const getPluginActionDebuggerState = (state: AppState) =>
+  state.ui.pluginActionEditor.debugger;
+
+export const isPluginActionCreating = (state: AppState) =>
+  state.ui.pluginActionEditor.isCreating;
+
+export const isPluginActionSettingsOpen = (state: AppState) =>
+  state.ui.pluginActionEditor.settingsOpen;
diff --git a/app/client/src/PluginActionEditor/store/pluginEditorReducer.ts b/app/client/src/PluginActionEditor/store/pluginEditorReducer.ts
new file mode 100644
index 000000000000..a3fbf803d844
--- /dev/null
+++ b/app/client/src/PluginActionEditor/store/pluginEditorReducer.ts
@@ -0,0 +1,186 @@
+import { createImmerReducer } from "utils/ReducerUtils";
+import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import {
+  ReduxActionTypes,
+  ReduxActionErrorTypes,
+} from "ee/constants/ReduxActionConstants";
+import type { Action } from "entities/Action";
+import { ActionExecutionResizerHeight } from "../components/PluginActionResponse/constants";
+import { DEBUGGER_TAB_KEYS } from "components/editorComponents/Debugger/constants";
+import type { ActionResponse } from "api/ActionAPI";
+import { omit, set } from "lodash";
+import { objectKeys } from "@appsmith/utils";
+import type { UpdateActionPropertyActionPayload } from "actions/pluginActionActions";
+
+export interface PluginEditorDebuggerState {
+  open: boolean;
+  responseTabHeight: number;
+  selectedTab?: string;
+}
+
+export interface PluginActionEditorState {
+  isCreating: boolean;
+  isRunning: Record<string, boolean>;
+  isSaving: Record<string, boolean>;
+  isDeleting: Record<string, boolean>;
+  isDirty: Record<string, boolean>;
+  runErrorMessage: Record<string, string>;
+  selectedConfigTab?: string;
+  formData: Record<string, { label: string; value: string }>;
+  debugger: PluginEditorDebuggerState;
+  settingsOpen?: boolean;
+}
+
+const initialState: PluginActionEditorState = {
+  isCreating: false,
+  isRunning: {},
+  isSaving: {},
+  isDeleting: {},
+  isDirty: {},
+  runErrorMessage: {},
+  formData: {},
+  debugger: {
+    open: false,
+    responseTabHeight: ActionExecutionResizerHeight,
+  },
+  settingsOpen: false,
+};
+
+export const handlers = {
+  [ReduxActionTypes.CREATE_ACTION_INIT]: (state: PluginActionEditorState) => {
+    state.isCreating = true;
+  },
+  [ReduxActionTypes.CREATE_ACTION_SUCCESS]: (
+    state: PluginActionEditorState,
+  ) => {
+    state.isCreating = false;
+  },
+  [ReduxActionErrorTypes.CREATE_ACTION_ERROR]: (
+    state: PluginActionEditorState,
+  ) => {
+    state.isCreating = false;
+  },
+  [ReduxActionTypes.UPDATE_ACTION_PROPERTY]: (
+    state: PluginActionEditorState,
+    action: ReduxAction<UpdateActionPropertyActionPayload>,
+  ) => {
+    set(state, ["isDirty", action.payload.id], true);
+  },
+  [ReduxActionTypes.UPDATE_ACTION_INIT]: (
+    state: PluginActionEditorState,
+    action: ReduxAction<{ id: string }>,
+  ) => {
+    set(state, ["isSaving", action.payload.id], true);
+  },
+  [ReduxActionTypes.UPDATE_ACTION_SUCCESS]: (
+    state: PluginActionEditorState,
+    action: ReduxAction<{ data: Action }>,
+  ) => {
+    set(state, ["isSaving", action.payload.data.id], false);
+    set(state, ["isDirty", action.payload.data.id], false);
+  },
+  [ReduxActionErrorTypes.UPDATE_ACTION_ERROR]: (
+    state: PluginActionEditorState,
+    action: ReduxAction<{ id: string }>,
+  ) => {
+    set(state, ["isSaving", action.payload.id], false);
+  },
+  [ReduxActionTypes.DELETE_ACTION_INIT]: (
+    state: PluginActionEditorState,
+    action: ReduxAction<{ id: string }>,
+  ) => {
+    set(state, ["isDeleting", action.payload.id], true);
+  },
+  [ReduxActionTypes.DELETE_ACTION_SUCCESS]: (
+    state: PluginActionEditorState,
+    action: ReduxAction<{ id: string }>,
+  ) => {
+    set(state, ["isDeleting", action.payload.id], false);
+  },
+  [ReduxActionErrorTypes.DELETE_ACTION_ERROR]: (
+    state: PluginActionEditorState,
+    action: ReduxAction<{ id: string }>,
+  ) => {
+    set(state, ["isDeleting", action.payload.id], false);
+  },
+  [ReduxActionTypes.RUN_ACTION_REQUEST]: (
+    state: PluginActionEditorState,
+    action: ReduxAction<{ id: string }>,
+  ) => {
+    set(state, ["isRunning", action.payload.id], true);
+    set(state, ["debugger", "selectedTab"], DEBUGGER_TAB_KEYS.RESPONSE_TAB);
+    set(state, ["debugger", "open"], true);
+  },
+  [ReduxActionTypes.RUN_ACTION_CANCELLED]: (
+    state: PluginActionEditorState,
+    action: ReduxAction<{ id: string }>,
+  ) => {
+    set(state, ["isRunning", action.payload.id], false);
+  },
+
+  [ReduxActionTypes.RUN_ACTION_SUCCESS]: (
+    state: PluginActionEditorState,
+    action: ReduxAction<Record<string, ActionResponse>>,
+  ) => {
+    const actionId = objectKeys(action.payload)[0];
+
+    set(state, ["isRunning", actionId], false);
+    set(state, ["runErrorMessage"], omit(state.runErrorMessage, [actionId]));
+  },
+  [ReduxActionErrorTypes.RUN_ACTION_ERROR]: (
+    state: PluginActionEditorState,
+    action: ReduxAction<{ id: string; error: Error }>,
+  ) => {
+    const { error, id } = action.payload;
+
+    set(state, ["isRunning", id], false);
+    set(state, ["runErrorMessage", id], error.message);
+  },
+  /**
+   * This redux action sets the extra form data field for an action. This is used to select the
+   * appropriate body type tab selection in the Rest API plugin based on the content-type.
+   * This redux action can be extended to other functionalities as well in the future.
+   */
+  [ReduxActionTypes.SET_EXTRA_FORMDATA]: (
+    state: PluginActionEditorState,
+    action: ReduxAction<{
+      values: Record<string, { label: string; value: string }>;
+    }>,
+  ) => {
+    const { values } = action.payload;
+
+    set(state, ["formData"], values);
+  },
+  [ReduxActionTypes.SET_PLUGIN_ACTION_EDITOR_FORM_SELECTED_TAB]: (
+    state: PluginActionEditorState,
+    action: ReduxAction<{ selectedTab: string }>,
+  ) => {
+    const { selectedTab } = action.payload;
+
+    state.selectedConfigTab = selectedTab;
+  },
+  [ReduxActionTypes.SET_PLUGIN_ACTION_EDITOR_DEBUGGER_STATE]: (
+    state: PluginActionEditorState,
+    action: ReduxAction<Partial<PluginEditorDebuggerState>>,
+  ) => {
+    state.debugger = {
+      ...state.debugger,
+      ...action.payload,
+    };
+  },
+  [ReduxActionTypes.RESET_EDITOR_REQUEST]: (state: PluginActionEditorState) => {
+    state.isSaving = {};
+  },
+  [ReduxActionTypes.OPEN_PLUGIN_ACTION_SETTINGS]: (
+    state: PluginActionEditorState,
+    action: ReduxAction<{ settingsOpen: boolean }>,
+  ) => {
+    const { settingsOpen } = action.payload;
+
+    state.settingsOpen = settingsOpen;
+  },
+};
+
+const pluginActionEditorReducer = createImmerReducer(initialState, handlers);
+
+export default pluginActionEditorReducer;
diff --git a/app/client/src/transformers/CurlImportTransformer.test.ts b/app/client/src/PluginActionEditor/transformers/CurlImportTransformer.test.ts
similarity index 88%
rename from app/client/src/transformers/CurlImportTransformer.test.ts
rename to app/client/src/PluginActionEditor/transformers/CurlImportTransformer.test.ts
index e0ce45e17406..bd1a9e10aa0f 100644
--- a/app/client/src/transformers/CurlImportTransformer.test.ts
+++ b/app/client/src/PluginActionEditor/transformers/CurlImportTransformer.test.ts
@@ -1,4 +1,4 @@
-import transformCurlImport from "transformers/CurlImportTransformer";
+import transformCurlImport from "./CurlImportTransformer";
 
 describe("CurlImportTransformer", () => {
   it("has quotes in start and end and escapes special characters", () => {
diff --git a/app/client/src/transformers/CurlImportTransformer.ts b/app/client/src/PluginActionEditor/transformers/CurlImportTransformer.ts
similarity index 100%
rename from app/client/src/transformers/CurlImportTransformer.ts
rename to app/client/src/PluginActionEditor/transformers/CurlImportTransformer.ts
diff --git a/app/client/src/transformers/RestAPIDatasourceFormTransformer.ts b/app/client/src/PluginActionEditor/transformers/RestAPIDatasourceFormTransformer.ts
similarity index 100%
rename from app/client/src/transformers/RestAPIDatasourceFormTransformer.ts
rename to app/client/src/PluginActionEditor/transformers/RestAPIDatasourceFormTransformer.ts
diff --git a/app/client/src/transformers/RestActionTransformer.ts b/app/client/src/PluginActionEditor/transformers/RestActionTransformer.ts
similarity index 98%
rename from app/client/src/transformers/RestActionTransformer.ts
rename to app/client/src/PluginActionEditor/transformers/RestActionTransformer.ts
index ccd31d302008..1ea3995f789f 100644
--- a/app/client/src/transformers/RestActionTransformer.ts
+++ b/app/client/src/PluginActionEditor/transformers/RestActionTransformer.ts
@@ -1,7 +1,7 @@
 import {
   HTTP_METHOD,
   CONTENT_TYPE_HEADER_KEY,
-} from "constants/ApiEditorConstants/CommonApiConstants";
+} from "../constants/CommonApiConstants";
 import type { ApiAction } from "entities/Action";
 import isEmpty from "lodash/isEmpty";
 import isString from "lodash/isString";
diff --git a/app/client/src/transformers/RestActionTransformers.test.ts b/app/client/src/PluginActionEditor/transformers/RestActionTransformers.test.ts
similarity index 98%
rename from app/client/src/transformers/RestActionTransformers.test.ts
rename to app/client/src/PluginActionEditor/transformers/RestActionTransformers.test.ts
index d24ead8b4378..f775df96e2e9 100644
--- a/app/client/src/transformers/RestActionTransformers.test.ts
+++ b/app/client/src/PluginActionEditor/transformers/RestActionTransformers.test.ts
@@ -1,15 +1,14 @@
 import {
   extractApiUrlPath,
   transformRestAction,
-} from "transformers/RestActionTransformer";
+} from "./RestActionTransformer";
 import type { ApiAction } from "entities/Action";
 import { PluginType } from "entities/Action";
 import {
   HTTP_PROTOCOL,
   MultiPartOptionTypes,
   POST_BODY_FORMAT_OPTIONS,
-  // POST_BODY_FORMAT_OPTIONS_ENUM,
-} from "constants/ApiEditorConstants/CommonApiConstants";
+} from "../constants/CommonApiConstants";
 
 // jest.mock("POST_");
 
diff --git a/app/client/src/UITelemetry/auto-otel-web.ts b/app/client/src/UITelemetry/auto-otel-web.ts
index 62116e49282e..c7740666ca5d 100644
--- a/app/client/src/UITelemetry/auto-otel-web.ts
+++ b/app/client/src/UITelemetry/auto-otel-web.ts
@@ -4,12 +4,11 @@ import { ZoneContextManager } from "@opentelemetry/context-zone";
 import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-proto";
 import { Resource } from "@opentelemetry/resources";
 import {
-  SEMRESATTRS_SERVICE_NAME,
-  SEMRESATTRS_SERVICE_VERSION,
-  SEMRESATTRS_SERVICE_INSTANCE_ID,
-} from "@opentelemetry/semantic-conventions";
+  ATTR_DEPLOYMENT_NAME,
+  ATTR_SERVICE_INSTANCE_ID,
+} from "@opentelemetry/semantic-conventions/incubating";
+import { ATTR_SERVICE_NAME } from "@opentelemetry/semantic-conventions";
 import { getAppsmithConfigs } from "ee/configs";
-import { W3CTraceContextPropagator } from "@opentelemetry/core";
 import {
   MeterProvider,
   PeriodicExportingMetricReader,
@@ -18,23 +17,19 @@ import {
   OTLPMetricExporter,
   AggregationTemporalityPreference,
 } from "@opentelemetry/exporter-metrics-otlp-http";
-import type { Context, TextMapSetter } from "@opentelemetry/api";
 import { metrics } from "@opentelemetry/api";
 import { registerInstrumentations } from "@opentelemetry/instrumentation";
 import { PageLoadInstrumentation } from "./PageLoadInstrumentation";
+import { getWebAutoInstrumentations } from "@opentelemetry/auto-instrumentations-web";
 
 enum CompressionAlgorithm {
   NONE = "none",
   GZIP = "gzip",
 }
-const { newRelic } = getAppsmithConfigs();
-const {
-  applicationId,
-  browserAgentEndpoint,
-  otlpEndpoint,
-  otlpLicenseKey,
-  otlpServiceName,
-} = newRelic;
+const { newRelic, observability } = getAppsmithConfigs();
+const { browserAgentEndpoint, otlpEndpoint, otlpLicenseKey } = newRelic;
+
+const { deploymentName, serviceInstanceId, serviceName } = observability;
 
 // This base domain is used to filter out the Smartlook requests from the browser agent
 // There are some requests made to subdomains of smartlook.cloud which will also be filtered out
@@ -42,9 +37,9 @@ const smartlookBaseDomain = "smartlook.cloud";
 
 const tracerProvider = new WebTracerProvider({
   resource: new Resource({
-    [SEMRESATTRS_SERVICE_NAME]: otlpServiceName,
-    [SEMRESATTRS_SERVICE_INSTANCE_ID]: applicationId,
-    [SEMRESATTRS_SERVICE_VERSION]: "1.0.0",
+    [ATTR_DEPLOYMENT_NAME]: deploymentName,
+    [ATTR_SERVICE_INSTANCE_ID]: serviceInstanceId,
+    [ATTR_SERVICE_NAME]: serviceName,
   }),
 });
 
@@ -71,32 +66,9 @@ const processor = new BatchSpanProcessor(
   },
 );
 
-const W3C_OTLP_TRACE_HEADER = "traceparent";
-const CUSTOM_OTLP_TRACE_HEADER = "traceparent-otlp";
-
-//We are overriding the default header "traceparent" used for trace context because the browser
-// agent shares the same header's distributed tracing
-class CustomW3CTraceContextPropagator extends W3CTraceContextPropagator {
-  inject(
-    context: Context,
-    carrier: Record<string, unknown>,
-    setter: TextMapSetter,
-  ) {
-    // Call the original inject method to get the default traceparent header
-    super.inject(context, carrier, setter);
-
-    // Modify the carrier to use a different header
-    if (carrier[W3C_OTLP_TRACE_HEADER]) {
-      carrier[CUSTOM_OTLP_TRACE_HEADER] = carrier[W3C_OTLP_TRACE_HEADER];
-      delete carrier[W3C_OTLP_TRACE_HEADER]; // Remove the original traceparent header
-    }
-  }
-}
-
 tracerProvider.addSpanProcessor(processor);
 tracerProvider.register({
   contextManager: new ZoneContextManager(),
-  propagator: new CustomW3CTraceContextPropagator(),
 });
 
 const nrMetricsExporter = new OTLPMetricExporter({
@@ -110,9 +82,9 @@ const nrMetricsExporter = new OTLPMetricExporter({
 
 const meterProvider = new MeterProvider({
   resource: new Resource({
-    [SEMRESATTRS_SERVICE_NAME]: otlpServiceName,
-    [SEMRESATTRS_SERVICE_INSTANCE_ID]: applicationId,
-    [SEMRESATTRS_SERVICE_VERSION]: "1.0.0",
+    [ATTR_DEPLOYMENT_NAME]: deploymentName,
+    [ATTR_SERVICE_INSTANCE_ID]: serviceInstanceId,
+    [ATTR_SERVICE_NAME]: serviceName,
   }),
   readers: [
     new PeriodicExportingMetricReader({
@@ -136,5 +108,10 @@ registerInstrumentations({
         smartlookBaseDomain,
       ],
     }),
+    getWebAutoInstrumentations({
+      "@opentelemetry/instrumentation-xml-http-request": {
+        enabled: true,
+      },
+    }),
   ],
 });
diff --git a/app/client/src/UITelemetry/generateTraces.ts b/app/client/src/UITelemetry/generateTraces.ts
index 12476bcbcfa1..ec1941e09e4f 100644
--- a/app/client/src/UITelemetry/generateTraces.ts
+++ b/app/client/src/UITelemetry/generateTraces.ts
@@ -14,10 +14,9 @@ import {
   osName,
   osVersion,
 } from "react-device-detect";
-import { APP_MODE } from "entities/App";
-import { matchBuilderPath, matchViewerPath } from "constants/routes";
 import nanoid from "nanoid";
 import memoizeOne from "memoize-one";
+import { getApplicationParamsFromUrl } from "ee/utils/serviceWorkerUtils";
 
 const GENERATOR_TRACE = "generator-tracer";
 
@@ -26,25 +25,36 @@ export type SpanAttributes = Attributes;
 
 const OTLP_SESSION_ID = nanoid();
 
-const getAppMode = memoizeOne((pathname: string) => {
-  const isEditorUrl = matchBuilderPath(pathname);
-  const isViewerUrl = matchViewerPath(pathname);
-
-  const appMode = isEditorUrl
-    ? APP_MODE.EDIT
-    : isViewerUrl
-      ? APP_MODE.PUBLISHED
-      : "";
-
-  return appMode;
-});
+const getAppParams = memoizeOne(
+  (origin: string, pathname: string, search: string) => {
+    const applicationParams = getApplicationParamsFromUrl({
+      origin,
+      pathname,
+      search,
+    });
+
+    const {
+      applicationSlug,
+      appMode = "",
+      basePageId: pageId,
+      branchName,
+    } = applicationParams || {};
+
+    return {
+      appMode,
+      pageId,
+      branchName,
+      applicationSlug,
+    };
+  },
+);
 
 export const getCommonTelemetryAttributes = () => {
-  const pathname = window.location.pathname;
-  const appMode = getAppMode(pathname);
+  const { origin, pathname, search } = window.location;
+  const appParams = getAppParams(origin, pathname, search);
 
   return {
-    appMode,
+    ...appParams,
     deviceType,
     browserName,
     browserVersion,
@@ -122,14 +132,6 @@ export const startAndEndSpanForFn = <T>(
   return res;
 };
 
-// TODO: Fix this the next time the file is edited
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function wrapFnWithParentTraceContext(parentSpan: Span, fn: () => any) {
-  const parentContext = trace.setSpan(context.active(), parentSpan);
-
-  return context.with(parentContext, fn);
-}
-
 export function startAndEndSpan(
   spanName: string,
   startTime: number,
diff --git a/app/client/src/UITelemetry/generateWebWorkerTraces.ts b/app/client/src/UITelemetry/generateWebWorkerTraces.ts
index c1c22d9fd97c..f677f1da611a 100644
--- a/app/client/src/UITelemetry/generateWebWorkerTraces.ts
+++ b/app/client/src/UITelemetry/generateWebWorkerTraces.ts
@@ -14,7 +14,7 @@ export interface WebworkerSpanData {
 //to regular otlp telemetry data and subsequently exported to our telemetry collector
 export const newWebWorkerSpanData = (
   spanName: string,
-  attributes: SpanAttributes,
+  attributes: SpanAttributes = {},
 ): WebworkerSpanData => {
   return {
     attributes,
@@ -28,6 +28,21 @@ const addEndTimeForWebWorkerSpanData = (span: WebworkerSpanData) => {
   span.endTime = Date.now();
 };
 
+export const profileAsyncFn = async <T>(
+  spanName: string,
+  fn: () => Promise<T>,
+  allSpans: Record<string, WebworkerSpanData | SpanAttributes>,
+  attributes: SpanAttributes = {},
+) => {
+  const span = newWebWorkerSpanData(spanName, attributes);
+  const res: T = await fn();
+
+  addEndTimeForWebWorkerSpanData(span);
+  allSpans[spanName] = span;
+
+  return res;
+};
+
 export const profileFn = <T>(
   spanName: string,
   attributes: SpanAttributes = {},
diff --git a/app/client/src/WidgetProvider/constants.ts b/app/client/src/WidgetProvider/constants.ts
index 0627b51862e9..3183d918c0c1 100644
--- a/app/client/src/WidgetProvider/constants.ts
+++ b/app/client/src/WidgetProvider/constants.ts
@@ -11,6 +11,7 @@ import { WIDGET_STATIC_PROPS } from "constants/WidgetConstants";
 import type { Stylesheet } from "entities/AppTheming";
 import { omit } from "lodash";
 import moment from "moment";
+import type { SVGProps } from "react";
 import type { DerivedPropertiesMap } from "WidgetProvider/factory";
 import type { WidgetFeatures } from "utils/WidgetFeatures";
 import type { WidgetProps } from "../widgets/BaseWidget";
@@ -150,8 +151,8 @@ export interface WidgetMethods {
   getCanvasHeightOffset?: GetCanvasHeightOffset;
   getEditorCallouts?: GetEditorCallouts;
   getOneClickBindingConnectableWidgetConfig?: GetOneClickBindingConnectableWidgetConfig;
-  IconCmp?: () => JSX.Element;
-  ThumbnailCmp?: () => JSX.Element;
+  IconCmp?: (props: SVGProps<SVGSVGElement>) => JSX.Element;
+  ThumbnailCmp?: (props: SVGProps<SVGSVGElement>) => JSX.Element;
 }
 
 type GetEditorCallouts = (props: WidgetProps) => WidgetCallout[];
@@ -208,6 +209,10 @@ export enum BlueprintOperationTypes {
   UPDATE_CREATE_PARAMS_BEFORE_ADD = "UPDATE_CREATE_PARAMS_BEFORE_ADD",
 }
 
+export enum BlueprintOperationActionTypes {
+  CREATE_OR_UPDATE_DATASOURCE_WITH_ACTION = "CREATE_OR_UPDATE_DATASOURCE_WITH_ACTION",
+}
+
 export type FlattenedWidgetProps = WidgetProps & {
   children?: string[];
 };
diff --git a/app/client/src/actions/apiPaneActions.ts b/app/client/src/actions/apiPaneActions.ts
deleted file mode 100644
index 30c2ee877516..000000000000
--- a/app/client/src/actions/apiPaneActions.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
-import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
-import type { EventLocation } from "ee/utils/analyticsUtilTypes";
-import type { SlashCommandPayload } from "entities/Action";
-import type { ApiPaneDebuggerState } from "ee/reducers/uiReducers/apiPaneReducer";
-
-export const changeApi = (
-  id: string,
-  isSaas: boolean,
-  newApi?: boolean,
-): ReduxAction<{ id: string; isSaas: boolean; newApi?: boolean }> => {
-  return {
-    type: ReduxActionTypes.API_PANE_CHANGE_API,
-    payload: { id, isSaas, newApi },
-  };
-};
-
-export const createNewApiAction = (
-  pageId: string,
-  from: EventLocation,
-  apiType?: string,
-): ReduxAction<{ pageId: string; from: EventLocation; apiType?: string }> => ({
-  type: ReduxActionTypes.CREATE_NEW_API_ACTION,
-  payload: { pageId, from, apiType },
-});
-
-export const createNewQueryAction = (
-  pageId: string,
-  from: EventLocation,
-  datasourceId: string,
-  queryDefaultTableName?: string,
-): ReduxAction<{
-  pageId: string;
-  from: EventLocation;
-  datasourceId: string;
-  queryDefaultTableName?: string;
-}> => ({
-  type: ReduxActionTypes.CREATE_NEW_QUERY_ACTION,
-  payload: { pageId, from, datasourceId, queryDefaultTableName },
-});
-
-export const updateBodyContentType = (
-  title: string,
-  apiId: string,
-): ReduxAction<{ title: string; apiId: string }> => ({
-  type: ReduxActionTypes.UPDATE_API_ACTION_BODY_CONTENT_TYPE,
-  payload: { title, apiId },
-});
-
-export const executeCommandAction = (payload: SlashCommandPayload) => ({
-  type: ReduxActionTypes.EXECUTE_COMMAND,
-  payload: payload,
-});
-
-export const setApiPaneConfigSelectedTabIndex: (
-  payload: number,
-) => ReduxAction<{ selectedTabIndex: number }> = (payload: number) => ({
-  type: ReduxActionTypes.SET_API_PANE_CONFIG_SELECTED_TAB,
-  payload: { selectedTabIndex: payload },
-});
-
-export const setApiPaneDebuggerState = (
-  payload: Partial<ApiPaneDebuggerState>,
-) => ({
-  type: ReduxActionTypes.SET_API_PANE_DEBUGGER_STATE,
-  payload,
-});
diff --git a/app/client/src/actions/datasourceActions.ts b/app/client/src/actions/datasourceActions.ts
index 250b6cc5b874..965f37bee77c 100644
--- a/app/client/src/actions/datasourceActions.ts
+++ b/app/client/src/actions/datasourceActions.ts
@@ -32,9 +32,10 @@ export const createDatasourceFromForm = (
   };
 };
 
-export const createTempDatasourceFromForm = (
-  payload: CreateDatasourceConfig | Datasource,
-) => {
+export const createTempDatasourceFromForm = (payload: {
+  pluginId: string;
+  type: PluginType;
+}) => {
   return {
     type: ReduxActionTypes.CREATE_TEMP_DATASOURCE_FROM_FORM_SUCCESS,
     payload,
diff --git a/app/client/src/actions/ideActions.ts b/app/client/src/actions/ideActions.ts
index 04f91ea23f0f..fbdf13b00c37 100644
--- a/app/client/src/actions/ideActions.ts
+++ b/app/client/src/actions/ideActions.ts
@@ -54,3 +54,17 @@ export const recordAnalyticsForSideBySideNavigation = () => ({
 export const resetAnalyticsForSideBySideHover = () => ({
   type: ReduxActionTypes.RESET_ANALYTICS_FOR_SIDE_BY_SIDE_HOVER,
 });
+
+export const setListViewActiveState = (payload: boolean) => {
+  return {
+    type: ReduxActionTypes.SET_IS_LIST_VIEW_ACTIVE,
+    payload,
+  };
+};
+
+export const setRenameEntity = (id: string) => {
+  return {
+    type: ReduxActionTypes.SET_RENAME_ENTITY,
+    payload: id,
+  };
+};
diff --git a/app/client/src/actions/pageActions.tsx b/app/client/src/actions/pageActions.tsx
index 51a10762d293..22cfe873e309 100644
--- a/app/client/src/actions/pageActions.tsx
+++ b/app/client/src/actions/pageActions.tsx
@@ -68,25 +68,23 @@ export const fetchPageAction = (
 export interface FetchPublishedPageActionPayload {
   pageId: string;
   bustCache?: boolean;
-  firstLoad?: boolean;
   pageWithMigratedDsl?: FetchPageResponse;
 }
 
 export interface FetchPublishedPageResourcesPayload {
   pageId: string;
+  basePageId: string;
 }
 
 export const fetchPublishedPageAction = (
   pageId: string,
   bustCache = false,
-  firstLoad = false,
   pageWithMigratedDsl?: FetchPageResponse,
 ): ReduxAction<FetchPublishedPageActionPayload> => ({
   type: ReduxActionTypes.FETCH_PUBLISHED_PAGE_INIT,
   payload: {
     pageId,
     bustCache,
-    firstLoad,
     pageWithMigratedDsl,
   },
 });
@@ -299,12 +297,14 @@ export const clonePageSuccess = ({
 
 // Fetches resources required for published page, currently only used for fetching actions
 // In future we can reuse this for fetching other page level resources in published mode
-export const fetchPublishedPageResourcesAction = (
-  pageId: string,
-): ReduxAction<FetchPublishedPageResourcesPayload> => ({
+export const fetchPublishedPageResources = ({
+  basePageId,
+  pageId,
+}: FetchPublishedPageResourcesPayload): ReduxAction<FetchPublishedPageResourcesPayload> => ({
   type: ReduxActionTypes.FETCH_PUBLISHED_PAGE_RESOURCES_INIT,
   payload: {
     pageId,
+    basePageId,
   },
 });
 
@@ -675,21 +675,18 @@ export const setupPageAction = (
 export interface SetupPublishedPageActionPayload {
   pageId: string;
   bustCache: boolean;
-  firstLoad: boolean;
   pageWithMigratedDsl?: FetchPageResponse;
 }
 
 export const setupPublishedPage = (
   pageId: string,
   bustCache = false,
-  firstLoad = false,
   pageWithMigratedDsl?: FetchPageResponse,
 ): ReduxAction<SetupPublishedPageActionPayload> => ({
   type: ReduxActionTypes.SETUP_PUBLISHED_PAGE_INIT,
   payload: {
     pageId,
     bustCache,
-    firstLoad,
     pageWithMigratedDsl,
   },
 });
diff --git a/app/client/src/actions/pluginActionActions.ts b/app/client/src/actions/pluginActionActions.ts
index 81a0edf9d06e..461a29d51722 100644
--- a/app/client/src/actions/pluginActionActions.ts
+++ b/app/client/src/actions/pluginActionActions.ts
@@ -7,7 +7,11 @@ import {
   ReduxActionTypes,
 } from "ee/constants/ReduxActionConstants";
 import type { JSUpdate } from "utils/JSPaneUtils";
-import type { Action, ActionViewMode } from "entities/Action";
+import type {
+  Action,
+  ActionViewMode,
+  SlashCommandPayload,
+} from "entities/Action";
 import { ActionExecutionContext } from "entities/Action";
 import { batchAction } from "actions/batchActions";
 import type { ExecuteErrorPayload } from "constants/AppsmithActionConstants/ActionConstants";
@@ -16,6 +20,8 @@ import type { OtlpSpan } from "UITelemetry/generateTraces";
 import type { ApiResponse } from "api/ApiResponses";
 import type { JSCollection } from "entities/JSCollection";
 import type { ErrorActionPayload } from "sagas/ErrorSagas";
+import type { EventLocation } from "ee/utils/analyticsUtilTypes";
+import type { GenerateDestinationIdInfoReturnType } from "ee/sagas/helpers";
 
 export const createActionRequest = (payload: Partial<Action>) => {
   return {
@@ -220,7 +226,7 @@ export const moveActionError = (
 
 export const copyActionRequest = (payload: {
   id: string;
-  destinationPageId: string;
+  destinationEntityId: string;
   name: string;
 }) => {
   return {
@@ -239,7 +245,7 @@ export const copyActionSuccess = (payload: Action) => {
 export const copyActionError = (
   payload: {
     id: string;
-    destinationPageId: string;
+    destinationEntityIdInfo: GenerateDestinationIdInfoReturnType;
   } & ErrorActionPayload,
 ) => {
   return {
@@ -428,13 +434,31 @@ export const closeQueryActionTabSuccess = (payload: {
   };
 };
 
-export default {
-  createAction: createActionRequest,
-  fetchActions,
-  runAction: runAction,
-  deleteAction,
-  deleteActionSuccess,
-  updateAction,
-  updateActionSuccess,
-  bindDataOnCanvas,
-};
+export const createNewApiAction = (
+  pageId: string,
+  from: EventLocation,
+  apiType?: string,
+): ReduxAction<{ pageId: string; from: EventLocation; apiType?: string }> => ({
+  type: ReduxActionTypes.CREATE_NEW_API_ACTION,
+  payload: { pageId, from, apiType },
+});
+
+export const createNewQueryAction = (
+  pageId: string,
+  from: EventLocation,
+  datasourceId: string,
+  queryDefaultTableName?: string,
+): ReduxAction<{
+  pageId: string;
+  from: EventLocation;
+  datasourceId: string;
+  queryDefaultTableName?: string;
+}> => ({
+  type: ReduxActionTypes.CREATE_NEW_QUERY_ACTION,
+  payload: { pageId, from, datasourceId, queryDefaultTableName },
+});
+
+export const executeCommandAction = (payload: SlashCommandPayload) => ({
+  type: ReduxActionTypes.EXECUTE_COMMAND,
+  payload: payload,
+});
diff --git a/app/client/src/actions/queryPaneActions.ts b/app/client/src/actions/queryPaneActions.ts
deleted file mode 100644
index 67a2b88f1c0f..000000000000
--- a/app/client/src/actions/queryPaneActions.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
-import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
-import type { Action } from "entities/Action";
-import type { QueryPaneDebuggerState } from "ee/reducers/uiReducers/queryPaneReducer";
-
-export interface ChangeQueryPayload {
-  baseQueryId: string;
-  packageId?: string;
-  applicationId?: string;
-  basePageId?: string;
-  moduleId?: string;
-  workflowId?: string;
-  newQuery?: boolean;
-  action?: Action;
-}
-
-export const changeQuery = (payload: ChangeQueryPayload) => {
-  return {
-    type: ReduxActionTypes.QUERY_PANE_CHANGE,
-    payload,
-  };
-};
-
-export const setQueryPaneConfigSelectedTabIndex: (
-  payload: string,
-) => ReduxAction<{ selectedTabIndex: string }> = (payload: string) => ({
-  type: ReduxActionTypes.SET_QUERY_PANE_CONFIG_SELECTED_TAB,
-  payload: { selectedTabIndex: payload },
-});
-
-export const setQueryPaneDebuggerState = (
-  payload: Partial<QueryPaneDebuggerState>,
-) => {
-  return {
-    type: ReduxActionTypes.SET_QUERY_PANE_DEBUGGER_STATE,
-    payload,
-  };
-};
diff --git a/app/client/src/api/ActionAPI.tsx b/app/client/src/api/ActionAPI.tsx
index 94e9fb5d9f6a..d0957fb7336b 100644
--- a/app/client/src/api/ActionAPI.tsx
+++ b/app/client/src/api/ActionAPI.tsx
@@ -8,8 +8,6 @@ import axios from "axios";
 import type { Action, ActionViewMode } from "entities/Action";
 import type { APIRequest } from "constants/AppsmithActionConstants/ActionConstants";
 import type { WidgetType } from "constants/WidgetConstants";
-import type { OtlpSpan } from "UITelemetry/generateTraces";
-import { wrapFnWithParentTraceContext } from "UITelemetry/generateTraces";
 import type { ActionParentEntityTypeInterface } from "ee/entities/Engine/actionHelpers";
 
 export interface Property {
@@ -233,17 +231,10 @@ class ActionAPI extends API {
   static async executeAction(
     executeAction: FormData,
     timeout?: number,
-    parentSpan?: OtlpSpan,
   ): Promise<AxiosPromise<ActionExecutionResponse>> {
     ActionAPI.abortActionExecutionTokenSource = axios.CancelToken.source();
 
-    if (!parentSpan) {
-      return this.executeApiCall(executeAction, timeout);
-    }
-
-    return wrapFnWithParentTraceContext(parentSpan, async () => {
-      return await this.executeApiCall(executeAction, timeout);
-    });
+    return await this.executeApiCall(executeAction, timeout);
   }
 
   static async moveAction(moveRequest: MoveActionRequest) {
diff --git a/app/client/src/api/Api.ts b/app/client/src/api/Api.ts
index 1eff364c4d04..e724fdac1830 100644
--- a/app/client/src/api/Api.ts
+++ b/app/client/src/api/Api.ts
@@ -7,6 +7,7 @@ import {
 } from "./interceptors";
 import { REQUEST_TIMEOUT_MS } from "ee/constants/ApiConstants";
 import { convertObjectToQueryParams } from "utils/URLUtils";
+import { startAndEndSpanForFn } from "UITelemetry/generateTraces";
 
 export const apiRequestConfig = {
   baseURL: "/api/",
@@ -19,6 +20,30 @@ export const apiRequestConfig = {
 
 const axiosInstance: AxiosInstance = axios.create();
 
+axiosInstance.defaults.transformResponse = [
+  function (...args) {
+    const transformResponseAr = axios.defaults.transformResponse;
+
+    // Pick up the transformFn from axios defaults and wrap it in with telemetry code so that we can capture how long it takes parse an api response
+    if (Array.isArray(transformResponseAr) && transformResponseAr?.[0]) {
+      const transfromFn = transformResponseAr?.[0];
+      const resp = startAndEndSpanForFn(
+        "axios.transformApiResponse",
+        { url: this.url },
+        () => transfromFn.call(this, ...args),
+      );
+
+      return resp;
+    } else {
+      // eslint-disable-next-line no-console
+      console.error("could not find the api transformerFn");
+
+      // return the data as it is.
+      return args[0];
+    }
+  },
+];
+
 axiosInstance.interceptors.request.use(apiRequestInterceptor);
 
 axiosInstance.interceptors.response.use(
diff --git a/app/client/src/api/PageApi.tsx b/app/client/src/api/PageApi.tsx
index 11b9a9143248..9071a854e567 100644
--- a/app/client/src/api/PageApi.tsx
+++ b/app/client/src/api/PageApi.tsx
@@ -47,6 +47,8 @@ export interface PageLayoutsRequest {
 }
 
 export interface FetchPageResponseData {
+  isDefault?: boolean;
+  isHidden?: boolean;
   id: string;
   baseId: string;
   name: string;
diff --git a/app/client/src/api/PluginApi.ts b/app/client/src/api/PluginApi.ts
index ef8987b4208f..5bcc33486109 100644
--- a/app/client/src/api/PluginApi.ts
+++ b/app/client/src/api/PluginApi.ts
@@ -13,6 +13,7 @@ export enum UIComponentTypes {
   UQIDbEditorForm = "UQIDbEditorForm",
   ApiEditorForm = "ApiEditorForm",
   JsEditorForm = "JsEditorForm",
+  GraphQLEditorForm = "GraphQLEditorForm",
 }
 
 export enum DatasourceComponentTypes {
diff --git a/app/client/src/api/helpers/validateJsonResponseMeta.ts b/app/client/src/api/helpers/validateJsonResponseMeta.ts
index de295660abdb..084e9b23f3b2 100644
--- a/app/client/src/api/helpers/validateJsonResponseMeta.ts
+++ b/app/client/src/api/helpers/validateJsonResponseMeta.ts
@@ -1,6 +1,6 @@
 import * as Sentry from "@sentry/react";
 import type { AxiosResponse } from "axios";
-import { CONTENT_TYPE_HEADER_KEY } from "constants/ApiEditorConstants/CommonApiConstants";
+import { CONTENT_TYPE_HEADER_KEY } from "PluginActionEditor/constants/CommonApiConstants";
 
 export const validateJsonResponseMeta = (response: AxiosResponse) => {
   if (
diff --git a/app/client/src/assets/icons/menu/js-function.svg b/app/client/src/assets/icons/menu/js-function.svg
index 765ab10a37c7..af593b9ea104 100644
--- a/app/client/src/assets/icons/menu/js-function.svg
+++ b/app/client/src/assets/icons/menu/js-function.svg
@@ -1 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" fill="none" viewBox="0 0 12 12"><path fill="#858282" d="M0 11.6667V10.8227H1.21754C1.6746 10.8227 2.02923 10.6977 2.2814 10.4476C2.53358 10.1976 2.65967 9.84591 2.65967 9.39267V4.65714H0.744707V3.81319H2.65967V2.58242C2.65967 2.0823 2.81334 1.69548 3.12067 1.42198C3.42801 1.14066 3.8575 1 4.40914 1H6.28863V1.83223H4.40914C3.87326 1.83223 3.60533 2.0862 3.60533 2.59414V3.81319H6.28863V4.65714H3.60533V9.42784C3.60533 10.1077 3.38861 10.6508 2.95518 11.0571C2.52176 11.4635 1.94254 11.6667 1.21754 11.6667H0Z"/><path fill="#858282" d="M6.32604 9.55678L8.59563 6.23956L6.46789 3.10989H7.57904L8.90297 5.19634C8.98965 5.337 9.08028 5.5011 9.17484 5.68864C9.26941 5.5011 9.36003 5.337 9.44672 5.19634L10.7706 3.10989H11.87L9.74224 6.25128L12 9.55678H10.8888L9.47036 7.35311C9.38368 7.21245 9.28517 7.03272 9.17484 6.81392L8.85568 7.35311L7.42537 9.55678H6.32604Z"/></svg>
\ No newline at end of file
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.14645 6.14645C8.34171 5.95118 8.65829 5.95118 8.85355 6.14645L10.5 7.79289L12.1464 6.14645C12.3417 5.95118 12.6583 5.95118 12.8536 6.14645C13.0488 6.34171 13.0488 6.65829 12.8536 6.85355L11.2071 8.5L12.8536 10.1464C13.0488 10.3417 13.0488 10.6583 12.8536 10.8536C12.6583 11.0488 12.3417 11.0488 12.1464 10.8536L10.5 9.20711L8.85355 10.8536C8.65829 11.0488 8.34171 11.0488 8.14645 10.8536C7.95118 10.6583 7.95118 10.3417 8.14645 10.1464L9.79289 8.5L8.14645 6.85355C7.95118 6.65829 7.95118 6.34171 8.14645 6.14645Z" fill="currentColor"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.5 3C7.11929 3 6 4.11929 6 5.5V9.5C6 11.433 4.433 13 2.5 13H1.5C1.22386 13 1 12.7761 1 12.5C1 12.2239 1.22386 12 1.5 12H2.5C3.88071 12 5 10.8807 5 9.5V5.5C5 3.567 6.567 2 8.5 2C8.77614 2 9 2.22386 9 2.5C9 2.77614 8.77614 3 8.5 3Z" fill="currentColor"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2 6.5C2 6.22386 2.22386 6 2.5 6H8.5C8.77614 6 9 6.22386 9 6.5C9 6.77614 8.77614 7 8.5 7H2.5C2.22386 7 2 6.77614 2 6.5Z" fill="currentColor"/>
+</svg>
diff --git a/app/client/src/ce/PluginActionEditor/components/PluginActionResponse/hooks/usePluginActionResponseTabs.tsx b/app/client/src/ce/PluginActionEditor/components/PluginActionResponse/hooks/usePluginActionResponseTabs.tsx
index 8e44395d5a03..0b44436bf908 100644
--- a/app/client/src/ce/PluginActionEditor/components/PluginActionResponse/hooks/usePluginActionResponseTabs.tsx
+++ b/app/client/src/ce/PluginActionEditor/components/PluginActionResponse/hooks/usePluginActionResponseTabs.tsx
@@ -4,7 +4,7 @@ import type { BottomTab } from "components/editorComponents/EntityBottomTabs";
 import { getIDEViewMode } from "selectors/ideSelectors";
 import { useSelector } from "react-redux";
 import { EditorViewMode } from "ee/entities/IDE/constants";
-import { DEBUGGER_TAB_KEYS } from "components/editorComponents/Debugger/helpers";
+import { DEBUGGER_TAB_KEYS } from "components/editorComponents/Debugger/constants";
 import {
   createMessage,
   DEBUGGER_ERRORS,
@@ -17,39 +17,52 @@ import DebuggerLogs from "components/editorComponents/Debugger/DebuggerLogs";
 import { PluginType } from "entities/Action";
 import { ApiResponse } from "PluginActionEditor/components/PluginActionResponse/components/ApiResponse";
 import { ApiResponseHeaders } from "PluginActionEditor/components/PluginActionResponse/components/ApiResponseHeaders";
-import { noop } from "lodash";
 import { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig";
 import { getErrorCount } from "selectors/debuggerSelectors";
-import { getApiPaneDebuggerState } from "selectors/apiPaneSelectors";
+import {
+  getPluginActionDebuggerState,
+  isActionRunning,
+} from "PluginActionEditor/store";
+import { doesPluginRequireDatasource } from "ee/entities/Engine/actionHelpers";
+import useShowSchema from "PluginActionEditor/components/PluginActionResponse/hooks/useShowSchema";
+import Schema from "PluginActionEditor/components/PluginActionResponse/components/Schema";
+import QueryResponseTab from "PluginActionEditor/components/PluginActionResponse/components/QueryResponseTab";
+import type { SourceEntity } from "entities/AppsmithConsole";
+import { ENTITY_TYPE as SOURCE_ENTITY_TYPE } from "ee/entities/AppsmithConsole/utils";
+import {
+  useBlockExecution,
+  useHandleRunClick,
+  useAnalyticsOnRunClick,
+} from "PluginActionEditor/hooks";
+import useDebuggerTriggerClick from "components/editorComponents/Debugger/hooks/useDebuggerTriggerClick";
 
 function usePluginActionResponseTabs() {
-  const { action, actionResponse, plugin } = usePluginActionContext();
+  const { action, actionResponse, datasource, plugin } =
+    usePluginActionContext();
+  const { handleRunClick } = useHandleRunClick();
+  const { callRunActionAnalytics } = useAnalyticsOnRunClick();
 
   const IDEViewMode = useSelector(getIDEViewMode);
   const errorCount = useSelector(getErrorCount);
+  const pluginRequireDatasource = doesPluginRequireDatasource(plugin);
+
+  const showSchema = useShowSchema(plugin.id) && pluginRequireDatasource;
 
-  const { responseTabHeight } = useSelector(getApiPaneDebuggerState);
+  const { responseTabHeight } = useSelector(getPluginActionDebuggerState);
+
+  const onDebugClick = useDebuggerTriggerClick();
+  const isRunning = useSelector(isActionRunning(action.id));
+  const blockExecution = useBlockExecution();
 
   const tabs: BottomTab[] = [];
 
-  if (IDEViewMode === EditorViewMode.FullScreen) {
-    tabs.push(
-      {
-        key: DEBUGGER_TAB_KEYS.ERROR_TAB,
-        title: createMessage(DEBUGGER_ERRORS),
-        count: errorCount,
-        panelComponent: <ErrorLogs />,
-      },
-      {
-        key: DEBUGGER_TAB_KEYS.LOGS_TAB,
-        title: createMessage(DEBUGGER_LOGS),
-        panelComponent: <DebuggerLogs searchQuery={action.name} />,
-      },
-    );
-  }
+  const onRunClick = () => {
+    callRunActionAnalytics();
+    handleRunClick();
+  };
 
   if (plugin.type === PluginType.API) {
-    return tabs.concat([
+    tabs.push(
       {
         key: DEBUGGER_TAB_KEYS.RESPONSE_TAB,
         title: createMessage(DEBUGGER_RESPONSE),
@@ -57,9 +70,9 @@ function usePluginActionResponseTabs() {
           <ApiResponse
             action={action}
             actionResponse={actionResponse}
-            isRunDisabled={false}
-            isRunning={false}
-            onRunClick={noop}
+            isRunDisabled={blockExecution}
+            isRunning={isRunning}
+            onRunClick={onRunClick}
             responseTabHeight={responseTabHeight}
             theme={EditorTheme.LIGHT}
           />
@@ -71,14 +84,76 @@ function usePluginActionResponseTabs() {
         panelComponent: (
           <ApiResponseHeaders
             actionResponse={actionResponse}
-            isRunDisabled={false}
-            isRunning={false}
-            onDebugClick={noop}
-            onRunClick={noop}
+            isRunDisabled={blockExecution}
+            isRunning={isRunning}
+            onDebugClick={onDebugClick}
+            onRunClick={onRunClick}
+          />
+        ),
+      },
+    );
+  }
+
+  if (
+    [
+      PluginType.DB,
+      PluginType.AI,
+      PluginType.REMOTE,
+      PluginType.SAAS,
+      PluginType.INTERNAL,
+    ].includes(plugin.type)
+  ) {
+    const actionSource: SourceEntity = {
+      type: SOURCE_ENTITY_TYPE.ACTION,
+      name: action.name,
+      id: action.id,
+    };
+
+    if (showSchema) {
+      tabs.push({
+        key: DEBUGGER_TAB_KEYS.SCHEMA_TAB,
+        title: "Schema",
+        panelComponent: (
+          <Schema
+            currentActionId={action.id}
+            datasourceId={datasource?.id || ""}
+            datasourceName={datasource?.name || ""}
           />
         ),
+      });
+    }
+
+    tabs.push({
+      key: DEBUGGER_TAB_KEYS.RESPONSE_TAB,
+      title: createMessage(DEBUGGER_RESPONSE),
+      panelComponent: (
+        <QueryResponseTab
+          actionName={action.name}
+          actionSource={actionSource}
+          currentActionConfig={action}
+          isRunDisabled={blockExecution}
+          isRunning={isRunning}
+          onRunClick={onRunClick}
+          runErrorMessage={""} // TODO
+        />
+      ),
+    });
+  }
+
+  if (IDEViewMode === EditorViewMode.FullScreen) {
+    tabs.push(
+      {
+        key: DEBUGGER_TAB_KEYS.ERROR_TAB,
+        title: createMessage(DEBUGGER_ERRORS),
+        count: errorCount,
+        panelComponent: <ErrorLogs />,
       },
-    ]);
+      {
+        key: DEBUGGER_TAB_KEYS.LOGS_TAB,
+        title: createMessage(DEBUGGER_LOGS),
+        panelComponent: <DebuggerLogs searchQuery={action.name} />,
+      },
+    );
   }
 
   return tabs;
diff --git a/app/client/src/ce/PluginActionEditor/hooks/useAnalyticsOnRunClick.ts b/app/client/src/ce/PluginActionEditor/hooks/useAnalyticsOnRunClick.ts
new file mode 100644
index 000000000000..421b9ebcc63c
--- /dev/null
+++ b/app/client/src/ce/PluginActionEditor/hooks/useAnalyticsOnRunClick.ts
@@ -0,0 +1,33 @@
+import { useCallback } from "react";
+import { useSelector } from "react-redux";
+import { usePluginActionContext } from "PluginActionEditor/PluginActionContext";
+import { getPageNameByPageId } from "ee/selectors/entitiesSelector";
+import AnalyticsUtil from "ee/utils/AnalyticsUtil";
+
+function useAnalyticsOnRunClick() {
+  const { action, datasource, plugin } = usePluginActionContext();
+  const pageName = useSelector((state) =>
+    getPageNameByPageId(state, action.pageId),
+  );
+
+  const actionId = action.id;
+  const actionName = action.name;
+  const datasourceId = datasource?.id;
+  const pluginName = plugin.name;
+  const isMock = !!datasource?.isMock || false; // as mock db exists only for postgres and mongo plugins
+
+  const callRunActionAnalytics = useCallback(() => {
+    AnalyticsUtil.logEvent("RUN_ACTION_CLICK", {
+      actionId,
+      actionName,
+      datasourceId,
+      pageName,
+      pluginName,
+      isMock,
+    });
+  }, [actionId, actionName, datasourceId, pageName, pluginName, isMock]);
+
+  return { callRunActionAnalytics };
+}
+
+export { useAnalyticsOnRunClick };
diff --git a/app/client/src/ce/PluginActionEditor/hooks/useBlockExecution.ts b/app/client/src/ce/PluginActionEditor/hooks/useBlockExecution.ts
new file mode 100644
index 000000000000..a2acdd1f5594
--- /dev/null
+++ b/app/client/src/ce/PluginActionEditor/hooks/useBlockExecution.ts
@@ -0,0 +1,63 @@
+import { getHasExecuteActionPermission } from "ee/utils/BusinessFeatures/permissionPageHelpers";
+import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
+import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
+import { DEFAULT_DATASOURCE_NAME } from "PluginActionEditor/constants/ApiEditorConstants";
+import { UIComponentTypes } from "api/PluginApi";
+import { SQL_DATASOURCES } from "constants/QueryEditorConstants";
+import { usePluginActionContext } from "PluginActionEditor/PluginActionContext";
+
+const useBlockExecution = () => {
+  const { action, plugin } = usePluginActionContext();
+  const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
+  const isExecutePermitted = getHasExecuteActionPermission(
+    isFeatureEnabled,
+    action?.userPermissions,
+  );
+
+  let actionBody = "";
+  let blockExecution = false;
+
+  // API Editor Constants
+  // this gets the url of the current action's datasource
+  const actionDatasourceUrl =
+    action.datasource.datasourceConfiguration?.url || "";
+  const actionDatasourceUrlPath = action.actionConfiguration.path || "";
+  // this gets the name of the current action's datasource
+  const actionDatasourceName = action.datasource.name || "";
+
+  // Query Editor Constants
+  if (!!action.actionConfiguration) {
+    if ("formData" in action.actionConfiguration) {
+      // if the action has a formData (the action is postUQI e.g. Oracle)
+      actionBody = action.actionConfiguration.formData?.body?.data || "";
+    } else {
+      // if the action is pre UQI, the path is different e.g. mySQL
+      actionBody = action.actionConfiguration?.body || "";
+    }
+  }
+
+  if (
+    [
+      UIComponentTypes.ApiEditorForm,
+      UIComponentTypes.GraphQLEditorForm,
+    ].includes(plugin.uiComponent)
+  ) {
+    // if the url is empty and the action's datasource name is the default datasource name (this means the api does not have a datasource attached)
+    // or the user does not have permission,
+    // we block action execution.
+    blockExecution =
+      (!actionDatasourceUrl &&
+        !actionDatasourceUrlPath &&
+        actionDatasourceName === DEFAULT_DATASOURCE_NAME) ||
+      !isExecutePermitted;
+  } else {
+    // if (the body is empty and the action is an sql datasource) or the user does not have permission, block action execution.
+    blockExecution =
+      (!actionBody && SQL_DATASOURCES.includes(plugin.name)) ||
+      !isExecutePermitted;
+  }
+
+  return blockExecution;
+};
+
+export { useBlockExecution };
diff --git a/app/client/src/ce/PluginActionEditor/hooks/useHandleDeleteClick.ts b/app/client/src/ce/PluginActionEditor/hooks/useHandleDeleteClick.ts
new file mode 100644
index 000000000000..9742d722a9c5
--- /dev/null
+++ b/app/client/src/ce/PluginActionEditor/hooks/useHandleDeleteClick.ts
@@ -0,0 +1,26 @@
+import { deleteAction } from "actions/pluginActionActions";
+import { usePluginActionContext } from "PluginActionEditor/PluginActionContext";
+import { useCallback } from "react";
+import { useDispatch } from "react-redux";
+
+function useHandleDeleteClick() {
+  const { action } = usePluginActionContext();
+  const dispatch = useDispatch();
+
+  const handleDeleteClick = useCallback(
+    ({ onSuccess }: { onSuccess?: () => void }) => {
+      dispatch(
+        deleteAction({
+          id: action?.id ?? "",
+          name: action?.name ?? "",
+          onSuccess,
+        }),
+      );
+    },
+    [action.id, action.name, dispatch],
+  );
+
+  return { handleDeleteClick };
+}
+
+export { useHandleDeleteClick };
diff --git a/app/client/src/ce/PluginActionEditor/hooks/useHandleRunClick.ts b/app/client/src/ce/PluginActionEditor/hooks/useHandleRunClick.ts
new file mode 100644
index 000000000000..62d8075bcbda
--- /dev/null
+++ b/app/client/src/ce/PluginActionEditor/hooks/useHandleRunClick.ts
@@ -0,0 +1,21 @@
+import { useCallback } from "react";
+import { useDispatch } from "react-redux";
+import { runAction } from "actions/pluginActionActions";
+import type { PaginationField } from "api/ActionAPI";
+import { usePluginActionContext } from "PluginActionEditor/PluginActionContext";
+
+function useHandleRunClick() {
+  const { action } = usePluginActionContext();
+  const dispatch = useDispatch();
+
+  const handleRunClick = useCallback(
+    (paginationField?: PaginationField) => {
+      dispatch(runAction(action?.id ?? "", paginationField));
+    },
+    [action.id, dispatch],
+  );
+
+  return { handleRunClick };
+}
+
+export { useHandleRunClick };
diff --git a/app/client/src/ce/RouteBuilder.ts b/app/client/src/ce/RouteBuilder.ts
index 406c9b42ee38..b8df54bcd135 100644
--- a/app/client/src/ce/RouteBuilder.ts
+++ b/app/client/src/ce/RouteBuilder.ts
@@ -204,3 +204,12 @@ export const queryAddURL = (props: URLBuilderParams): string =>
     ...props,
     suffix: `queries/add`,
   });
+
+export const appLibrariesURL = (): string =>
+  urlBuilder.build({
+    suffix: "libraries",
+  });
+export const appPackagesURL = (): string =>
+  urlBuilder.build({
+    suffix: "packages",
+  });
diff --git a/app/client/src/ce/actions/helpers.ts b/app/client/src/ce/actions/helpers.ts
index 40611d888a8a..5c976888d3e9 100644
--- a/app/client/src/ce/actions/helpers.ts
+++ b/app/client/src/ce/actions/helpers.ts
@@ -1,14 +1,14 @@
 import type { EventLocation } from "ee/utils/analyticsUtilTypes";
-import {
-  createNewApiAction,
-  createNewQueryAction,
-} from "actions/apiPaneActions";
 import { createNewJSCollection } from "actions/jsPaneActions";
 import {
   ActionParentEntityType,
   type ActionParentEntityTypeInterface,
 } from "ee/entities/Engine/actionHelpers";
-import { saveActionName } from "actions/pluginActionActions";
+import {
+  createNewApiAction,
+  createNewQueryAction,
+  saveActionName,
+} from "actions/pluginActionActions";
 import { saveJSObjectName } from "actions/jsActionActions";
 
 export const createNewQueryBasedOnParentEntity = (
diff --git a/app/client/src/ce/api/UserApi.tsx b/app/client/src/ce/api/UserApi.tsx
index 82697968b445..c6a2e1f506c2 100644
--- a/app/client/src/ce/api/UserApi.tsx
+++ b/app/client/src/ce/api/UserApi.tsx
@@ -4,21 +4,6 @@ import type { ApiResponse } from "api/ApiResponses";
 import type { FeatureFlags } from "ee/entities/FeatureFlag";
 import type { ProductAlert } from "../../reducers/uiReducers/usersReducer";
 
-export interface LoginUserRequest {
-  email: string;
-  password: string;
-}
-
-export interface CreateUserRequest {
-  email: string;
-  password: string;
-}
-
-export type CreateUserResponse = ApiResponse & {
-  email: string;
-  id: string;
-};
-
 export interface ForgotPasswordRequest {
   email: string;
 }
@@ -34,14 +19,6 @@ export interface VerifyTokenRequest {
   token: string;
 }
 
-export type FetchUserResponse = ApiResponse & {
-  id: string;
-};
-
-export interface FetchUserRequest {
-  id: string;
-}
-
 export interface LeaveWorkspaceRequest {
   workspaceId: string;
 }
@@ -57,7 +34,6 @@ export interface UpdateUserRequest {
   name?: string;
   email?: string;
   proficiency?: string;
-  role?: string;
   useCase?: string;
   intercomConsentGiven?: boolean;
 }
@@ -70,19 +46,6 @@ export interface SendTestEmailPayload {
   password?: string;
 }
 
-export interface CreateSuperUserRequest {
-  email: string;
-  name: string;
-  source: "FORM";
-  state: "ACTIVATED";
-  isEnabled: boolean;
-  password: string;
-  role: "Developer";
-  companyName: string;
-  allowCollectingAnonymousData: boolean;
-  signupForNewsletter: boolean;
-}
-
 export class UserApi extends Api {
   static usersURL = "v1/users";
   static productAlertURL = "v1/product-alert/alert";
@@ -93,35 +56,21 @@ export class UserApi extends Api {
   static inviteUserURL = "v1/users/invite";
   static verifyInviteTokenURL = `${UserApi.inviteUserURL}/verify`;
   static confirmUserInviteURL = `${UserApi.inviteUserURL}/confirm`;
-  static addWorkspaceURL = `${UserApi.usersURL}/addWorkspace`;
   static leaveWorkspaceURL = `${UserApi.usersURL}/leaveWorkspace`;
   static logoutURL = "v1/logout";
   static currentUserURL = "v1/users/me";
   static photoURL = "v1/users/photo";
   static featureFlagsURL = "v1/users/features";
-  static superUserURL = "v1/users/super";
   static adminSettingsURL = "v1/admin/env";
   static restartServerURL = "v1/admin/restart";
   static sendTestEmailURL = "/v1/admin/send-test-email";
 
-  static async createUser(
-    request: CreateUserRequest,
-  ): Promise<AxiosPromise<CreateUserResponse>> {
-    return Api.post(UserApi.usersURL, request);
-  }
-
   static async updateUser(
     request: UpdateUserRequest,
   ): Promise<AxiosPromise<ApiResponse>> {
     return Api.put(UserApi.usersURL, request);
   }
 
-  static async fetchUser(
-    request: FetchUserRequest,
-  ): Promise<AxiosPromise<FetchUserResponse>> {
-    return Api.get(UserApi.usersURL + "/" + request.id);
-  }
-
   static async getCurrentUser(): Promise<AxiosPromise<ApiResponse>> {
     return Api.get(UserApi.currentUserURL);
   }
@@ -214,12 +163,6 @@ export class UserApi extends Api {
     return Api.get(UserApi.featureFlagsURL);
   }
 
-  static async createSuperUser(
-    request: CreateSuperUserRequest,
-  ): Promise<AxiosPromise<CreateUserResponse>> {
-    return Api.post(UserApi.superUserURL, request);
-  }
-
   /*
    * Super user endpoints
    */
diff --git a/app/client/src/ce/configs/index.ts b/app/client/src/ce/configs/index.ts
index 516cd1dea526..62cd798fb269 100644
--- a/app/client/src/ce/configs/index.ts
+++ b/app/client/src/ce/configs/index.ts
@@ -13,6 +13,10 @@ export interface INJECTED_CONFIGS {
     apiKey: string;
     ceKey: string;
   };
+  observability: {
+    deploymentName: string;
+    serviceInstanceId: string;
+  };
   newRelic: {
     enableNewRelic: boolean;
     accountId: string;
@@ -20,13 +24,15 @@ export interface INJECTED_CONFIGS {
     browserAgentlicenseKey: string;
     browserAgentEndpoint: string;
     otlpLicenseKey: string;
-    otlpServiceName: string;
     otlpEndpoint: string;
   };
   fusioncharts: {
     licenseKey: string;
   };
-  enableMixpanel: boolean;
+  mixpanel: {
+    enabled: boolean;
+    apiKey: string;
+  };
   cloudHosting: boolean;
   algolia: {
     apiId: string;
@@ -77,15 +83,22 @@ export const getConfigsFromEnvVars = (): INJECTED_CONFIGS => {
     fusioncharts: {
       licenseKey: process.env.REACT_APP_FUSIONCHARTS_LICENSE_KEY || "",
     },
-    enableMixpanel: process.env.REACT_APP_SEGMENT_KEY
-      ? process.env.REACT_APP_SEGMENT_KEY.length > 0
-      : false,
+    mixpanel: {
+      enabled: process.env.REACT_APP_SEGMENT_KEY
+        ? process.env.REACT_APP_SEGMENT_KEY.length > 0
+        : false,
+      apiKey: process.env.REACT_APP_MIXPANEL_KEY || "",
+    },
     algolia: {
       apiId: process.env.REACT_APP_ALGOLIA_API_ID || "",
       apiKey: process.env.REACT_APP_ALGOLIA_API_KEY || "",
       indexName: process.env.REACT_APP_ALGOLIA_SEARCH_INDEX_NAME || "",
       snippetIndex: process.env.REACT_APP_ALGOLIA_SNIPPET_INDEX_NAME || "",
     },
+    observability: {
+      deploymentName: process.env.APPSMITH_DEPLOYMENT_NAME || "self-hosted",
+      serviceInstanceId: process.env.HOSTNAME || "appsmith-0",
+    },
     newRelic: {
       enableNewRelic: !!process.env.APPSMITH_NEW_RELIC_ACCOUNT_ENABLE,
       accountId: process.env.APPSMITH_NEW_RELIC_ACCOUNT_ID || "",
@@ -96,8 +109,6 @@ export const getConfigsFromEnvVars = (): INJECTED_CONFIGS => {
         process.env.APPSMITH_NEW_RELIC_BROWSER_AGENT_ENDPOINT || "",
       otlpLicenseKey: process.env.APPSMITH_NEW_RELIC_OTLP_LICENSE_KEY || "",
       otlpEndpoint: process.env.APPSMITH_NEW_RELIC_OTEL_SERVICE_NAME || "",
-      otlpServiceName:
-        process.env.APPSMITH_NEW_RELIC_OTEL_EXPORTER_OTLP_ENDPOINT || "",
     },
     logLevel:
       (process.env.REACT_APP_CLIENT_LOG_LEVEL as
@@ -161,6 +172,18 @@ export const getAppsmithConfigs = (): AppsmithUIConfigs => {
     ENV_CONFIG.segment.apiKey,
     APPSMITH_FEATURE_CONFIGS?.segment.apiKey,
   );
+  const mixpanel = getConfig(
+    ENV_CONFIG.mixpanel.apiKey,
+    APPSMITH_FEATURE_CONFIGS?.mixpanel.apiKey,
+  );
+  const observabilityDeploymentName = getConfig(
+    ENV_CONFIG.observability.deploymentName,
+    APPSMITH_FEATURE_CONFIGS?.observability.deploymentName,
+  );
+  const observabilityServiceInstanceId = getConfig(
+    ENV_CONFIG.observability.serviceInstanceId,
+    APPSMITH_FEATURE_CONFIGS?.observability.serviceInstanceId,
+  );
   const newRelicAccountId = getConfig(
     ENV_CONFIG.newRelic.accountId,
     APPSMITH_FEATURE_CONFIGS?.newRelic.accountId,
@@ -181,11 +204,6 @@ export const getAppsmithConfigs = (): AppsmithUIConfigs => {
     ENV_CONFIG.newRelic.otlpLicenseKey,
     APPSMITH_FEATURE_CONFIGS?.newRelic.otlpLicenseKey,
   );
-
-  const newRelicOtlpServiceName = getConfig(
-    ENV_CONFIG.newRelic.otlpServiceName,
-    APPSMITH_FEATURE_CONFIGS?.newRelic.otlpServiceName,
-  );
   const newRelicOtlpEndpoint = getConfig(
     ENV_CONFIG.newRelic.otlpEndpoint,
     APPSMITH_FEATURE_CONFIGS?.newRelic.otlpEndpoint,
@@ -261,7 +279,11 @@ export const getAppsmithConfigs = (): AppsmithUIConfigs => {
       browserAgentEndpoint: newRelicBrowserAgentEndpoint.value,
       otlpLicenseKey: newRelicOtlpLicenseKey.value,
       otlpEndpoint: newRelicOtlpEndpoint.value,
-      otlpServiceName: newRelicOtlpServiceName.value,
+    },
+    observability: {
+      deploymentName: observabilityDeploymentName.value,
+      serviceInstanceId: observabilityServiceInstanceId.value,
+      serviceName: "appsmith-client",
     },
     fusioncharts: {
       enabled: fusioncharts.enabled,
@@ -278,10 +300,10 @@ export const getAppsmithConfigs = (): AppsmithUIConfigs => {
       enabled: googleRecaptchaSiteKey.enabled,
       apiKey: googleRecaptchaSiteKey.value,
     },
-    enableMixpanel:
-      ENV_CONFIG.enableMixpanel ||
-      APPSMITH_FEATURE_CONFIGS?.enableMixpanel ||
-      false,
+    mixpanel: {
+      enabled: segment.enabled,
+      apiKey: mixpanel.value,
+    },
     cloudHosting:
       ENV_CONFIG.cloudHosting ||
       APPSMITH_FEATURE_CONFIGS?.cloudHosting ||
diff --git a/app/client/src/ce/configs/types.ts b/app/client/src/ce/configs/types.ts
index 4f025925d7d1..0b1868d7fb8a 100644
--- a/app/client/src/ce/configs/types.ts
+++ b/app/client/src/ce/configs/types.ts
@@ -20,6 +20,11 @@ export interface AppsmithUIConfigs {
     enabled: boolean;
     id: string;
   };
+  observability: {
+    deploymentName: string;
+    serviceInstanceId: string;
+    serviceName: string;
+  };
   newRelic: {
     enableNewRelic: boolean;
     accountId: string;
@@ -27,7 +32,6 @@ export interface AppsmithUIConfigs {
     browserAgentlicenseKey: string;
     browserAgentEndpoint: string;
     otlpLicenseKey: string;
-    otlpServiceName: string;
     otlpEndpoint: string;
   };
   segment: {
@@ -47,7 +51,10 @@ export interface AppsmithUIConfigs {
     snippetIndex: string;
   };
 
-  enableMixpanel: boolean;
+  mixpanel: {
+    enabled: boolean;
+    apiKey: string;
+  };
 
   cloudHosting: boolean;
 
diff --git a/app/client/src/ce/constants/ReduxActionConstants.tsx b/app/client/src/ce/constants/ReduxActionConstants.tsx
index 133cf9a420e7..a4ef8ae1d025 100644
--- a/app/client/src/ce/constants/ReduxActionConstants.tsx
+++ b/app/client/src/ce/constants/ReduxActionConstants.tsx
@@ -349,8 +349,6 @@ const SnippingModeActionTypes = {
 };
 
 const UserAuthActionTypes = {
-  CREATE_USER_INIT: "CREATE_USER_INIT",
-  CREATE_USER_SUCCESS: "CREATE_USER_SUCCESS",
   RESET_USER_PASSWORD_INIT: "RESET_USER_PASSWORD_INIT",
   RESET_USER_PASSWORD_SUCCESS: "RESET_USER_PASSWORD_SUCCESS",
   FORGOT_PASSWORD_INIT: "FORGOT_PASSWORD_INIT",
@@ -370,7 +368,6 @@ const UserAuthActionTypes = {
   GET_OAUTH_ACCESS_TOKEN_SUCCESS: "GET_OAUTH_ACCESS_TOKEN_SUCCESS",
 };
 const UserAuthActionErrorTypes = {
-  CREATE_USER_ERROR: "CREATE_USER_ERROR",
   RESET_USER_PASSWORD_ERROR: "RESET_USER_PASSWORD_ERROR",
   FORGOT_PASSWORD_ERROR: "FORGOT_PASSWORD_ERROR",
   RESET_PASSWORD_VERIFY_TOKEN_ERROR: "RESET_PASSWORD_VERIFY_TOKEN_ERROR",
@@ -452,6 +449,8 @@ const IDEActionTypes = {
   REMOVE_FOCUS_HISTORY: "REMOVE_FOCUS_HISTORY",
   SET_FOCUSABLE_PROPERTY_FIELD: "SET_FOCUSABLE_PROPERTY_FIELD",
   ROUTE_CHANGED: "ROUTE_CHANGED",
+  SET_PLUGIN_ACTION_EDITOR_FORM_SELECTED_TAB:
+    "SET_PLUGIN_ACTION_EDITOR_FORM_SELECTED_TAB",
   SET_API_PANE_CONFIG_SELECTED_TAB: "SET_API_PANE_CONFIG_SELECTED_TAB",
   SET_EDITOR_FIELD_FOCUS: "SET_EDITOR_FIELD_FOCUS",
   SET_FOCUSABLE_INPUT_FIELD: "SET_FOCUSABLE_INPUT_FIELD",
@@ -496,6 +495,9 @@ const IDEActionTypes = {
   CLOSE_JS_ACTION_TAB_SUCCESS: "CLOSE_JS_ACTION_TAB_SUCCESS",
   CLOSE_QUERY_ACTION_TAB: "CLOSE_QUERY_ACTION_TAB",
   CLOSE_QUERY_ACTION_TAB_SUCCESS: "CLOSE_QUERY_ACTION_TAB_SUCCESS",
+  SET_IS_LIST_VIEW_ACTIVE: "SET_IS_LIST_VIEW_ACTIVE",
+  OPEN_PLUGIN_ACTION_SETTINGS: "OPEN_PLUGIN_ACTION_SETTINGS",
+  SET_RENAME_ENTITY: "SET_RENAME_ENTITY",
 };
 
 const IDEActionErrorTypes = {
@@ -710,6 +712,8 @@ const IDEDebuggerActionTypes = {
   SET_RESPONSE_PANE_SCROLL_POSITION: "SET_RESPONSE_PANE_SCROLL_POSITION",
   TOGGLE_EXPAND_ERROR_LOG_ITEM: "TOGGLE_EXPAND_ERROR_LOG_ITEM",
   NAVIGATE_TO_ENTITY: "NAVIGATE_TO_ENTITY",
+  SET_PLUGIN_ACTION_EDITOR_DEBUGGER_STATE:
+    "SET_PLUGIN_ACTION_EDITOR_DEBUGGER_STATE",
   SET_QUERY_PANE_DEBUGGER_STATE: "SET_QUERY_PANE_DEBUGGER_STATE",
   SET_API_PANE_DEBUGGER_STATE: "SET_API_PANE_DEBUGGER_STATE",
   SET_JS_PANE_DEBUGGER_STATE: "SET_JS_PANE_DEBUGGER_STATE",
@@ -980,6 +984,8 @@ const AppViewActionTypes = {
   SET_APP_VIEWER_HEADER_HEIGHT: "SET_APP_VIEWER_HEADER_HEIGHT",
   SET_APP_SIDEBAR_PINNED: "SET_APP_SIDEBAR_PINNED",
   FETCH_PUBLISHED_PAGE_RESOURCES_INIT: "FETCH_PUBLISHED_PAGE_RESOURCES_INIT",
+  FETCH_PUBLISHED_PAGE_RESOURCES_SUCCESS:
+    "FETCH_PUBLISHED_PAGE_RESOURCES_SUCCESS",
 };
 
 const AppViewActionErrorTypes = {
diff --git a/app/client/src/ce/constants/messages.ts b/app/client/src/ce/constants/messages.ts
index b9ca94d7ffda..b5a102028ede 100644
--- a/app/client/src/ce/constants/messages.ts
+++ b/app/client/src/ce/constants/messages.ts
@@ -247,6 +247,7 @@ export const FORK_APP = () => `Fork app`;
 export const SIGN_IN = () => `Sign in`;
 export const SHARE_APP = () => `Share app`;
 export const ALL_APPS = () => `All apps`;
+export const KNOW_MORE = () => "Know more";
 
 export const EDITOR_HEADER = {
   saving: () => "Saving",
@@ -336,7 +337,7 @@ export const ACTION_MOVE_SUCCESS = (actionName: string, pageName: string) =>
 export const ERROR_ACTION_MOVE_FAIL = (actionName: string) =>
   `Error while moving action ${actionName}`;
 export const ACTION_COPY_SUCCESS = (actionName: string, pageName: string) =>
-  `${actionName} action copied to page ${pageName} successfully`;
+  `${actionName} action copied ${pageName.length > 0 ? "to page " + pageName : ""} successfully`;
 export const ERROR_ACTION_COPY_FAIL = (actionName: string) =>
   `Error while copying action ${actionName}`;
 export const ERROR_ACTION_RENAME_FAIL = (actionName: string) =>
@@ -353,7 +354,7 @@ export const ENTITY_EXPLORER_ACTION_NAME_CONFLICT_ERROR = (name: string) =>
 
 export const ACTION_ID_NOT_FOUND_IN_URL =
   "No correct API id or Query id found in the url.";
-export const JSOBJECT_ID_NOT_FOUND_IN_URL =
+export const JS_OBJECT_ID_NOT_FOUND_IN_URL =
   "No correct JS Object id found in the url.";
 
 export const DATASOURCE_CREATE = (dsName: string) =>
@@ -365,7 +366,9 @@ export const DATASOURCE_UPDATE = (dsName: string) =>
 export const DATASOURCE_VALID = (dsName: string) =>
   `${dsName} datasource is valid`;
 export const EDIT_DATASOURCE = () => "Edit";
-export const SAVE_DATASOURCE = () => "Save";
+export const SAVE_DATASOURCE = () => "Save URL";
+export const EDIT_DATASOURCE_TOOLTIP = () => "Edit datasource";
+export const SAVE_DATASOURCE_TOOLTIP = () => "Save URL as a datasource";
 export const SAVE_DATASOURCE_MESSAGE = () =>
   "Save the URL as a datasource to access authentication settings";
 export const EDIT_DATASOURCE_MESSAGE = () =>
@@ -644,6 +647,7 @@ export const NO_JS_FUNCTION_TO_RUN = (JSObjectName: string) =>
   `${JSObjectName} has no function`;
 export const NO_JS_FUNCTION_RETURN_VALUE = (JSFunctionName: string) =>
   `${JSFunctionName} did not return any data. Did you add a return statement?`;
+export const MORE_ON_QUERY_SETTINGS = () => "More on query settings";
 
 export const REMOVE_CONFIRM_BEFORE_CALLING_HEADING = () =>
   `Remove 'Confirm before calling' `;
@@ -793,7 +797,8 @@ export const EMPTY_ACTIVE_DATA_SOURCES = () => "No active datasources found.";
 
 // Datasource structure
 
-export const SCHEMA_NOT_AVAILABLE = () => "Schema not available";
+export const SCHEMA_NOT_AVAILABLE = () =>
+  "We can't show schema for this datasource";
 export const TABLE_NOT_FOUND = () => "Table not found.";
 export const DATASOURCE_STRUCTURE_INPUT_PLACEHOLDER_TEXT = (name: string) =>
   `Tables in ${name}`;
@@ -1730,6 +1735,7 @@ export const CONTEXT_RENAME = () => "Rename";
 export const CONTEXT_SHOW_BINDING = () => "Show bindings";
 export const CONTEXT_MOVE = () => "Move to page";
 export const CONTEXT_COPY = () => "Copy to page";
+export const CONTEXT_DUPLICATE = () => "Duplicate";
 export const CONTEXT_DELETE = () => "Delete";
 export const CONFIRM_CONTEXT_DELETE = () => "Are you sure?";
 export const CONFIRM_CONTEXT_DELETING = () => "Deleting";
@@ -2508,6 +2514,18 @@ export const FIELD_REQUIRED_MESSAGE = () => `This field is required`;
 
 export const PREPARED_STATEMENT_WARNING = {
   MESSAGE: () =>
-    "Prepared Statements are currently enabled, which may be causing the query error. Turn them off and try running the query again",
+    "Prepared statements are currently enabled, which may be causing the query error. Turn them off and try running the query again",
   LINK: () => "Open settings",
 };
+
+export const JS_EDITOR_SETTINGS = {
+  TITLE: () => "Settings",
+  ON_LOAD_TITLE: () => "Choose the functions to run on page load",
+};
+
+export const CUSTOM_WIDGET_BUILDER_TAB_TITLE = {
+  AI: () => "AI",
+  HTML: () => "HTML",
+  STYLE: () => "Style",
+  JS: () => "Javascript",
+};
diff --git a/app/client/src/ce/constants/routes/appRoutes.ts b/app/client/src/ce/constants/routes/appRoutes.ts
index 949360d6e944..8031209435be 100644
--- a/app/client/src/ce/constants/routes/appRoutes.ts
+++ b/app/client/src/ce/constants/routes/appRoutes.ts
@@ -67,6 +67,7 @@ export const JS_COLLECTION_ID_ADD_PATH = `${JS_COLLECTION_EDITOR_PATH}/:baseColl
 export const DATA_SOURCES_EDITOR_LIST_PATH = `/datasource`;
 export const DATA_SOURCES_EDITOR_ID_PATH = `/datasource/:datasourceId`;
 export const APP_LIBRARIES_EDITOR_PATH = `/libraries`;
+export const APP_PACKAGES_EDITOR_PATH = `/packages`;
 export const APP_SETTINGS_EDITOR_PATH = `/settings`;
 export const SAAS_GSHEET_EDITOR_ID_PATH = `/saas/google-sheets-plugin/datasources/:datasourceId`;
 export const GEN_TEMPLATE_URL = "generate-page";
@@ -128,6 +129,12 @@ export const matchGeneratePagePath = (pathName: string) =>
   match(`${BUILDER_CUSTOM_PATH}${GENERATE_TEMPLATE_FORM_PATH}`)(pathName) ||
   match(`${BUILDER_PATH_DEPRECATED}${GENERATE_TEMPLATE_FORM_PATH}`)(pathName);
 
+export const matchAppLibrariesPath = (pathName: string) =>
+  match(`${BUILDER_PATH}${APP_LIBRARIES_EDITOR_PATH}`)(pathName);
+
+export const matchAppPackagesPath = (pathName: string) =>
+  match(`${BUILDER_PATH}${APP_PACKAGES_EDITOR_PATH}`)(pathName);
+
 export const addBranchParam = (branch: string) => {
   const url = new URL(window.location.href);
 
diff --git a/app/client/src/ce/entities/DataTree/types.ts b/app/client/src/ce/entities/DataTree/types.ts
index 4357954002ce..04a5877c4a1d 100644
--- a/app/client/src/ce/entities/DataTree/types.ts
+++ b/app/client/src/ce/entities/DataTree/types.ts
@@ -199,7 +199,6 @@ export interface DataTreeSeed {
   pluginDependencyConfig: Record<string, DependencyMap>;
   widgets: CanvasWidgetsReduxState;
   widgetsMeta: MetaState;
-  pageList: Page[];
   appData: AppDataState;
   jsActions: JSCollectionDataState;
   theme: AppTheme["properties"];
diff --git a/app/client/src/ce/entities/Engine/actionHelpers.ts b/app/client/src/ce/entities/Engine/actionHelpers.ts
index d27051602e57..96518343501e 100644
--- a/app/client/src/ce/entities/Engine/actionHelpers.ts
+++ b/app/client/src/ce/entities/Engine/actionHelpers.ts
@@ -30,6 +30,7 @@ export const getPageDependencyActions = (
   currentWorkspaceId: string = "",
   featureFlags: DependentFeatureFlags = {},
   allResponses: EditConsolidatedApi,
+  applicationId: string,
 ) => {
   const { datasources, pagesWithMigratedDsl, plugins } = allResponses || {};
   const initActions = [
diff --git a/app/client/src/ce/entities/FeatureFlag.ts b/app/client/src/ce/entities/FeatureFlag.ts
index 63d49c89f77f..413547130dc4 100644
--- a/app/client/src/ce/entities/FeatureFlag.ts
+++ b/app/client/src/ce/entities/FeatureFlag.ts
@@ -30,20 +30,19 @@ export const FEATURE_FLAG = {
   release_actions_redesign_enabled: "release_actions_redesign_enabled",
   rollout_remove_feature_walkthrough_enabled:
     "rollout_remove_feature_walkthrough_enabled",
+  rollout_eslint_enabled: "rollout_eslint_enabled",
   release_drag_drop_building_blocks_enabled:
     "release_drag_drop_building_blocks_enabled",
-  release_table_cell_label_value_enabled:
-    "release_table_cell_label_value_enabled",
-  rollout_js_enabled_one_click_binding_enabled:
-    "rollout_js_enabled_one_click_binding_enabled",
   rollout_side_by_side_enabled: "rollout_side_by_side_enabled",
-  ab_learnability_ease_of_initial_use_enabled:
-    "ab_learnability_ease_of_initial_use_enabled",
-  ab_learnability_discoverability_collapse_all_except_data_enabled:
-    "ab_learnability_discoverability_collapse_all_except_data_enabled",
   release_layout_conversion_enabled: "release_layout_conversion_enabled",
   release_anvil_toggle_enabled: "release_anvil_toggle_enabled",
+  release_git_persist_branch_enabled: "release_git_persist_branch_enabled",
   release_ide_animations_enabled: "release_ide_animations_enabled",
+  release_ide_datasource_selector_enabled:
+    "release_ide_datasource_selector_enabled",
+  release_table_custom_loading_state_enabled:
+    "release_table_custom_loading_state_enabled",
+  release_custom_widget_ai_builder: "release_custom_widget_ai_builder",
 } as const;
 
 export type FeatureFlag = keyof typeof FEATURE_FLAG;
@@ -64,7 +63,6 @@ export const DEFAULT_FEATURE_FLAG_VALUE: FeatureFlags = {
   license_gac_enabled: false,
   release_anvil_enabled: false,
   release_drag_drop_building_blocks_enabled: false,
-  release_table_cell_label_value_enabled: false,
   license_git_branch_protection_enabled: false,
   license_git_continuous_delivery_enabled: false,
   license_widget_rtl_support_enabled: false,
@@ -74,13 +72,15 @@ export const DEFAULT_FEATURE_FLAG_VALUE: FeatureFlags = {
   ab_appsmith_ai_query: false,
   release_actions_redesign_enabled: false,
   rollout_remove_feature_walkthrough_enabled: true,
-  rollout_js_enabled_one_click_binding_enabled: true,
+  rollout_eslint_enabled: false,
   rollout_side_by_side_enabled: false,
-  ab_learnability_ease_of_initial_use_enabled: true,
-  ab_learnability_discoverability_collapse_all_except_data_enabled: true,
   release_layout_conversion_enabled: false,
   release_anvil_toggle_enabled: false,
+  release_git_persist_branch_enabled: false,
   release_ide_animations_enabled: false,
+  release_ide_datasource_selector_enabled: false,
+  release_table_custom_loading_state_enabled: false,
+  release_custom_widget_ai_builder: false,
 };
 
 export const AB_TESTING_EVENT_KEYS = {
diff --git a/app/client/src/ce/entities/IDE/constants.ts b/app/client/src/ce/entities/IDE/constants.ts
index 3f1425dce203..0b19c02f6255 100644
--- a/app/client/src/ce/entities/IDE/constants.ts
+++ b/app/client/src/ce/entities/IDE/constants.ts
@@ -122,6 +122,7 @@ export interface EntityItem {
   key: string;
   icon?: ReactNode;
   group?: string;
+  userPermissions?: string[];
 }
 
 export type UseRoutes = Array<{
diff --git a/app/client/src/ce/entities/IDE/utils.ts b/app/client/src/ce/entities/IDE/utils.ts
index 9beb96cdf2c2..d119cac82369 100644
--- a/app/client/src/ce/entities/IDE/utils.ts
+++ b/app/client/src/ce/entities/IDE/utils.ts
@@ -7,6 +7,19 @@ import {
   BUILDER_PATH,
   BUILDER_PATH_DEPRECATED,
 } from "ee/constants/routes/appRoutes";
+import { saveActionName } from "actions/pluginActionActions";
+import { saveJSObjectName } from "actions/jsActionActions";
+import { EditorEntityTab, type EntityItem } from "ee/entities/IDE/constants";
+import { getHasManageActionPermission } from "ee/utils/BusinessFeatures/permissionPageHelpers";
+
+export interface SaveEntityName {
+  params: {
+    name: string;
+    id: string;
+  };
+  segment: EditorEntityTab;
+  entity?: EntityItem;
+}
 
 export const EDITOR_PATHS = [
   BUILDER_CUSTOM_PATH,
@@ -35,3 +48,28 @@ export function getIDETypeByUrl(path: string): IDEType {
 export function getBaseUrlsForIDEType(type: IDEType): string[] {
   return IDEBasePaths[type];
 }
+
+export const saveEntityName = ({ params, segment }: SaveEntityName) => {
+  let saveNameAction = saveActionName(params);
+
+  if (EditorEntityTab.JS === segment) {
+    saveNameAction = saveJSObjectName(params);
+  }
+
+  return saveNameAction;
+};
+
+export interface EditableTabPermissions {
+  isFeatureEnabled: boolean;
+  entity?: EntityItem;
+}
+
+export const getEditableTabPermissions = ({
+  entity,
+  isFeatureEnabled,
+}: EditableTabPermissions) => {
+  return getHasManageActionPermission(
+    isFeatureEnabled,
+    entity?.userPermissions || [],
+  );
+};
diff --git a/app/client/src/ce/hooks/hooks.test.ts b/app/client/src/ce/hooks/hooks.test.ts
new file mode 100644
index 000000000000..8259537e9dd3
--- /dev/null
+++ b/app/client/src/ce/hooks/hooks.test.ts
@@ -0,0 +1,25 @@
+import { useEditorType, EditorNames } from "./index";
+import {
+  BUILDER_VIEWER_PATH_PREFIX,
+  BUILDER_BASE_PATH_DEPRECATED,
+} from "constants/routes";
+
+describe("useEditorType", () => {
+  it('should return "app" for BUILDER_VIEWER_PATH_PREFIX', () => {
+    const result = useEditorType(BUILDER_VIEWER_PATH_PREFIX);
+
+    expect(result).toBe(EditorNames.APPLICATION);
+  });
+
+  it('should return "app" for BUILDER_BASE_PATH_DEPRECATED', () => {
+    const result = useEditorType(BUILDER_BASE_PATH_DEPRECATED);
+
+    expect(result).toBe(EditorNames.APPLICATION);
+  });
+
+  it('should default to "app" for unmatched paths', () => {
+    const result = useEditorType("/some-random-path");
+
+    expect(result).toBe(EditorNames.APPLICATION);
+  });
+});
diff --git a/app/client/src/ce/hooks/index.ts b/app/client/src/ce/hooks/index.ts
index 2112914bd322..cd84f5ca1dfd 100644
--- a/app/client/src/ce/hooks/index.ts
+++ b/app/client/src/ce/hooks/index.ts
@@ -15,6 +15,7 @@ export interface EditorType {
 
 export const editorType: EditorType = {
   [BUILDER_VIEWER_PATH_PREFIX]: EditorNames.APPLICATION,
+  [BUILDER_BASE_PATH_DEPRECATED]: EditorNames.APPLICATION,
 };
 
 export const useEditorType = (path: string) => {
diff --git a/app/client/src/ce/navigation/FocusElements/AppIDE.ts b/app/client/src/ce/navigation/FocusElements/AppIDE.ts
index d179e44d22c7..336ddaeeee1a 100644
--- a/app/client/src/ce/navigation/FocusElements/AppIDE.ts
+++ b/app/client/src/ce/navigation/FocusElements/AppIDE.ts
@@ -1,7 +1,3 @@
-import {
-  setApiPaneConfigSelectedTabIndex,
-  setApiPaneDebuggerState,
-} from "actions/apiPaneActions";
 import {
   setAllEntityCollapsibleStates,
   setAllSubEntityCollapsibleStates,
@@ -11,10 +7,6 @@ import {
   setPanelPropertiesState,
   setWidgetSelectedPropertyTabIndex,
 } from "actions/editorContextActions";
-import {
-  getApiPaneConfigSelectedTabIndex,
-  getApiPaneDebuggerState,
-} from "selectors/apiPaneSelectors";
 import {
   getAllEntityCollapsibleStates,
   getAllPropertySectionState,
@@ -43,10 +35,6 @@ import {
   setPropertyPaneWidthAction,
   setSelectedPropertyPanels,
 } from "actions/propertyPaneActions";
-import {
-  setQueryPaneConfigSelectedTabIndex,
-  setQueryPaneDebuggerState,
-} from "actions/queryPaneActions";
 import { selectWidgetInitAction } from "actions/widgetSelectionActions";
 import {
   DEFAULT_ENTITY_EXPLORER_WIDTH,
@@ -66,11 +54,7 @@ import {
   getPropertyPaneWidth,
   getSelectedPropertyPanel,
 } from "selectors/propertyPaneSelectors";
-import {
-  getLastQueryTab,
-  getQueryPaneConfigSelectedTabIndex,
-  getQueryPaneDebuggerState,
-} from "selectors/queryPaneSelectors";
+import { getLastQueryTab } from "ee/selectors/appIDESelectors";
 import { getDebuggerContext } from "selectors/debuggerSelectors";
 import { setDebuggerContext } from "actions/debuggerActions";
 import { DefaultDebuggerContext } from "reducers/uiReducers/debuggerReducer";
@@ -89,7 +73,20 @@ import {
 import { getFirstDatasourceId } from "selectors/datasourceSelectors";
 import { FocusElement, FocusElementConfigType } from "navigation/FocusElements";
 import type { FocusElementsConfigList } from "sagas/FocusRetentionSaga";
-import { ActionExecutionResizerHeight } from "pages/Editor/APIEditor/constants";
+import { ActionExecutionResizerHeight } from "PluginActionEditor/components/PluginActionResponse/constants";
+import {
+  getPluginActionConfigSelectedTab,
+  getPluginActionDebuggerState,
+  getFormData,
+  setExtraFormData,
+  setPluginActionEditorDebuggerState,
+  setPluginActionEditorSelectedTab,
+} from "PluginActionEditor/store";
+import { EDITOR_TABS } from "constants/QueryEditorConstants";
+import {
+  API_EDITOR_TABS,
+  POST_BODY_FORMAT_OPTIONS,
+} from "PluginActionEditor/constants/CommonApiConstants";
 
 export const AppIDEFocusElements: FocusElementsConfigList = {
   [FocusEntity.DATASOURCE_LIST]: [
@@ -145,45 +142,34 @@ export const AppIDEFocusElements: FocusElementsConfigList = {
     },
     {
       type: FocusElementConfigType.Redux,
-      name: FocusElement.QueryPaneConfigTabs,
-      selector: getQueryPaneConfigSelectedTabIndex,
-      setter: setQueryPaneConfigSelectedTabIndex,
-      defaultValue: 0,
-    },
-    {
-      type: FocusElementConfigType.Redux,
-      name: FocusElement.ApiPaneConfigTabs,
-      selector: getApiPaneConfigSelectedTabIndex,
-      setter: setApiPaneConfigSelectedTabIndex,
-      defaultValue: 0,
+      name: FocusElement.PluginActionConfigTabs,
+      selector: getPluginActionConfigSelectedTab,
+      setter: setPluginActionEditorSelectedTab,
+      defaultValue: EDITOR_TABS.QUERY,
       subTypes: {
         [PluginPackageName.GRAPHQL]: {
-          defaultValue: 2,
+          defaultValue: API_EDITOR_TABS.BODY,
+        },
+        [PluginPackageName.REST_API]: {
+          defaultValue: API_EDITOR_TABS.HEADERS,
         },
       },
     },
     {
       type: FocusElementConfigType.Redux,
-      name: FocusElement.InputField,
-      selector: getFocusableInputField,
-      setter: setFocusableInputField,
-    },
-    {
-      type: FocusElementConfigType.Redux,
-      name: FocusElement.QueryDebugger,
-      selector: getQueryPaneDebuggerState,
-      setter: setQueryPaneDebuggerState,
+      name: FocusElement.PluginActionFormData,
+      selector: getFormData,
+      setter: setExtraFormData,
       defaultValue: {
-        open: false,
-        responseTabHeight: ActionExecutionResizerHeight,
-        selectedTab: undefined,
+        label: POST_BODY_FORMAT_OPTIONS.NONE,
+        value: POST_BODY_FORMAT_OPTIONS.NONE,
       },
     },
     {
       type: FocusElementConfigType.Redux,
-      name: FocusElement.ApiDebugger,
-      selector: getApiPaneDebuggerState,
-      setter: setApiPaneDebuggerState,
+      name: FocusElement.PluginActionDebugger,
+      selector: getPluginActionDebuggerState,
+      setter: setPluginActionEditorDebuggerState,
       defaultValue: {
         open: false,
         responseTabHeight: ActionExecutionResizerHeight,
diff --git a/app/client/src/ce/pages/AdminSettings/config/general.tsx b/app/client/src/ce/pages/AdminSettings/config/general.tsx
index fcfa7d3ed453..ce70177f71f5 100644
--- a/app/client/src/ce/pages/AdminSettings/config/general.tsx
+++ b/app/client/src/ce/pages/AdminSettings/config/general.tsx
@@ -181,7 +181,7 @@ export const APPSMITH_ALLOWED_FRAME_ANCESTORS_SETTING: Setting = {
 };
 
 export const config: AdminConfigType = {
-  icon: "settings-2-line",
+  icon: "settings-v3",
   type: SettingCategories.GENERAL,
   categoryType: CategoryType.GENERAL,
   controlType: SettingTypes.GROUP,
diff --git a/app/client/src/ce/pages/Applications/CreateNewAppsOption.test.tsx b/app/client/src/ce/pages/Applications/CreateNewAppsOption.test.tsx
index c21d71179051..180268afb6a9 100644
--- a/app/client/src/ce/pages/Applications/CreateNewAppsOption.test.tsx
+++ b/app/client/src/ce/pages/Applications/CreateNewAppsOption.test.tsx
@@ -59,7 +59,7 @@ const defaultStoreState = {
         config: {},
       },
     },
-    apiPane: {
+    pluginActionEditor: {
       isCreating: false,
       isRunning: {},
       isSaving: {},
diff --git a/app/client/src/ce/pages/Applications/WorkspaceMenu.tsx b/app/client/src/ce/pages/Applications/WorkspaceMenu.tsx
index d79aec1e15e2..d9c137fc2c8d 100644
--- a/app/client/src/ce/pages/Applications/WorkspaceMenu.tsx
+++ b/app/client/src/ce/pages/Applications/WorkspaceMenu.tsx
@@ -144,7 +144,7 @@ function WorkspaceMenu({
                 })
               }
             >
-              <Icon name="settings-2-line" size="md" />
+              <Icon name="settings-v3" size="md" />
               Settings
             </CustomMenuItem>
           </>
diff --git a/app/client/src/ce/pages/Applications/index.tsx b/app/client/src/ce/pages/Applications/index.tsx
index 4bbdf514595d..5c3e54af7fbd 100644
--- a/app/client/src/ce/pages/Applications/index.tsx
+++ b/app/client/src/ce/pages/Applications/index.tsx
@@ -318,6 +318,7 @@ export function LeftPaneSection(props: {
             <Button
               data-testid="t--workspace-new-workspace-auto-create"
               isDisabled={props.isFetchingWorkspaces}
+              isIconButton
               kind="tertiary"
               onClick={createNewWorkspace}
               startIcon="add-line"
@@ -752,7 +753,7 @@ export function ApplicationsSection(props: any) {
       ) {
         createNewApplication(
           getNextEntityName(
-            "Untitled application ",
+            isAnvilEnabled ? "AI app " : "Untitled application ",
             // TODO: Fix this the next time the file is edited
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             applications.map((el: any) => el.name),
diff --git a/app/client/src/ce/pages/Editor/AppPluginActionEditor/components/PluginActionMoreActions.tsx b/app/client/src/ce/pages/Editor/AppPluginActionEditor/components/PluginActionMoreActions.tsx
deleted file mode 100644
index 1fcab27adb36..000000000000
--- a/app/client/src/ce/pages/Editor/AppPluginActionEditor/components/PluginActionMoreActions.tsx
+++ /dev/null
@@ -1,184 +0,0 @@
-import React, { useCallback, useMemo, useState } from "react";
-import {
-  getHasDeleteActionPermission,
-  getHasManageActionPermission,
-} from "ee/utils/BusinessFeatures/permissionPageHelpers";
-import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
-import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
-import { usePluginActionContext } from "PluginActionEditor";
-import {
-  MenuItem,
-  MenuSub,
-  MenuSubContent,
-  MenuSubTrigger,
-} from "@appsmith/ads";
-import {
-  CONFIRM_CONTEXT_DELETE,
-  CONTEXT_COPY,
-  CONTEXT_DELETE,
-  CONTEXT_MOVE,
-  createMessage,
-} from "ee/constants/messages";
-import { useDispatch, useSelector } from "react-redux";
-import {
-  copyActionRequest,
-  deleteAction,
-  moveActionRequest,
-} from "actions/pluginActionActions";
-import { getCurrentPageId } from "selectors/editorSelectors";
-import type { Page } from "entities/Page";
-import { getPageList } from "ee/selectors/entitiesSelector";
-import { ConvertToModuleCTA } from "./ConvertToModule";
-
-const PageMenuItem = (props: {
-  page: Page;
-  onSelect: (id: string) => void;
-}) => {
-  const handleOnSelect = useCallback(() => {
-    props.onSelect(props.page.pageId);
-  }, [props]);
-
-  return <MenuItem onSelect={handleOnSelect}>{props.page.pageName}</MenuItem>;
-};
-
-const Copy = () => {
-  const menuPages = useSelector(getPageList);
-  const { action } = usePluginActionContext();
-  const dispatch = useDispatch();
-
-  const copyActionToPage = useCallback(
-    (pageId: string) =>
-      dispatch(
-        copyActionRequest({
-          id: action.id,
-          destinationPageId: pageId,
-          name: action.name,
-        }),
-      ),
-    [action.id, action.name, dispatch],
-  );
-
-  return (
-    <MenuSub>
-      <MenuSubTrigger startIcon="duplicate">
-        {createMessage(CONTEXT_COPY)}
-      </MenuSubTrigger>
-      <MenuSubContent>
-        {menuPages.map((page) => {
-          return (
-            <PageMenuItem
-              key={page.basePageId}
-              onSelect={copyActionToPage}
-              page={page}
-            />
-          );
-        })}
-      </MenuSubContent>
-    </MenuSub>
-  );
-};
-
-const Move = () => {
-  const dispatch = useDispatch();
-  const { action } = usePluginActionContext();
-
-  const currentPageId = useSelector(getCurrentPageId);
-  const allPages = useSelector(getPageList);
-  const menuPages = useMemo(() => {
-    return allPages.filter((page) => page.pageId !== currentPageId);
-  }, [allPages, currentPageId]);
-
-  const moveActionToPage = useCallback(
-    (destinationPageId: string) =>
-      dispatch(
-        moveActionRequest({
-          id: action.id,
-          destinationPageId,
-          originalPageId: currentPageId,
-          name: action.name,
-        }),
-      ),
-    [dispatch, action.id, action.name, currentPageId],
-  );
-
-  return (
-    <MenuSub>
-      <MenuSubTrigger startIcon="swap-horizontal">
-        {createMessage(CONTEXT_MOVE)}
-      </MenuSubTrigger>
-      <MenuSubContent>
-        {menuPages.length > 1 ? (
-          menuPages.map((page) => {
-            return (
-              <PageMenuItem
-                key={page.basePageId}
-                onSelect={moveActionToPage}
-                page={page}
-              />
-            );
-          })
-        ) : (
-          <MenuItem key="no-pages">No pages</MenuItem>
-        )}
-      </MenuSubContent>
-    </MenuSub>
-  );
-};
-
-const Delete = () => {
-  const dispatch = useDispatch();
-  const { action } = usePluginActionContext();
-
-  const [confirmDelete, setConfirmDelete] = useState(false);
-
-  const deleteActionFromPage = useCallback(() => {
-    dispatch(deleteAction({ id: action.id, name: action.name }));
-  }, [action.id, action.name, dispatch]);
-
-  const handleSelect = useCallback(() => {
-    confirmDelete ? deleteActionFromPage() : setConfirmDelete(true);
-  }, [confirmDelete, deleteActionFromPage]);
-
-  const menuLabel = confirmDelete
-    ? createMessage(CONFIRM_CONTEXT_DELETE)
-    : createMessage(CONTEXT_DELETE);
-
-  return (
-    <MenuItem
-      className="t--apiFormDeleteBtn error-menuitem"
-      onSelect={handleSelect}
-      startIcon="trash"
-    >
-      {menuLabel}
-    </MenuItem>
-  );
-};
-
-const AppPluginActionMenu = () => {
-  const { action } = usePluginActionContext();
-
-  const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
-  const isChangePermitted = getHasManageActionPermission(
-    isFeatureEnabled,
-    action.userPermissions,
-  );
-  const isDeletePermitted = getHasDeleteActionPermission(
-    isFeatureEnabled,
-    action?.userPermissions,
-  );
-
-  return (
-    <>
-      <ConvertToModuleCTA />
-      {isChangePermitted && (
-        <>
-          <Copy />
-          <Move />
-        </>
-      )}
-      {isDeletePermitted && <Delete />}
-    </>
-  );
-};
-
-export default AppPluginActionMenu;
diff --git a/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/hooks.ts b/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/hooks.tsx
similarity index 57%
rename from app/client/src/ce/pages/Editor/IDE/EditorPane/JS/hooks.ts
rename to app/client/src/ce/pages/Editor/IDE/EditorPane/JS/hooks.tsx
index 11d1c00d67c9..34ce88dd556a 100644
--- a/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/hooks.ts
+++ b/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/hooks.tsx
@@ -1,4 +1,5 @@
-import { useCallback } from "react";
+import { lazy, Suspense, useCallback, useMemo } from "react";
+import React from "react";
 import { useDispatch, useSelector } from "react-redux";
 import { createNewJSCollection } from "actions/jsPaneActions";
 import { getCurrentPageId } from "selectors/editorSelectors";
@@ -7,14 +8,16 @@ import { createMessage, EDITOR_PANE_TEXTS } from "ee/constants/messages";
 import { JsFileIconV2 } from "pages/Editor/Explorer/ExplorerIcons";
 import { SEARCH_ITEM_TYPES } from "components/editorComponents/GlobalSearch/utils";
 import type { UseRoutes } from "ee/entities/IDE/constants";
-import JSEditor from "pages/Editor/JSEditor";
-import AddJS from "pages/Editor/IDE/EditorPane/JS/Add";
 import { ADD_PATH } from "ee/constants/routes/appRoutes";
 import history from "utils/history";
 import { FocusEntity, identifyEntityFromPath } from "navigation/FocusEntity";
 import { useModuleOptions } from "ee/utils/moduleInstanceHelpers";
 import { getJSUrl } from "ee/pages/Editor/IDE/EditorPane/JS/utils";
-import { JSBlankState } from "pages/Editor/JSEditor/JSBlankState";
+import { getIDEViewMode } from "selectors/ideSelectors";
+import { EditorViewMode } from "ee/entities/IDE/constants";
+import { setListViewActiveState } from "actions/ideActions";
+import { retryPromise } from "utils/AppsmithUtils";
+import Skeleton from "widgets/Skeleton";
 
 export const useJSAdd = () => {
   const pageId = useSelector(getCurrentPageId);
@@ -24,12 +27,17 @@ export const useJSAdd = () => {
   const jsModuleCreationOptions = moduleCreationOptions.filter(
     (opt) => opt.focusEntityType === FocusEntity.JS_MODULE_INSTANCE,
   );
+  const ideViewMode = useSelector(getIDEViewMode);
 
   const openAddJS = useCallback(() => {
     if (jsModuleCreationOptions.length === 0) {
       dispatch(createNewJSCollection(pageId, "ENTITY_EXPLORER"));
     } else {
       if (currentEntityInfo.entity === FocusEntity.JS_OBJECT_ADD) {
+        if (ideViewMode === EditorViewMode.SplitScreen) {
+          dispatch(setListViewActiveState(false));
+        }
+
         return;
       }
 
@@ -37,7 +45,13 @@ export const useJSAdd = () => {
 
       history.push(url);
     }
-  }, [jsModuleCreationOptions, pageId, dispatch, currentEntityInfo]);
+  }, [
+    jsModuleCreationOptions,
+    pageId,
+    dispatch,
+    currentEntityInfo,
+    ideViewMode,
+  ]);
 
   const closeAddJS = useCallback(() => {
     const url = getJSUrl(currentEntityInfo, false);
@@ -79,25 +93,64 @@ export const useGroupedAddJsOperations = (): GroupedAddOperations => {
   ];
 };
 
+const AddJS = lazy(async () =>
+  retryPromise(
+    async () =>
+      import(
+        /* webpackChunkName: "AddJS" */ "pages/Editor/IDE/EditorPane/JS/Add"
+      ),
+  ),
+);
+const JSEditor = lazy(async () =>
+  retryPromise(
+    async () =>
+      import(/* webpackChunkName: "JSEditor" */ "pages/Editor/JSEditor"),
+  ),
+);
+
+const JSEmpty = lazy(async () =>
+  retryPromise(
+    async () =>
+      import(
+        /* webpackChunkName: "JSEmpty" */ "pages/Editor/JSEditor/JSBlankState"
+      ),
+  ),
+);
+
 export const useJSEditorRoutes = (path: string): UseRoutes => {
-  return [
-    {
-      exact: true,
-      key: "AddJS",
-      component: AddJS,
-      path: [`${path}${ADD_PATH}`, `${path}/:baseCollectionId${ADD_PATH}`],
-    },
-    {
-      exact: true,
-      key: "JSEditor",
-      component: JSEditor,
-      path: [path + "/:baseCollectionId"],
-    },
-    {
-      key: "JSEmpty",
-      component: JSBlankState,
-      exact: true,
-      path: [path],
-    },
-  ];
+  return useMemo(
+    () => [
+      {
+        exact: true,
+        key: "AddJS",
+        component: (args) => (
+          <Suspense fallback={<Skeleton />}>
+            <AddJS {...args} />
+          </Suspense>
+        ),
+        path: [`${path}${ADD_PATH}`, `${path}/:baseCollectionId${ADD_PATH}`],
+      },
+      {
+        exact: true,
+        key: "JSEditor",
+        component: (args) => (
+          <Suspense fallback={<Skeleton />}>
+            <JSEditor {...args} />
+          </Suspense>
+        ),
+        path: [path + "/:baseCollectionId"],
+      },
+      {
+        key: "JSEmpty",
+        component: (args) => (
+          <Suspense fallback={<Skeleton />}>
+            <JSEmpty {...args} />
+          </Suspense>
+        ),
+        exact: true,
+        path: [path],
+      },
+    ],
+    [path],
+  );
 };
diff --git a/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/hooks.tsx b/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/hooks.tsx
index 34f8322f8ed3..9d58eceb7a99 100644
--- a/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/hooks.tsx
+++ b/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/hooks.tsx
@@ -1,4 +1,5 @@
-import { useCallback, useMemo } from "react";
+import { lazy, Suspense, useCallback, useMemo } from "react";
+import React from "react";
 import history from "utils/history";
 import { useLocation } from "react-router";
 import { FocusEntity, identifyEntityFromPath } from "navigation/FocusEntity";
@@ -23,36 +24,41 @@ import {
   BUILDER_PATH_DEPRECATED,
 } from "ee/constants/routes/appRoutes";
 import { SAAS_EDITOR_API_ID_PATH } from "pages/Editor/SaaSEditor/constants";
-import ApiEditor from "pages/Editor/APIEditor";
 import type { UseRoutes } from "ee/entities/IDE/constants";
-import QueryEditor from "pages/Editor/QueryEditor";
-import AddQuery from "pages/Editor/IDE/EditorPane/Query/Add";
 import type { AppState } from "ee/reducers";
 import keyBy from "lodash/keyBy";
 import { getPluginEntityIcon } from "pages/Editor/Explorer/ExplorerIcons";
 import type { ListItemProps } from "@appsmith/ads";
 import { createAddClassName } from "pages/Editor/IDE/EditorPane/utils";
-import { QueriesBlankState } from "pages/Editor/QueryEditor/QueriesBlankState";
+import { getIDEViewMode } from "selectors/ideSelectors";
+import { EditorViewMode } from "ee/entities/IDE/constants";
+import { setListViewActiveState } from "actions/ideActions";
+import { retryPromise } from "utils/AppsmithUtils";
+import Skeleton from "widgets/Skeleton";
 
 export const useQueryAdd = () => {
   const location = useLocation();
+  const dispatch = useDispatch();
   const currentEntityInfo = identifyEntityFromPath(location.pathname);
+  const ideViewMode = useSelector(getIDEViewMode);
 
   const openAddQuery = useCallback(() => {
     if (currentEntityInfo.entity === FocusEntity.QUERY_ADD) {
+      if (ideViewMode === EditorViewMode.SplitScreen) {
+        dispatch(setListViewActiveState(false));
+      }
+
       return;
     }
 
-    let url = "";
+    const url = getQueryUrl(currentEntityInfo);
 
-    url = getQueryUrl(currentEntityInfo);
     history.push(url);
-  }, [currentEntityInfo]);
+  }, [currentEntityInfo, dispatch, ideViewMode]);
 
   const closeAddQuery = useCallback(() => {
-    let url = "";
+    const url = getQueryUrl(currentEntityInfo, false);
 
-    url = getQueryUrl(currentEntityInfo, false);
     history.push(url);
   }, [currentEntityInfo]);
 
@@ -105,47 +111,174 @@ export const useGroupedAddQueryOperations = (): GroupedAddOperations => {
   return groups;
 };
 
+const PluginActionEditor = lazy(async () =>
+  retryPromise(
+    async () =>
+      import(
+        /* webpackChunkName: "PluginActionEditor" */ "pages/Editor/AppPluginActionEditor"
+      ),
+  ),
+);
+
+const ApiEditor = lazy(async () =>
+  retryPromise(
+    async () =>
+      import(/* webpackChunkName: "APIEditor" */ "pages/Editor/APIEditor"),
+  ),
+);
+
+const AddQuery = lazy(async () =>
+  retryPromise(
+    async () =>
+      import(
+        /* webpackChunkName: "AddQuery" */ "pages/Editor/IDE/EditorPane/Query/Add"
+      ),
+  ),
+);
+const QueryEditor = lazy(async () =>
+  retryPromise(
+    async () =>
+      import(/* webpackChunkName: "QueryEditor" */ "pages/Editor/QueryEditor"),
+  ),
+);
+
+const QueryEmpty = lazy(async () =>
+  retryPromise(
+    async () =>
+      import(
+        /* webpackChunkName: "QueryEmpty" */ "pages/Editor/QueryEditor/QueriesBlankState"
+      ),
+  ),
+);
+
 export const useQueryEditorRoutes = (path: string): UseRoutes => {
-  return [
-    {
-      key: "ApiEditor",
-      component: ApiEditor,
-      exact: true,
-      path: [
-        BUILDER_PATH + API_EDITOR_ID_PATH,
-        BUILDER_CUSTOM_PATH + API_EDITOR_ID_PATH,
-        BUILDER_PATH_DEPRECATED + API_EDITOR_ID_PATH,
-      ],
-    },
-    {
-      key: "AddQuery",
-      exact: true,
-      component: AddQuery,
-      path: [`${path}${ADD_PATH}`, `${path}/:baseQueryId${ADD_PATH}`],
-    },
-    {
-      key: "SAASEditor",
-      component: QueryEditor,
-      exact: true,
-      path: [
-        BUILDER_PATH + SAAS_EDITOR_API_ID_PATH,
-        BUILDER_CUSTOM_PATH + SAAS_EDITOR_API_ID_PATH,
-        BUILDER_PATH_DEPRECATED + SAAS_EDITOR_API_ID_PATH,
-      ],
-    },
-    {
-      key: "QueryEditor",
-      component: QueryEditor,
-      exact: true,
-      path: [path + "/:baseQueryId"],
-    },
-    {
-      key: "QueryEmpty",
-      component: QueriesBlankState,
-      exact: true,
-      path: [path],
-    },
-  ];
+  const isActionRedesignEnabled = useFeatureFlag(
+    FEATURE_FLAG.release_actions_redesign_enabled,
+  );
+
+  const skeleton = useMemo(() => <Skeleton />, []);
+
+  const newComponents = useMemo(
+    () => [
+      {
+        key: "PluginActionEditor",
+        component: () => {
+          return (
+            <Suspense fallback={skeleton}>
+              <PluginActionEditor />
+            </Suspense>
+          );
+        },
+        path: [
+          BUILDER_PATH + API_EDITOR_ID_PATH,
+          BUILDER_CUSTOM_PATH + API_EDITOR_ID_PATH,
+          BUILDER_PATH_DEPRECATED + API_EDITOR_ID_PATH,
+          BUILDER_PATH + SAAS_EDITOR_API_ID_PATH,
+          BUILDER_CUSTOM_PATH + SAAS_EDITOR_API_ID_PATH,
+          BUILDER_PATH_DEPRECATED + SAAS_EDITOR_API_ID_PATH,
+          path + "/:baseQueryId",
+        ],
+        exact: true,
+      },
+      {
+        key: "AddQuery",
+        exact: true,
+        component: () => (
+          <Suspense fallback={skeleton}>
+            <AddQuery />
+          </Suspense>
+        ),
+        path: [`${path}${ADD_PATH}`, `${path}/:baseQueryId${ADD_PATH}`],
+      },
+      {
+        key: "QueryEmpty",
+        component: () => (
+          <Suspense fallback={skeleton}>
+            <QueryEmpty />
+          </Suspense>
+        ),
+        exact: true,
+        path: [path],
+      },
+    ],
+    [path, skeleton],
+  );
+
+  const oldComponents = useMemo(
+    () => [
+      {
+        key: "ApiEditor",
+        component: (args: object) => {
+          return (
+            <Suspense fallback={skeleton}>
+              <ApiEditor {...args} />
+            </Suspense>
+          );
+        },
+        exact: true,
+        path: [
+          BUILDER_PATH + API_EDITOR_ID_PATH,
+          BUILDER_CUSTOM_PATH + API_EDITOR_ID_PATH,
+          BUILDER_PATH_DEPRECATED + API_EDITOR_ID_PATH,
+        ],
+      },
+      {
+        key: "AddQuery",
+        exact: true,
+        component: () => (
+          <Suspense fallback={skeleton}>
+            <AddQuery />
+          </Suspense>
+        ),
+        path: [`${path}${ADD_PATH}`, `${path}/:baseQueryId${ADD_PATH}`],
+      },
+      {
+        key: "SAASEditor",
+        component: (args: object) => {
+          return (
+            <Suspense fallback={skeleton}>
+              <QueryEditor {...args} />
+            </Suspense>
+          );
+        },
+        exact: true,
+        path: [
+          BUILDER_PATH + SAAS_EDITOR_API_ID_PATH,
+          BUILDER_CUSTOM_PATH + SAAS_EDITOR_API_ID_PATH,
+          BUILDER_PATH_DEPRECATED + SAAS_EDITOR_API_ID_PATH,
+        ],
+      },
+      {
+        key: "QueryEditor",
+        component: (args: object) => {
+          return (
+            <Suspense fallback={skeleton}>
+              <QueryEditor {...args} />
+            </Suspense>
+          );
+        },
+        exact: true,
+        path: [path + "/:baseQueryId"],
+      },
+      {
+        key: "QueryEmpty",
+        component: () => (
+          <Suspense fallback={skeleton}>
+            <QueryEmpty />
+          </Suspense>
+        ),
+        exact: true,
+        path: [path],
+      },
+    ],
+    [path, skeleton],
+  );
+
+  if (isActionRedesignEnabled) {
+    return newComponents;
+  }
+
+  return oldComponents;
 };
 
 export const useAddQueryListItems = () => {
diff --git a/app/client/src/ce/pages/Editor/IDE/Header/useLibraryHeaderTitle.ts b/app/client/src/ce/pages/Editor/IDE/Header/useLibraryHeaderTitle.ts
new file mode 100644
index 000000000000..489d1d74425b
--- /dev/null
+++ b/app/client/src/ce/pages/Editor/IDE/Header/useLibraryHeaderTitle.ts
@@ -0,0 +1,12 @@
+import { createMessage, HEADER_TITLES } from "ee/constants/messages";
+
+/**
+ * In CE this returns a simple text as title but this
+ * hook is extended in EE where based on feature flags
+ * the title changes
+ */
+function useLibraryHeaderTitle() {
+  return createMessage(HEADER_TITLES.LIBRARIES);
+}
+
+export default useLibraryHeaderTitle;
diff --git a/app/client/src/ce/pages/Editor/IDE/LeftPane/LibrarySidePane.tsx b/app/client/src/ce/pages/Editor/IDE/LeftPane/LibrarySidePane.tsx
new file mode 100644
index 000000000000..3203c1b5b64e
--- /dev/null
+++ b/app/client/src/ce/pages/Editor/IDE/LeftPane/LibrarySidePane.tsx
@@ -0,0 +1,13 @@
+import React from "react";
+import JSLibrariesSection from "pages/Editor/IDE/LeftPane/JSLibrariesSection";
+import { IDESidePaneWrapper } from "IDE";
+
+const LibrarySidePane = () => {
+  return (
+    <IDESidePaneWrapper>
+      <JSLibrariesSection />
+    </IDESidePaneWrapper>
+  );
+};
+
+export default LibrarySidePane;
diff --git a/app/client/src/ce/pages/Editor/IDE/MainPane/useRoutes.ts b/app/client/src/ce/pages/Editor/IDE/MainPane/useRoutes.tsx
similarity index 84%
rename from app/client/src/ce/pages/Editor/IDE/MainPane/useRoutes.ts
rename to app/client/src/ce/pages/Editor/IDE/MainPane/useRoutes.tsx
index e2efc6cafe78..d0fdc4ecda05 100644
--- a/app/client/src/ce/pages/Editor/IDE/MainPane/useRoutes.ts
+++ b/app/client/src/ce/pages/Editor/IDE/MainPane/useRoutes.tsx
@@ -4,6 +4,7 @@ import {
   API_EDITOR_ID_ADD_PATH,
   API_EDITOR_ID_PATH,
   APP_LIBRARIES_EDITOR_PATH,
+  APP_PACKAGES_EDITOR_PATH,
   APP_SETTINGS_EDITOR_PATH,
   BUILDER_CHECKLIST_PATH,
   BUILDER_CUSTOM_PATH,
@@ -23,7 +24,6 @@ import {
   WIDGETS_EDITOR_ID_PATH,
 } from "constants/routes";
 import CreateNewDatasourceTab from "pages/Editor/IntegrationEditor/CreateNewDatasourceTab";
-import OnboardingChecklist from "pages/Editor/FirstTimeUserOnboarding/Checklist";
 import {
   SAAS_EDITOR_API_ID_ADD_PATH,
   SAAS_EDITOR_API_ID_PATH,
@@ -37,7 +37,28 @@ import GeneratePage from "pages/Editor/GeneratePage";
 import type { RouteProps } from "react-router";
 import { useSelector } from "react-redux";
 import { combinedPreviewModeSelector } from "selectors/editorSelectors";
+import { lazy, Suspense } from "react";
+import React from "react";
 
+import { retryPromise } from "utils/AppsmithUtils";
+import Skeleton from "widgets/Skeleton";
+
+const FirstTimeUserOnboardingChecklist = lazy(async () =>
+  retryPromise(
+    async () =>
+      import(
+        /* webpackChunkName: "FirstTimeUserOnboardingChecklist" */ "pages/Editor/FirstTimeUserOnboarding/Checklist"
+      ),
+  ),
+);
+
+export const LazilyLoadedFirstTimeUserOnboardingChecklist = () => {
+  return (
+    <Suspense fallback={<Skeleton />}>
+      <FirstTimeUserOnboardingChecklist />
+    </Suspense>
+  );
+};
 export interface RouteReturnType extends RouteProps {
   key: string;
 }
@@ -82,6 +103,7 @@ function useRoutes(path: string): RouteReturnType[] {
         `${path}${SAAS_EDITOR_API_ID_PATH}`,
         `${path}${SAAS_EDITOR_API_ID_ADD_PATH}`,
         `${path}${APP_LIBRARIES_EDITOR_PATH}`,
+        `${path}${APP_PACKAGES_EDITOR_PATH}`,
         `${path}${APP_SETTINGS_EDITOR_PATH}`,
       ],
     },
@@ -93,7 +115,9 @@ function useRoutes(path: string): RouteReturnType[] {
     },
     {
       key: "OnboardingChecklist",
-      component: isPreviewMode ? WidgetsEditor : OnboardingChecklist,
+      component: isPreviewMode
+        ? WidgetsEditor
+        : FirstTimeUserOnboardingChecklist,
       exact: true,
       path: `${path}${BUILDER_CHECKLIST_PATH}`,
     },
diff --git a/app/client/src/ce/pages/common/PackageSearchItem.tsx b/app/client/src/ce/pages/common/PackageSearchItem.tsx
index f87efbdc0af0..9ce611b81720 100644
--- a/app/client/src/ce/pages/common/PackageSearchItem.tsx
+++ b/app/client/src/ce/pages/common/PackageSearchItem.tsx
@@ -1,10 +1,10 @@
-interface Props {
-  // TODO: Fix this the next time the file is edited
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  searchedPackages: any;
+import type { Package } from "ee/constants/PackageConstants";
+
+export interface PackageSearchItemProps {
+  searchedPackages: Package[];
 }
 
-const PackageSearchItem = (props: Props) => {
+const PackageSearchItem = (props: PackageSearchItemProps) => {
   // eslint-disable-next-line
   const { searchedPackages } = props;
 
diff --git a/app/client/src/ce/pages/common/WorkflowSearchItem.tsx b/app/client/src/ce/pages/common/WorkflowSearchItem.tsx
index 57da1d52da9d..888824d71533 100644
--- a/app/client/src/ce/pages/common/WorkflowSearchItem.tsx
+++ b/app/client/src/ce/pages/common/WorkflowSearchItem.tsx
@@ -1,10 +1,10 @@
 import type { Workflow } from "ee/constants/WorkflowConstants";
 
-interface Props {
+export interface WorkflowSearchItemProps {
   workflowsList: Workflow[];
 }
 
-const WorkflowSearchItem = (props: Props) => {
+const WorkflowSearchItem = (props: WorkflowSearchItemProps) => {
   // eslint-disable-next-line
   const { workflowsList } = props;
 
diff --git a/app/client/src/ce/reducers/index.tsx b/app/client/src/ce/reducers/index.tsx
index a371011e661f..66d367063fe9 100644
--- a/app/client/src/ce/reducers/index.tsx
+++ b/app/client/src/ce/reducers/index.tsx
@@ -13,8 +13,6 @@ import type { AppViewReduxState } from "reducers/uiReducers/appViewReducer";
 import type { DatasourcePaneReduxState } from "reducers/uiReducers/datasourcePaneReducer";
 import type { ApplicationsReduxState } from "ee/reducers/uiReducers/applicationsReducer";
 import type { PageListReduxState } from "reducers/entityReducers/pageListReducer";
-import type { ApiPaneReduxState } from "ee/reducers/uiReducers/apiPaneReducer";
-import type { QueryPaneReduxState } from "ee/reducers/uiReducers/queryPaneReducer";
 import type { PluginDataState } from "reducers/entityReducers/pluginsReducer";
 import type { AuthState } from "reducers/uiReducers/authReducer";
 import type { WorkspaceReduxState } from "ee/reducers/uiReducers/workspaceReducer";
@@ -73,6 +71,7 @@ import type { MetaWidgetsReduxState } from "reducers/entityReducers/metaWidgetsR
 import type { layoutConversionReduxState } from "reducers/uiReducers/layoutConversionReducer";
 import type { OneClickBindingState } from "reducers/uiReducers/oneClickBindingReducer";
 import type { IDEState } from "reducers/uiReducers/ideReducer";
+import type { PluginActionEditorState } from "PluginActionEditor";
 
 /* Reducers which are integrated into the core system when registering a pluggable module
     or done so by a module that is designed to be eventually pluggable */
@@ -102,7 +101,6 @@ export interface AppState {
     errors: ErrorReduxState;
     appView: AppViewReduxState;
     applications: ApplicationsReduxState;
-    apiPane: ApiPaneReduxState;
     auth: AuthState;
     templates: TemplatesReduxState;
     buildingBlocks: BuildingBlocksReduxState;
@@ -111,7 +109,6 @@ export interface AppState {
     users: UsersReduxState;
     widgetDragResize: WidgetDragResizeState;
     imports: ImportReduxState;
-    queryPane: QueryPaneReduxState;
     datasourcePane: DatasourcePaneReduxState;
     help: HelpReduxState;
     apiName: ApiNameReduxState;
@@ -146,6 +143,7 @@ export interface AppState {
     oneClickBinding: OneClickBindingState;
     activeField: ActiveField;
     ide: IDEState;
+    pluginActionEditor: PluginActionEditorState;
   };
   entities: {
     canvasWidgetsStructure: CanvasWidgetStructure;
diff --git a/app/client/src/ce/reducers/uiReducers/apiPaneReducer.ts b/app/client/src/ce/reducers/uiReducers/apiPaneReducer.ts
deleted file mode 100644
index 61bbf458ba1e..000000000000
--- a/app/client/src/ce/reducers/uiReducers/apiPaneReducer.ts
+++ /dev/null
@@ -1,256 +0,0 @@
-import { createReducer } from "utils/ReducerUtils";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
-import {
-  ReduxActionTypes,
-  ReduxActionErrorTypes,
-} from "ee/constants/ReduxActionConstants";
-import type { Action } from "entities/Action";
-import type { UpdateActionPropertyActionPayload } from "actions/pluginActionActions";
-import { ActionExecutionResizerHeight } from "pages/Editor/APIEditor/constants";
-
-export const initialState: ApiPaneReduxState = {
-  isCreating: false,
-  isRunning: {},
-  isSaving: {},
-  isDeleting: {},
-  isDirty: {},
-  extraformData: {},
-  selectedConfigTabIndex: 0,
-  debugger: {
-    open: false,
-    responseTabHeight: ActionExecutionResizerHeight,
-  },
-};
-
-export interface ApiPaneDebuggerState {
-  open: boolean;
-  responseTabHeight: number;
-  selectedTab?: string;
-}
-
-export interface ApiPaneReduxState {
-  isCreating: boolean; // RR
-  isRunning: Record<string, boolean>;
-  isSaving: Record<string, boolean>; // RN
-  isDeleting: Record<string, boolean>;
-  isDirty: Record<string, boolean>;
-  // TODO: Fix this the next time the file is edited
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  extraformData: Record<string, any>;
-  selectedConfigTabIndex: number;
-  debugger: ApiPaneDebuggerState;
-}
-
-export const handlers = {
-  [ReduxActionTypes.FETCH_ACTIONS_INIT]: (state: ApiPaneReduxState) => ({
-    ...state,
-    isFetching: true,
-  }),
-  [ReduxActionTypes.FETCH_ACTIONS_SUCCESS]: (state: ApiPaneReduxState) => ({
-    ...state,
-    isFetching: false,
-  }),
-  [ReduxActionErrorTypes.FETCH_ACTIONS_ERROR]: (state: ApiPaneReduxState) => ({
-    ...state,
-    isFetching: false,
-  }),
-  [ReduxActionTypes.CREATE_ACTION_INIT]: (
-    state: ApiPaneReduxState,
-  ): ApiPaneReduxState => ({
-    ...state,
-    isCreating: true,
-  }),
-  [ReduxActionTypes.CREATE_ACTION_SUCCESS]: (
-    state: ApiPaneReduxState,
-  ): ApiPaneReduxState => ({
-    ...state,
-    isCreating: false,
-  }),
-  [ReduxActionErrorTypes.CREATE_ACTION_ERROR]: (
-    state: ApiPaneReduxState,
-  ): ApiPaneReduxState => ({
-    ...state,
-    isCreating: false,
-  }),
-  [ReduxActionTypes.RUN_ACTION_REQUEST]: (
-    state: ApiPaneReduxState,
-    action: ReduxAction<{ id: string }>,
-  ) => ({
-    ...state,
-    isRunning: {
-      ...state.isRunning,
-      [action.payload.id]: true,
-    },
-    debugger: {
-      ...state.debugger,
-      open: true,
-    },
-  }),
-  [ReduxActionTypes.RUN_ACTION_SUCCESS]: (
-    state: ApiPaneReduxState,
-    // TODO: Fix this the next time the file is edited
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    action: ReduxAction<{ [id: string]: any }>,
-  ) => {
-    const actionId = Object.keys(action.payload)[0];
-
-    return {
-      ...state,
-      isRunning: {
-        ...state.isRunning,
-        [actionId]: false,
-      },
-    };
-  },
-  [ReduxActionErrorTypes.RUN_ACTION_ERROR]: (
-    state: ApiPaneReduxState,
-    action: ReduxAction<{ id: string }>,
-  ) => ({
-    ...state,
-    isRunning: {
-      ...state.isRunning,
-      [action.payload.id]: false,
-    },
-  }),
-  [ReduxActionTypes.RUN_ACTION_CANCELLED]: (
-    state: ApiPaneReduxState,
-    action: ReduxAction<{ id: string }>,
-  ): ApiPaneReduxState => ({
-    ...state,
-    isRunning: {
-      ...state.isRunning,
-      [action.payload.id]: false,
-    },
-  }),
-  [ReduxActionTypes.UPDATE_ACTION_PROPERTY]: (
-    state: ApiPaneReduxState,
-    action: ReduxAction<UpdateActionPropertyActionPayload>,
-  ) => ({
-    ...state,
-    isDirty: {
-      ...state.isDirty,
-      [action.payload.id]: true,
-    },
-  }),
-  [ReduxActionTypes.UPDATE_ACTION_INIT]: (
-    state: ApiPaneReduxState,
-    action: ReduxAction<{ id: string }>,
-  ) => ({
-    ...state,
-    isSaving: {
-      ...state.isSaving,
-      [action.payload.id]: true,
-    },
-  }),
-  [ReduxActionTypes.UPDATE_ACTION_SUCCESS]: (
-    state: ApiPaneReduxState,
-    action: ReduxAction<{ data: Action }>,
-  ) => ({
-    ...state,
-    isSaving: {
-      ...state.isSaving,
-      [action.payload.data.id]: false,
-    },
-    isDirty: {
-      ...state.isDirty,
-      [action.payload.data.id]: false,
-    },
-  }),
-  [ReduxActionErrorTypes.UPDATE_ACTION_ERROR]: (
-    state: ApiPaneReduxState,
-    action: ReduxAction<{ id: string }>,
-  ) => ({
-    ...state,
-    isSaving: {
-      ...state.isSaving,
-      [action.payload.id]: false,
-    },
-  }),
-  [ReduxActionTypes.DELETE_ACTION_INIT]: (
-    state: ApiPaneReduxState,
-    action: ReduxAction<{ id: string }>,
-  ) => ({
-    ...state,
-    isDeleting: {
-      ...state.isDeleting,
-      [action.payload.id]: true,
-    },
-  }),
-  [ReduxActionTypes.DELETE_ACTION_SUCCESS]: (
-    state: ApiPaneReduxState,
-    action: ReduxAction<{ id: string }>,
-  ) => ({
-    ...state,
-    isDeleting: {
-      ...state.isDeleting,
-      [action.payload.id]: false,
-    },
-  }),
-  [ReduxActionErrorTypes.DELETE_ACTION_ERROR]: (
-    state: ApiPaneReduxState,
-    action: ReduxAction<{ id: string }>,
-  ) => ({
-    ...state,
-    isDeleting: {
-      ...state.isDeleting,
-      [action.payload.id]: false,
-    },
-  }),
-
-  /**
-   * This redux action sets the extraformData field for an action. This is used to select the
-   * appropriate body type tab selection in the Rest API plugin based on the content-type.
-   * This redux action can be extended to other functionalities as well in the future.
-   *
-   * @param {ApiPaneReduxState} state
-   * @param {ReduxAction} action
-   * @returns {ApiPaneReduxState}
-   */
-  [ReduxActionTypes.SET_EXTRA_FORMDATA]: (
-    state: ApiPaneReduxState,
-    action: ReduxAction<{ id: string; values: Record<string, unknown> }>,
-  ): ApiPaneReduxState => {
-    const { id, values } = action.payload;
-
-    return {
-      ...state,
-      extraformData: {
-        ...state.extraformData,
-        [id]: values,
-      },
-    };
-  },
-  [ReduxActionTypes.SET_API_PANE_CONFIG_SELECTED_TAB]: (
-    state: ApiPaneReduxState,
-    action: ReduxAction<{ selectedTabIndex: number }>,
-  ) => {
-    const { selectedTabIndex } = action.payload;
-
-    return {
-      ...state,
-      selectedConfigTabIndex: selectedTabIndex,
-    };
-  },
-  [ReduxActionTypes.SET_API_PANE_DEBUGGER_STATE]: (
-    state: ApiPaneReduxState,
-    action: ReduxAction<Partial<ApiPaneDebuggerState>>,
-  ) => {
-    return {
-      ...state,
-      debugger: {
-        ...state.debugger,
-        ...action.payload,
-      },
-    };
-  },
-  [ReduxActionTypes.RESET_EDITOR_REQUEST]: (state: ApiPaneReduxState) => {
-    return {
-      ...state,
-      isSaving: {},
-    };
-  },
-};
-
-const apiPaneReducer = createReducer(initialState, handlers);
-
-export default apiPaneReducer;
diff --git a/app/client/src/ce/reducers/uiReducers/index.tsx b/app/client/src/ce/reducers/uiReducers/index.tsx
index 0a746521b700..35c9294b3969 100644
--- a/app/client/src/ce/reducers/uiReducers/index.tsx
+++ b/app/client/src/ce/reducers/uiReducers/index.tsx
@@ -3,7 +3,6 @@ import errorReducer from "reducers/uiReducers/errorReducer";
 import propertyPaneReducer from "reducers/uiReducers/propertyPaneReducer";
 import appViewReducer from "reducers/uiReducers/appViewReducer";
 import applicationsReducer from "ee/reducers/uiReducers/applicationsReducer";
-import apiPaneReducer from "ee/reducers/uiReducers/apiPaneReducer";
 import datasourcePaneReducer from "reducers/uiReducers/datasourcePaneReducer";
 import authReducer from "reducers/uiReducers/authReducer";
 import workspaceReducer from "ee/reducers/uiReducers/workspaceReducer";
@@ -12,7 +11,6 @@ import buildingBlockReducer from "reducers/uiReducers/buildingBlockReducer";
 import usersReducer from "reducers/uiReducers/usersReducer";
 import { widgetDraggingReducer } from "reducers/uiReducers/dragResizeReducer";
 import importReducer from "reducers/uiReducers/importReducer";
-import queryPaneReducer from "ee/reducers/uiReducers/queryPaneReducer";
 import helpReducer from "reducers/uiReducers/helpReducer";
 import apiNameReducer from "ee/reducers/uiReducers/apiNameReducer";
 import explorerReducer from "ee/reducers/uiReducers/explorerReducer";
@@ -48,8 +46,9 @@ import layoutConversionReducer from "reducers/uiReducers/layoutConversionReducer
 import oneClickBindingReducer from "reducers/uiReducers/oneClickBindingReducer";
 import activeFieldReducer from "reducers/uiReducers/activeFieldEditorReducer";
 import selectedWorkspaceReducer from "ee/reducers/uiReducers/selectedWorkspaceReducer";
-import ideReducer from "../../../reducers/uiReducers/ideReducer";
+import ideReducer from "reducers/uiReducers/ideReducer";
 import consolidatedPageLoadReducer from "reducers/uiReducers/consolidatedPageLoadReducer";
+import { pluginActionReducer } from "PluginActionEditor/store";
 
 export const uiReducerObject = {
   analytics: analyticsReducer,
@@ -59,7 +58,6 @@ export const uiReducerObject = {
   tableFilterPane: tableFilterPaneReducer,
   appView: appViewReducer,
   applications: applicationsReducer,
-  apiPane: apiPaneReducer,
   auth: authReducer,
   templates: templateReducer,
   buildingBlocks: buildingBlockReducer,
@@ -68,7 +66,6 @@ export const uiReducerObject = {
   users: usersReducer,
   widgetDragResize: widgetDraggingReducer,
   imports: importReducer,
-  queryPane: queryPaneReducer,
   datasourcePane: datasourcePaneReducer,
   datasourceName: datasourceNameReducer,
   help: helpReducer,
@@ -104,4 +101,5 @@ export const uiReducerObject = {
   activeField: activeFieldReducer,
   ide: ideReducer,
   consolidatedPageLoad: consolidatedPageLoadReducer,
+  pluginActionEditor: pluginActionReducer,
 };
diff --git a/app/client/src/ce/reducers/uiReducers/queryPaneReducer.ts b/app/client/src/ce/reducers/uiReducers/queryPaneReducer.ts
deleted file mode 100644
index 83b6d37aab24..000000000000
--- a/app/client/src/ce/reducers/uiReducers/queryPaneReducer.ts
+++ /dev/null
@@ -1,231 +0,0 @@
-import { createReducer } from "utils/ReducerUtils";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
-import {
-  ReduxActionTypes,
-  ReduxActionErrorTypes,
-} from "ee/constants/ReduxActionConstants";
-import { omit } from "lodash";
-import type { Action } from "entities/Action";
-import type { ActionResponse } from "api/ActionAPI";
-import { ActionExecutionResizerHeight } from "pages/Editor/APIEditor/constants";
-import { DEBUGGER_TAB_KEYS } from "../../../components/editorComponents/Debugger/helpers";
-
-export const initialState: QueryPaneReduxState = {
-  isRunning: {},
-  isSaving: {},
-  isDeleting: {},
-  runErrorMessage: {},
-  debugger: {
-    open: false,
-    responseTabHeight: ActionExecutionResizerHeight,
-  },
-  selectedConfigTabIndex: "0",
-};
-
-export interface QueryPaneDebuggerState {
-  open: boolean;
-  responseTabHeight: number;
-  selectedTab?: string;
-}
-
-export interface QueryPaneReduxState {
-  isRunning: Record<string, boolean>;
-  isSaving: Record<string, boolean>; // RR
-  isDeleting: Record<string, boolean>;
-  runErrorMessage: Record<string, string>;
-  selectedConfigTabIndex: string;
-  debugger: QueryPaneDebuggerState;
-}
-
-export const handlers = {
-  [ReduxActionTypes.CREATE_ACTION_INIT]: (state: QueryPaneReduxState) => {
-    return {
-      ...state,
-      isCreating: true,
-    };
-  },
-  [ReduxActionTypes.CREATE_ACTION_SUCCESS]: (state: QueryPaneReduxState) => {
-    return {
-      ...state,
-      isCreating: false,
-    };
-  },
-  [ReduxActionErrorTypes.CREATE_ACTION_ERROR]: (state: QueryPaneReduxState) => {
-    return {
-      ...state,
-      isCreating: false,
-    };
-  },
-  [ReduxActionTypes.QUERY_PANE_CHANGE]: (
-    state: QueryPaneReduxState,
-    action: ReduxAction<{ id: string }>,
-  ) => ({
-    ...state,
-    lastUsed: action.payload.id,
-  }),
-  [ReduxActionTypes.UPDATE_ACTION_INIT]: (
-    state: QueryPaneReduxState,
-    action: ReduxAction<{ id: string }>,
-  ) => ({
-    ...state,
-    isSaving: {
-      ...state.isSaving,
-      [action.payload.id]: true,
-    },
-  }),
-  [ReduxActionTypes.UPDATE_ACTION_SUCCESS]: (
-    state: QueryPaneReduxState,
-    action: ReduxAction<{ data: Action }>,
-  ) => ({
-    ...state,
-    isSaving: {
-      ...state.isSaving,
-      [action.payload.data.id]: false,
-    },
-  }),
-  [ReduxActionErrorTypes.UPDATE_ACTION_ERROR]: (
-    state: QueryPaneReduxState,
-    action: ReduxAction<{ id: string }>,
-  ) => ({
-    ...state,
-    isSaving: {
-      ...state.isSaving,
-      [action.payload.id]: false,
-    },
-  }),
-  [ReduxActionTypes.DELETE_ACTION_INIT]: (
-    state: QueryPaneReduxState,
-    action: ReduxAction<{ id: string }>,
-  ) => ({
-    ...state,
-    isDeleting: {
-      ...state.isDeleting,
-      [action.payload.id]: true,
-    },
-  }),
-  [ReduxActionTypes.DELETE_ACTION_SUCCESS]: (
-    state: QueryPaneReduxState,
-    action: ReduxAction<{ id: string }>,
-  ) => ({
-    ...state,
-    isDeleting: {
-      ...state.isDeleting,
-      [action.payload.id]: false,
-    },
-  }),
-  [ReduxActionErrorTypes.DELETE_ACTION_ERROR]: (
-    state: QueryPaneReduxState,
-    action: ReduxAction<{ id: string }>,
-  ) => ({
-    ...state,
-    isDeleting: {
-      ...state.isDeleting,
-      [action.payload.id]: false,
-    },
-  }),
-  [ReduxActionTypes.RUN_ACTION_REQUEST]: (
-    // TODO: Fix this the next time the file is edited
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    state: any,
-    action: ReduxAction<{ id: string }>,
-  ): QueryPaneReduxState => {
-    return {
-      ...state,
-      isRunning: {
-        ...state.isRunning,
-        [action.payload.id]: true,
-      },
-      debugger: {
-        ...state.debugger,
-        selectedTab: DEBUGGER_TAB_KEYS.RESPONSE_TAB,
-        open: true,
-      },
-    };
-  },
-
-  [ReduxActionTypes.RUN_ACTION_CANCELLED]: (
-    // TODO: Fix this the next time the file is edited
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    state: any,
-    action: ReduxAction<{ id: string }>,
-  ) => {
-    return {
-      ...state,
-      isRunning: {
-        ...state.isRunning,
-        [action.payload.id]: false,
-      },
-    };
-  },
-
-  [ReduxActionTypes.RUN_ACTION_SUCCESS]: (
-    // TODO: Fix this the next time the file is edited
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    state: any,
-    action: ReduxAction<{ [id: string]: ActionResponse }>,
-  ) => {
-    const actionId = Object.keys(action.payload)[0];
-
-    return {
-      ...state,
-      isRunning: {
-        ...state.isRunning,
-        [actionId]: false,
-      },
-      runErrorMessage: omit(state.runErrorMessage, [actionId]),
-    };
-  },
-  [ReduxActionErrorTypes.RUN_ACTION_ERROR]: (
-    // TODO: Fix this the next time the file is edited
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    state: any,
-    action: ReduxAction<{ id: string; error: Error }>,
-  ) => {
-    const { error, id } = action.payload;
-
-    return {
-      ...state,
-      isRunning: {
-        ...state.isRunning,
-        [id]: false,
-      },
-      runErrorMessage: {
-        ...state.runError,
-        [id]: error.message,
-      },
-    };
-  },
-  [ReduxActionTypes.SET_QUERY_PANE_CONFIG_SELECTED_TAB]: (
-    state: QueryPaneReduxState,
-    action: ReduxAction<{ selectedTabIndex: number }>,
-  ) => {
-    const { selectedTabIndex } = action.payload;
-
-    return {
-      ...state,
-      selectedConfigTabIndex: selectedTabIndex,
-    };
-  },
-  [ReduxActionTypes.SET_QUERY_PANE_DEBUGGER_STATE]: (
-    state: QueryPaneReduxState,
-    action: ReduxAction<Partial<QueryPaneDebuggerState>>,
-  ) => {
-    return {
-      ...state,
-      debugger: {
-        ...state.debugger,
-        ...action.payload,
-      },
-    };
-  },
-  [ReduxActionTypes.RESET_EDITOR_REQUEST]: (state: QueryPaneReduxState) => {
-    return {
-      ...state,
-      isSaving: {},
-    };
-  },
-};
-
-const queryPaneReducer = createReducer(initialState, handlers);
-
-export default queryPaneReducer;
diff --git a/app/client/src/ce/sagas/PageSagas.tsx b/app/client/src/ce/sagas/PageSagas.tsx
index 12e52ba930c5..d1c8e1e86837 100644
--- a/app/client/src/ce/sagas/PageSagas.tsx
+++ b/app/client/src/ce/sagas/PageSagas.tsx
@@ -193,14 +193,15 @@ export function* refreshTheApp() {
   }
 }
 
-export const getCanvasWidgetsPayload = (
+export const getCanvasWidgetsPayload = async (
   pageResponse: FetchPageResponse,
   dslTransformer?: (dsl: DSLWidget) => DSLWidget,
-): UpdateCanvasPayload => {
-  const extractedDSL = extractCurrentDSL({
+): Promise<UpdateCanvasPayload> => {
+  const currentDSL = await extractCurrentDSL({
     dslTransformer,
     response: pageResponse,
-  }).dsl;
+  });
+  const extractedDSL = currentDSL.dsl;
   const flattenedDSL = flattenDSL(extractedDSL);
   const pageWidgetId = MAIN_CONTAINER_WIDGET_ID;
 
@@ -249,10 +250,9 @@ export function* handleFetchedPage({
     // Wait for widget config to be loaded before we can generate the canvas payload
     yield call(waitForWidgetConfigBuild);
     // Get Canvas payload
-    const canvasWidgetsPayload = getCanvasWidgetsPayload(
-      fetchPageResponse,
-      dslTransformer,
-    );
+
+    const canvasWidgetsPayload: UpdateCanvasPayload =
+      yield getCanvasWidgetsPayload(fetchPageResponse, dslTransformer);
 
     // Update the canvas
     yield put(initCanvasLayout(canvasWidgetsPayload));
@@ -325,12 +325,48 @@ export function* fetchPageSaga(action: ReduxAction<FetchPageActionPayload>) {
   }
 }
 
+export function* updateCanvasLayout(response: FetchPageResponse) {
+  // Wait for widget config to load before we can get the canvas payload
+  yield call(waitForWidgetConfigBuild);
+  // Get Canvas payload
+  const canvasWidgetsPayload: UpdateCanvasPayload =
+    yield getCanvasWidgetsPayload(response);
+
+  // resize main canvas
+  resizePublishedMainCanvasToLowestWidget(canvasWidgetsPayload.widgets);
+  // Update the canvas
+  yield put(initCanvasLayout(canvasWidgetsPayload));
+
+  // Since new page has new layout, we need to generate a data structure
+  // to compute dynamic height based on the new layout.
+  yield put(generateAutoHeightLayoutTreeAction(true, true));
+}
+
+export function* postFetchedPublishedPage(
+  response: FetchPageResponse,
+  pageId: string,
+) {
+  // set current page
+  yield put(
+    updateCurrentPage(
+      pageId,
+      response.data.slug,
+      response.data.userPermissions,
+    ),
+  );
+  // Clear any existing caches
+  yield call(clearEvalCache);
+  // Set url params
+  yield call(setDataUrl);
+
+  yield call(updateCanvasLayout, response);
+}
+
 export function* fetchPublishedPageSaga(
   action: ReduxAction<FetchPublishedPageActionPayload>,
 ) {
   try {
-    const { bustCache, firstLoad, pageId, pageWithMigratedDsl } =
-      action.payload;
+    const { bustCache, pageId, pageWithMigratedDsl } = action.payload;
 
     const params = { pageId, bustCache };
     const response: FetchPageResponse = yield call(
@@ -342,41 +378,9 @@ export function* fetchPublishedPageSaga(
     const isValidResponse: boolean = yield validateResponse(response);
 
     if (isValidResponse) {
-      // Clear any existing caches
-      yield call(clearEvalCache);
-      // Set url params
-      yield call(setDataUrl);
-      // Wait for widget config to load before we can get the canvas payload
-      yield call(waitForWidgetConfigBuild);
-      // Get Canvas payload
-      const canvasWidgetsPayload = getCanvasWidgetsPayload(response);
-
-      // resize main canvas
-      resizePublishedMainCanvasToLowestWidget(canvasWidgetsPayload.widgets);
-      // Update the canvas
-      yield put(initCanvasLayout(canvasWidgetsPayload));
-      // set current page
-      yield put(
-        updateCurrentPage(
-          pageId,
-          response.data.slug,
-          response.data.userPermissions,
-        ),
-      );
+      yield call(postFetchedPublishedPage, response, pageId);
 
-      // dispatch fetch page success
       yield put(fetchPublishedPageSuccess());
-
-      // Since new page has new layout, we need to generate a data structure
-      // to compute dynamic height based on the new layout.
-      yield put(generateAutoHeightLayoutTreeAction(true, true));
-
-      /* Currently, All Actions are fetched in initSagas and on pageSwitch we only fetch page
-       */
-      // Hence, if is not isFirstLoad then trigger evaluation with execute pageLoad action
-      if (!firstLoad) {
-        yield put(fetchAllPageEntityCompletion([executePageLoadActions()]));
-      }
     }
   } catch (error) {
     yield put({
@@ -392,9 +396,9 @@ export function* fetchPublishedPageResourcesSaga(
   action: ReduxAction<FetchPublishedPageResourcesPayload>,
 ) {
   try {
-    const { pageId } = action.payload;
+    const { basePageId, pageId } = action.payload;
 
-    const params = { defaultPageId: pageId };
+    const params = { defaultPageId: basePageId };
     const initConsolidatedApiResponse: ApiResponse<InitConsolidatedApi> =
       yield ConsolidatedPageLoadApi.getConsolidatedPageLoadDataView(params);
 
@@ -410,10 +414,18 @@ export function* fetchPublishedPageResourcesSaga(
       // In future, we can reuse this saga to fetch other resources of the page like actionCollections etc
       const { publishedActions } = response;
 
-      // Sending applicationId as empty as we have publishedActions present,
-      // it won't call the actions view api with applicationId
+      yield call(
+        postFetchedPublishedPage,
+        response.pageWithMigratedDsl,
+        pageId,
+      );
+
+      // NOTE: fetchActionsForView is used here to update publishedActions in redux store and not to fetch actions again
       yield put(fetchActionsForView({ applicationId: "", publishedActions }));
       yield put(fetchAllPageEntityCompletion([executePageLoadActions()]));
+      yield put({
+        type: ReduxActionTypes.FETCH_PUBLISHED_PAGE_RESOURCES_SUCCESS,
+      });
     }
   } catch (error) {
     yield put({
@@ -677,9 +689,11 @@ export function* createNewPageFromEntity(
     // So, the client premptively uses the default page DSL
     // The default page DSL is used and modified using the layout system
     // specific dslTransformer
+    const currentDSL: { dsl: DSLWidget; layoutId: string | undefined } =
+      yield extractCurrentDSL({ dslTransformer });
     const defaultPageLayouts = [
       {
-        dsl: extractCurrentDSL({ dslTransformer }).dsl,
+        dsl: currentDSL.dsl,
         layoutOnLoadActions: [],
       },
     ];
@@ -743,14 +757,17 @@ export function* createPageSaga(action: ReduxAction<CreatePageActionPayload>) {
       // Add this to the page DSLs for entity explorer
       // The dslTransformer may not be necessary for the entity explorer
       // However, we still transform for consistency.
+      const currentDSL: { dsl: DSLWidget; layoutId: string | undefined } =
+        yield extractCurrentDSL({
+          dslTransformer,
+          response,
+        });
+
       yield put({
         type: ReduxActionTypes.FETCH_PAGE_DSL_SUCCESS,
         payload: {
           pageId: response.data.id,
-          dsl: extractCurrentDSL({
-            dslTransformer,
-            response,
-          }).dsl,
+          dsl: currentDSL.dsl,
           layoutId: response.data.layouts[0].id,
         },
       });
@@ -868,7 +885,7 @@ export function* clonePageSaga(
       // We're not sending the `dslTransformer` to the `extractCurrentDSL` function
       // as this is a clone operation, and any layout system specific
       // updates to the DSL would have already been performed in the original page
-      const { dsl, layoutId } = extractCurrentDSL({
+      const { dsl, layoutId } = yield extractCurrentDSL({
         response,
       });
 
@@ -1158,7 +1175,7 @@ export function* fetchPageDSLSaga(
       // between Auto Layout and Fixed layout systems, this means that
       // particularly for these two layout systems the dslTransformer may be necessary
       // unless we're no longer running any conversions
-      const { dsl, layoutId } = extractCurrentDSL({
+      const { dsl, layoutId } = yield extractCurrentDSL({
         dslTransformer,
         response: fetchPageResponse,
       });
@@ -1425,21 +1442,13 @@ export function* setupPublishedPageSaga(
   action: ReduxAction<SetupPublishedPageActionPayload>,
 ) {
   try {
-    const { bustCache, firstLoad, pageId, pageWithMigratedDsl } =
-      action.payload;
+    const { bustCache, pageId, pageWithMigratedDsl } = action.payload;
 
     /*
       Added the first line for isPageSwitching redux state to be true when page is being fetched to fix scroll position issue.
       Added the second line for sync call instead of async (due to first line) as it was leading to issue with on page load actions trigger.
     */
-    yield put(
-      fetchPublishedPageAction(
-        pageId,
-        bustCache,
-        firstLoad,
-        pageWithMigratedDsl,
-      ),
-    );
+    yield put(fetchPublishedPageAction(pageId, bustCache, pageWithMigratedDsl));
     yield take(ReduxActionTypes.FETCH_PUBLISHED_PAGE_SUCCESS);
 
     yield put({
diff --git a/app/client/src/ce/sagas/__tests__/PageSaga.test.ts b/app/client/src/ce/sagas/__tests__/PageSaga.test.ts
index 96dc534cc274..4fb55f74d31b 100644
--- a/app/client/src/ce/sagas/__tests__/PageSaga.test.ts
+++ b/app/client/src/ce/sagas/__tests__/PageSaga.test.ts
@@ -47,7 +47,6 @@ describe("ce/PageSaga", () => {
         pageWithMigratedDsl: mockResponse.data
           .pageWithMigratedDsl as FetchPageResponse,
         bustCache: false,
-        firstLoad: true,
       },
     };
 
@@ -57,7 +56,6 @@ describe("ce/PageSaga", () => {
         fetchPublishedPageAction(
           action.payload.pageId,
           action.payload.bustCache,
-          action.payload.firstLoad,
           action.payload.pageWithMigratedDsl,
         ),
       )
diff --git a/app/client/src/ce/sagas/helpers.ts b/app/client/src/ce/sagas/helpers.ts
index 6a8e70d2c47f..6a57f1cf322e 100644
--- a/app/client/src/ce/sagas/helpers.ts
+++ b/app/client/src/ce/sagas/helpers.ts
@@ -10,6 +10,23 @@ export interface ResolveParentEntityMetadataReturnType {
   parentEntityKey?: CreateNewActionKeyInterface;
 }
 
+// This function is extended in EE. Please check the EE implementation before any modification.
+export interface GenerateDestinationIdInfoReturnType {
+  pageId?: string;
+}
+
+// This function is extended in EE. Please check the EE implementation before any modification.
+export function generateDestinationIdInfoForQueryDuplication(
+  destinationEntityId: string,
+  parentEntityKey: CreateNewActionKeyInterface,
+): GenerateDestinationIdInfoReturnType {
+  if (parentEntityKey === CreateNewActionKey.PAGE) {
+    return { pageId: destinationEntityId };
+  }
+
+  return {};
+}
+
 // This function is extended in EE. Please check the EE implementation before any modification.
 export const resolveParentEntityMetadata = (
   action: Partial<Action>,
diff --git a/app/client/src/ce/sagas/userSagas.tsx b/app/client/src/ce/sagas/userSagas.tsx
index cbf80d702d57..8daba706b682 100644
--- a/app/client/src/ce/sagas/userSagas.tsx
+++ b/app/client/src/ce/sagas/userSagas.tsx
@@ -1,4 +1,4 @@
-import { call, put, race, select, take } from "redux-saga/effects";
+import { call, fork, put, race, select, take } from "redux-saga/effects";
 import type {
   ReduxAction,
   ReduxActionWithPromise,
@@ -9,8 +9,6 @@ import {
 } from "ee/constants/ReduxActionConstants";
 import { reset } from "redux-form";
 import type {
-  CreateUserRequest,
-  CreateUserResponse,
   ForgotPasswordRequest,
   VerifyTokenRequest,
   TokenPasswordUpdateRequest,
@@ -43,7 +41,6 @@ import {
 import AnalyticsUtil from "ee/utils/AnalyticsUtil";
 import { INVITE_USERS_TO_WORKSPACE_FORM } from "ee/constants/forms";
 import type { User } from "constants/userConstants";
-import { ANONYMOUS_USERNAME } from "constants/userConstants";
 import {
   flushErrorsAndRedirect,
   safeCrashAppRequest,
@@ -89,49 +86,6 @@ import type {
 import { selectFeatureFlags } from "ee/selectors/featureFlagsSelectors";
 import { getFromServerWhenNoPrefetchedResult } from "sagas/helper";
 
-export function* createUserSaga(
-  action: ReduxActionWithPromise<CreateUserRequest>,
-) {
-  const { email, password, reject, resolve } = action.payload;
-
-  try {
-    const request: CreateUserRequest = { email, password };
-    const response: CreateUserResponse = yield callAPI(
-      UserApi.createUser,
-      request,
-    );
-    //TODO(abhinav): DRY this
-    const isValidResponse: boolean = yield validateResponse(response);
-
-    if (!isValidResponse) {
-      const errorMessage = getResponseErrorMessage(response);
-
-      yield call(reject, { _error: errorMessage });
-    } else {
-      //@ts-expect-error: response is of type unknown
-      const { email, id, name } = response.data;
-
-      yield put({
-        type: ReduxActionTypes.CREATE_USER_SUCCESS,
-        payload: {
-          email,
-          name,
-          id,
-        },
-      });
-      yield call(resolve);
-    }
-  } catch (error) {
-    yield call(reject, { _error: (error as Error).message });
-    yield put({
-      type: ReduxActionErrorTypes.CREATE_USER_ERROR,
-      payload: {
-        error,
-      },
-    });
-  }
-}
-
 export function* waitForSegmentInit(skipWithAnonymousId: boolean) {
   if (skipWithAnonymousId && AnalyticsUtil.getAnonymousId()) return;
 
@@ -183,27 +137,25 @@ export function* getCurrentUserSaga(action?: {
   }
 }
 
+function* initTrackers(currentUser: User) {
+  const initializeSentry = initializeAnalyticsAndTrackers(currentUser);
+
+  const sentryInitialized: boolean = yield initializeSentry;
+
+  if (sentryInitialized) {
+    yield put(segmentInitSuccess());
+  } else {
+    yield put(segmentInitUncertain());
+  }
+}
+
 export function* runUserSideEffectsSaga() {
   const currentUser: User = yield select(getCurrentUser);
   const { enableTelemetry } = currentUser;
   const isAirgappedInstance = isAirgapped();
 
   if (enableTelemetry) {
-    const promise = initializeAnalyticsAndTrackers();
-
-    if (promise instanceof Promise) {
-      const result: boolean = yield promise;
-
-      if (result) {
-        yield put(segmentInitSuccess());
-      } else {
-        yield put(segmentInitUncertain());
-      }
-    }
-  }
-
-  if (!currentUser.isAnonymous && currentUser.username !== ANONYMOUS_USERNAME) {
-    enableTelemetry && AnalyticsUtil.identifyUser(currentUser);
+    yield fork(initTrackers, currentUser);
   }
 
   const isFFFetched: boolean = yield select(getFeatureFlagsFetched);
@@ -413,14 +365,13 @@ export function* inviteUsers(
 
 export function* updateUserDetailsSaga(action: ReduxAction<UpdateUserRequest>) {
   try {
-    const { email, intercomConsentGiven, name, proficiency, role, useCase } =
+    const { email, intercomConsentGiven, name, proficiency, useCase } =
       action.payload;
 
     const response: ApiResponse = yield callAPI(UserApi.updateUser, {
       email,
       name,
       proficiency,
-      role,
       useCase,
       intercomConsentGiven,
     });
diff --git a/app/client/src/ce/selectors/appIDESelectors.ts b/app/client/src/ce/selectors/appIDESelectors.ts
index d7df0c96b1e9..3d17b4894ef8 100644
--- a/app/client/src/ce/selectors/appIDESelectors.ts
+++ b/app/client/src/ce/selectors/appIDESelectors.ts
@@ -7,6 +7,9 @@ import {
 } from "ee/selectors/entitiesSelector";
 import { getJSTabs, getQueryTabs } from "selectors/ideSelectors";
 import type { AppState } from "ee/reducers";
+import { identifyEntityFromPath } from "navigation/FocusEntity";
+import { getCurrentPageId } from "selectors/editorSelectors";
+import { getQueryEntityItemUrl } from "ee/pages/Editor/IDE/EditorPane/Query/utils";
 
 export type EditorSegmentList = Array<{
   group: string | "NA";
@@ -68,3 +71,16 @@ export const selectQuerySegmentEditorTabs = (state: AppState) => {
 
   return tabs.map((tab) => keyedItems[tab]).filter(Boolean);
 };
+
+export const getLastQueryTab = createSelector(
+  selectQuerySegmentEditorTabs,
+  getCurrentPageId,
+  (tabs, pageId) => {
+    if (tabs.length) {
+      const url = getQueryEntityItemUrl(tabs[tabs.length - 1], pageId);
+      const urlWithoutQueryParams = url.split("?")[0];
+
+      return identifyEntityFromPath(urlWithoutQueryParams);
+    }
+  },
+);
diff --git a/app/client/src/ce/selectors/entitiesSelector.ts b/app/client/src/ce/selectors/entitiesSelector.ts
index afe96173b641..03262d1b6489 100644
--- a/app/client/src/ce/selectors/entitiesSelector.ts
+++ b/app/client/src/ce/selectors/entitiesSelector.ts
@@ -59,12 +59,16 @@ import {
 import { MAX_DATASOURCE_SUGGESTIONS } from "constants/DatasourceEditorConstants";
 import type { CreateNewActionKeyInterface } from "ee/entities/Engine/actionHelpers";
 import { getNextEntityName } from "utils/AppsmithUtils";
-import type { EntityItem } from "ee/entities/IDE/constants";
+import { EditorEntityTab, type EntityItem } from "ee/entities/IDE/constants";
 import {
   ActionUrlIcon,
   JsFileIconV2,
 } from "pages/Editor/Explorer/ExplorerIcons";
 import { getAssetUrl } from "ee/utils/airgapHelpers";
+import {
+  getIsSavingForApiName,
+  getIsSavingForJSObjectName,
+} from "selectors/ui";
 
 export enum GROUP_TYPES {
   API = "APIs",
@@ -869,28 +873,6 @@ export function getPageNameByPageId(state: AppState, pageId: string): string {
   return page ? page.pageName : "";
 }
 
-const getQueryPaneSavingMap = (state: AppState) => state.ui.queryPane.isSaving;
-
-export const getApiPaneSavingMap = (state: AppState) =>
-  state.ui.apiPane.isSaving;
-const getActionDirtyState = (state: AppState) => state.ui.apiPane.isDirty;
-
-export const isActionSaving = (id: string) =>
-  createSelector(
-    [getQueryPaneSavingMap, getApiPaneSavingMap],
-    (querySavingMap, apiSavingsMap) => {
-      return (
-        (id in querySavingMap && querySavingMap[id]) ||
-        (id in apiSavingsMap && apiSavingsMap[id])
-      );
-    },
-  );
-
-export const isActionDirty = (id: string) =>
-  createSelector([getActionDirtyState], (actionDirtyMap) => {
-    return id in actionDirtyMap && actionDirtyMap[id];
-  });
-
 export const getAppData = (state: AppState) => state.entities.app;
 
 export const getAppStoreData = (state: AppState): AppStoreState =>
@@ -1672,6 +1654,7 @@ export const getQuerySegmentItems = createSelector(
         key: action.config.baseId,
         type: action.config.pluginType,
         group,
+        userPermissions: action.config.userPermissions,
       };
     });
 
@@ -1686,6 +1669,7 @@ export const getJSSegmentItems = createSelector(
       title: js.config.name,
       key: js.config.baseId,
       type: PluginType.JS,
+      userPermissions: js.config.userPermissions,
     }));
 
     return items;
@@ -1713,3 +1697,22 @@ export const getDatasourceUsageCountForApp = createSelector(
     return actionDsMap;
   },
 );
+
+export interface IsSavingEntityNameParams {
+  id: string;
+  segment: EditorEntityTab;
+  entity?: EntityItem;
+}
+
+export const getIsSavingEntityName = (
+  state: AppState,
+  { id, segment }: IsSavingEntityNameParams,
+) => {
+  let isSavingEntityName = getIsSavingForApiName(state, id);
+
+  if (EditorEntityTab.JS === segment) {
+    isSavingEntityName = getIsSavingForJSObjectName(state, id);
+  }
+
+  return isSavingEntityName;
+};
diff --git a/app/client/src/ce/utils/AnalyticsUtil.tsx b/app/client/src/ce/utils/AnalyticsUtil.tsx
index 9a8548006f11..4aebc519ed61 100644
--- a/app/client/src/ce/utils/AnalyticsUtil.tsx
+++ b/app/client/src/ce/utils/AnalyticsUtil.tsx
@@ -14,6 +14,7 @@ export function getUserSource() {
 
   return source;
 }
+
 declare global {
   interface Window {
     // Zipy is added via script tags in index.html
@@ -70,6 +71,7 @@ class AnalyticsUtil {
   static blockTrackEvent: boolean | undefined;
   static instanceId?: string = "";
   static blockErrorLogs = false;
+
   static initializeSmartLook(id: string) {
     smartlookClient.init(id);
   }
@@ -364,6 +366,7 @@ class AnalyticsUtil {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     (window as any).analytics = undefined;
   }
+
   static setBlockErrorLogs(value: boolean) {
     AnalyticsUtil.blockErrorLogs = value;
   }
diff --git a/app/client/src/ce/utils/analyticsUtilTypes.ts b/app/client/src/ce/utils/analyticsUtilTypes.ts
index 988306feb3d7..9bb8ea464f57 100644
--- a/app/client/src/ce/utils/analyticsUtilTypes.ts
+++ b/app/client/src/ce/utils/analyticsUtilTypes.ts
@@ -48,11 +48,8 @@ export type EventName =
   | "DELETE_SAAS"
   | "RUN_SAAS_API"
   | "SAVE_API_CLICK"
-  | "RUN_API"
   | "RUN_API_CLICK"
-  | "RUN_API_SHORTCUT"
   | "DELETE_API"
-  | "DELETE_API_CLICK"
   | "IMPORT_API"
   | "EXPAND_API"
   | "IMPORT_API_CLICK"
@@ -60,9 +57,8 @@ export type EventName =
   | "ADD_API_PAGE"
   | "DUPLICATE_ACTION"
   | "DUPLICATE_ACTION_CLICK"
-  | "RUN_QUERY"
   | "RUN_QUERY_CLICK"
-  | "RUN_QUERY_SHORTCUT"
+  | "RUN_ACTION_CLICK"
   | "DELETE_QUERY"
   | "MOVE_API"
   | "3P_PROVIDER_CLICK"
diff --git a/app/client/src/ce/utils/serviceWorkerUtils.test.ts b/app/client/src/ce/utils/serviceWorkerUtils.test.ts
index 87c07a50c60f..5a71363c89e1 100644
--- a/app/client/src/ce/utils/serviceWorkerUtils.test.ts
+++ b/app/client/src/ce/utils/serviceWorkerUtils.test.ts
@@ -212,6 +212,7 @@ describe("serviceWorkerUtils", () => {
       const expectedParams: TApplicationParams = {
         origin: "https://app.appsmith.com",
         basePageId,
+        applicationSlug: "my-app",
         baseApplicationId: undefined,
         branchName: "main",
         appMode: APP_MODE.EDIT,
@@ -227,6 +228,7 @@ describe("serviceWorkerUtils", () => {
       const expectedParams: TApplicationParams = {
         origin: "https://app.appsmith.com",
         basePageId,
+        applicationSlug: "my-app",
         baseApplicationId: undefined,
         branchName: "main",
         appMode: APP_MODE.PUBLISHED,
@@ -307,6 +309,7 @@ describe("serviceWorkerUtils", () => {
       );
       const expectedParams: TApplicationParams = {
         origin: "https://app.appsmith.com",
+        applicationSlug: "my-app",
         basePageId,
         baseApplicationId: undefined,
         branchName: "",
diff --git a/app/client/src/ce/utils/serviceWorkerUtils.ts b/app/client/src/ce/utils/serviceWorkerUtils.ts
index e32455dbcd07..7d729e72826d 100644
--- a/app/client/src/ce/utils/serviceWorkerUtils.ts
+++ b/app/client/src/ce/utils/serviceWorkerUtils.ts
@@ -9,11 +9,12 @@ import {
   VIEWER_CUSTOM_PATH,
   BUILDER_PATH_DEPRECATED,
   VIEWER_PATH_DEPRECATED,
-} from "ee/constants/routes/appRoutes";
+} from "../constants/routes/appRoutes";
 
 interface TMatchResult {
   basePageId?: string;
   baseApplicationId?: string;
+  applicationSlug?: string;
 }
 
 export interface TApplicationParams {
@@ -22,6 +23,7 @@ export interface TApplicationParams {
   baseApplicationId?: string;
   branchName: string;
   appMode: APP_MODE;
+  applicationSlug?: string;
 }
 
 type TApplicationParamsOrNull = TApplicationParams | null;
@@ -57,33 +59,36 @@ export const getSearchQuery = (search = "", key: string) => {
 };
 
 export const getApplicationParamsFromUrl = (
-  url: URL,
+  urlParams: Pick<URL, "origin" | "pathname" | "search">,
 ): TApplicationParamsOrNull => {
+  const { origin, pathname, search } = urlParams;
   // Get the branch name from the query string
-  const branchName = getSearchQuery(url.search, "branch");
+  const branchName = getSearchQuery(search, "branch");
 
-  const matchedBuilder: Match<TMatchResult> = matchBuilderPath(url.pathname, {
+  const matchedBuilder: Match<TMatchResult> = matchBuilderPath(pathname, {
     end: false,
   });
-  const matchedViewer: Match<TMatchResult> = matchViewerPath(url.pathname);
+  const matchedViewer: Match<TMatchResult> = matchViewerPath(pathname);
 
   if (matchedBuilder) {
     return {
-      origin: url.origin,
+      origin,
       basePageId: matchedBuilder.params.basePageId,
       baseApplicationId: matchedBuilder.params.baseApplicationId,
       branchName,
       appMode: APP_MODE.EDIT,
+      applicationSlug: matchedBuilder.params.applicationSlug,
     };
   }
 
   if (matchedViewer) {
     return {
-      origin: url.origin,
+      origin,
       basePageId: matchedViewer.params.basePageId,
       baseApplicationId: matchedViewer.params.baseApplicationId,
       branchName,
       appMode: APP_MODE.PUBLISHED,
+      applicationSlug: matchedViewer.params.applicationSlug,
     };
   }
 
diff --git a/app/client/src/ce/workers/Evaluation/evalWorkerActions.ts b/app/client/src/ce/workers/Evaluation/evalWorkerActions.ts
index ffd267a62e24..cee80158781f 100644
--- a/app/client/src/ce/workers/Evaluation/evalWorkerActions.ts
+++ b/app/client/src/ce/workers/Evaluation/evalWorkerActions.ts
@@ -1,6 +1,5 @@
 export enum EVAL_WORKER_SYNC_ACTION {
   SETUP = "SETUP",
-  EVAL_TREE = "EVAL_TREE",
   EVAL_ACTION_BINDINGS = "EVAL_ACTION_BINDINGS",
   CLEAR_CACHE = "CLEAR_CACHE",
   VALIDATE_PROPERTY = "VALIDATE_PROPERTY",
@@ -16,6 +15,7 @@ export enum EVAL_WORKER_SYNC_ACTION {
 }
 
 export enum EVAL_WORKER_ASYNC_ACTION {
+  EVAL_TREE = "EVAL_TREE",
   EVAL_TRIGGER = "EVAL_TRIGGER",
   EVAL_EXPRESSION = "EVAL_EXPRESSION",
   LOAD_LIBRARIES = "LOAD_LIBRARIES",
diff --git a/app/client/src/components/common/Card.tsx b/app/client/src/components/common/Card.tsx
index cb77fd8d7ed2..bc6e4a8d05bf 100644
--- a/app/client/src/components/common/Card.tsx
+++ b/app/client/src/components/common/Card.tsx
@@ -336,14 +336,14 @@ function Card({
         className={testId}
         hasReadPermission={hasReadPermission}
         isContextMenuOpen={isContextMenuOpen}
-        onMouseEnter={() => {
-          !isFetching && setShowOverlay(true);
-        }}
         onMouseLeave={() => {
           // If the menu is not open, then setOverlay false
           // Set overlay false on outside click.
           !isContextMenuOpen && setShowOverlay(false);
         }}
+        onMouseOver={() => {
+          !isFetching && setShowOverlay(true);
+        }}
         showOverlay={showOverlay}
         testId={testId}
       >
diff --git a/app/client/src/components/designSystems/blueprintjs/icon/Icon.tsx b/app/client/src/components/designSystems/blueprintjs/icon/Icon.tsx
index 58d701c33f43..2456625d6d2c 100644
--- a/app/client/src/components/designSystems/blueprintjs/icon/Icon.tsx
+++ b/app/client/src/components/designSystems/blueprintjs/icon/Icon.tsx
@@ -1,9 +1,13 @@
 // See readme.md for why this file exists.
 
-import React, { useMemo } from "react";
+import React, {
+  useEffect,
+  useState,
+  type ComponentType,
+  type SVGProps,
+} from "react";
 import classNames from "classnames";
 import type { IconProps } from "@blueprintjs/core";
-import svgImportsMap from "components/designSystems/blueprintjs/icon/svgImportsMap";
 // Below symbols must be imported directly from target files to avoid crashes
 // caused by cyclic dependencies in @blueprintjs/core.
 import {
@@ -12,12 +16,39 @@ import {
   intentClass,
 } from "@blueprintjs/core/lib/esm/common/classes";
 import { importSvg } from "@appsmith/ads-old";
+import type { IconName } from "@blueprintjs/core";
+import log from "loglevel";
 
 // This export must be named "IconSize" to match the exports of @blueprintjs/core/lib/esm/components/icon
 export enum IconSize {
   STANDARD = 16,
   LARGE = 20,
 }
+type IconMapType = Record<
+  IconName,
+  // eslint-disable-next-line @typescript-eslint/consistent-type-imports
+  Record<IconSize, () => Promise<typeof import("*.svg")>>
+>;
+
+// Cache for lazy-loaded svg imports
+let cachedSvgImportsMap: IconMapType | null = null;
+
+// Function to lazily load the file once
+const loadSvgImportsMapOnce = async () => {
+  if (!cachedSvgImportsMap) {
+    try {
+      const { default: svgImportsMap } = await import(
+        "components/designSystems/blueprintjs/icon/svgImportsMap"
+      );
+
+      cachedSvgImportsMap = svgImportsMap; // Cache the module for future use
+    } catch (e) {
+      log.error("Error loading SvgImportsMap", e);
+    }
+  }
+
+  return cachedSvgImportsMap;
+};
 
 function Icon(props: IconProps) {
   const {
@@ -31,18 +62,32 @@ function Icon(props: IconProps) {
     tagName: TagName = "span",
     ...htmlprops
   } = props;
+  const [SvgIcon, setSvgIcon] = useState<ComponentType<
+    SVGProps<SVGSVGElement>
+  > | null>(null);
 
   // choose which pixel grid is most appropriate for given icon size
   const pixelGridSize =
     size >= IconSize.LARGE ? IconSize.LARGE : IconSize.STANDARD;
 
-  // render the icon, or nothing if icon name is unknown.
-  const SvgIcon = useMemo(() => {
-    if (typeof icon === "string" && icon in svgImportsMap) {
-      return importSvg(svgImportsMap[icon][pixelGridSize]);
-    }
+  useEffect(() => {
+    const loadScript = async () => {
+      // Load the cached svgImportsMap once
+      const svgImportsMap = await loadSvgImportsMapOnce();
+
+      if (svgImportsMap && typeof icon === "string" && icon in svgImportsMap) {
+        const SvgIcon = await importSvg(svgImportsMap[icon][pixelGridSize]);
+
+        setSvgIcon(() => SvgIcon); // Set the component as lazy-loaded
+      }
+    };
+
+    loadScript();
 
-    return () => null;
+    // Cleanup on unmount
+    return () => {
+      setSvgIcon(null);
+    };
   }, [icon, pixelGridSize]);
 
   if (icon == null || typeof icon === "boolean") {
@@ -68,13 +113,15 @@ function Icon(props: IconProps) {
         icon={icon}
         title={htmlTitle}
       >
-        <SvgIcon
-          data-icon={icon}
-          fill={color}
-          height={size}
-          viewBox={viewBox}
-          width={size}
-        />
+        {SvgIcon && (
+          <SvgIcon
+            data-icon={icon}
+            fill={color}
+            height={size}
+            viewBox={viewBox}
+            width={size}
+          />
+        )}
       </TagName>
     );
   }
diff --git a/app/client/src/components/editorComponents/ActionCreator/viewComponents/ActionBlockTree/utils.tsx b/app/client/src/components/editorComponents/ActionCreator/viewComponents/ActionBlockTree/utils.tsx
index 474ea6c4bf58..b148e4e40036 100644
--- a/app/client/src/components/editorComponents/ActionCreator/viewComponents/ActionBlockTree/utils.tsx
+++ b/app/client/src/components/editorComponents/ActionCreator/viewComponents/ActionBlockTree/utils.tsx
@@ -9,7 +9,7 @@ import { getCodeFromMoustache, getEvaluationVersion } from "../../utils";
 import { ApiMethodIcon } from "pages/Editor/Explorer/ExplorerIcons";
 import { getCurrentActions } from "ee/selectors/entitiesSelector";
 import { useSelector } from "react-redux";
-import type { HTTP_METHOD } from "constants/ApiEditorConstants/CommonApiConstants";
+import type { HTTP_METHOD } from "PluginActionEditor/constants/CommonApiConstants";
 
 function GetIconForAction(
   actionType: ActionTree["actionType"],
diff --git a/app/client/src/components/editorComponents/ActionNameEditor.tsx b/app/client/src/components/editorComponents/ActionNameEditor.tsx
index 1d9bf01aa7cb..7db94c26666d 100644
--- a/app/client/src/components/editorComponents/ActionNameEditor.tsx
+++ b/app/client/src/components/editorComponents/ActionNameEditor.tsx
@@ -17,8 +17,6 @@ import {
 } from "ee/constants/messages";
 import type { ReduxAction } from "ee/constants/ReduxActionConstants";
 import type { SaveActionNameParams } from "PluginActionEditor";
-import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
-import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
 import type { Action } from "entities/Action";
 import type { ModuleInstance } from "ee/constants/ModuleInstanceConstants";
 
@@ -49,10 +47,6 @@ function ActionNameEditor(props: ActionNameEditorProps) {
     saveStatus,
   } = props;
 
-  const isActionRedesignEnabled = useFeatureFlag(
-    FEATURE_FLAG.release_actions_redesign_enabled,
-  );
-
   return (
     <NameEditorComponent
       id={actionConfig?.id}
@@ -89,7 +83,7 @@ function ActionNameEditor(props: ActionNameEditorProps) {
               editInteractionKind={EditInteractionKind.SINGLE}
               errorTooltipClass="t--action-name-edit-error"
               forceDefault={forceUpdate}
-              iconSize={isActionRedesignEnabled ? "sm" : "md"}
+              iconSize={"md"}
               isEditingDefault={isNew}
               isInvalid={isInvalidNameForEntity}
               onTextChanged={handleNameChange}
diff --git a/app/client/src/components/editorComponents/ApiResponseView.test.tsx b/app/client/src/components/editorComponents/ApiResponseView.test.tsx
index cd747429b4f3..189f6beaa306 100644
--- a/app/client/src/components/editorComponents/ApiResponseView.test.tsx
+++ b/app/client/src/components/editorComponents/ApiResponseView.test.tsx
@@ -50,7 +50,7 @@ const storeState = {
         errorCount: 0,
       },
     },
-    apiPane: {
+    pluginActionEditor: {
       debugger: {
         open: true,
         responseTabHeight: 200,
@@ -81,7 +81,7 @@ describe("ApiResponseView", () => {
           <Router>
             <ApiResponseView
               currentActionConfig={Api1}
-              disabled={false}
+              isRunDisabled={false}
               isRunning={false}
               onRunClick={noop}
             />
diff --git a/app/client/src/components/editorComponents/ApiResponseView.tsx b/app/client/src/components/editorComponents/ApiResponseView.tsx
index 623973d23735..ef01cbd7d9ce 100644
--- a/app/client/src/components/editorComponents/ApiResponseView.tsx
+++ b/app/client/src/components/editorComponents/ApiResponseView.tsx
@@ -14,13 +14,15 @@ import ErrorLogs from "./Debugger/Errors";
 import AnalyticsUtil from "ee/utils/AnalyticsUtil";
 import type { BottomTab } from "./EntityBottomTabs";
 import EntityBottomTabs from "./EntityBottomTabs";
-import { DEBUGGER_TAB_KEYS } from "./Debugger/helpers";
+import { DEBUGGER_TAB_KEYS } from "./Debugger/constants";
 import { getErrorCount } from "selectors/debuggerSelectors";
-import { ActionExecutionResizerHeight } from "pages/Editor/APIEditor/constants";
+import { ActionExecutionResizerHeight } from "PluginActionEditor/components/PluginActionResponse/constants";
 import type { Action } from "entities/Action";
 import { EMPTY_RESPONSE } from "./emptyResponse";
-import { setApiPaneDebuggerState } from "actions/apiPaneActions";
-import { getApiPaneDebuggerState } from "selectors/apiPaneSelectors";
+import {
+  getPluginActionDebuggerState,
+  setPluginActionEditorDebuggerState,
+} from "PluginActionEditor/store";
 import { getIDEViewMode } from "selectors/ideSelectors";
 import { EditorViewMode } from "ee/entities/IDE/constants";
 import useDebuggerTriggerClick from "./Debugger/hooks/useDebuggerTriggerClick";
@@ -31,7 +33,7 @@ import { ApiResponseHeaders } from "PluginActionEditor/components/PluginActionRe
 interface Props {
   currentActionConfig: Action;
   theme?: EditorTheme;
-  disabled: boolean;
+  isRunDisabled: boolean;
   onRunClick: () => void;
   actionResponse?: ActionResponse;
   isRunning: boolean;
@@ -41,7 +43,7 @@ function ApiResponseView(props: Props) {
   const {
     actionResponse = EMPTY_RESPONSE,
     currentActionConfig,
-    disabled,
+    isRunDisabled = false,
     isRunning,
     theme = EditorTheme.LIGHT,
   } = props;
@@ -49,7 +51,7 @@ function ApiResponseView(props: Props) {
   const dispatch = useDispatch();
   const errorCount = useSelector(getErrorCount);
   const { open, responseTabHeight, selectedTab } = useSelector(
-    getApiPaneDebuggerState,
+    getPluginActionDebuggerState,
   );
 
   const ideViewMode = useSelector(getIDEViewMode);
@@ -72,7 +74,9 @@ function ApiResponseView(props: Props) {
         });
       }
 
-      dispatch(setApiPaneDebuggerState({ open: true, selectedTab: tabKey }));
+      dispatch(
+        setPluginActionEditorDebuggerState({ open: true, selectedTab: tabKey }),
+      );
     },
     [dispatch],
   );
@@ -80,7 +84,9 @@ function ApiResponseView(props: Props) {
   // update the height of the response pane on resize.
   const updateResponsePaneHeight = useCallback(
     (height: number) => {
-      dispatch(setApiPaneDebuggerState({ responseTabHeight: height }));
+      dispatch(
+        setPluginActionEditorDebuggerState({ responseTabHeight: height }),
+      );
     },
     [dispatch],
   );
@@ -93,7 +99,7 @@ function ApiResponseView(props: Props) {
         <ApiResponse
           action={currentActionConfig}
           actionResponse={actionResponse}
-          isRunDisabled={disabled}
+          isRunDisabled={isRunDisabled}
           isRunning={isRunning}
           onRunClick={onRunClick}
           responseTabHeight={responseTabHeight}
@@ -107,7 +113,7 @@ function ApiResponseView(props: Props) {
       panelComponent: (
         <ApiResponseHeaders
           actionResponse={actionResponse}
-          isRunDisabled={disabled}
+          isRunDisabled={isRunDisabled}
           isRunning={isRunning}
           onDebugClick={onDebugClick}
           onRunClick={onRunClick}
@@ -135,7 +141,7 @@ function ApiResponseView(props: Props) {
   // close the debugger
   //TODO: move this to a common place
   const toggleHide = useCallback(
-    () => dispatch(setApiPaneDebuggerState({ open: !open })),
+    () => dispatch(setPluginActionEditorDebuggerState({ open: !open })),
     [dispatch, open],
   );
 
diff --git a/app/client/src/components/editorComponents/CodeEditor/EditorConfig.ts b/app/client/src/components/editorComponents/CodeEditor/EditorConfig.ts
index 4bbe96454509..1c31557f9a2a 100644
--- a/app/client/src/components/editorComponents/CodeEditor/EditorConfig.ts
+++ b/app/client/src/components/editorComponents/CodeEditor/EditorConfig.ts
@@ -54,6 +54,11 @@ export const EditorThemes: Record<EditorTheme, string> = {
   [EditorTheme.DARK]: "duotone-dark",
 };
 
+export interface BlockCompletion {
+  parentPath: string;
+  subPath: string;
+}
+
 export interface FieldEntityInformation {
   entityName?: string;
   expectedType?: AutocompleteDataType;
@@ -61,7 +66,7 @@ export interface FieldEntityInformation {
   entityId?: string;
   propertyPath?: string;
   isTriggerPath?: boolean;
-  blockCompletions?: Array<{ parentPath: string; subPath: string }>;
+  blockCompletions?: Array<BlockCompletion>;
   example?: ExpectedValueExample;
   mode?: TEditorModes;
   token?: CodeMirror.Token;
diff --git a/app/client/src/components/editorComponents/CodeEditor/EvaluatedValuePopup.tsx b/app/client/src/components/editorComponents/CodeEditor/EvaluatedValuePopup.tsx
index 8e19d836f53b..b28429e7b866 100644
--- a/app/client/src/components/editorComponents/CodeEditor/EvaluatedValuePopup.tsx
+++ b/app/client/src/components/editorComponents/CodeEditor/EvaluatedValuePopup.tsx
@@ -29,7 +29,7 @@ import { getEntityNameAndPropertyPath } from "ee/workers/Evaluation/evaluationUt
 import { getPathNavigationUrl } from "selectors/navigationSelectors";
 import { Button, Icon, Link, toast, Tooltip } from "@appsmith/ads";
 import type { EvaluationError } from "utils/DynamicBindingUtils";
-import { DEBUGGER_TAB_KEYS } from "../Debugger/helpers";
+import { DEBUGGER_TAB_KEYS } from "../Debugger/constants";
 
 const modifiers: IPopoverSharedProps["modifiers"] = {
   offset: {
@@ -92,6 +92,7 @@ const CurrentValueWrapper = styled.div<{ colorTheme: EditorTheme }>`
   display: flex;
   align-items: center;
   justify-content: space-between;
+
   &:hover {
     .copyIconWrapper {
       display: flex;
@@ -99,6 +100,7 @@ const CurrentValueWrapper = styled.div<{ colorTheme: EditorTheme }>`
   }
 
   /* for audit logs */
+
   .pushed-content .object-key-val,
   .variable-row {
     border-left: 1px solid var(--ads-v2-color-border) !important;
@@ -173,6 +175,7 @@ const StyledIcon = styled(Icon)`
   &.open-collapse {
     transform: rotate(90deg);
   }
+
   float: right;
 `;
 
@@ -281,13 +284,14 @@ interface PreparedStatementValue {
   value: string;
   parameters: Record<string, number | string>;
 }
+
 export function PreparedStatementViewer(props: {
   evaluatedValue: PreparedStatementValue;
 }) {
   const { parameters, value } = props.evaluatedValue;
 
   if (!value) {
-    Sentry.captureException("Prepared Statement got no value", {
+    Sentry.captureException("Prepared statement got no value", {
       level: Severity.Debug,
       extra: { props },
     });
diff --git a/app/client/src/components/editorComponents/CodeEditor/codeEditorUtils.ts b/app/client/src/components/editorComponents/CodeEditor/codeEditorUtils.ts
index 4df9bd20fdee..8f9ff477825a 100644
--- a/app/client/src/components/editorComponents/CodeEditor/codeEditorUtils.ts
+++ b/app/client/src/components/editorComponents/CodeEditor/codeEditorUtils.ts
@@ -4,9 +4,6 @@ import type { WidgetEntity, ActionEntity } from "ee/entities/DataTree/types";
 import { trim } from "lodash";
 import { getDynamicStringSegments } from "utils/DynamicBindingUtils";
 import { EditorSize } from "./EditorConfig";
-import { selectFeatureFlagCheck } from "ee/selectors/featureFlagsSelectors";
-import store from "store";
-import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
 import { SlashCommandMenuOnFocusWidgetProps } from "./constants";
 
 // TODO: Fix this the next time the file is edited
@@ -168,13 +165,7 @@ export function shouldShowSlashCommandMenu(
   widgetType: string = "",
   propertyPath: string = "",
 ) {
-  const isEaseOfUseFlagEnabled = selectFeatureFlagCheck(
-    store.getState(),
-    FEATURE_FLAG.ab_learnability_ease_of_initial_use_enabled,
-  );
-
   return (
-    !!isEaseOfUseFlagEnabled &&
     !!SlashCommandMenuOnFocusWidgetProps[widgetType] &&
     SlashCommandMenuOnFocusWidgetProps[widgetType].includes(propertyPath)
   );
diff --git a/app/client/src/components/editorComponents/CodeEditor/index.tsx b/app/client/src/components/editorComponents/CodeEditor/index.tsx
index fb825654305e..8c9027dc647e 100644
--- a/app/client/src/components/editorComponents/CodeEditor/index.tsx
+++ b/app/client/src/components/editorComponents/CodeEditor/index.tsx
@@ -47,6 +47,7 @@ import type {
   Hinter,
   HintHelper,
   MarkHelper,
+  BlockCompletion,
 } from "components/editorComponents/CodeEditor/EditorConfig";
 import {
   EditorModes,
@@ -95,7 +96,6 @@ import { getRecentEntityIds } from "selectors/globalSearchSelectors";
 import type { AutocompleteDataType } from "utils/autocomplete/AutocompleteDataType";
 import type { Placement } from "@blueprintjs/popover2";
 import { getLintAnnotations, getLintTooltipDirection } from "./lintHelpers";
-import { executeCommandAction } from "actions/apiPaneActions";
 import { startingEntityUpdate } from "actions/editorActions";
 import type { SlashCommandPayload } from "entities/Action";
 import type { Indices } from "constants/Layers";
@@ -163,6 +163,7 @@ import {
 import CodeMirrorTernService from "utils/autocomplete/CodemirrorTernService";
 import { getEachEntityInformation } from "ee/utils/autocomplete/EntityDefinitions";
 import { getCurrentPageId } from "selectors/editorSelectors";
+import { executeCommandAction } from "actions/pluginActionActions";
 
 type ReduxStateProps = ReturnType<typeof mapStateToProps>;
 type ReduxDispatchProps = ReturnType<typeof mapDispatchToProps>;
@@ -199,7 +200,7 @@ export interface EditorStyleProps {
   evaluationSubstitutionType?: EvaluationSubstitutionType;
   popperPlacement?: Placement;
   popperZIndex?: Indices;
-  blockCompletions?: FieldEntityInformation["blockCompletions"];
+  blockCompletions?: Array<BlockCompletion>;
 }
 /**
  *  line => Line to which the gutter is added
@@ -1709,6 +1710,7 @@ class CodeEditor extends Component<Props, State> {
               "commands-button invisible",
               !showSlashCommandButton && "!hidden",
             )}
+            isIconButton
             kind="tertiary"
             onClick={() => {
               const newValue =
diff --git a/app/client/src/components/editorComponents/Debugger/DebugCTA.tsx b/app/client/src/components/editorComponents/Debugger/DebugCTA.tsx
index 9aafa87a247f..a6c6e4a23ab4 100644
--- a/app/client/src/components/editorComponents/Debugger/DebugCTA.tsx
+++ b/app/client/src/components/editorComponents/Debugger/DebugCTA.tsx
@@ -7,7 +7,7 @@ import AnalyticsUtil from "ee/utils/AnalyticsUtil";
 import { getTypographyByKey } from "@appsmith/ads-old";
 import type { Message } from "entities/AppsmithConsole";
 import ContextualMenu from "./ContextualMenu";
-import { DEBUGGER_TAB_KEYS } from "./helpers";
+import { DEBUGGER_TAB_KEYS } from "./constants";
 import type { FieldEntityInformation } from "../CodeEditor/EditorConfig";
 import { Button } from "@appsmith/ads";
 
diff --git a/app/client/src/components/editorComponents/Debugger/DebuggerTabs.tsx b/app/client/src/components/editorComponents/Debugger/DebuggerTabs.tsx
index 325b6e29d2de..60115c31c370 100644
--- a/app/client/src/components/editorComponents/Debugger/DebuggerTabs.tsx
+++ b/app/client/src/components/editorComponents/Debugger/DebuggerTabs.tsx
@@ -20,9 +20,9 @@ import {
   DEBUGGER_LOGS,
   INSPECT_ENTITY,
 } from "ee/constants/messages";
-import { DEBUGGER_TAB_KEYS } from "./helpers";
+import { DEBUGGER_TAB_KEYS } from "./constants";
 import EntityBottomTabs from "../EntityBottomTabs";
-import { ActionExecutionResizerHeight } from "pages/Editor/APIEditor/constants";
+import { ActionExecutionResizerHeight } from "PluginActionEditor/components/PluginActionResponse/constants";
 import { IDEBottomView, ViewHideBehaviour, ViewDisplayMode } from "IDE";
 
 function DebuggerTabs() {
diff --git a/app/client/src/components/editorComponents/Debugger/LogItem.tsx b/app/client/src/components/editorComponents/Debugger/LogItem.tsx
index 821002cb03de..b80d94c4fec2 100644
--- a/app/client/src/components/editorComponents/Debugger/LogItem.tsx
+++ b/app/client/src/components/editorComponents/Debugger/LogItem.tsx
@@ -395,4 +395,4 @@ function LogItem(props: LogItemProps) {
   );
 }
 
-export default LogItem;
+export default React.memo(LogItem);
diff --git a/app/client/src/components/editorComponents/Debugger/Resizer/index.tsx b/app/client/src/components/editorComponents/Debugger/Resizer/index.tsx
index b4e7a5ecddc5..9f887d30edc7 100644
--- a/app/client/src/components/editorComponents/Debugger/Resizer/index.tsx
+++ b/app/client/src/components/editorComponents/Debugger/Resizer/index.tsx
@@ -2,7 +2,7 @@ import { Layers } from "constants/Layers";
 import type { RefObject } from "react";
 import React, { useState, useEffect } from "react";
 import styled, { css } from "styled-components";
-import { ActionExecutionResizerHeight } from "pages/Editor/APIEditor/constants";
+import { ActionExecutionResizerHeight } from "PluginActionEditor/components/PluginActionResponse/constants";
 
 export const ResizerCSS = css`
   width: 100%;
diff --git a/app/client/src/components/editorComponents/Debugger/constants.ts b/app/client/src/components/editorComponents/Debugger/constants.ts
new file mode 100644
index 000000000000..c69ccdb217e5
--- /dev/null
+++ b/app/client/src/components/editorComponents/Debugger/constants.ts
@@ -0,0 +1,8 @@
+export enum DEBUGGER_TAB_KEYS {
+  SCHEMA_TAB = "SCHEMA_TAB",
+  RESPONSE_TAB = "RESPONSE_TAB",
+  HEADER_TAB = "HEADERS_TAB",
+  ERROR_TAB = "ERROR_TAB",
+  LOGS_TAB = "LOGS_TAB",
+  INSPECT_TAB = "INSPECT_TAB",
+}
diff --git a/app/client/src/components/editorComponents/Debugger/helpers.tsx b/app/client/src/components/editorComponents/Debugger/helpers.tsx
index 287a30a901bc..3dcc6bfb9840 100644
--- a/app/client/src/components/editorComponents/Debugger/helpers.tsx
+++ b/app/client/src/components/editorComponents/Debugger/helpers.tsx
@@ -7,8 +7,8 @@ import { createMessage, OPEN_THE_DEBUGGER, PRESS } from "ee/constants/messages";
 import type { DependencyMap } from "utils/DynamicBindingUtils";
 import { isChildPropertyPath } from "utils/DynamicBindingUtils";
 import {
-  matchBuilderPath,
   matchApiPath,
+  matchBuilderPath,
   matchQueryPath,
 } from "constants/routes";
 import { getEntityNameAndPropertyPath } from "ee/workers/Evaluation/evaluationUtils";
@@ -22,8 +22,8 @@ const BlankStateWrapper = styled.div`
   justify-content: center;
   align-items: center;
   color: var(--ads-v2-color-fg);
-  ${getTypographyByKey("p1")}
 
+  ${getTypographyByKey("p1")}
   .debugger-shortcut {
     color: var(--ads-v2-color-fg);
     ${getTypographyByKey("h5")}
@@ -51,15 +51,6 @@ export function BlankState(props: {
   );
 }
 
-export enum DEBUGGER_TAB_KEYS {
-  SCHEMA_TAB = "schema",
-  RESPONSE_TAB = "response",
-  HEADER_TAB = "headers",
-  ERROR_TAB = "ERROR",
-  LOGS_TAB = "LOGS_TAB",
-  INSPECT_TAB = "INSPECT_TAB",
-}
-
 export const SeverityIcon: Record<Severity, string> = {
   [Severity.INFO]: "success",
   [Severity.ERROR]: "close-circle",
diff --git a/app/client/src/components/editorComponents/Debugger/hooks/useDebuggerTriggerClick.ts b/app/client/src/components/editorComponents/Debugger/hooks/useDebuggerTriggerClick.ts
index f6ae639baf98..11e38440fc0d 100644
--- a/app/client/src/components/editorComponents/Debugger/hooks/useDebuggerTriggerClick.ts
+++ b/app/client/src/components/editorComponents/Debugger/hooks/useDebuggerTriggerClick.ts
@@ -1,15 +1,15 @@
 import { useLocation } from "react-router";
-import { DEBUGGER_TAB_KEYS } from "../helpers";
+import { DEBUGGER_TAB_KEYS } from "../constants";
 import { setCanvasDebuggerState } from "actions/debuggerActions";
 import AnalyticsUtil from "ee/utils/AnalyticsUtil";
 import type { FocusEntityInfo } from "navigation/FocusEntity";
 import { FocusEntity, identifyEntityFromPath } from "navigation/FocusEntity";
 import { setJsPaneDebuggerState } from "actions/jsPaneActions";
-import { setApiPaneDebuggerState } from "actions/apiPaneActions";
-import { setQueryPaneDebuggerState } from "actions/queryPaneActions";
 import { getJsPaneDebuggerState } from "selectors/jsPaneSelectors";
-import { getApiPaneDebuggerState } from "selectors/apiPaneSelectors";
-import { getQueryPaneDebuggerState } from "selectors/queryPaneSelectors";
+import {
+  getPluginActionDebuggerState,
+  setPluginActionEditorDebuggerState,
+} from "PluginActionEditor/store";
 import { getCanvasDebuggerState } from "selectors/debuggerSelectors";
 import { getIDEViewMode } from "selectors/ideSelectors";
 import { useDispatch, useSelector } from "react-redux";
@@ -30,26 +30,15 @@ const canvasDebuggerConfig: Config = {
   get: getCanvasDebuggerState,
 };
 
-const queryDebuggerConfig: Config = {
-  set: setQueryPaneDebuggerState,
-  get: getQueryPaneDebuggerState,
+const pluginActionEditorDebuggerConfig: Config = {
+  set: setPluginActionEditorDebuggerState,
+  get: getPluginActionDebuggerState,
 };
 
 const getConfig = (focusInfo: FocusEntityInfo): Config => {
   switch (focusInfo.entity) {
     case FocusEntity.QUERY:
-      if (focusInfo.params.baseApiId) {
-        if (focusInfo.params.pluginPackageName) {
-          return queryDebuggerConfig;
-        }
-
-        return {
-          set: setApiPaneDebuggerState,
-          get: getApiPaneDebuggerState,
-        };
-      }
-
-      return queryDebuggerConfig;
+      return pluginActionEditorDebuggerConfig;
     case FocusEntity.JS_OBJECT:
       return {
         set: setJsPaneDebuggerState,
diff --git a/app/client/src/components/editorComponents/EditableText.tsx b/app/client/src/components/editorComponents/EditableText.tsx
index 29b4439871af..a4516918b0c5 100644
--- a/app/client/src/components/editorComponents/EditableText.tsx
+++ b/app/client/src/components/editorComponents/EditableText.tsx
@@ -61,6 +61,7 @@ const EditableTextWrapper = styled.div<{
     justify-content: flex-start;
     align-items: flex-start;
     width: 100%;
+
     & .${Classes.EDITABLE_TEXT} {
       background: ${(props) =>
         props.isEditing && !props.minimal
@@ -73,11 +74,13 @@ const EditableTextWrapper = styled.div<{
       max-width: 100%;
       overflow: hidden;
       display: flex;
+
       &:before,
       &:after {
         display: none;
       }
     }
+
     & div.${Classes.EDITABLE_TEXT_INPUT} {
       text-transform: none;
       width: 100%;
@@ -100,6 +103,7 @@ const TextContainer = styled.div<{
   color: var(--ads-v2-color-fg-emphasis-plus);
   display: flex;
   align-items: center;
+
   &&&& .${Classes.EDITABLE_TEXT} {
     & .${Classes.EDITABLE_TEXT_CONTENT} {
       &:hover {
@@ -108,6 +112,7 @@ const TextContainer = styled.div<{
       }
     }
   }
+
   &&& .${Classes.EDITABLE_TEXT_CONTENT}:hover {
     ${(props) =>
       props.underline
diff --git a/app/client/src/components/editorComponents/EntityBottomTabs.tsx b/app/client/src/components/editorComponents/EntityBottomTabs.tsx
index 9e2f05ba0434..e649ba41d1a0 100644
--- a/app/client/src/components/editorComponents/EntityBottomTabs.tsx
+++ b/app/client/src/components/editorComponents/EntityBottomTabs.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import AnalyticsUtil from "ee/utils/AnalyticsUtil";
-import { DEBUGGER_TAB_KEYS } from "./Debugger/helpers";
+import { DEBUGGER_TAB_KEYS } from "./Debugger/constants";
 import { Tab, TabPanel, Tabs, TabsList } from "@appsmith/ads";
 import styled from "styled-components";
 import { LIST_HEADER_HEIGHT, FOOTER_MARGIN } from "./Debugger/DebuggerLogs";
@@ -9,11 +9,14 @@ import type { RefObject } from "react";
 const TabPanelWrapper = styled(TabPanel)`
   margin-top: 0;
   height: calc(100% - ${LIST_HEADER_HEIGHT});
+
   &.ads-v2-tabs__panel {
     overflow: auto;
   }
+
   & .t--code-editor-wrapper.codeWrapper {
     height: calc(100% - ${FOOTER_MARGIN});
+
     & .CodeMirror-scroll {
       box-sizing: border-box;
     }
diff --git a/app/client/src/components/editorComponents/ErrorBoundry.tsx b/app/client/src/components/editorComponents/ErrorBoundry.tsx
index 788b7ff2c2d0..44bf4bfb639e 100644
--- a/app/client/src/components/editorComponents/ErrorBoundry.tsx
+++ b/app/client/src/components/editorComponents/ErrorBoundry.tsx
@@ -8,6 +8,7 @@ import type { ReactNode, CSSProperties } from "react";
 interface Props {
   children: ReactNode;
   style?: CSSProperties;
+  fallback?: ReactNode;
 }
 interface State {
   hasError: boolean;
@@ -47,17 +48,17 @@ class ErrorBoundary extends React.Component<Props, State> {
         className="error-boundary"
         style={this.props.style}
       >
-        {this.state.hasError ? (
-          <p>
-            Oops, Something went wrong.
-            <br />
-            <RetryLink onClick={() => this.setState({ hasError: false })}>
-              Click here to retry
-            </RetryLink>
-          </p>
-        ) : (
-          this.props.children
-        )}
+        {this.state.hasError
+          ? this.props.fallback || (
+              <p>
+                Oops, Something went wrong.
+                <br />
+                <RetryLink onClick={() => this.setState({ hasError: false })}>
+                  Click here to retry
+                </RetryLink>
+              </p>
+            )
+          : this.props.children}
       </ErrorBoundaryContainer>
     );
   }
diff --git a/app/client/src/components/editorComponents/GlobalSearch/HelpBar.tsx b/app/client/src/components/editorComponents/GlobalSearch/HelpBar.tsx
index e05c5bdb78d4..c52eb62c9ef2 100644
--- a/app/client/src/components/editorComponents/GlobalSearch/HelpBar.tsx
+++ b/app/client/src/components/editorComponents/GlobalSearch/HelpBar.tsx
@@ -1,18 +1,16 @@
 import React from "react";
 import styled from "styled-components";
-import { connect, useSelector } from "react-redux";
+import { connect } from "react-redux";
 import { getTypographyByKey, Text, TextType } from "@appsmith/ads-old";
 import { Icon } from "@appsmith/ads";
 import { setGlobalSearchCategory } from "actions/globalSearchActions";
-import { HELPBAR_PLACEHOLDER } from "ee/constants/messages";
 import AnalyticsUtil from "ee/utils/AnalyticsUtil";
 import { modText } from "utils/helpers";
 import { filterCategories, SEARCH_CATEGORY_ID } from "./utils";
 import { protectedModeSelector } from "selectors/gitSyncSelectors";
 import type { AppState } from "ee/reducers";
-import { getIsSideBySideEnabled } from "selectors/ideSelectors";
 
-const StyledHelpBar = styled.button<{ isSideBySideFlagEnabled?: boolean }>`
+const StyledHelpBar = styled.button`
   padding: 0 var(--ads-v2-spaces-3);
   margin: var(--ads-v2-spaces-2);
   .placeholder-text {
@@ -30,6 +28,10 @@ const StyledHelpBar = styled.button<{ isSideBySideFlagEnabled?: boolean }>`
   font-family: var(--ads-v2-font-family);
   font-size: var(--ads-v2-font-size-4);
   color: var(--ads-v2-color-fg);
+  flex-grow: 0;
+  gap: 8px;
+  min-width: fit-content;
+
   &:hover {
     border: 1px solid var(--ads-v2-color-border-emphasis-plus);
   }
@@ -38,13 +40,6 @@ const StyledHelpBar = styled.button<{ isSideBySideFlagEnabled?: boolean }>`
   &[disabled] {
     cursor: not-allowed;
   }
-  ${({ isSideBySideFlagEnabled }) =>
-    isSideBySideFlagEnabled &&
-    `
-      flex-grow: 0;
-      gap: 8px;
-      min-width: fit-content;
-  `}
 `;
 
 interface Props {
@@ -53,20 +48,14 @@ interface Props {
 }
 
 function HelpBar({ isProtectedMode, toggleShowModal }: Props) {
-  const isSideBySideFlagEnabled = useSelector(getIsSideBySideEnabled);
-
   return (
     <StyledHelpBar
       className="t--global-search-modal-trigger"
       data-testid="global-search-modal-trigger"
       disabled={isProtectedMode}
-      isSideBySideFlagEnabled={isSideBySideFlagEnabled}
       onClick={toggleShowModal}
     >
-      {!isSideBySideFlagEnabled && (
-        <Text type={TextType.P2}>{HELPBAR_PLACEHOLDER()}</Text>
-      )}
-      {isSideBySideFlagEnabled && <Icon name={"search-line"} size={"md"} />}
+      <Icon name={"search-line"} size={"md"} />
       <Text italic type={TextType.P3}>
         {modText()} K
       </Text>
diff --git a/app/client/src/components/editorComponents/JSResponseView.test.tsx b/app/client/src/components/editorComponents/JSResponseView.test.tsx
index 1ca5857b41e3..5d3e177cc176 100644
--- a/app/client/src/components/editorComponents/JSResponseView.test.tsx
+++ b/app/client/src/components/editorComponents/JSResponseView.test.tsx
@@ -13,6 +13,7 @@ import type { JSCollectionData } from "ee/reducers/entityReducers/jsActionsReduc
 import { PluginType } from "entities/Action";
 import "@testing-library/jest-dom/extend-expect";
 import { EMPTY_RESPONSE_LAST_HALF } from "ee/constants/messages";
+import { DEBUGGER_TAB_KEYS } from "./Debugger/constants";
 
 jest.mock("ee/utils/actionExecutionUtils");
 
@@ -43,7 +44,7 @@ const storeState = {
       debugger: {
         open: true,
         responseTabHeight: 200,
-        selectedTab: "response",
+        selectedTab: DEBUGGER_TAB_KEYS.RESPONSE_TAB,
       },
     },
     editor: {
diff --git a/app/client/src/components/editorComponents/JSResponseView.tsx b/app/client/src/components/editorComponents/JSResponseView.tsx
index 91d8519abe07..96d5fbbf006d 100644
--- a/app/client/src/components/editorComponents/JSResponseView.tsx
+++ b/app/client/src/components/editorComponents/JSResponseView.tsx
@@ -23,7 +23,7 @@ import { Flex, Text } from "@appsmith/ads";
 import LoadingOverlayScreen from "components/editorComponents/LoadingOverlayScreen";
 import type { JSCollectionData } from "ee/reducers/entityReducers/jsActionsReducer";
 import type { EvaluationError } from "utils/DynamicBindingUtils";
-import { DEBUGGER_TAB_KEYS } from "./Debugger/helpers";
+import { DEBUGGER_TAB_KEYS } from "./Debugger/constants";
 import type { BottomTab } from "./EntityBottomTabs";
 import EntityBottomTabs from "./EntityBottomTabs";
 import { getIsSavingEntity } from "selectors/editorSelectors";
@@ -56,6 +56,7 @@ const ResponseTabWrapper = styled.div`
     opacity: 0.8;
     pointer-events: none;
   }
+
   .response-run {
     margin: 0 10px;
   }
@@ -190,7 +191,7 @@ function JSResponseView(props: Props) {
 
   const tabs: BottomTab[] = [
     {
-      key: "response",
+      key: DEBUGGER_TAB_KEYS.RESPONSE_TAB,
       title: createMessage(DEBUGGER_RESPONSE),
       panelComponent: (
         <>
diff --git a/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/unitTestUtils.ts b/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/unitTestUtils.ts
index a43305d93bd5..05b046f51f09 100644
--- a/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/unitTestUtils.ts
+++ b/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/unitTestUtils.ts
@@ -9772,8 +9772,9 @@ export const defaultAppState = {
                 },
               },
               {
-                label: "Use Prepared Statement",
-                info: "Prepared statements prevent SQL injections on your queries but do not support dynamic bindings outside values in your SQL",
+                label: "Use prepared statements",
+                tooltipText:
+                  "Prepared statements prevent SQL injections on your queries but do not support dynamic bindings outside values in your SQL",
                 configProperty:
                   "actionConfiguration.pluginSpecifiedTemplates[0].value",
                 controlType: "SWITCH",
@@ -10037,21 +10038,20 @@ export const defaultAppState = {
             id: 1,
             children: [
               {
-                label: "Run query on page load",
+                label: "Run the query on page load",
                 configProperty: "executeOnLoad",
                 controlType: "SWITCH",
-                subtitle: "Will refresh data each time the page is loaded",
               },
               {
-                label: "Request confirmation before running query",
+                label: "Request confirmation before running this query",
                 configProperty: "confirmBeforeExecute",
                 controlType: "SWITCH",
-                subtitle:
+                tooltipText:
                   "Ask confirmation from the user each time before refreshing data",
               },
               {
                 label: "Smart BSON substitution",
-                subtitle:
+                tooltipText:
                   "Turning on this property fixes the BSON substitution of bindings in the Mongo BSON document by adding/removing quotes intelligently and reduces developer errors",
                 configProperty:
                   "actionConfiguration.formData.smartSubstitution.data",
@@ -10074,21 +10074,20 @@ export const defaultAppState = {
             id: 1,
             children: [
               {
-                label: "Run query on page load",
+                label: "Run the query on page load",
                 configProperty: "executeOnLoad",
                 controlType: "SWITCH",
-                subtitle: "Will refresh data each time the page is loaded",
               },
               {
-                label: "Request confirmation before running query",
+                label: "Request confirmation before running this query",
                 configProperty: "confirmBeforeExecute",
                 controlType: "SWITCH",
-                subtitle:
+                tooltipText:
                   "Ask confirmation from the user each time before refreshing data",
               },
               {
-                label: "Use Prepared Statement",
-                subtitle:
+                label: "Use prepared statements",
+                tooltipText:
                   "Prepared statements prevent SQL injections on your queries but do not support dynamic bindings outside values in your SQL",
                 configProperty:
                   "actionConfiguration.pluginSpecifiedTemplates[0].value",
@@ -10111,23 +10110,22 @@ export const defaultAppState = {
             id: 1,
             children: [
               {
-                label: "Run API on page load",
+                label: "Run the API on page load",
                 configProperty: "executeOnLoad",
                 controlType: "SWITCH",
-                subtitle: "Will refresh data each time the page is loaded",
               },
               {
-                label: "Request confirmation before running API",
+                label: "Request confirmation before running this API",
                 configProperty: "confirmBeforeExecute",
                 controlType: "SWITCH",
-                subtitle:
+                tooltipText:
                   "Ask confirmation from the user each time before refreshing data",
               },
               {
                 label: "Encode query params",
                 configProperty: "actionConfiguration.encodeParamsToggle",
                 controlType: "SWITCH",
-                subtitle:
+                tooltipText:
                   "Encode query params for all APIs. Also encode form body when Content-Type header is set to x-www-form-encoded",
               },
               {
@@ -10135,7 +10133,7 @@ export const defaultAppState = {
                 configProperty:
                   "actionConfiguration.pluginSpecifiedTemplates[0].value",
                 controlType: "SWITCH",
-                subtitle:
+                tooltipText:
                   "Turning on this property fixes the JSON substitution of bindings in API body by adding/removing quotes intelligently and reduces developer errors",
                 initialValue: true,
               },
@@ -10144,8 +10142,6 @@ export const defaultAppState = {
                 configProperty: "actionConfiguration.httpVersion",
                 name: "actionConfiguration.httpVersion",
                 controlType: "DROP_DOWN",
-                subtitle:
-                  "Select the protocol that best suits your security and performance requirements.",
                 initialValue: "HTTP/1.1",
                 options: [
                   {
@@ -10180,23 +10176,22 @@ export const defaultAppState = {
             id: 1,
             children: [
               {
-                label: "Run API on page load",
+                label: "Run the API on page load",
                 configProperty: "executeOnLoad",
                 controlType: "SWITCH",
-                subtitle: "Will refresh data each time the page is loaded",
               },
               {
-                label: "Request confirmation before running API",
+                label: "Request confirmation before running this API",
                 configProperty: "confirmBeforeExecute",
                 controlType: "SWITCH",
-                subtitle:
+                tooltipText:
                   "Ask confirmation from the user each time before refreshing data",
               },
               {
                 label: "Encode query params",
                 configProperty: "actionConfiguration.encodeParamsToggle",
                 controlType: "SWITCH",
-                subtitle:
+                tooltipText:
                   "Encode query params for all APIs. Also encode form body when Content-Type header is set to x-www-form-encoded",
               },
               {
@@ -10204,7 +10199,7 @@ export const defaultAppState = {
                 configProperty:
                   "actionConfiguration.pluginSpecifiedTemplates[0].value",
                 controlType: "SWITCH",
-                subtitle:
+                tooltipText:
                   "Turning on this property fixes the JSON substitution of bindings in API body by adding/removing quotes intelligently and reduces developer errors",
                 initialValue: true,
               },
@@ -10213,8 +10208,6 @@ export const defaultAppState = {
                 configProperty: "actionConfiguration.httpVersion",
                 name: "actionConfiguration.httpVersion",
                 controlType: "DROP_DOWN",
-                subtitle:
-                  "Select the protocol that best suits your security and performance requirements.",
                 initialValue: "HTTP/1.1",
                 options: [
                   {
@@ -12757,12 +12750,10 @@ export const defaultAppState = {
           release_datasource_environments_enabled: false,
           release_appnavigationlogoupload_enabled: false,
           release_embed_hide_share_settings_enabled: false,
-          ab_gsheet_schema_enabled: true,
           release_table_serverside_filtering_enabled: false,
           license_branding_enabled: false,
           license_sso_saml_enabled: false,
           license_sso_oidc_enabled: false,
-          ab_mock_mongo_schema_enabled: true,
           license_private_embeds_enabled: false,
           release_show_publish_app_to_community_enabled: false,
           license_gac_enabled: false,
@@ -12776,7 +12767,6 @@ export const defaultAppState = {
           release_side_by_side_ide_enabled: false,
           release_global_add_pane_enabled: false,
           license_git_unlimited_repo_enabled: false,
-          ab_ds_binding_enabled: true,
           ask_ai_js: false,
           license_connection_pool_size_enabled: false,
           ab_ai_js_function_completion_enabled: true,
@@ -12786,7 +12776,6 @@ export const defaultAppState = {
           license_audit_logs_enabled: false,
           ask_ai_sql: false,
           release_query_module_enabled: false,
-          ab_ds_schema_enabled: true,
           ab_onboarding_flow_start_with_data_dev_only_enabled: false,
           license_session_limit_enabled: false,
           rollout_datasource_test_rate_limit_enabled: false,
diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/DropdownOption.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/DropdownOption.tsx
index 740af870f62a..bbc1833d6adb 100644
--- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/DropdownOption.tsx
+++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/DropdownOption.tsx
@@ -59,7 +59,7 @@ export function LoadMoreOptions(props: LoadmoreProps) {
     return (
       <MenuItem>
         <div
-          data-testId="t--one-click-binding-datasource--load-more"
+          data-testid="t--one-click-binding-datasource--load-more"
           onMouseDown={(e) => {
             e?.stopPropagation();
           }}
diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/index.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/index.tsx
index 5d4e95b9a30d..ced58132eca4 100644
--- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/index.tsx
+++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/index.tsx
@@ -100,7 +100,7 @@ function DatasourceDropdown() {
   const onChange = useCallback((value: string) => setSearchText(value), []);
 
   return (
-    <SelectWrapper data-testId="t--one-click-binding-datasource-selector">
+    <SelectWrapper data-testid="t--one-click-binding-datasource-selector">
       <Menu
         onOpenChange={(open: boolean) => {
           setOpen(open);
@@ -110,7 +110,7 @@ function DatasourceDropdown() {
       >
         <MenuTrigger>
           <StyledDropdownTrigger
-            data-testId="t--one-click-binding-datasource-trigger"
+            data-testid="t--one-click-binding-datasource-trigger"
             isDisabled={disabled}
             isValid={!error}
           >
@@ -131,7 +131,7 @@ function DatasourceDropdown() {
             <StyledInputContainer>
               <SearchInput
                 autoFocus
-                data-testId="t--one-click-binding-datasource--search"
+                data-testid="t--one-click-binding-datasource--search"
                 onChange={onChange}
                 size="md"
                 // @ts-expect-error Fix this the next time the file is edited
@@ -141,7 +141,7 @@ function DatasourceDropdown() {
             </StyledInputContainer>
 
             {!!connectToOptions.length && (
-              <StyledMenuGroupName data-testId="t--one-click-binding-datasource-selector--bind-to-query">
+              <StyledMenuGroupName data-testid="t--one-click-binding-datasource-selector--bind-to-query">
                 <Text kind="heading-xs">{constants?.connectToText}</Text>
               </StyledMenuGroupName>
             )}
@@ -156,7 +156,7 @@ function DatasourceDropdown() {
               .map((option) => {
                 return (
                   <MenuItem
-                    data-testId="t--one-click-binding-datasource-selector--query"
+                    data-testid="t--one-click-binding-datasource-selector--query"
                     key={option?.id}
                     onSelect={() => {
                       option?.onSelect(option?.value, option);
@@ -202,7 +202,7 @@ function DatasourceDropdown() {
               .map((option) => {
                 return (
                   <MenuItem
-                    data-testId="t--one-click-binding-datasource-selector--datasource"
+                    data-testid="t--one-click-binding-datasource-selector--datasource"
                     key={option.id}
                     onSelect={() => {
                       option?.onSelect?.(option.value || "", option);
@@ -248,7 +248,7 @@ function DatasourceDropdown() {
             {otherOptions.map((option: DropdownOptionType) => {
               return (
                 <MenuItem
-                  data-testId="t--one-click-binding-datasource-selector--other-action"
+                  data-testid="t--one-click-binding-datasource-selector--other-action"
                   key={option.id}
                   onSelect={() => {
                     option.onSelect?.(option.value || "", option);
diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/types.ts b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/types.ts
index e17856a4fbd6..3a4e4f49977f 100644
--- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/types.ts
+++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/types.ts
@@ -1,4 +1,5 @@
 export enum DROPDOWN_VARIANT {
   CONNECT_TO_DATASOURCE = "Connect to datasource",
   CREATE_OR_EDIT_RECORDS = "Create or edit records",
+  CONNECT_TO_QUERY = "Connect to query",
 }
diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useConnectToOptions.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useConnectToOptions.tsx
index 01460af48a52..8701bd31c7d9 100644
--- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useConnectToOptions.tsx
+++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useConnectToOptions.tsx
@@ -4,6 +4,7 @@ import {
   getCurrentActions,
   getCurrentPageWidgets,
   getPluginIdPackageNamesMap,
+  getPlugins,
   getQueryModuleInstances,
 } from "ee/selectors/entitiesSelector";
 import WidgetFactory from "WidgetProvider/factory";
@@ -22,12 +23,10 @@ import type {
   ModuleInstanceData,
   ModuleInstanceDataState,
 } from "ee/constants/ModuleInstanceConstants";
-import { selectFeatureFlagCheck } from "ee/selectors/featureFlagsSelectors";
-import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
-import type { AppState } from "ee/reducers";
 import type { Module } from "ee/constants/ModuleConstants";
 import { getAllModules } from "ee/selectors/modulesSelector";
 import { getModuleIcon } from "pages/Editor/utils";
+import { isDynamicValue } from "@shared/dsl";
 
 enum SortingWeights {
   alphabetical = 1,
@@ -77,20 +76,26 @@ export function sortQueries(
   });
 }
 
+export const getDefaultQueryBindingValue = (
+  query: ActionData | ModuleInstanceData,
+) => `{{${query.config.name}.data}}`;
+
 export function getBindingValue(
   widget: WidgetProps,
   query: ActionData | ModuleInstanceData,
+  getQueryBindingValue: (
+    query: ActionData | ModuleInstanceData,
+  ) => string = getDefaultQueryBindingValue,
 ) {
-  const defaultBindingValue = `{{${query.config.name}.data}}`;
   const querySuggestedWidgets = query.data?.suggestedWidgets;
 
-  if (!querySuggestedWidgets) return defaultBindingValue;
+  if (!querySuggestedWidgets) return getQueryBindingValue(query);
 
   const suggestedWidget = querySuggestedWidgets.find(
     (suggestedWidget) => suggestedWidget.type === widget.type,
   );
 
-  if (!suggestedWidget) return defaultBindingValue;
+  if (!suggestedWidget) return getQueryBindingValue(query);
 
   return `{{${query.config.name}.${suggestedWidget.bindingQuery}}}`;
 }
@@ -160,7 +165,9 @@ export const getAnalyticsInfo = (
 function useConnectToOptions(props: ConnectToOptionsProps) {
   const {
     addBinding,
+    allowedDatasourceTypes,
     expectedType,
+    getQueryBindingValue,
     isConnectableToWidget,
     propertyName,
     updateConfig,
@@ -168,13 +175,7 @@ function useConnectToOptions(props: ConnectToOptionsProps) {
 
   const queries = useSelector(getCurrentActions);
   const pluginsPackageNamesMap = useSelector(getPluginIdPackageNamesMap);
-  const isJSEnabledByDefaultOnForOneClickBinding = useSelector(
-    (state: AppState) =>
-      selectFeatureFlagCheck(
-        state,
-        FEATURE_FLAG.rollout_js_enabled_one_click_binding_enabled,
-      ),
-  );
+  const plugins = useSelector(getPlugins);
 
   const { pluginImages, widget } = props;
 
@@ -192,6 +193,19 @@ function useConnectToOptions(props: ConnectToOptionsProps) {
     });
   }
 
+  // filter query based on allowedDatasourceType
+  if (allowedDatasourceTypes) {
+    const allowedPluginIds = plugins
+      .filter((plugin) => allowedDatasourceTypes.includes(plugin.name))
+      .map((plugin) => plugin.id);
+
+    if (allowedPluginIds.length) {
+      filteredQueries = filteredQueries.filter((query) =>
+        allowedPluginIds.includes(query.config.pluginId),
+      );
+    }
+  }
+
   filteredQueries = [...filteredQueries, ...queryModuleInstances] as
     | ActionDataState
     | ModuleInstanceDataState;
@@ -200,13 +214,12 @@ function useConnectToOptions(props: ConnectToOptionsProps) {
     return sortQueries(filteredQueries, expectedType).map((query) => ({
       id: query.config.id,
       label: query.config.name,
-      value: getBindingValue(widget, query),
+      value: getBindingValue(widget, query, getQueryBindingValue),
       icon: getQueryIcon(query, pluginImages, modules),
-      onSelect: function (value?: string, valueOption?: DropdownOptionType) {
-        addBinding(
-          valueOption?.value,
-          !!isJSEnabledByDefaultOnForOneClickBinding,
-        );
+      onSelect: function (value: string, valueOption?: DropdownOptionType) {
+        const isDynamic = isDynamicValue(value);
+
+        addBinding(valueOption?.value, isDynamic);
 
         updateConfig({
           datasource: "",
@@ -240,6 +253,9 @@ function useConnectToOptions(props: ConnectToOptionsProps) {
           // This is the path we bind to the sourceData field Ex: `{{Table1.selectedRow}}`
           const { widgetBindPath } =
             getOneClickBindingConnectableWidgetConfig(currWidget);
+          const iconSVG =
+            WidgetFactory.getConfig(currWidget.type)?.iconSVG ||
+            currWidget.iconSVG;
 
           return {
             id: widgetId,
@@ -250,7 +266,7 @@ function useConnectToOptions(props: ConnectToOptionsProps) {
                 <DatasourceImage
                   alt="widget-icon"
                   className="dataSourceImage"
-                  src={currWidget.iconSVG}
+                  src={iconSVG}
                 />
               </ImageWrapper>
             ),
diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useDatasourceOptions.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useDatasourceOptions.tsx
index 01c690cfcaa9..cedf9653feba 100644
--- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useDatasourceOptions.tsx
+++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useDatasourceOptions.tsx
@@ -34,6 +34,7 @@ import type { WidgetProps } from "widgets/BaseWidget";
 import { WidgetQueryGeneratorFormContext } from "components/editorComponents/WidgetQueryGeneratorForm/index";
 import { getAssetUrl } from "ee/utils/airgapHelpers";
 import { getDatasourceConnectionMode } from "components/editorComponents/WidgetQueryGeneratorForm/utils";
+import { DROPDOWN_VARIANT } from "../types";
 
 interface DatasourceOptionsProps {
   widget: WidgetProps;
@@ -41,9 +42,8 @@ interface DatasourceOptionsProps {
 }
 
 function useDatasourceOptions(props: DatasourceOptionsProps) {
-  const { config, propertyName, updateConfig } = useContext(
-    WidgetQueryGeneratorFormContext,
-  );
+  const { config, datasourceDropdownVariant, propertyName, updateConfig } =
+    useContext(WidgetQueryGeneratorFormContext);
   const { pluginImages, widget } = props;
   const dispatch = useDispatch();
   const datasources: Datasource[] = useSelector(getDatasources);
@@ -58,6 +58,11 @@ function useDatasourceOptions(props: DatasourceOptionsProps) {
     useState(false);
 
   const [actualDatasourceOptions, mockDatasourceOptions] = useMemo(() => {
+    // we don't want to show the datasource options for connect to query variant
+    if (datasourceDropdownVariant === DROPDOWN_VARIANT.CONNECT_TO_QUERY) {
+      return [[], []];
+    }
+
     const availableDatasources = datasources.filter(({ pluginId }) =>
       WidgetQueryGeneratorRegistry.has(pluginsPackageNamesMap[pluginId]),
     );
diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useOtherOptions.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useOtherOptions.tsx
index 8fac0f697776..e28f1fe53e3c 100644
--- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useOtherOptions.tsx
+++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useOtherOptions.tsx
@@ -35,35 +35,39 @@ function useOtherOptions(props: OtherOptionsProps) {
     datasourceDropdownVariant === DROPDOWN_VARIANT.CREATE_OR_EDIT_RECORDS;
   const { widget } = props;
   const otherOptions = useMemo(() => {
-    const options = [
-      {
-        icon: <Icon name="plus" size="md" />,
-        id: "Connect new datasource",
-        label: "Connect new datasource",
-        value: "Connect new datasource",
-        onSelect: () => {
-          history.push(
-            integrationEditorURL({
-              basePageId,
-              selectedTab: INTEGRATION_TABS.NEW,
-            }),
-          );
+    // we don't want to show the options for connect to query variant
+    if (datasourceDropdownVariant === DROPDOWN_VARIANT.CONNECT_TO_QUERY)
+      return [];
 
-          AnalyticsUtil.logEvent("BIND_OTHER_ACTIONS", {
-            widgetName: widget.widgetName,
-            widgetType: widget.type,
-            propertyName: propertyName,
-            selectedAction: "Connect new datasource",
-          });
+    const options = [];
 
-          const entryPoint = DatasourceCreateEntryPoints.ONE_CLICK_BINDING;
+    options.push({
+      icon: <Icon name="plus" size="md" />,
+      id: "Connect new datasource",
+      label: "Connect new datasource",
+      value: "Connect new datasource",
+      onSelect: () => {
+        history.push(
+          integrationEditorURL({
+            basePageId,
+            selectedTab: INTEGRATION_TABS.NEW,
+          }),
+        );
 
-          AnalyticsUtil.logEvent("NAVIGATE_TO_CREATE_NEW_DATASOURCE_PAGE", {
-            entryPoint,
-          });
-        },
+        AnalyticsUtil.logEvent("BIND_OTHER_ACTIONS", {
+          widgetName: widget.widgetName,
+          widgetType: widget.type,
+          propertyName: propertyName,
+          selectedAction: "Connect new datasource",
+        });
+
+        const entryPoint = DatasourceCreateEntryPoints.ONE_CLICK_BINDING;
+
+        AnalyticsUtil.logEvent("NAVIGATE_TO_CREATE_NEW_DATASOURCE_PAGE", {
+          entryPoint,
+        });
       },
-    ];
+    });
 
     if (sampleData) {
       options.push({
diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/TableOrSpreadsheetDropdown/index.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/TableOrSpreadsheetDropdown/index.tsx
index ad169cdb28c7..801e23a135f4 100644
--- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/TableOrSpreadsheetDropdown/index.tsx
+++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/TableOrSpreadsheetDropdown/index.tsx
@@ -58,7 +58,7 @@ function TableOrSpreadsheetDropdown() {
           {options.map((option) => {
             return (
               <Option
-                data-testId="t--one-click-binding-table-selector--table"
+                data-testid="t--one-click-binding-table-selector--table"
                 key={option.id}
                 value={option.value}
               >
@@ -67,7 +67,7 @@ function TableOrSpreadsheetDropdown() {
             );
           })}
         </Select>
-        <ErrorMessage data-testId="t--one-click-binding-table-selector--error">
+        <ErrorMessage data-testid="t--one-click-binding-table-selector--error">
           {error}
         </ErrorMessage>
       </SelectWrapper>
diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/ConnectData/index.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/ConnectData/index.tsx
index 31ed5b56a492..ebcddb1f23c4 100644
--- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/ConnectData/index.tsx
+++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/ConnectData/index.tsx
@@ -9,7 +9,7 @@ export function ConnectData({ btnText }: { btnText: string }) {
   if (show) {
     return (
       <StyledButton
-        data-testId="t--one-click-binding-connect-data"
+        data-testid="t--one-click-binding-connect-data"
         isDisabled={disabled}
         isLoading={isLoading}
         onClick={onClick}
diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/DatasourceSpecificControls/GoogleSheetControls/SheetsDropdown/index.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/DatasourceSpecificControls/GoogleSheetControls/SheetsDropdown/index.tsx
index d1e3396a77e5..33a69370638f 100644
--- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/DatasourceSpecificControls/GoogleSheetControls/SheetsDropdown/index.tsx
+++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/DatasourceSpecificControls/GoogleSheetControls/SheetsDropdown/index.tsx
@@ -26,7 +26,7 @@ export default memo(function SheetsDropdown() {
           <Label>{label}</Label>
         </Tooltip>
         <Select
-          data-testId="t--sheetName-dropdown"
+          data-testid="t--sheetName-dropdown"
           dropdownStyle={{
             minWidth: "350px",
             maxHeight: "300px",
diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/ColumnDropdown/index.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/ColumnDropdown/index.tsx
index 51b4b7f85336..d1162ac51deb 100644
--- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/ColumnDropdown/index.tsx
+++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/ColumnDropdown/index.tsx
@@ -33,7 +33,7 @@ function ColumnDropdown(props: Props) {
         <Label>{props.label}</Label>
         <Select
           allowClear
-          data-testId={`t--one-click-binding-column-${props.id}`}
+          data-testid={`t--one-click-binding-column-${props.id}`}
           dropdownStyle={{
             minWidth: "350px",
             maxHeight: "300px",
@@ -56,7 +56,7 @@ function ColumnDropdown(props: Props) {
           {options.map((option) => {
             return (
               <Option
-                data-testId={`t--one-click-binding-column-${props.id}--column`}
+                data-testid={`t--one-click-binding-column-${props.id}--column`}
                 key={option.id}
                 value={option.value}
               >
diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/OtherFields/Field/Dropdown/useDropdown.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/OtherFields/Field/Dropdown/useDropdown.tsx
index efac989bf96f..9226031a5f83 100644
--- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/OtherFields/Field/Dropdown/useDropdown.tsx
+++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/OtherFields/Field/Dropdown/useDropdown.tsx
@@ -81,12 +81,15 @@ export function useDropdown(props: OneClickDropdownFieldProps) {
       if (getOneClickBindingConnectableWidgetConfig) {
         const { message, widgetBindPath } =
           getOneClickBindingConnectableWidgetConfig(currWidget);
+        const iconSVG =
+          WidgetFactory.getConfig(currWidget.type)?.iconSVG ||
+          currWidget.iconSVG;
 
         return {
           id: currWidgetId,
           value: widgetBindPath,
           label: currWidget.widgetName,
-          icon: <StyledImage alt="widget-icon" src={currWidget.iconSVG} />,
+          icon: <StyledImage alt="widget-icon" src={iconSVG} />,
           data: {
             widgetType: currWidget.type,
             widgetName: currWidget.widgetName,
@@ -173,7 +176,7 @@ export function useDropdown(props: OneClickDropdownFieldProps) {
     if (options && options.length > 0) {
       return (options as DropdownOptionType[])?.map((option) => (
         <Option
-          data-testId={`t--one-click-binding-column-${props.id}--column`}
+          data-testid={`t--one-click-binding-column-${props.id}--column`}
           key={option.id}
           value={option.value}
         >
@@ -183,7 +186,7 @@ export function useDropdown(props: OneClickDropdownFieldProps) {
     } else {
       return (
         <Option
-          data-testId="t--one-click-binding-no-connectable-widget"
+          data-testid="t--one-click-binding-no-connectable-widget"
           disabled
         >
           {createMessage(NO_CONNECTABLE_WIDGET_FOUND)}
diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/index.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/index.tsx
index bc1a394bb363..aba8a7770462 100644
--- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/index.tsx
+++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/index.tsx
@@ -16,10 +16,10 @@ import {
 import { updateOneClickBindingOptionsVisibility } from "actions/oneClickBindingActions";
 import type { AlertMessage, Alias, OtherField } from "./types";
 import { CONNECT_BUTTON_TEXT, createMessage } from "ee/constants/messages";
-
 import { DROPDOWN_VARIANT } from "./CommonControls/DatasourceDropdown/types";
+import type { getDefaultQueryBindingValue } from "./CommonControls/DatasourceDropdown/useSource/useConnectToOptions";
 
-interface WidgetQueryGeneratorFormContextType {
+export interface WidgetQueryGeneratorFormContextType {
   widgetId: string;
   propertyValue: string;
   propertyName: string;
@@ -53,6 +53,8 @@ interface WidgetQueryGeneratorFormContextType {
   datasourceDropdownVariant: DROPDOWN_VARIANT;
   alertMessage?: AlertMessage | null;
   showEditFieldsModal?: boolean;
+  allowedDatasourceTypes?: string[];
+  getQueryBindingValue?: typeof getDefaultQueryBindingValue;
 }
 
 const DEFAULT_CONFIG_VALUE = {
@@ -110,6 +112,8 @@ interface Props {
   datasourceDropdownVariant: DROPDOWN_VARIANT;
   actionButtonCtaText?: string;
   alertMessage?: AlertMessage;
+  allowedDatasourceTypes?: WidgetQueryGeneratorFormContextType["allowedDatasourceTypes"];
+  getQueryBindingValue?: WidgetQueryGeneratorFormContextType["getQueryBindingValue"];
 }
 
 function WidgetQueryGeneratorForm(props: Props) {
@@ -121,10 +125,12 @@ function WidgetQueryGeneratorForm(props: Props) {
     actionButtonCtaText = createMessage(CONNECT_BUTTON_TEXT),
     alertMessage,
     aliases,
+    allowedDatasourceTypes,
     datasourceDropdownVariant,
     errorMsg,
     excludePrimaryColumnFromQueryGeneration,
     expectedType,
+    getQueryBindingValue,
     isConnectableToWidget,
     onUpdate,
     otherFields = [],
@@ -247,6 +253,8 @@ function WidgetQueryGeneratorForm(props: Props) {
       datasourceDropdownVariant,
       alertMessage,
       showEditFieldsModal,
+      allowedDatasourceTypes,
+      getQueryBindingValue,
     };
   }, [
     config,
@@ -266,6 +274,9 @@ function WidgetQueryGeneratorForm(props: Props) {
     datasourceDropdownVariant,
     alertMessage,
     showEditFieldsModal,
+    allowedDatasourceTypes,
+    getQueryBindingValue,
+    expectedType,
   ]);
 
   useEffect(() => {
diff --git a/app/client/src/components/editorComponents/form/fields/KeyValueFieldArray.tsx b/app/client/src/components/editorComponents/form/fields/KeyValueFieldArray.tsx
index 3d01a9550692..c30513169b5d 100644
--- a/app/client/src/components/editorComponents/form/fields/KeyValueFieldArray.tsx
+++ b/app/client/src/components/editorComponents/form/fields/KeyValueFieldArray.tsx
@@ -17,7 +17,7 @@ import { AutocompleteDataType } from "utils/autocomplete/AutocompleteDataType";
 import {
   DEFAULT_MULTI_PART_DROPDOWN_PLACEHOLDER,
   MULTI_PART_DROPDOWN_OPTIONS,
-} from "constants/ApiEditorConstants/CommonApiConstants";
+} from "PluginActionEditor/constants/CommonApiConstants";
 import { Button, Text } from "@appsmith/ads";
 import RequestDropdownField from "./RequestDropdownField";
 
@@ -33,7 +33,7 @@ const KeyValueStackContainer = styled.div<CustomStack>`
 // `;
 const FormRowWithLabel = styled(FormRow)`
   flex-wrap: wrap;
-  margin-bottom: ${(props) => props.theme.spaces[2] - 1}px;
+  margin-bottom: var(--ads-v2-spaces-3);
   ${FormLabel} {
     width: 100%;
   }
@@ -52,7 +52,7 @@ const Flex = styled.div<{ size: number }>`
   ${(props) =>
     props.size === 3
       ? `
-    margin-left: 5px;
+    margin-left: var(--ads-v2-spaces-3);
   `
       : null};
 `;
@@ -81,7 +81,7 @@ const DynamicTextFieldWithDropdownWrapper = styled.div`
 
 const DynamicDropdownFieldWrapper = styled.div`
   position: relative;
-  margin-left: 5px;
+  margin-left: var(--ads-v2-spaces-3);
   border-color: var(--ads-v2-color-border);
   color: var(--ads-v2-color-fg);
 
diff --git a/app/client/src/components/editorComponents/form/fields/StyledFormComponents.tsx b/app/client/src/components/editorComponents/form/fields/StyledFormComponents.tsx
index 6cc500f53a45..c8e638796926 100644
--- a/app/client/src/components/editorComponents/form/fields/StyledFormComponents.tsx
+++ b/app/client/src/components/editorComponents/form/fields/StyledFormComponents.tsx
@@ -122,7 +122,7 @@ const StyledFormLabel = styled.label<{
   font-weight: 400;
   font-size: 14px;
   line-height: 16px;
-  letter-spacing: 0.02em;
+  letter-spacing: normal;
   margin-bottom: ${(props) =>
     props.extraStyles?.marginBottom
       ? props.extraStyles?.marginBottom
@@ -153,6 +153,7 @@ const FormEncrytedSection = styled.div`
 `;
 
 interface FormLabelProps {
+  className?: string;
   config?: ControlProps;
   children: JSX.Element | React.ReactNode;
   // TODO: Fix this the next time the file is edited
@@ -163,7 +164,11 @@ interface FormLabelProps {
 //Wrapper on styled <label/>
 function FormLabel(props: FormLabelProps) {
   return (
-    <StyledFormLabel config={props.config} extraStyles={props.extraStyles}>
+    <StyledFormLabel
+      className={props.className}
+      config={props.config}
+      extraStyles={props.extraStyles}
+    >
       {props.children}
     </StyledFormLabel>
   );
diff --git a/app/client/src/components/formControls/BaseControl.tsx b/app/client/src/components/formControls/BaseControl.tsx
index 400dff4a6490..89dd371339b3 100644
--- a/app/client/src/components/formControls/BaseControl.tsx
+++ b/app/client/src/components/formControls/BaseControl.tsx
@@ -108,6 +108,7 @@ export interface ControlData {
   validator?: (value: string) => { isValid: boolean; message: string };
   isSecretExistsPath?: string;
   addMoreButtonLabel?: string;
+  datasourceId?: string;
 }
 export type FormConfigType = Omit<ControlData, "configProperty"> & {
   configProperty?: string;
diff --git a/app/client/src/components/formControls/DynamicTextFieldControl.tsx b/app/client/src/components/formControls/DynamicTextFieldControl.tsx
index 4bb9c594814f..0725efb17eae 100644
--- a/app/client/src/components/formControls/DynamicTextFieldControl.tsx
+++ b/app/client/src/components/formControls/DynamicTextFieldControl.tsx
@@ -21,10 +21,14 @@ import { actionPathFromName } from "components/formControls/utils";
 import type { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
 import { getSqlEditorModeFromPluginName } from "components/editorComponents/CodeEditor/sql/config";
 import { selectFeatureFlags } from "ee/selectors/featureFlagsSelectors";
+import { Flex } from "@appsmith/ads";
 
-const Wrapper = styled.div<{ fullWidth: boolean }>`
+const Wrapper = styled.div`
   min-width: 380px;
-  max-width: ${({ fullWidth }) => (fullWidth ? "100%" : "872px;")};
+  width: 100%;
+  min-height: 200px;
+  height: 100%;
+  display: flex;
 `;
 
 interface DynamicTextControlState {
@@ -64,25 +68,24 @@ class DynamicTextControl extends BaseControl<
         : EditorModes.JSON_WITH_BINDING;
 
     return (
-      <Wrapper
-        className={`t--${configProperty} dynamic-text-field-control`}
-        fullWidth={isActionRedesignEnabled}
-      >
-        <DynamicTextField
-          dataTreePath={dataTreePath}
-          disabled={this.props.disabled}
-          evaluatedPopUpLabel={this?.props?.label}
-          evaluationSubstitutionType={evaluationSubstitutionType}
-          height="200px"
-          mode={mode}
-          name={this.props.configProperty}
-          placeholder={placeholderText}
-          showLineNumbers={
-            isActionRedesignEnabled || this.props.showLineNumbers
-          }
-          size={EditorSize.EXTENDED}
-          tabBehaviour={TabBehaviour.INDENT}
-        />
+      <Wrapper className={`t--${configProperty} dynamic-text-field-control`}>
+        <Flex flex="1">
+          <DynamicTextField
+            dataTreePath={dataTreePath}
+            disabled={this.props.disabled}
+            evaluatedPopUpLabel={this?.props?.label}
+            evaluationSubstitutionType={evaluationSubstitutionType}
+            height="100%"
+            mode={mode}
+            name={this.props.configProperty}
+            placeholder={placeholderText}
+            showLineNumbers={
+              isActionRedesignEnabled || this.props.showLineNumbers
+            }
+            size={EditorSize.EXTENDED}
+            tabBehaviour={TabBehaviour.INDENT}
+          />
+        </Flex>
       </Wrapper>
     );
   }
diff --git a/app/client/src/components/formControls/PaginationControl.tsx b/app/client/src/components/formControls/PaginationControl.tsx
index d66a04a82c51..532f71877feb 100644
--- a/app/client/src/components/formControls/PaginationControl.tsx
+++ b/app/client/src/components/formControls/PaginationControl.tsx
@@ -10,7 +10,6 @@ import { PaginationSubComponent } from "components/formControls/utils";
 
 export const StyledFormLabel = styled(FormLabel)`
   margin-top: 5px;
-  /* font-weight: 400; */
   font-size: 12px;
   color: var(--ads-v2-color-fg-muted);
   line-height: 12px;
@@ -19,14 +18,13 @@ export const StyledFormLabel = styled(FormLabel)`
 export const FormControlContainer = styled.div`
   display: flex;
   flex-direction: column;
-  width: 270px;
-  margin-right: 1rem;
 `;
 
 const PaginationContainer = styled.div`
   display: grid;
-  grid-gap: 5px 5px;
-  grid-template-columns: repeat(auto-fill, 270px);
+  column-gap: var(--ads-v2-spaces-4);
+  row-gap: var(--ads-v2-spaces-2);
+  grid-template-columns: repeat(auto-fill, minmax(260px, 1fr));
 `;
 
 // using query dynamic input text for both so user can dynamically change these values.
@@ -36,9 +34,6 @@ const valueFieldConfig: any = {
   key: "value",
   controlType: "QUERY_DYNAMIC_INPUT_TEXT",
   placeholderText: "value",
-  customStyles: {
-    // width: "280px",
-  },
 };
 
 // TODO: Fix this the next time the file is edited
@@ -91,7 +86,6 @@ export function Pagination(props: {
   );
 
   const defaultStyles = {
-    // width: "280px",
     ...customStyles,
   };
 
@@ -115,7 +109,6 @@ export function Pagination(props: {
         />
         <StyledFormLabel>Limits the number of rows returned.</StyledFormLabel>
       </FormControlContainer>
-
       {/*  form control for Offset field */}
       <FormControlContainer>
         <FormControl
diff --git a/app/client/src/components/formControls/RadioButtonControl.test.tsx b/app/client/src/components/formControls/RadioButtonControl.test.tsx
new file mode 100644
index 000000000000..03077c379b19
--- /dev/null
+++ b/app/client/src/components/formControls/RadioButtonControl.test.tsx
@@ -0,0 +1,118 @@
+import React from "react";
+import RadioButtonControl from "./RadioButtonControl";
+import { render, screen } from "test/testUtils";
+import { Provider } from "react-redux";
+import { reduxForm } from "redux-form";
+import configureStore from "redux-mock-store";
+import "@testing-library/jest-dom";
+
+const mockStore = configureStore([]);
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function TestForm(props: any) {
+  return <div>{props.children}</div>;
+}
+
+const ReduxFormDecorator = reduxForm({
+  form: "TestForm",
+})(TestForm);
+
+const mockOptions = [
+  { label: "Option 1", value: "option1", children: "Option 1" },
+  { label: "Option 2", value: "option2", children: "Option 2" },
+  { label: "Option 3", value: "option3", children: "Option 3" },
+];
+
+let radioButtonProps = {
+  options: mockOptions,
+  configProperty: "actionConfiguration.testPath",
+  controlType: "PROJECTION",
+  label: "Columns",
+  id: "column",
+  formName: "",
+  isValid: true,
+  initialValue: "option1",
+};
+
+describe("RadioButtonControl", () => {
+  const mockStoreInstance = mockStore();
+  let store: typeof mockStoreInstance;
+
+  beforeEach(() => {
+    store = mockStore();
+  });
+  it("should render RadioButtonControl and options properly", async () => {
+    render(
+      <Provider store={store}>
+        <ReduxFormDecorator>
+          <RadioButtonControl {...radioButtonProps} />
+        </ReduxFormDecorator>
+      </Provider>,
+    );
+    const radioButton = (await screen.findByTestId(
+      "actionConfiguration.testPath",
+    )) as HTMLElement;
+
+    expect(radioButton).toBeInTheDocument();
+
+    const options = screen.getAllByRole("radio");
+
+    expect(options).toHaveLength(3);
+  });
+
+  it("should show the default selected option", async () => {
+    radioButtonProps = {
+      ...radioButtonProps,
+    };
+
+    render(
+      <Provider store={store}>
+        <ReduxFormDecorator>
+          <RadioButtonControl {...radioButtonProps} />
+        </ReduxFormDecorator>
+      </Provider>,
+    );
+    const radioButton = (await screen.findByTestId(
+      "actionConfiguration.testPath",
+    )) as HTMLElement;
+
+    expect(radioButton).toBeInTheDocument();
+
+    const options = screen.getAllByRole("radio");
+
+    expect(options[0]).toBeChecked();
+    expect(options[1]).not.toBeChecked();
+    expect(options[2]).not.toBeChecked();
+  });
+
+  it("should select the option when clicked", async () => {
+    radioButtonProps = {
+      ...radioButtonProps,
+    };
+
+    render(
+      <Provider store={store}>
+        <ReduxFormDecorator>
+          <RadioButtonControl {...radioButtonProps} />
+        </ReduxFormDecorator>
+      </Provider>,
+    );
+    const radioButton = (await screen.findByTestId(
+      "actionConfiguration.testPath",
+    )) as HTMLElement;
+
+    expect(radioButton).toBeInTheDocument();
+
+    const options = screen.getAllByRole("radio");
+
+    expect(options[0]).toBeChecked();
+    expect(options[1]).not.toBeChecked();
+    expect(options[2]).not.toBeChecked();
+
+    options[1].click();
+
+    expect(options[0]).not.toBeChecked();
+    expect(options[1]).toBeChecked();
+    expect(options[2]).not.toBeChecked();
+  });
+});
diff --git a/app/client/src/components/formControls/RadioButtonControl.tsx b/app/client/src/components/formControls/RadioButtonControl.tsx
new file mode 100644
index 000000000000..ecee054f58c5
--- /dev/null
+++ b/app/client/src/components/formControls/RadioButtonControl.tsx
@@ -0,0 +1,70 @@
+import React from "react";
+import type { ControlProps } from "./BaseControl";
+import BaseControl from "./BaseControl";
+import type { ControlType } from "constants/PropertyControlConstants";
+import type { WrappedFieldInputProps, WrappedFieldMetaProps } from "redux-form";
+import { Field } from "redux-form";
+import { Radio, RadioGroup, type SelectOptionProps } from "@appsmith/ads";
+import styled from "styled-components";
+
+class RadioButtonControl extends BaseControl<RadioButtonControlProps> {
+  getControlType(): ControlType {
+    return "RADIO_BUTTON";
+  }
+  render() {
+    return (
+      <Field
+        component={renderComponent}
+        name={this.props.configProperty}
+        props={{ ...this.props }}
+        type="radiobutton"
+      />
+    );
+  }
+}
+
+type renderComponentProps = RadioButtonControlProps & {
+  input?: WrappedFieldInputProps;
+  meta?: WrappedFieldMetaProps;
+  options?: Array<{ label: string; value: string }>;
+};
+
+const StyledRadioGroup = styled(RadioGroup)({
+  display: "flex",
+  flexDirection: "column",
+  gap: "16px",
+  marginTop: "16px",
+});
+
+function renderComponent(props: renderComponentProps) {
+  const onChangeHandler = (value: string) => {
+    if (typeof props.input?.onChange === "function") {
+      props.input.onChange(value);
+    }
+  };
+
+  const options = props.options || [];
+  const defaultValue = props.initialValue as string;
+
+  return (
+    <StyledRadioGroup
+      data-testid={props.input?.name}
+      defaultValue={defaultValue}
+      onChange={onChangeHandler}
+    >
+      {options.map((option) => {
+        return (
+          <Radio key={option.value} value={option.value}>
+            {option.label}
+          </Radio>
+        );
+      })}
+    </StyledRadioGroup>
+  );
+}
+
+export interface RadioButtonControlProps extends ControlProps {
+  options: SelectOptionProps[];
+}
+
+export default RadioButtonControl;
diff --git a/app/client/src/components/formControls/SortingControl.tsx b/app/client/src/components/formControls/SortingControl.tsx
index 9f8454edde98..93e718ac3d88 100644
--- a/app/client/src/components/formControls/SortingControl.tsx
+++ b/app/client/src/components/formControls/SortingControl.tsx
@@ -54,13 +54,13 @@ const orderFieldConfig: any = {
 
 const SortingContainer = styled.div`
   display: flex;
-  gap: 5px;
+  gap: var(--ads-v2-spaces-4);
   flex-direction: column;
 `;
 
 const SortingDropdownContainer = styled.div`
   display: flex;
-  gap: 5px;
+  gap: var(--ads-v2-spaces-4);
 `;
 
 const SortingFields = styled.div<{ isBreakpointSmall: boolean }>`
@@ -69,7 +69,9 @@ const SortingFields = styled.div<{ isBreakpointSmall: boolean }>`
     isBreakpointSmall ? "1fr" : "1fr 180px"};
   grid-template-rows: ${({ isBreakpointSmall }) =>
     isBreakpointSmall ? "1fr 1fr" : "1fr"};
-  gap: 5px;
+  column-gap: var(--ads-v2-spaces-4);
+  row-gap: var(--ads-v2-spaces-2);
+  width: 100%;
 `;
 
 const ButtonWrapper = styled.div`
@@ -159,9 +161,6 @@ function SortingComponent(props: SortingComponentProps) {
                 <FormControl
                   config={{
                     ...columnFieldConfig,
-                    customStyles: {
-                      width: "100%",
-                    },
                     configProperty: columnPath,
                     nestedFormControl: true,
                   }}
diff --git a/app/client/src/components/formControls/WhereClauseControl.tsx b/app/client/src/components/formControls/WhereClauseControl.tsx
index b220801ea7d2..3ac3f2fce376 100644
--- a/app/client/src/components/formControls/WhereClauseControl.tsx
+++ b/app/client/src/components/formControls/WhereClauseControl.tsx
@@ -90,7 +90,7 @@ const CenteredIconButton = styled(Button)<{
 `;
 
 // We are setting a background color for the last two nested levels
-const handleSecondaryBoxBackgroudColor = (
+const handleSecondaryBoxBackgroundColor = (
   currentNestingLevel: number,
   nestedLevels: number,
 ) => {
@@ -113,11 +113,12 @@ const SecondaryBox = styled.div<{
   display: flex;
   flex-direction: column;
   position: relative;
-  border-radius: var(--ads-v2-border-radius);
   border: solid 1px var(--ads-v2-color-border);
+  border-radius: var(--ads-v2-border-radius);
   border-width: ${(props) => (props?.showBorder ? "1px" : "0px")};
   padding: ${(props) =>
-    props?.showBorder ? "0px 12px 12px 8px" : "4px 12px 12px 0px"};
+    props?.showBorder ? "0px 12px 12px 8px" : "4px 0px 12px 0px"};
+
   width: 100%;
   // Setting a max width to not have it really elongate on very large screens
   max-width: 2000px;
@@ -125,11 +126,10 @@ const SecondaryBox = styled.div<{
   ${(props) =>
     props.size === "small" &&
     `
-    ${handleSecondaryBoxBackgroudColor(
+    ${handleSecondaryBoxBackgroundColor(
       props.currentNestingLevel,
       props.nestedLevels,
     )}
-    padding-bottom: 12px;
   `}
 `;
 
@@ -139,14 +139,13 @@ const ConditionWrapper = styled.div<{ size: string }>`
   flex-direction: row;
   align-items: center;
   width: 100%;
-  gap: 5px;
+  gap: var(--ads-v2-spaces-4);
   margin-top: var(--ads-v2-spaces-3);
   margin-bottom: 5px;
 
   ${(props) =>
     props.size === "small" &&
     `
-    // margin-top: 0px;
     gap: 0px;
     flex-direction: column;
     align-items: start;
@@ -163,8 +162,8 @@ const ConditionBox = styled.div<{ size?: string }>`
   // The 4 elements(3 input fields and a close button) are horizontally aligned
   // by default
   grid-template-columns: auto 100px auto max-content;
-  grid-column-gap: 5px;
-  grid-row-gap: 5px;
+  column-gap: var(--ads-v2-spaces-4);
+  row-gap: var(--ads-v2-spaces-2);
   width: 100%;
 
   ${(props) =>
@@ -178,7 +177,7 @@ const ConditionBox = styled.div<{ size?: string }>`
     // are verticall aligned one below the other.
     grid-template-columns: repeat(2, max-content);
     grid-template-rows: repeat(3, max-content);
-    grid-column-gap: 5px;
+    column-gap: var(--ads-v2-spaces-4);
     // The three input fields will be in the first column
     & :not(:nth-child(4)) {
       grid-column-start: 1;
@@ -196,7 +195,7 @@ const ConditionBox = styled.div<{ size?: string }>`
 const ActionBox = styled.div<{ marginLeft: string; size: string }>`
   display: flex;
   flex-direction: row;
-  gap: 5px;
+  row-gap: var(--ads-v2-spaces-2);
   background-color: inherit;
   margin-left: ${(props) => props.marginLeft};
 
@@ -210,16 +209,15 @@ const ActionBox = styled.div<{ marginLeft: string; size: string }>`
 const GroupConditionBox = styled.div<{ size: string }>`
   display: flex;
   flex-direction: row;
-  gap: 5px;
+  gap: var(--ads-v2-spaces-4);
   width: 100%;
 
   ${(props) =>
     props.size === "small" &&
     `
-  gap: 5px;
-  margin: 5px 0px;
-  flex-direction: row;
-  min-width: max-content;
+    margin: 5px 0px;
+    flex-direction: row;
+    min-width: max-content;
   `}
 `;
 
@@ -308,9 +306,8 @@ function ConditionBlock(props: any) {
   // Smallest width of the component below which the individual input fields don't
   // decrease in width anymore so we decide to shift to small space layout at this point
   const size = useResponsiveBreakpoints(targetRef, [{ small: 505 }]);
-  // TODO: Fix this the next time the file is edited
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const formValues: any = useSelector((state) =>
+
+  const formValues = useSelector((state) =>
     getFormValues(props.formName)(state),
   );
 
@@ -413,6 +410,7 @@ function ConditionBlock(props: any) {
                   <CenteredIconButton
                     alignSelf={"start"}
                     data-testid={`t--where-clause-delete-[${index}]`}
+                    isIconButton
                     kind="tertiary"
                     onClick={(e: React.MouseEvent) => {
                       e.stopPropagation();
diff --git a/app/client/src/components/propertyControls/ArrayComponent.tsx b/app/client/src/components/propertyControls/ArrayComponent.tsx
new file mode 100644
index 000000000000..ec98932273b9
--- /dev/null
+++ b/app/client/src/components/propertyControls/ArrayComponent.tsx
@@ -0,0 +1,152 @@
+import { Button } from "@appsmith/ads";
+import { debounce } from "lodash";
+import React, { useCallback, useEffect, useState } from "react";
+import styled from "styled-components";
+import { ControlWrapper, InputGroup } from "./StyledControls";
+
+function updateOptionLabel<T>(
+  items: Array<T>,
+  index: number,
+  updatedLabel: string,
+) {
+  return items.map((option: T, optionIndex) => {
+    if (index !== optionIndex) {
+      return option;
+    }
+
+    return updatedLabel;
+  });
+}
+
+const StyledBox = styled.div`
+  width: 10px;
+`;
+
+type UpdateItemsFunction = (
+  items: string[],
+  isUpdatedViaKeyboard?: boolean,
+) => void;
+
+interface ArrayComponentProps {
+  items: string[];
+  updateItems: UpdateItemsFunction;
+  addLabel?: string;
+}
+
+const StyledInputGroup = styled(InputGroup)`
+  > .ads-v2-input__input-section > div {
+    flex: 1;
+    min-width: 0px;
+  }
+`;
+
+export function ArrayComponent(props: ArrayComponentProps) {
+  const [renderItems, setRenderItems] = useState<string[]>([]);
+  const [typing, setTyping] = useState<boolean>(false);
+  const { items } = props;
+
+  useEffect(() => {
+    let { items } = props;
+
+    items = Array.isArray(items) ? items.slice() : [];
+
+    items.length !== 0 && !typing && setRenderItems(items);
+  }, [props, items.length, renderItems.length, typing]);
+
+  const debouncedUpdateItems = useCallback(
+    debounce((updatedItems: string[]) => {
+      props.updateItems(updatedItems, true);
+    }, 200),
+    [props.updateItems],
+  );
+
+  function updateKey(index: number, updatedKey: string) {
+    let { items } = props;
+
+    items = Array.isArray(items) ? items : [];
+    const updatedItems = updateOptionLabel(items, index, updatedKey);
+    const updatedRenderItems = updateOptionLabel(
+      renderItems,
+      index,
+      updatedKey,
+    );
+
+    setRenderItems(updatedRenderItems);
+    debouncedUpdateItems(updatedItems);
+  }
+
+  function deleteItem(index: number, isUpdatedViaKeyboard = false) {
+    let { items } = props;
+
+    items = Array.isArray(items) ? items : [];
+
+    const newItems = items.filter((o, i) => i !== index);
+    const newRenderItems = renderItems.filter((o, i) => i !== index);
+
+    setRenderItems(newRenderItems);
+    props.updateItems(newItems, isUpdatedViaKeyboard);
+  }
+
+  function addItem(e: React.MouseEvent) {
+    let { items } = props;
+
+    items = Array.isArray(items) ? items.slice() : [];
+
+    items.push("");
+
+    const updatedRenderItems = renderItems.slice();
+
+    updatedRenderItems.push("");
+
+    setRenderItems(updatedRenderItems);
+    props.updateItems(items, e.detail === 0);
+  }
+
+  function onInputFocus() {
+    setTyping(true);
+  }
+
+  function onInputBlur() {
+    setTyping(false);
+  }
+
+  return (
+    <>
+      {renderItems.map((item: string, index) => {
+        return (
+          <ControlWrapper key={index} orientation={"HORIZONTAL"}>
+            <StyledInputGroup
+              dataType={"text"}
+              onBlur={onInputBlur}
+              onChange={(value: string) => updateKey(index, value)}
+              onFocus={onInputFocus}
+              value={item}
+            />
+            <StyledBox />
+            <Button
+              isIconButton
+              kind="tertiary"
+              onClick={(e: React.MouseEvent) =>
+                deleteItem(index, e.detail === 0)
+              }
+              size="sm"
+              startIcon="delete-bin-line"
+            />
+          </ControlWrapper>
+        );
+      })}
+
+      <div className="flex flex-row-reverse mt-1">
+        <Button
+          className="t--property-control-options-add"
+          kind="tertiary"
+          onClick={addItem}
+          size="sm"
+          startIcon="plus"
+        >
+          {props.addLabel || "Add suggestion"}
+        </Button>
+      </div>
+    </>
+  );
+}
diff --git a/app/client/src/components/propertyControls/ArrayControl.tsx b/app/client/src/components/propertyControls/ArrayControl.tsx
new file mode 100644
index 000000000000..8dab080e041a
--- /dev/null
+++ b/app/client/src/components/propertyControls/ArrayControl.tsx
@@ -0,0 +1,48 @@
+import { objectKeys } from "@appsmith/utils";
+import type { DropdownOption } from "components/constants";
+import React from "react";
+import { isDynamicValue } from "utils/DynamicBindingUtils";
+import { ArrayComponent } from "./ArrayComponent";
+import type { ControlData, ControlProps } from "./BaseControl";
+import BaseControl from "./BaseControl";
+
+class ArrayControl extends BaseControl<ControlProps> {
+  render() {
+    return (
+      <ArrayComponent
+        items={this.props.propertyValue}
+        updateItems={this.updateItems}
+      />
+    );
+  }
+
+  updateItems = (items: string[], isUpdatedViaKeyboard = false) => {
+    this.updateProperty(this.props.propertyName, items, isUpdatedViaKeyboard);
+  };
+
+  static getControlType() {
+    return "ARRAY_INPUT";
+  }
+
+  static canDisplayValueInUI(_config: ControlData, value: string): boolean {
+    if (isDynamicValue(value)) return false;
+
+    try {
+      const items: DropdownOption[] = JSON.parse(value);
+
+      for (const x of items) {
+        const keys = objectKeys(x);
+
+        if (!keys.includes("label") || !keys.includes("value")) {
+          return false;
+        }
+      }
+    } catch {
+      return false;
+    }
+
+    return true;
+  }
+}
+
+export default ArrayControl;
diff --git a/app/client/src/components/propertyControls/DraggableListCard.tsx b/app/client/src/components/propertyControls/DraggableListCard.tsx
index 2cbe8e45b500..04b368dee55a 100644
--- a/app/client/src/components/propertyControls/DraggableListCard.tsx
+++ b/app/client/src/components/propertyControls/DraggableListCard.tsx
@@ -205,7 +205,7 @@ export function DraggableListCard(props: RenderComponentProps) {
             }}
             onFocus={(e) => e.stopPropagation()}
             size="sm"
-            startIcon="settings-2-line"
+            startIcon="settings-v3"
           />
         )}
         {showDelete && (
diff --git a/app/client/src/components/propertyControls/IconTabControl.tsx b/app/client/src/components/propertyControls/IconTabControl.tsx
index 9facf3e4cc92..e253941d5234 100644
--- a/app/client/src/components/propertyControls/IconTabControl.tsx
+++ b/app/client/src/components/propertyControls/IconTabControl.tsx
@@ -12,8 +12,16 @@ import {
 } from "utils/AppsmithUtils";
 
 const StyledSegmentedControl = styled(SegmentedControl)`
+  &.ads-v2-segmented-control {
+    gap: 0;
+  }
+
   > .ads-v2-segmented-control__segments-container {
-    flex: 1 1 0%;
+    flex: 1 1 auto;
+  }
+
+  > .ads-v2-segmented-control__segments-container:has(.ads-v2-text) span {
+    padding: 0;
   }
 `;
 
diff --git a/app/client/src/components/propertyControls/OneClickBindingControl.tsx b/app/client/src/components/propertyControls/OneClickBindingControl.tsx
index a442b898a1d4..38f271173cf4 100644
--- a/app/client/src/components/propertyControls/OneClickBindingControl.tsx
+++ b/app/client/src/components/propertyControls/OneClickBindingControl.tsx
@@ -1,4 +1,6 @@
-import WidgetQueryGeneratorForm from "components/editorComponents/WidgetQueryGeneratorForm";
+import WidgetQueryGeneratorForm, {
+  type WidgetQueryGeneratorFormContextType,
+} from "components/editorComponents/WidgetQueryGeneratorForm";
 import type {
   AlertMessage,
   Alias,
@@ -70,6 +72,9 @@ class OneClickBindingControl extends BaseControl<OneClickBindingControlProps> {
         actionButtonCtaText={this.props.controlConfig?.actionButtonCtaText}
         alertMessage={this.props.controlConfig?.alertMessage}
         aliases={this.props.controlConfig.aliases}
+        allowedDatasourceTypes={
+          this.props.controlConfig?.allowedDatasourceTypes
+        }
         datasourceDropdownVariant={
           this.props.controlConfig?.datasourceDropdownVariant ||
           DROPDOWN_VARIANT.CONNECT_TO_DATASOURCE
@@ -79,6 +84,7 @@ class OneClickBindingControl extends BaseControl<OneClickBindingControlProps> {
           this.props.controlConfig?.excludePrimaryColumnFromQueryGeneration
         }
         expectedType={this.props.expected?.autocompleteDataType || ""}
+        getQueryBindingValue={this.props.controlConfig?.getQueryBindingValue}
         isConnectableToWidget={this.props.controlConfig?.isConnectableToWidget}
         onUpdate={this.onUpdatePropertyValue}
         otherFields={this.props.controlConfig.otherFields}
@@ -107,5 +113,7 @@ export type OneClickBindingControlProps = ControlProps & {
     actionButtonCtaText: string;
     datasourceDropdownVariant: DROPDOWN_VARIANT;
     alertMessage: AlertMessage;
+    allowedDatasourceTypes?: WidgetQueryGeneratorFormContextType["allowedDatasourceTypes"];
+    getQueryBindingValue?: WidgetQueryGeneratorFormContextType["getQueryBindingValue"];
   };
 };
diff --git a/app/client/src/components/propertyControls/OptionControl.tsx b/app/client/src/components/propertyControls/OptionControl.tsx
index 8a9ceebdf137..c4ab3c911c5b 100644
--- a/app/client/src/components/propertyControls/OptionControl.tsx
+++ b/app/client/src/components/propertyControls/OptionControl.tsx
@@ -20,7 +20,7 @@ class OptionControl extends BaseControl<ControlProps> {
     options: SegmentedControlOption[],
     isUpdatedViaKeyboard = false,
   ) => {
-    this.updateProperty("options", options, isUpdatedViaKeyboard);
+    this.updateProperty(this.props.propertyName, options, isUpdatedViaKeyboard);
   };
 
   static getControlType() {
diff --git a/app/client/src/components/propertyControls/index.ts b/app/client/src/components/propertyControls/index.ts
index 6683cd30246b..cf85e900e04b 100644
--- a/app/client/src/components/propertyControls/index.ts
+++ b/app/client/src/components/propertyControls/index.ts
@@ -76,12 +76,14 @@ import type { IconSelectControlV2Props } from "./IconSelectControlV2";
 import IconSelectControlV2 from "./IconSelectControlV2";
 import PrimaryColumnsControlWDS from "./PrimaryColumnsControlWDS";
 import ToolbarButtonListControl from "./ToolbarButtonListControl";
+import ArrayControl from "./ArrayControl";
 
 export const PropertyControls = {
   InputTextControl,
   DropDownControl,
   SwitchControl,
   OptionControl,
+  ArrayControl,
   CodeEditorControl,
   DatePickerControl,
   ActionSelectorControl,
diff --git a/app/client/src/constants/AppConstants.ts b/app/client/src/constants/AppConstants.ts
index 1d8994a6f2d4..c5d8ede0ae8c 100644
--- a/app/client/src/constants/AppConstants.ts
+++ b/app/client/src/constants/AppConstants.ts
@@ -9,6 +9,7 @@ export const CANVAS_DEFAULT_MIN_ROWS = Math.ceil(
 export const DEFAULT_ENTITY_EXPLORER_WIDTH = 256;
 export const DEFAULT_PROPERTY_PANE_WIDTH = 288;
 export const APP_SETTINGS_PANE_WIDTH = 525;
+export const APP_LIBRARIES_PANE_WIDTH = 384;
 export const DEFAULT_EXPLORER_PANE_WIDTH = 255;
 export const SPLIT_SCREEN_RATIO = 0.404;
 
diff --git a/app/client/src/constants/AppsmithActionConstants/formConfig/ApiSettingsConfig.ts b/app/client/src/constants/AppsmithActionConstants/formConfig/ApiSettingsConfig.ts
index 927e5fdc9211..103aff745a68 100644
--- a/app/client/src/constants/AppsmithActionConstants/formConfig/ApiSettingsConfig.ts
+++ b/app/client/src/constants/AppsmithActionConstants/formConfig/ApiSettingsConfig.ts
@@ -5,7 +5,7 @@ import {
 import {
   HTTP_PROTOCOL,
   HTTP_PROTOCOL_VERSIONS,
-} from "constants/ApiEditorConstants/CommonApiConstants";
+} from "PluginActionEditor/constants/CommonApiConstants";
 
 export default [
   {
@@ -13,30 +13,29 @@ export default [
     id: 1,
     children: [
       {
-        label: "Run API on page load",
+        label: "Run the API on page load",
         configProperty: "executeOnLoad",
         controlType: "SWITCH",
-        subtitle: "Will refresh data each time the page is loaded",
       },
       {
-        label: "Request confirmation before running API",
+        label: "Request confirmation before running this API",
         configProperty: "confirmBeforeExecute",
         controlType: "SWITCH",
-        subtitle:
+        tooltipText:
           "Ask confirmation from the user each time before refreshing data",
       },
       {
         label: "Encode query params",
         configProperty: "actionConfiguration.encodeParamsToggle",
         controlType: "SWITCH",
-        subtitle:
+        tooltipText:
           "Encode query params for all APIs. Also encode form body when Content-Type header is set to x-www-form-encoded",
       },
       {
         label: "Smart JSON substitution",
         configProperty: "actionConfiguration.pluginSpecifiedTemplates[0].value",
         controlType: "SWITCH",
-        subtitle:
+        tooltipText:
           "Turning on this property fixes the JSON substitution of bindings in API body by adding/removing quotes intelligently and reduces developer errors",
         initialValue: true,
       },
@@ -45,8 +44,6 @@ export default [
         configProperty: "actionConfiguration.httpVersion",
         name: "actionConfiguration.httpVersion",
         controlType: "DROP_DOWN",
-        subtitle:
-          "Select the protocol that best suits your security and performance requirements.",
         initialValue: HTTP_PROTOCOL.HTTP11.label,
         options: HTTP_PROTOCOL_VERSIONS,
         placeholder: createMessage(HTTP_PROTOCOL_INPUT_PLACEHOLDER),
diff --git a/app/client/src/constants/AppsmithActionConstants/formConfig/GoogleSheetsSettingsConfig.ts b/app/client/src/constants/AppsmithActionConstants/formConfig/GoogleSheetsSettingsConfig.ts
index 0a1bc7d3f4c5..7ad33fde15e2 100644
--- a/app/client/src/constants/AppsmithActionConstants/formConfig/GoogleSheetsSettingsConfig.ts
+++ b/app/client/src/constants/AppsmithActionConstants/formConfig/GoogleSheetsSettingsConfig.ts
@@ -4,16 +4,15 @@ export default [
     id: 1,
     children: [
       {
-        label: "Run API on page load",
+        label: "Run the API on page load",
         configProperty: "executeOnLoad",
         controlType: "SWITCH",
-        subtitle: "Will refresh data each time the page is loaded",
       },
       {
-        label: "Request confirmation before running API",
+        label: "Request confirmation before running this API",
         configProperty: "confirmBeforeExecute",
         controlType: "SWITCH",
-        subtitle:
+        tooltipText:
           "Ask confirmation from the user each time before refreshing data",
       },
       {
diff --git a/app/client/src/constants/AppsmithActionConstants/formConfig/QuerySettingsConfig.ts b/app/client/src/constants/AppsmithActionConstants/formConfig/QuerySettingsConfig.ts
index 74798c22d81f..d5a4f038f08a 100644
--- a/app/client/src/constants/AppsmithActionConstants/formConfig/QuerySettingsConfig.ts
+++ b/app/client/src/constants/AppsmithActionConstants/formConfig/QuerySettingsConfig.ts
@@ -4,16 +4,15 @@ export default [
     id: 1,
     children: [
       {
-        label: "Run query on page load",
+        label: "Run the query on page load",
         configProperty: "executeOnLoad",
         controlType: "SWITCH",
-        subtitle: "Will refresh data each time the page is loaded",
       },
       {
-        label: "Request confirmation before running query",
+        label: "Request confirmation before running this query",
         configProperty: "confirmBeforeExecute",
         controlType: "SWITCH",
-        subtitle:
+        tooltipText:
           "Ask confirmation from the user each time before refreshing data",
       },
       {
diff --git a/app/client/src/constants/DocumentationLinks.ts b/app/client/src/constants/DocumentationLinks.ts
index cc3fa9904e34..1083c4b2a800 100644
--- a/app/client/src/constants/DocumentationLinks.ts
+++ b/app/client/src/constants/DocumentationLinks.ts
@@ -6,6 +6,7 @@ export enum DocsLink {
   CONNECT_DATA = "CONNECT_DATA",
   QUERY = "QUERY",
   TROUBLESHOOT_ERROR = "TROUBLESHOOT_ERROR",
+  QUERY_SETTINGS = "QUERY_SETTINGS",
 }
 
 const LinkData: Record<DocsLink, string> = {
@@ -19,6 +20,8 @@ const LinkData: Record<DocsLink, string> = {
     "https://docs.appsmith.com/core-concepts/data-access-and-binding/capturing-data-write",
   TROUBLESHOOT_ERROR:
     "https://docs.appsmith.com/help-and-support/troubleshooting-guide",
+  QUERY_SETTINGS:
+    "https://docs.appsmith.com/connect-data/reference/query-settings",
 };
 
 export const openDoc = (type: DocsLink, link?: string, subType?: string) => {
diff --git a/app/client/src/constants/PropertyControlConstants.tsx b/app/client/src/constants/PropertyControlConstants.tsx
index 0d52e03366dc..a0e25666b543 100644
--- a/app/client/src/constants/PropertyControlConstants.tsx
+++ b/app/client/src/constants/PropertyControlConstants.tsx
@@ -17,19 +17,73 @@ const ControlTypes = getPropertyControlTypes();
 export type ControlType = (typeof ControlTypes)[keyof typeof ControlTypes];
 
 export interface PropertyPaneSectionConfig {
+  /**
+   * Title displayed at the top of a collapsible section in the property pane.
+   */
   sectionName: string;
+  /**
+   * Unique identifier for the section. Used for:
+   * - Managing section collapse/expand state in Redux
+   * - Navigation and search functionality in the property pane
+   * - React rendering optimization (as key)
+   *
+   * If not provided, it will be auto-generated during widget initialization.
+   */
   id?: string;
+  /**
+   * Array of properties that should go inside the section.
+   */
   children: PropertyPaneConfig[];
-  collapsible?: boolean; // Indicates whether the section could be collapsed or not
-  childrenId?: string; // A unique id generated by combining the ids of all the children
+  /**
+   * If false, the section will not be collapsible.
+   */
+  collapsible?: boolean;
+  /**
+   * A unique id generated by combining the ids of all the children.
+   * Mainly used in memoization to prevent unnecessary re-renders of property sections ( PropertySection.tsx )
+   */
+  childrenId?: string;
+  /**
+   * Callback function to determine if the section should be hidden.
+   *
+   * @param props - Current widget properties
+   * @param propertyPath - Path to the widget property
+   * @returns - True if the section should be hidden, false otherwise
+   */
   // TODO: Fix this the next time the file is edited
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   hidden?: (props: any, propertyPath: string) => boolean;
+  /**
+   * when true, the section will be open by default.
+   * Note: Seems like this is not used anywhere.
+   */
   isDefaultOpen?: boolean;
   propertySectionPath?: string;
-  tag?: string; // Used to show a tag right after the section name (only in the search results)
-
+  /**
+   * Used to show a tag right after the section name (usedonly in the search results)
+   */
+  tag?: string;
+  /**
+   * Indicates whether this section contains properties that need to be generated dynamically at runtime.
+   * Used in conjunction with generateDynamicProperties.
+   *
+   * Common use cases:
+   * - Dynamic event handlers ( CustomWidget's )
+   * - Properties that depend on user configuration
+   * - Properties that need to be generated based on widget state
+   */
   hasDynamicProperties?: boolean;
+  /**
+   * Function to generate property controls dynamically at runtime.
+   * Called when hasDynamicProperties is true.
+   *
+   * @param widget - Current widget properties
+   * @returns Array of dynamically generated property controls
+   *
+   * @example
+   * Used in CustomWidget and ExternalWidget to dynamically generate event handler properties
+   * based on available events.
+   */
   generateDynamicProperties?: (
     widget: WidgetProps,
   ) => PropertyPaneControlConfig[];
@@ -56,26 +110,64 @@ export interface PanelConfig {
 }
 
 export interface PropertyPaneControlConfig {
-  // unique id to identify the property. It is added automatically with generateReactKey()
+  /**
+   * Unique identifier for the control. Used for internal tracking and debugging.
+   * It added by `addPropertyConfigIds` function in `WidgetProvider/factory/helpers.ts`.
+   */
   id?: string;
-  // label is used to display the name of the property
+  /**
+   * Label shown above the control.
+   */
   label: string;
-  // unique name of the property
+  /**
+   * Human-readable slugified name of the property. Used to identify the property in the widget properties.
+   */
   propertyName: string;
-  // Serves in the tooltip
+  /**
+   * Used to provide more context about the property. Appears as tooltip when we hover over the label of the property.
+   * Note: This is different from `helperText` which appears below the property input.
+   */
   helpText?: string;
-  // Dynamic text serves below the property pane inputs
+  /**
+   * Dynamic text that appears below the property input.
+   */
   helperText?: ((props: unknown) => React.ReactNode) | React.ReactNode;
-  // used to tell if the property is a JS convertible property.
-  // If true, It will show the little JS icon button next to the property name
+  /**
+   * If true, transform the property input into plain input where js can be written..
+   */
   isJSConvertible?: boolean;
+  /**
+   * Used in special cases where we want to custom control instead regular text input control.
+   * For example: `COMPUTE_VALUE` control is used in table widget provides access to currentRow in controls in the table columns.
+   */
   customJSControl?: string;
+  /**
+   * Type of the property control.
+   * Full list of supported controls can be found in `app/client/src/components/propertyControls/index.ts`.
+   */
   controlType: ControlType;
+  /** @deprecated. Not used anywhere. */
   validationMessage?: string;
+  /**
+   * path that is used to get evaluated value for the property.
+   */
   dataTreePath?: string;
-  // used to define children property configs when the current property is a section
+  /**
+   * There is no requirement to define children for a control. This is just done to suffice types
+   * in places where controlConfig and sectionConfig are not differentiated.
+   */
   children?: PropertyPaneConfig[];
   panelConfig?: PanelConfig;
+  /**
+   * Callback function to update related widget properties.
+   *
+   * @param propertyName - Path to the widget property
+   * @param propertyValue - New value of the property
+   * @param props - Current widget properties
+   * @returns - Array of property updates
+   *
+   * @example Used in tabs widget to update the label of the tab.
+   */
   updateRelatedWidgetProperties?: (
     propertyName: string,
     // TODO: Fix this the next time the file is edited
@@ -85,7 +177,15 @@ export interface PropertyPaneControlConfig {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     props: any,
   ) => UpdateWidgetPropertyPayload[];
-  // Function that is called when the property is updated, it is mainly used to update other properties
+  /**
+   * Function that is called when the property is updated, it is mainly used to update other properties
+   *
+   * @param props - Current widget properties
+   * @param propertyName - Path to the widget property
+   * @param propertyValue - New value of the property
+   *
+   * @returns - Array of property updates
+   */
   updateHook?: (
     // TODO: Fix this the next time the file is edited
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -95,24 +195,70 @@ export interface PropertyPaneControlConfig {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     propertyValue: any,
   ) => Array<PropertyUpdates> | undefined;
+  /**
+   * callback function to determine if the property should be hidden.
+
+   * @param props - Current widget properties
+   * @param propertyPath - Path to the widget property
+   * @returns - True if the property should be hidden, false otherwise
+   */
   // TODO: Fix this the next time the file is edited
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   hidden?: (props: any, propertyPath: string) => boolean;
+  /**
+   * If true, the property is hidden.
+   * Note: hidden and invisible do the same thing but differently. hidden uses a callback to determine if the property should be hidden.
+   * invisible is a boolean flag to hide the property.
+   */
   invisible?: boolean;
   isBindProperty: boolean;
+  /**
+   * If true, it means the property triggers a widget action.
+   *
+   * @example
+   * OnClick property in Button widget is a trigger property that can trigger an action.
+   */
   isTriggerProperty: boolean;
+  /**
+   * Validation configuration for the property
+   */
   validation?: ValidationConfig;
-  useValidationMessage?: boolean;
+  /**
+   * Callback function to provide additional autocomplete data for the autocomplete list.
+   *
+   * @param props - Current widget properties
+   * @returns - Additional autocomplete data
+   */
   // TODO: Fix this the next time the file is edited
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   additionalAutoComplete?: (props: any) => AdditionalDynamicDataTree;
   evaluationSubstitutionType?: EvaluationSubstitutionType;
-  // all the properties that current property  is dependent on. All the properties passed here comes into widgetProperties
+  /**
+   * All properties that current property is dependent on.
+   * All of these properties becomes available in `widgetProperties` in the property control..
+   */
   dependencies?: string[];
+  /**
+   * It is same as `dependencies` but these dependencies are not statically defined in the widget.
+   * The callback is called  during rendering of the property control to get the latest dependencies.
+   *
+   * @example
+   * Used in CustomWidget to dynamically get the dependencies based on the current state of the widget.
+   */
   dynamicDependencies?: (widget: WidgetProps) => string[];
-  evaluatedDependencies?: string[]; // dependencies to be picked from the __evaluated__ object
+  /**
+   * Dependencies to be picked from the __evaluated__ object
+   */
+  evaluatedDependencies?: string[];
   expected?: CodeEditorExpected;
-  // Used to get value of the property from stylesheet config. Used in app theming v1 ( Not needed in anvil )
+  /**
+   * Used to get value of the property from stylesheet config. Used in app theming v1 ( Not needed in anvil )
+   *
+   * @param props - Current widget properties
+   * @param propertyPath - Path to the widget property
+   * @param stylesheet - Stylesheet config
+   * @returns - Value of the property
+   */
   getStylesheetValue?: (
     // TODO: Fix this the next time the file is edited
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -120,6 +266,10 @@ export interface PropertyPaneControlConfig {
     propertyPath: string,
     stylesheet?: Stylesheet,
   ) => Stylesheet[string];
+  /**
+   * Options for certain controls like Dropdown Control
+   * Note: This should be moved to controlConfig instead of being a top level property.
+   */
   // TODO(abhinav): To fix this, rename the options property of the controls which use this
   // Alternatively, create a new structure
   // TODO: Fix this the next time the file is edited
@@ -127,47 +277,92 @@ export interface PropertyPaneControlConfig {
   options?: any;
   // The following should ideally be used internally
   postUpdateAction?: ReduxActionType;
-  onBlur?: () => void;
-  onFocus?: () => void;
+  /**
+   * If true, the property is a panel property ( that is nested property pane )
+   */
   isPanelProperty?: boolean;
-  // Numeric Input Control
-  min?: number;
   // Switch mode ( JS -> Text )
   shouldSwitchToNormalMode?: (
     isDynamic: boolean,
     isToggleDisabled: boolean,
     triggerFlag?: boolean,
   ) => boolean;
-
   /**
    * `controlConfig` is a generic record that can be used to pass additional configuration
    * options to the property control. The specific structure and contents of this record
    * will depend on the control type and its individual requirements.
    */
   controlConfig?: Record<string, unknown>;
+  /**
+   * The default value of the property.
+   */
   defaultValue?: unknown;
-  /** used to mark a property as reusable so that it can be reused in next dropping widget */
+  /**
+   * If the property is marked reusable, on the next drop it will use the value of the last dropped widget.
+   */
   isReusable?: boolean;
 }
 
 interface ValidationConfigParams {
-  min?: number; // min allowed for a number
-  max?: number; // max allowed for a number
-  natural?: boolean; // is a positive integer
-  default?: unknown; // default for any type
-  unique?: boolean | string[]; // unique in an array (string if a particular path is unique)
-  required?: boolean; // required type
-  // required is now used to check if value is an empty string.
-  requiredKey?: boolean; //required key
-  regex?: RegExp; // validator regex for text type
+  /**
+   * Minimum allowed value for a number.
+   */
+  min?: number;
+  /**
+   * Maximum allowed value for a number.
+   */
+  max?: number;
+  /**
+   * If true, the value must be a positive integer.
+   */
+  natural?: boolean;
+  /**
+   * Default value for any type.
+   */
+  default?: unknown;
+  /**
+   * If true or an array of strings, the value must be unique in an array.
+   * If an array of strings is provided, it specifies particular paths that must be unique.
+   */
+  unique?: boolean | string[];
+  /**
+   * If true, the value is required.
+   * Now used to check if the value is an empty string.
+   */
+  required?: boolean;
+  /**
+   * If true, the key is required.
+   */
+  requiredKey?: boolean;
+  /**
+   * Validator regex for text type.
+   */
+  regex?: RegExp;
+  /**
+   * Allowed keys in an object type.
+   */
   allowedKeys?: Array<{
-    // Allowed keys in an object type
     name: string;
     type: ValidationTypes;
     params?: ValidationConfigParams;
   }>;
-  allowedValues?: unknown[]; // Allowed values in a string and array type
-  children?: ValidationConfig; // Children configurations in an ARRAY or OBJECT_ARRAY type
+  /**
+   * Allowed values in a string and array type.
+   */
+  allowedValues?: unknown[];
+  /**
+   * Children configurations in an ARRAY or OBJECT_ARRAY type.
+   */
+  children?: ValidationConfig;
+  /**
+   * Validation function for FUNCTION type.
+   *
+   * @param value - The value to validate
+   * @param props - Current widget properties
+   * @param _ - Additional parameter (unused)
+   * @param moment - Moment.js instance
+   * @returns - Validation response
+   */
   fn?: (
     value: unknown,
     // TODO: Fix this the next time the file is edited
@@ -179,18 +374,51 @@ interface ValidationConfigParams {
     // TODO: Fix this the next time the file is edited
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     moment?: any,
-  ) => ValidationResponse; // Function in a FUNCTION type
-  fnString?: string; // AUTO GENERATED, SHOULD NOT BE SET BY WIDGET DEVELOPER
-  expected?: CodeEditorExpected; // FUNCTION type expected type and example
-  strict?: boolean; //for strict string validation of TEXT type
-  ignoreCase?: boolean; //to ignore the case of key
-  type?: ValidationTypes; // Used for ValidationType.ARRAY_OF_TYPE_OR_TYPE to define sub type
-  types?: ValidationConfig[]; // Used for ValidationType.UNION to define sub type
-  params?: ValidationConfigParams; // Used for ValidationType.ARRAY_OF_TYPE_OR_TYPE to define sub type params
-  passThroughOnZero?: boolean; // Used for ValidationType.NUMBER to allow 0 to be passed through. Deafults value is true
-  limitLineBreaks?: boolean; // Used for ValidationType.TEXT to limit line breaks in a large json object.
-  defaultValue?: unknown; // used for ValidationType.UNION when none the union type validation is success
-  defaultErrorMessage?: string; // used for ValidationType.UNION when none the union type validation is success
+  ) => ValidationResponse;
+  /**
+   * AUTO GENERATED, SHOULD NOT BE SET BY WIDGET DEVELOPER
+   */
+  fnString?: string;
+  /**
+   * FUNCTION type expected type and example.
+   */
+  expected?: CodeEditorExpected;
+  /**
+   * If true, enables strict string validation of TEXT type.
+   */
+  strict?: boolean;
+  /**
+   * If true, ignores the case of keys.
+   */
+  ignoreCase?: boolean;
+  /**
+   * Used for ValidationType.ARRAY_OF_TYPE_OR_TYPE to define sub type.
+   */
+  type?: ValidationTypes;
+  /**
+   * Used for ValidationType.UNION to define sub types.
+   */
+  types?: ValidationConfig[];
+  /**
+   * Used for ValidationType.ARRAY_OF_TYPE_OR_TYPE to define sub type params.
+   */
+  params?: ValidationConfigParams;
+  /**
+   * Used for ValidationType.NUMBER to allow 0 to be passed through. Default value is true.
+   */
+  passThroughOnZero?: boolean;
+  /**
+   * Used for ValidationType.TEXT to limit line breaks in a large JSON object.
+   */
+  limitLineBreaks?: boolean;
+  /**
+   * Used for ValidationType.UNION when none of the union type validations succeed.
+   */
+  defaultValue?: unknown;
+  /**
+   * Used for ValidationType.UNION when none of the union type validations succeed.
+   */
+  defaultErrorMessage?: string;
 }
 
 export interface ValidationConfig {
diff --git a/app/client/src/constants/WalkthroughConstants.ts b/app/client/src/constants/WalkthroughConstants.ts
index 9c6460392412..7adfdc3645cc 100644
--- a/app/client/src/constants/WalkthroughConstants.ts
+++ b/app/client/src/constants/WalkthroughConstants.ts
@@ -1,6 +1,4 @@
 export const FEATURE_WALKTHROUGH_KEYS = {
-  ds_binding: "ab_ds_binding_enabled",
-  ds_schema: "ab_ds_schema_enabled",
   binding_widget: "binding_widget",
   env_walkthrough: "ab_env_walkthrough_enabled",
   // Signposting keys
diff --git a/app/client/src/ee/PluginActionEditor/hooks/useAnalyticsOnRunClick.ts b/app/client/src/ee/PluginActionEditor/hooks/useAnalyticsOnRunClick.ts
new file mode 100644
index 000000000000..c77f70fc9d9e
--- /dev/null
+++ b/app/client/src/ee/PluginActionEditor/hooks/useAnalyticsOnRunClick.ts
@@ -0,0 +1 @@
+export * from "ce/PluginActionEditor/hooks/useAnalyticsOnRunClick";
diff --git a/app/client/src/ee/PluginActionEditor/hooks/useBlockExecution.ts b/app/client/src/ee/PluginActionEditor/hooks/useBlockExecution.ts
new file mode 100644
index 000000000000..d95708182c37
--- /dev/null
+++ b/app/client/src/ee/PluginActionEditor/hooks/useBlockExecution.ts
@@ -0,0 +1 @@
+export * from "ce/PluginActionEditor/hooks/useBlockExecution";
diff --git a/app/client/src/ee/PluginActionEditor/hooks/useHandleDeleteClick.ts b/app/client/src/ee/PluginActionEditor/hooks/useHandleDeleteClick.ts
new file mode 100644
index 000000000000..f44960bfdde8
--- /dev/null
+++ b/app/client/src/ee/PluginActionEditor/hooks/useHandleDeleteClick.ts
@@ -0,0 +1 @@
+export * from "ce/PluginActionEditor/hooks/useHandleDeleteClick";
diff --git a/app/client/src/ee/PluginActionEditor/hooks/useHandleRunClick.ts b/app/client/src/ee/PluginActionEditor/hooks/useHandleRunClick.ts
new file mode 100644
index 000000000000..bf69932b7c27
--- /dev/null
+++ b/app/client/src/ee/PluginActionEditor/hooks/useHandleRunClick.ts
@@ -0,0 +1 @@
+export * from "ce/PluginActionEditor/hooks/useHandleRunClick";
diff --git a/app/client/src/ee/components/formControls/CarbonButton/CarbonButton.tsx b/app/client/src/ee/components/formControls/CarbonButton/CarbonButton.tsx
new file mode 100644
index 000000000000..e98751ee4d19
--- /dev/null
+++ b/app/client/src/ee/components/formControls/CarbonButton/CarbonButton.tsx
@@ -0,0 +1,7 @@
+import type { ControlProps } from "../../../../components/formControls/BaseControl";
+
+export interface CarbonButtonProps extends ControlProps {}
+
+export const CarbonButton = () => {
+  return null;
+};
diff --git a/app/client/src/ee/components/formControls/CarbonButton/index.ts b/app/client/src/ee/components/formControls/CarbonButton/index.ts
new file mode 100644
index 000000000000..a0c07b92bb9d
--- /dev/null
+++ b/app/client/src/ee/components/formControls/CarbonButton/index.ts
@@ -0,0 +1 @@
+export * from "./CarbonButton";
diff --git a/app/client/src/ee/modules/ui-builder/ui/wds/constants.ts b/app/client/src/ee/modules/ui-builder/ui/wds/constants.ts
new file mode 100644
index 000000000000..a04bb6dada97
--- /dev/null
+++ b/app/client/src/ee/modules/ui-builder/ui/wds/constants.ts
@@ -0,0 +1 @@
+export const WDS_EE_WIDGET_MAP = {};
diff --git a/app/client/src/ee/modules/ui-builder/ui/wds/index.ts b/app/client/src/ee/modules/ui-builder/ui/wds/index.ts
new file mode 100644
index 000000000000..6cb9e7159f47
--- /dev/null
+++ b/app/client/src/ee/modules/ui-builder/ui/wds/index.ts
@@ -0,0 +1 @@
+export const EEWDSWidgets = [];
diff --git a/app/client/src/ee/pages/Editor/AppPluginActionEditor/AppPluginActionEditor.tsx b/app/client/src/ee/pages/Editor/AppPluginActionEditor/AppPluginActionEditor.tsx
deleted file mode 100644
index 2d974cc98581..000000000000
--- a/app/client/src/ee/pages/Editor/AppPluginActionEditor/AppPluginActionEditor.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import { default as CE_AppPluginActionEditor } from "ce/pages/Editor/AppPluginActionEditor/AppPluginActionEditor";
-
-export default CE_AppPluginActionEditor;
diff --git a/app/client/src/ee/pages/Editor/IDE/Header/useLibraryHeaderTitle.ts b/app/client/src/ee/pages/Editor/IDE/Header/useLibraryHeaderTitle.ts
new file mode 100644
index 000000000000..0b81d5d9afea
--- /dev/null
+++ b/app/client/src/ee/pages/Editor/IDE/Header/useLibraryHeaderTitle.ts
@@ -0,0 +1,3 @@
+export * from "ce/pages/Editor/IDE/Header/useLibraryHeaderTitle";
+import { default as CE_useLibraryHeaderTitle } from "ce/pages/Editor/IDE/Header/useLibraryHeaderTitle";
+export default CE_useLibraryHeaderTitle;
diff --git a/app/client/src/ee/pages/Editor/IDE/LeftPane/LibrarySidePane.tsx b/app/client/src/ee/pages/Editor/IDE/LeftPane/LibrarySidePane.tsx
new file mode 100644
index 000000000000..20fb8b49fe3d
--- /dev/null
+++ b/app/client/src/ee/pages/Editor/IDE/LeftPane/LibrarySidePane.tsx
@@ -0,0 +1,3 @@
+export * from "ce/pages/Editor/IDE/LeftPane/LibrarySidePane";
+import { default as CE_LibrarySidePane } from "ce/pages/Editor/IDE/LeftPane/LibrarySidePane";
+export default CE_LibrarySidePane;
diff --git a/app/client/src/ee/reducers/uiReducers/apiPaneReducer.tsx b/app/client/src/ee/reducers/uiReducers/apiPaneReducer.tsx
deleted file mode 100644
index dd2ecbe891d4..000000000000
--- a/app/client/src/ee/reducers/uiReducers/apiPaneReducer.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from "ce/reducers/uiReducers/apiPaneReducer";
-import { default as CE_apiPaneReducer } from "ce/reducers/uiReducers/apiPaneReducer";
-export default CE_apiPaneReducer;
diff --git a/app/client/src/ee/reducers/uiReducers/queryPaneReducer.ts b/app/client/src/ee/reducers/uiReducers/queryPaneReducer.ts
deleted file mode 100644
index c2e8eabefee9..000000000000
--- a/app/client/src/ee/reducers/uiReducers/queryPaneReducer.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from "ce/reducers/uiReducers/queryPaneReducer";
-import { default as CE_queryPaneReducer } from "ce/reducers/uiReducers/queryPaneReducer";
-export default CE_queryPaneReducer;
diff --git a/app/client/src/ee/sagas/userSagas.tsx b/app/client/src/ee/sagas/userSagas.tsx
index 8682e062475d..2094e1c3c723 100644
--- a/app/client/src/ee/sagas/userSagas.tsx
+++ b/app/client/src/ee/sagas/userSagas.tsx
@@ -1,6 +1,5 @@
 export * from "ce/sagas/userSagas";
 import {
-  createUserSaga,
   getCurrentUserSaga,
   runUserSideEffectsSaga,
   forgotPasswordSaga,
@@ -23,7 +22,6 @@ import { takeLatest, all } from "redux-saga/effects";
 
 export default function* userSagas() {
   yield all([
-    takeLatest(ReduxActionTypes.CREATE_USER_INIT, createUserSaga),
     takeLatest(ReduxActionTypes.FETCH_USER_INIT, getCurrentUserSaga),
     takeLatest(
       ReduxActionTypes.FETCH_USER_DETAILS_SUCCESS,
diff --git a/app/client/src/entities/AppsmithConsole/index.ts b/app/client/src/entities/AppsmithConsole/index.ts
index 0692a902d974..bf8175040f3f 100644
--- a/app/client/src/entities/AppsmithConsole/index.ts
+++ b/app/client/src/entities/AppsmithConsole/index.ts
@@ -2,7 +2,7 @@ import type { ReduxAction } from "ee/constants/ReduxActionConstants";
 import type LOG_TYPE from "./logtype";
 import type { PropertyEvaluationErrorType } from "utils/DynamicBindingUtils";
 import type { PluginType } from "entities/Action";
-import type { HTTP_METHOD } from "constants/ApiEditorConstants/CommonApiConstants";
+import type { HTTP_METHOD } from "PluginActionEditor/constants/CommonApiConstants";
 import type {
   ENTITY_TYPE,
   PLATFORM_ERROR,
diff --git a/app/client/src/entities/DataTree/dataTreeFactory.ts b/app/client/src/entities/DataTree/dataTreeFactory.ts
index 5d68c072be0e..1d3cbb6ec86f 100644
--- a/app/client/src/entities/DataTree/dataTreeFactory.ts
+++ b/app/client/src/entities/DataTree/dataTreeFactory.ts
@@ -1,88 +1,72 @@
 import { generateDataTreeAction } from "ee/entities/DataTree/dataTreeAction";
 import { generateDataTreeJSAction } from "ee/entities/DataTree/dataTreeJSAction";
 import { generateDataTreeWidget } from "entities/DataTree/dataTreeWidget";
-import log from "loglevel";
 import {
   ENTITY_TYPE,
   EvaluationSubstitutionType,
 } from "ee/entities/DataTree/types";
 import { generateDataTreeModuleInputs } from "ee/entities/DataTree/utils";
-import type {
-  DataTreeSeed,
-  AppsmithEntity,
-  EntityTypeValue,
-} from "ee/entities/DataTree/types";
-import type {
-  unEvalAndConfigTree,
-  ConfigTree,
-  UnEvalTree,
-} from "entities/DataTree/dataTreeTypes";
+import type { EntityTypeValue } from "ee/entities/DataTree/types";
+import type { ConfigTree, UnEvalTree } from "entities/DataTree/dataTreeTypes";
 import { isEmpty } from "lodash";
 import { generateModuleInstance } from "ee/entities/DataTree/dataTreeModuleInstance";
-import {
-  endSpan,
-  startNestedSpan,
-  startRootSpan,
-} from "UITelemetry/generateTraces";
+import { endSpan, startRootSpan } from "UITelemetry/generateTraces";
+import type { ActionDataState } from "ee/reducers/entityReducers/actionsReducer";
+import type { JSCollectionDataState } from "ee/reducers/entityReducers/jsActionsReducer";
+import type { LayoutSystemTypes } from "layoutSystems/types";
+import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer";
+import type { MetaState } from "reducers/entityReducers/metaReducer";
+import type { LoadingEntitiesState } from "reducers/evaluationReducers/loadingEntitiesReducer";
+import type { MetaWidgetsReduxState } from "reducers/entityReducers/metaWidgetsReducer";
+import type { Module } from "ee/constants/ModuleConstants";
+import type { ModuleInstance } from "ee/constants/ModuleInstanceConstants";
+import type {
+  DependencyMap,
+  FormEditorConfigs,
+} from "utils/DynamicBindingUtils";
+import type { DataTreeSeed } from "ee/entities/DataTree/types";
+
 export class DataTreeFactory {
-  static create({
-    actions,
-    appData,
-    editorConfigs,
-    isMobile,
-    jsActions,
-    layoutSystemType,
-    loadingEntities,
-    metaWidgets,
-    moduleInputs,
-    moduleInstanceEntities,
-    moduleInstances,
-    pluginDependencyConfig,
-    theme,
-    widgets,
-    widgetsMeta,
-  }: DataTreeSeed): unEvalAndConfigTree {
+  public static metaWidgets(
+    metaWidgets: MetaWidgetsReduxState,
+    widgetsMeta: MetaState,
+    loadingEntities: LoadingEntitiesState,
+  ) {
     const dataTree: UnEvalTree = {};
     const configTree: ConfigTree = {};
-    const start = performance.now();
-    const startActions = performance.now();
-    const rootSpan = startRootSpan("DataTreeFactory.create");
-    const actionsSpan = startNestedSpan("DataTreeFactory.actions", rootSpan);
+    const metaWidgetsSpan = startRootSpan("DataTreeFactory.metaWidgets");
 
-    actions.forEach((action) => {
-      const editorConfig = editorConfigs[action.config.pluginId];
-      const dependencyConfig = pluginDependencyConfig[action.config.pluginId];
-      const { configEntity, unEvalEntity } = generateDataTreeAction(
-        action,
-        editorConfig,
-        dependencyConfig,
+    Object.values(metaWidgets).forEach((widget) => {
+      const { configEntity, unEvalEntity } = generateDataTreeWidget(
+        widget,
+        widgetsMeta[widget.metaWidgetId || widget.widgetId],
+        loadingEntities,
       );
 
-      dataTree[action.config.name] = unEvalEntity;
-      configTree[action.config.name] = configEntity;
-    });
-    const endActions = performance.now();
-
-    endSpan(actionsSpan);
-
-    const startJsActions = performance.now();
-    const jsActionsSpan = startNestedSpan(
-      "DataTreeFactory.jsActions",
-      rootSpan,
-    );
-
-    jsActions.forEach((js) => {
-      const { configEntity, unEvalEntity } = generateDataTreeJSAction(js);
-
-      dataTree[js.config.name] = unEvalEntity;
-      configTree[js.config.name] = configEntity;
+      dataTree[widget.widgetName] = unEvalEntity;
+      configTree[widget.widgetName] = configEntity;
     });
-    const endJsActions = performance.now();
+    endSpan(metaWidgetsSpan);
 
-    endSpan(jsActionsSpan);
+    return {
+      dataTree,
+      configTree,
+    };
+  }
 
-    const startWidgets = performance.now();
-    const widgetsSpan = startNestedSpan("DataTreeFactory.widgets", rootSpan);
+  public static widgets(
+    moduleInputs: Module["inputsForm"],
+    moduleInstances: Record<string, ModuleInstance> | null,
+    moduleInstanceEntities: DataTreeSeed["moduleInstanceEntities"],
+    widgets: CanvasWidgetsReduxState,
+    widgetsMeta: MetaState,
+    loadingEntities: LoadingEntitiesState,
+    layoutSystemType: LayoutSystemTypes,
+    isMobile: boolean,
+  ) {
+    const dataTree: UnEvalTree = {};
+    const configTree: ConfigTree = {};
+    const widgetsSpan = startRootSpan("DataTreeFactory.widgets");
 
     if (!isEmpty(moduleInputs)) {
       const { configEntity, unEvalEntity } =
@@ -120,54 +104,60 @@ export class DataTreeFactory {
       dataTree[widget.widgetName] = unEvalEntity;
       configTree[widget.widgetName] = configEntity;
     });
-
-    const endWidgets = performance.now();
-
     endSpan(widgetsSpan);
 
-    dataTree.appsmith = {
-      ...appData,
-      // combine both persistent and transient state with the transient state
-      // taking precedence in case the key is the same
-      store: appData.store,
-      theme,
-    } as AppsmithEntity;
-    (dataTree.appsmith as AppsmithEntity).ENTITY_TYPE = ENTITY_TYPE.APPSMITH;
-
-    const startMetaWidgets = performance.now();
-    const metaWidgetsSpan = startNestedSpan(
-      "DataTreeFactory.metaWidgets",
-      rootSpan,
-    );
+    return {
+      dataTree,
+      configTree,
+    };
+  }
 
-    Object.values(metaWidgets).forEach((widget) => {
-      const { configEntity, unEvalEntity } = generateDataTreeWidget(
-        widget,
-        widgetsMeta[widget.metaWidgetId || widget.widgetId],
-        loadingEntities,
-      );
+  public static jsActions(jsActions: JSCollectionDataState) {
+    const dataTree: UnEvalTree = {};
+    const configTree: ConfigTree = {};
+    const actionsSpan = startRootSpan("DataTreeFactory.jsActions");
 
-      dataTree[widget.widgetName] = unEvalEntity;
-      configTree[widget.widgetName] = configEntity;
+    jsActions.forEach((js) => {
+      const { configEntity, unEvalEntity } = generateDataTreeJSAction(js);
+
+      dataTree[js.config.name] = unEvalEntity;
+      configTree[js.config.name] = configEntity;
     });
-    const endMetaWidgets = performance.now();
+    endSpan(actionsSpan);
 
-    endSpan(metaWidgetsSpan);
-    endSpan(rootSpan);
+    return {
+      dataTree,
+      configTree,
+    };
+  }
 
-    const end = performance.now();
+  public static actions(
+    actions: ActionDataState,
+    editorConfigs: FormEditorConfigs,
+    pluginDependencyConfig: Record<string, DependencyMap>,
+  ) {
+    const dataTree: UnEvalTree = {};
+    const configTree: ConfigTree = {};
+    const actionsSpan = startRootSpan("DataTreeFactory.actions");
 
-    const out = {
-      total: end - start,
-      widgets: endWidgets - startWidgets,
-      actions: endActions - startActions,
-      jsActions: endJsActions - startJsActions,
-      metaWidgets: endMetaWidgets - startMetaWidgets,
-    };
+    actions.forEach((action) => {
+      const editorConfig = editorConfigs[action.config.pluginId];
+      const dependencyConfig = pluginDependencyConfig[action.config.pluginId];
+      const { configEntity, unEvalEntity } = generateDataTreeAction(
+        action,
+        editorConfig,
+        dependencyConfig,
+      );
 
-    log.debug("### Create unevalTree timing", out);
+      dataTree[action.config.name] = unEvalEntity;
+      configTree[action.config.name] = configEntity;
+    });
+    endSpan(actionsSpan);
 
-    return { unEvalTree: dataTree, configTree };
+    return {
+      dataTree,
+      configTree,
+    };
   }
 }
 
diff --git a/app/client/src/entities/DataTree/dataTreeWidget.test.ts b/app/client/src/entities/DataTree/dataTreeWidget.test.ts
index f50444e11a03..36d78901d407 100644
--- a/app/client/src/entities/DataTree/dataTreeWidget.test.ts
+++ b/app/client/src/entities/DataTree/dataTreeWidget.test.ts
@@ -225,8 +225,6 @@ describe("generateDataTreeWidget", () => {
       parentColumnSpace: 0,
       parentRowSpace: 0,
       rightColumn: 0,
-      renderMode: RenderModes.CANVAS,
-      version: 0,
       topRow: 0,
       widgetId: "123",
       widgetName: "Input1",
diff --git a/app/client/src/entities/DataTree/dataTreeWidget.ts b/app/client/src/entities/DataTree/dataTreeWidget.ts
index a5a9a2fd8c8b..c909e682ffa9 100644
--- a/app/client/src/entities/DataTree/dataTreeWidget.ts
+++ b/app/client/src/entities/DataTree/dataTreeWidget.ts
@@ -1,5 +1,5 @@
 import { getAllPathsFromPropertyConfig } from "entities/Widget/utils";
-import _, { get, isEmpty } from "lodash";
+import _, { get, isEmpty, omit } from "lodash";
 import memoize from "micro-memoize";
 import type { FlattenedWidgetProps } from "reducers/entityReducers/canvasWidgetsReducer";
 import type { DynamicPath } from "utils/DynamicBindingUtils";
@@ -21,6 +21,7 @@ import WidgetFactory from "WidgetProvider/factory";
 import { getComponentDimensions } from "layoutSystems/common/utils/ComponentSizeUtils";
 import type { LoadingEntitiesState } from "reducers/evaluationReducers/loadingEntitiesReducer";
 import { LayoutSystemTypes } from "layoutSystems/types";
+import { WIDGET_PROPS_TO_SKIP_FROM_EVAL } from "constants/WidgetConstants";
 
 /**
  *
@@ -176,13 +177,17 @@ export function getSetterConfig(
 // Widget changes only when dynamicBindingPathList changes.
 // Only meta properties change very often, for example typing in an input or selecting a table row.
 const generateDataTreeWidgetWithoutMeta = (
-  widget: FlattenedWidgetProps,
+  widgetWithEval: FlattenedWidgetProps,
 ): {
   dataTreeWidgetWithoutMetaProps: WidgetEntity;
   overridingMetaPropsMap: Record<string, boolean>;
   defaultMetaProps: Record<string, unknown>;
   entityConfig: WidgetEntityConfig;
 } => {
+  const widget = omit(
+    widgetWithEval,
+    Object.keys(WIDGET_PROPS_TO_SKIP_FROM_EVAL),
+  ) as FlattenedWidgetProps;
   // TODO: Fix this the next time the file is edited
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const derivedProps: any = {};
diff --git a/app/client/src/entities/Engine/AppEditorEngine.ts b/app/client/src/entities/Engine/AppEditorEngine.ts
index b36e86b4e08c..d2ff14faf778 100644
--- a/app/client/src/entities/Engine/AppEditorEngine.ts
+++ b/app/client/src/entities/Engine/AppEditorEngine.ts
@@ -33,7 +33,10 @@ import {
   reportSWStatus,
   waitForWidgetConfigBuild,
 } from "sagas/InitSagas";
-import { getCurrentGitBranch } from "selectors/gitSyncSelectors";
+import {
+  getCurrentGitBranch,
+  isGitPersistBranchEnabledSelector,
+} from "selectors/gitSyncSelectors";
 import AnalyticsUtil from "ee/utils/AnalyticsUtil";
 import history from "utils/history";
 import type { AppEnginePayload } from ".";
@@ -50,7 +53,7 @@ import {
 } from "ee/sagas/userSagas";
 import { getFirstTimeUserOnboardingComplete } from "selectors/onboardingSelectors";
 import { isAirgapped } from "ee/utils/airgapHelpers";
-import { getAIPromptTriggered } from "utils/storage";
+import { getAIPromptTriggered, setLatestGitBranchInLocal } from "utils/storage";
 import { trackOpenEditorTabs } from "../../utils/editor/browserTabsTracking";
 import { EditorModes } from "components/editorComponents/CodeEditor/EditorConfig";
 import { waitForFetchEnvironments } from "ee/sagas/EnvironmentSagas";
@@ -68,6 +71,9 @@ import {
 import { getCurrentApplication } from "ee/selectors/applicationSelectors";
 import type { Span } from "@opentelemetry/api";
 import { endSpan, startNestedSpan } from "UITelemetry/generateTraces";
+import { getCurrentUser } from "selectors/usersSelectors";
+import type { User } from "constants/userConstants";
+import log from "loglevel";
 
 export default class AppEditorEngine extends AppEngine {
   constructor(mode: APP_MODE) {
@@ -186,6 +192,13 @@ export default class AppEditorEngine extends AppEngine {
     yield call(waitForFetchEnvironments);
     endSpan(waitForFetchEnvironmentsSpan);
 
+    yield call(
+      this.loadPluginsAndDatasources,
+      allResponses,
+      rootSpan,
+      applicationId,
+    );
+
     yield put(fetchAllPageEntityCompletion([executePageLoadActions()]));
     endSpan(loadPageThemesAndActionsSpan);
   }
@@ -193,6 +206,7 @@ export default class AppEditorEngine extends AppEngine {
   private *loadPluginsAndDatasources(
     allResponses: EditConsolidatedApi,
     rootSpan: Span,
+    applicationId: string,
   ) {
     const loadPluginsAndDatasourcesSpan = startNestedSpan(
       "AppEditorEngine.loadPluginsAndDatasources",
@@ -205,7 +219,12 @@ export default class AppEditorEngine extends AppEngine {
       getFeatureFlagsForEngine,
     );
     const { errorActions, initActions, successActions } =
-      getPageDependencyActions(currentWorkspaceId, featureFlags, allResponses);
+      getPageDependencyActions(
+        currentWorkspaceId,
+        featureFlags,
+        allResponses,
+        applicationId,
+      );
 
     if (!isAirgappedInstance) {
       initActions.push(fetchMockDatasources(mockDatasources));
@@ -253,7 +272,6 @@ export default class AppEditorEngine extends AppEngine {
       allResponses,
       rootSpan,
     );
-    yield call(this.loadPluginsAndDatasources, allResponses, rootSpan);
   }
 
   public *completeChore(rootSpan: Span) {
@@ -269,6 +287,27 @@ export default class AppEditorEngine extends AppEngine {
       getCurrentApplication,
     );
 
+    const isGitPersistBranchEnabled: boolean = yield select(
+      isGitPersistBranchEnabledSelector,
+    );
+
+    if (isGitPersistBranchEnabled) {
+      const currentUser: User = yield select(getCurrentUser);
+      const currentBranch: string = yield select(getCurrentGitBranch);
+
+      if (currentUser?.email && currentApplication?.baseId && currentBranch) {
+        yield setLatestGitBranchInLocal(
+          currentUser.email,
+          currentApplication.baseId,
+          currentBranch,
+        );
+      } else {
+        log.error(
+          `There was an error setting the latest git branch in local - userEmail: ${!!currentUser?.email}, applicationId: ${currentApplication?.baseId}, branch: ${currentBranch}`,
+        );
+      }
+    }
+
     const [isAnotherEditorTabOpen, currentTabs] = yield call(
       trackOpenEditorTabs,
       currentApplication.id,
diff --git a/app/client/src/entities/Engine/AppViewerEngine.ts b/app/client/src/entities/Engine/AppViewerEngine.ts
index d93d7b6cb1a5..e4cca1b7db6e 100644
--- a/app/client/src/entities/Engine/AppViewerEngine.ts
+++ b/app/client/src/entities/Engine/AppViewerEngine.ts
@@ -105,7 +105,7 @@ export default class AppViewerEngine extends AppEngine {
       }),
       fetchSelectedAppThemeAction(applicationId, currentTheme),
       fetchAppThemesAction(applicationId, themes),
-      setupPublishedPage(toLoadPageId, true, true, pageWithMigratedDsl),
+      setupPublishedPage(toLoadPageId, true, pageWithMigratedDsl),
     ];
 
     const successActionEffects = [
diff --git a/app/client/src/index.tsx b/app/client/src/index.tsx
index c5c6db423d36..1b21d5f0f738 100755
--- a/app/client/src/index.tsx
+++ b/app/client/src/index.tsx
@@ -30,7 +30,6 @@ import { PageViewTiming } from "@newrelic/browser-agent/features/page_view_timin
 import { PageViewEvent } from "@newrelic/browser-agent/features/page_view_event";
 import { Agent } from "@newrelic/browser-agent/loaders/agent";
 import { getCommonTelemetryAttributes } from "UITelemetry/generateTraces";
-
 const { newRelic } = getAppsmithConfigs();
 const { enableNewRelic } = newRelic;
 
diff --git a/app/client/src/layoutSystems/anvil/common/styles.module.css b/app/client/src/layoutSystems/anvil/common/styles.module.css
index 7a39ba004975..17cb02727103 100644
--- a/app/client/src/layoutSystems/anvil/common/styles.module.css
+++ b/app/client/src/layoutSystems/anvil/common/styles.module.css
@@ -7,15 +7,15 @@
 */
 .anvilWidgetWrapper {
   /** If a section,zone and card have elevation, then add padding */
-  [data-elevation="true"][elevation="1"],
-  [data-elevation="true"][elevation="2"],
-  [data-elevation="true"][elevation="3"],
+  [data-elevation="true"][elevation="1"]:not([data-no-padding]),
+  [data-elevation="true"][elevation="2"]:not([data-no-padding]),
+  [data-elevation="true"][elevation="3"]:not([data-no-padding]),
   /** If a section has any zone with elevation, then add padding to all the zones that don't have elevation */
-  [elevation="1"]:has([elevation="2"][data-elevation="true"]) [elevation="2"][data-elevation="false"],
+  [elevation="1"]:has([elevation="2"][data-elevation="true"]) [elevation="2"][data-elevation="false"]:not([data-no-padding]),
   /** If a section has any card with elevation, then add padding to all the cards that don't have elevation */
-  [elevation="1"]:has([elevation="3"][data-elevation="true"]) [elevation="3"][data-elevation="false"],
+  [elevation="1"]:has([elevation="3"][data-elevation="true"]) [elevation="3"][data-elevation="false"]:not([data-no-padding]),
   /** If a zone has any card with elevation, then add padding to all the cards that don't have elevation,*/
-  [elevation="2"]:has([elevation="3"][data-elevation="true"]) [elevation="3"][data-elevation="false"] {
+  [elevation="2"]:has([elevation="3"][data-elevation="true"]) [elevation="3"][data-elevation="false"]:not([data-no-padding]) {
     padding-block: var(--outer-spacing-3);
     padding-inline: var(--outer-spacing-3);
   }
diff --git a/app/client/src/layoutSystems/anvil/editor/canvasArenas/AnvilDragPreview/index.tsx b/app/client/src/layoutSystems/anvil/editor/canvasArenas/AnvilDragPreview/index.tsx
index 70a7776d29b3..ed4a97341967 100644
--- a/app/client/src/layoutSystems/anvil/editor/canvasArenas/AnvilDragPreview/index.tsx
+++ b/app/client/src/layoutSystems/anvil/editor/canvasArenas/AnvilDragPreview/index.tsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { type SVGProps } from "react";
 import { createPortal } from "react-dom";
 import type { DragDetails } from "reducers/uiReducers/dragResizeReducer";
 import type { DraggedWidget } from "layoutSystems/anvil/utils/anvilTypes";
@@ -8,7 +8,7 @@ import memoize from "micro-memoize";
 
 interface DragPreviewConfig {
   displayName: string;
-  ThumbnailCmp?: () => JSX.Element;
+  ThumbnailCmp?: (props: SVGProps<SVGSVGElement>) => JSX.Element;
 }
 
 const getWidgetConfigsArray = memoize(() => {
diff --git a/app/client/src/layoutSystems/anvil/editor/styles.module.css b/app/client/src/layoutSystems/anvil/editor/styles.module.css
index 1e40e185332a..3d2ccdd43a39 100644
--- a/app/client/src/layoutSystems/anvil/editor/styles.module.css
+++ b/app/client/src/layoutSystems/anvil/editor/styles.module.css
@@ -3,4 +3,12 @@
   & > * {
     pointer-events: none;
   }
+
+  /*
+    This is a temporary solution. According to the product requirements, we need to make AI chat widget interactive.
+    This code can be deleted when full-fledged inline editing feature is implemented.
+  */
+  & [data-widget-name*="AIChat"] > * {
+    pointer-events: all;
+  }
 }
diff --git a/app/client/src/layoutSystems/anvil/integrations/sagas/anvilWidgetAdditionSagas/index.ts b/app/client/src/layoutSystems/anvil/integrations/sagas/anvilWidgetAdditionSagas/index.ts
index c121a4583586..730772a90e03 100644
--- a/app/client/src/layoutSystems/anvil/integrations/sagas/anvilWidgetAdditionSagas/index.ts
+++ b/app/client/src/layoutSystems/anvil/integrations/sagas/anvilWidgetAdditionSagas/index.ts
@@ -27,6 +27,7 @@ import log from "loglevel";
 import { generateDefaultLayoutPreset } from "layoutSystems/anvil/layoutComponents/presets/DefaultLayoutPreset";
 import { addWidgetsToPreset } from "layoutSystems/anvil/utils/layouts/update/additionUtils";
 import { addNewAnvilWidgetToDSL } from "./helpers";
+import { klona } from "klona";
 
 // The suggested widget functionality allows users to bind data from the Query pane
 // to a new or existing widget on the Canvas.
@@ -109,7 +110,8 @@ export function* getUpdatedListOfWidgetsAfterAddingNewWidget(
   isSection: boolean, // Indicates if the drop zone is a section
 ) {
   const { alignment, canvasId } = highlight;
-  const allWidgets: CanvasWidgetsReduxState = yield select(getWidgets);
+  const allWidgetsFromRedux: CanvasWidgetsReduxState = yield select(getWidgets);
+  const allWidgets = klona(allWidgetsFromRedux) as CanvasWidgetsReduxState;
 
   const parentWidgetWithLayout = allWidgets[canvasId];
 
diff --git a/app/client/src/layoutSystems/anvil/layoutComponents/components/LayoutColumn.tsx b/app/client/src/layoutSystems/anvil/layoutComponents/components/LayoutColumn.tsx
index 6721a8c022a3..efe835478809 100644
--- a/app/client/src/layoutSystems/anvil/layoutComponents/components/LayoutColumn.tsx
+++ b/app/client/src/layoutSystems/anvil/layoutComponents/components/LayoutColumn.tsx
@@ -1,3 +1,5 @@
+import React from "react";
+import { deriveAlignedColumnHighlights } from "../../utils/layouts/highlights/alignedColumnHighlights";
 import BaseLayoutComponent from "../BaseLayoutComponent";
 import {
   type DeriveHighlightsFn,
@@ -5,12 +7,12 @@ import {
   type LayoutProps,
 } from "layoutSystems/anvil/utils/anvilTypes";
 import type { FlexLayoutProps } from "./FlexLayout";
-import { deriveColumnHighlights } from "layoutSystems/anvil/utils/layouts/highlights/columnHighlights";
+import { MainCanvasWrapper } from "./MainCanvasWrapper";
 
 class LayoutColumn extends BaseLayoutComponent {
   static type: LayoutComponentTypes = LayoutComponentTypes.LAYOUT_COLUMN;
 
-  static deriveHighlights: DeriveHighlightsFn = deriveColumnHighlights;
+  static deriveHighlights: DeriveHighlightsFn = deriveAlignedColumnHighlights;
 
   static getChildTemplate(props: LayoutProps): LayoutProps | null {
     if (props.childTemplate || props.childTemplate === null)
@@ -19,7 +21,7 @@ class LayoutColumn extends BaseLayoutComponent {
     return {
       insertChild: true,
       layoutId: "",
-      layoutType: LayoutComponentTypes.WIDGET_ROW,
+      layoutType: LayoutComponentTypes.ALIGNED_WIDGET_ROW,
       layout: [],
     };
   }
@@ -27,10 +29,19 @@ class LayoutColumn extends BaseLayoutComponent {
   getFlexLayoutProps(): Omit<FlexLayoutProps, "children"> {
     return {
       ...super.getFlexLayoutProps(),
-      alignSelf: "stretch",
+      height: "100%",
+      gap: "spacing-4",
       direction: "column",
     };
   }
+
+  renderViewMode(): JSX.Element {
+    return (
+      <MainCanvasWrapper {...this.getFlexLayoutProps()}>
+        {super.renderChildren()}
+      </MainCanvasWrapper>
+    );
+  }
 }
 
 export default LayoutColumn;
diff --git a/app/client/src/layoutSystems/anvil/layoutComponents/components/MainCanvasWrapper.tsx b/app/client/src/layoutSystems/anvil/layoutComponents/components/MainCanvasWrapper.tsx
new file mode 100644
index 000000000000..c4a2c7b74d69
--- /dev/null
+++ b/app/client/src/layoutSystems/anvil/layoutComponents/components/MainCanvasWrapper.tsx
@@ -0,0 +1,14 @@
+import React from "react";
+import { FlexLayout, type FlexLayoutProps } from "./FlexLayout";
+
+export const MainCanvasWrapper = (props: FlexLayoutProps) => {
+  const { search } = window.location;
+  const queryParams = new URLSearchParams(search);
+  const isEmbed = queryParams.get("embed") === "true";
+
+  return (
+    <FlexLayout {...props} padding={isEmbed ? "spacing-0" : "spacing-4"}>
+      {props.children}
+    </FlexLayout>
+  );
+};
diff --git a/app/client/src/layoutSystems/anvil/utils/AnvilDSLTransformer.ts b/app/client/src/layoutSystems/anvil/utils/AnvilDSLTransformer.ts
index c15c7393b827..b9131c7d83be 100644
--- a/app/client/src/layoutSystems/anvil/utils/AnvilDSLTransformer.ts
+++ b/app/client/src/layoutSystems/anvil/utils/AnvilDSLTransformer.ts
@@ -18,14 +18,8 @@ export function anvilDSLTransformer(dsl: DSLWidget) {
     _dsl.layout = [
       {
         layoutId: generateReactKey(),
-        layoutType: LayoutComponentTypes.ALIGNED_LAYOUT_COLUMN,
+        layoutType: LayoutComponentTypes.LAYOUT_COLUMN,
         layout: [],
-        layoutStyle: {
-          border: "none",
-          height: "100%",
-          padding: "spacing-4",
-          gap: "spacing-4",
-        },
         isDropTarget: true,
         isPermanent: true,
         childTemplate: {
diff --git a/app/client/src/layoutSystems/anvil/utils/layouts/update/sectionUtils.ts b/app/client/src/layoutSystems/anvil/utils/layouts/update/sectionUtils.ts
index 9a4f5df405eb..8cb4c9d4474e 100644
--- a/app/client/src/layoutSystems/anvil/utils/layouts/update/sectionUtils.ts
+++ b/app/client/src/layoutSystems/anvil/utils/layouts/update/sectionUtils.ts
@@ -19,7 +19,7 @@ import { addNewAnvilWidgetToDSL } from "layoutSystems/anvil/integrations/sagas/a
 export function* createSectionAndAddWidget(
   allWidgets: CanvasWidgetsReduxState,
   highlight: AnvilHighlightInfo,
-  widgets: WidgetLayoutProps[],
+  draggedWidgets: WidgetLayoutProps[],
   parentId: string,
 ) {
   /**
@@ -48,7 +48,7 @@ export function* createSectionAndAddWidget(
     yield call(
       addWidgetsToSection,
       updatedWidgets,
-      widgets,
+      draggedWidgets,
       highlight,
       sectionProps,
     );
diff --git a/app/client/src/layoutSystems/anvil/utils/layouts/update/zoneUtils.ts b/app/client/src/layoutSystems/anvil/utils/layouts/update/zoneUtils.ts
index acffc1094914..09cef911286e 100644
--- a/app/client/src/layoutSystems/anvil/utils/layouts/update/zoneUtils.ts
+++ b/app/client/src/layoutSystems/anvil/utils/layouts/update/zoneUtils.ts
@@ -58,7 +58,7 @@ export function* createZoneAndAddWidgets(
       updatedWidgets,
       draggedWidgets,
       highlight,
-      zoneProps,
+      zoneProps.widgetId,
     );
 
   return res;
@@ -68,13 +68,11 @@ export function* addWidgetsToZone(
   allWidgets: CanvasWidgetsReduxState,
   draggedWidgets: WidgetLayoutProps[],
   highlight: AnvilHighlightInfo,
-  zone: WidgetProps,
+  zoneWidgetId: string,
 ) {
   let updatedWidgets: CanvasWidgetsReduxState = { ...allWidgets };
-  const zoneProps = { ...zone };
-  const preset: LayoutProps[] = zoneProps.layout;
+  const preset: LayoutProps[] = updatedWidgets[zoneWidgetId].layout;
   let zoneLayout: LayoutProps = preset[0];
-  const { widgetId: zoneWidgetId } = zoneProps;
 
   /**
    * If dragged widget is a new widget,
@@ -86,7 +84,6 @@ export function* addWidgetsToZone(
     zoneWidgetId,
     draggedWidgets,
   );
-  zoneProps.children = updatedWidgets[zoneWidgetId].children;
 
   /**
    * Split new widgets based on type.
@@ -127,14 +124,11 @@ export function* addWidgetsToZone(
   /**
    * Update zone widget with the updated preset.
    */
-  zoneProps.layout = [zoneLayout];
+  updatedWidgets[zoneWidgetId].layout = [zoneLayout];
 
   return {
-    canvasWidgets: {
-      ...updatedWidgets,
-      [zoneProps.widgetId]: zoneProps,
-    },
-    zone: zoneProps,
+    canvasWidgets: updatedWidgets,
+    zone: updatedWidgets[zoneWidgetId],
   };
 }
 
@@ -219,7 +213,7 @@ function* moveWidgetsToNewLayout(
     widgets,
     transformMovedWidgets(widgets, movedWidgets, highlight),
     highlight,
-    zone,
+    zone.widgetId,
   );
 
   return canvasWidgets;
diff --git a/app/client/src/layoutSystems/anvil/viewer/canvas/styles.module.css b/app/client/src/layoutSystems/anvil/viewer/canvas/styles.module.css
index 0d87502e720e..03d60fd75393 100644
--- a/app/client/src/layoutSystems/anvil/viewer/canvas/styles.module.css
+++ b/app/client/src/layoutSystems/anvil/viewer/canvas/styles.module.css
@@ -1,4 +1,5 @@
 .anvil-canvas {
+  position: relative;
   container-type: inline-size;
   width: 100%;
   height: 100%;
diff --git a/app/client/src/layoutSystems/fixedlayout/editor/FixedLayoutCanvasArenas/CanvasSelectionArena.test.tsx b/app/client/src/layoutSystems/fixedlayout/editor/FixedLayoutCanvasArenas/CanvasSelectionArena.test.tsx
index c35b0e685364..d19d0c21b56c 100644
--- a/app/client/src/layoutSystems/fixedlayout/editor/FixedLayoutCanvasArenas/CanvasSelectionArena.test.tsx
+++ b/app/client/src/layoutSystems/fixedlayout/editor/FixedLayoutCanvasArenas/CanvasSelectionArena.test.tsx
@@ -53,7 +53,7 @@ describe("Canvas selection test cases", () => {
     jest.useRealTimers();
   });
 
-  it("Should select using canvas draw", () => {
+  it("Should select using canvas draw", async () => {
     // TODO: Fix this the next time the file is edited
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const children: any = buildChildren([
@@ -94,10 +94,13 @@ describe("Canvas selection test cases", () => {
       </MemoryRouter>,
       { initialState: store.getState(), sagasToRun: sagasToRunForTests },
     );
+
     // TODO: Fix this the next time the file is edited
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    let selectionCanvas: any = component.queryByTestId(
+    let selectionCanvas: any = await component.findByTestId(
       `canvas-selection-${MAIN_CONTAINER_WIDGET_ID}`,
+      undefined,
+      { timeout: 3000 },
     );
     // TODO: Fix this the next time the file is edited
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -121,7 +124,7 @@ describe("Canvas selection test cases", () => {
     expect(selectionCanvas.style.zIndex).toBe("");
   });
 
-  it("Should select all elements using canvas from top to bottom", () => {
+  it("Should select all elements using canvas from top to bottom", async () => {
     // TODO: Fix this the next time the file is edited
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const children: any = buildChildren([
@@ -166,8 +169,10 @@ describe("Canvas selection test cases", () => {
     );
     // TODO: Fix this the next time the file is edited
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const selectionDiv: any = component.queryByTestId(
+    const selectionDiv: any = await component.findByTestId(
       `div-selection-${MAIN_CONTAINER_WIDGET_ID}`,
+      undefined,
+      { timeout: 3000 },
     );
 
     fireEvent(
@@ -221,7 +226,7 @@ describe("Canvas selection test cases", () => {
     );
   });
 
-  it("Should allow draw to select using cmd + draw in Container component", () => {
+  it("Should allow draw to select using cmd + draw in Container component", async () => {
     const containerId = generateReactKey();
     const canvasId = generateReactKey();
     // TODO: Fix this the next time the file is edited
@@ -273,8 +278,10 @@ describe("Canvas selection test cases", () => {
     );
     // TODO: Fix this the next time the file is edited
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    let selectionCanvas: any = component.queryByTestId(
+    let selectionCanvas: any = await component.findByTestId(
       `canvas-selection-${canvasId}`,
+      undefined,
+      { timeout: 3000 },
     );
     // TODO: Fix this the next time the file is edited
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -300,7 +307,7 @@ describe("Canvas selection test cases", () => {
     expect(selectionCanvas.style.zIndex).toBe("");
   });
 
-  it("Should not allow draw to select using cmd + draw in drop disabled Canvas component", () => {
+  it("Should not allow draw to select using cmd + draw in drop disabled Canvas component", async () => {
     const containerId = generateReactKey();
     const canvasId = generateReactKey();
     // TODO: Fix this the next time the file is edited
@@ -341,14 +348,27 @@ describe("Canvas selection test cases", () => {
         <Canvas canvasWidth={dsl.rightColumn} widgetsStructure={dsl} />
       </MockPageDSL>,
     );
+
+    let selectionCanvas;
+
     // TODO: Fix this the next time the file is edited
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const selectionCanvas: any = component.queryByTestId(`canvas-${canvasId}`);
+    try {
+      // We actually want to assert the canvas component could not be found,
+      // if the canvas component could not be found after timeout findByTestId will throw an error
+      // In that case we set the component to be null
+      selectionCanvas = await component.findByTestId(
+        `canvas-${canvasId}`,
+        undefined,
+        { timeout: 3000 },
+      );
+    } catch (e) {
+      selectionCanvas = null;
+    }
 
     expect(selectionCanvas).toBeNull();
   });
 
-  it("Should select all elements inside a CONTAINER using draw on canvas from top to bottom", () => {
+  it("Should select all elements inside a CONTAINER using draw on canvas from top to bottom", async () => {
     const containerId = "containerWidget";
     const canvasId = "canvasWidget";
     // TODO: Fix this the next time the file is edited
@@ -426,8 +446,10 @@ describe("Canvas selection test cases", () => {
 
     // TODO: Fix this the next time the file is edited
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const selectionDiv: any = component.queryByTestId(
+    const selectionDiv: any = await component.findByTestId(
       `div-selection-${canvasId}`,
+      undefined,
+      { timeout: 3000 },
     );
 
     fireEvent(
@@ -479,7 +501,7 @@ describe("Canvas selection test cases", () => {
     );
   });
 
-  it("Draw to select from outside of canvas(editor) ", () => {
+  it("Draw to select from outside of canvas(editor) ", async () => {
     const mockGetIsFetchingPage = jest.spyOn(utilities, "getIsFetchingPage");
     // TODO: Fix this the next time the file is edited
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -525,7 +547,11 @@ describe("Canvas selection test cases", () => {
     );
     // TODO: Fix this the next time the file is edited
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const widgetEditor: any = component.queryByTestId("t--widgets-editor");
+    const widgetEditor: any = await component.findByTestId(
+      "t--widgets-editor",
+      undefined,
+      { timeout: 3000 },
+    );
     // TODO: Fix this the next time the file is edited
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     let selectionCanvas: any = component.queryByTestId(
diff --git a/app/client/src/modules/ui-builder/ui/wds/Container.tsx b/app/client/src/modules/ui-builder/ui/wds/Container.tsx
index 67132176fd4c..5cc6af34e545 100644
--- a/app/client/src/modules/ui-builder/ui/wds/Container.tsx
+++ b/app/client/src/modules/ui-builder/ui/wds/Container.tsx
@@ -29,6 +29,7 @@ export function ContainerComponent(props: ContainerComponentProps) {
     <StyledContainerComponent
       className={`${generateClassName(props.widgetId)}`}
       data-elevation={props.elevatedBackground}
+      data-no-padding={props.noPadding}
       elevatedBackground={props.elevatedBackground}
       elevation={props.elevation}
     >
@@ -42,4 +43,5 @@ export interface ContainerComponentProps {
   children?: ReactNode;
   elevation: Elevations;
   elevatedBackground: boolean;
+  noPadding?: boolean;
 }
diff --git a/app/client/src/modules/ui-builder/ui/wds/WDSBaseInputWidget/component/types.ts b/app/client/src/modules/ui-builder/ui/wds/WDSBaseInputWidget/component/types.ts
index ef04302274c8..97b9b6d550b8 100644
--- a/app/client/src/modules/ui-builder/ui/wds/WDSBaseInputWidget/component/types.ts
+++ b/app/client/src/modules/ui-builder/ui/wds/WDSBaseInputWidget/component/types.ts
@@ -1,5 +1,4 @@
 import type { ComponentProps } from "widgets/BaseComponent";
-import type { TextInputProps } from "@appsmith/wds";
 
 export type KeyDownEvent = React.KeyboardEvent<
   HTMLTextAreaElement | HTMLInputElement
@@ -31,7 +30,7 @@ export interface BaseInputComponentProps extends ComponentProps {
   label: string;
 
   // validation props
-  validationStatus?: TextInputProps["validationState"];
+  validationStatus?: "invalid" | "valid";
   errorMessage?: string;
 
   // misc
diff --git a/app/client/src/modules/ui-builder/ui/wds/WDSCheckboxGroupWidget/widget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSCheckboxGroupWidget/widget/index.tsx
index d1a3bfa15212..ffd439a90eb9 100644
--- a/app/client/src/modules/ui-builder/ui/wds/WDSCheckboxGroupWidget/widget/index.tsx
+++ b/app/client/src/modules/ui-builder/ui/wds/WDSCheckboxGroupWidget/widget/index.tsx
@@ -113,8 +113,7 @@ class WDSCheckboxGroupWidget extends BaseWidget<
   };
 
   getWidgetView() {
-    const { labelTooltip, options, selectedValues, widgetId, ...rest } =
-      this.props;
+    const { labelTooltip, options, selectedValues, ...rest } = this.props;
 
     const validation = validateInput(this.props);
 
@@ -124,19 +123,18 @@ class WDSCheckboxGroupWidget extends BaseWidget<
         contextualHelp={labelTooltip}
         errorMessage={validation.errorMessage}
         isInvalid={validation.validationStatus === "invalid"}
-        items={options}
         onChange={this.onChange}
         value={selectedValues}
       >
-        {({ index, label, value }) => (
+        {options.map((option) => (
           <Checkbox
             excludeFromTabOrder={this.props.disableWidgetInteraction}
-            key={`${widgetId}-option-${index}`}
-            value={value}
+            key={option.value}
+            value={option.value}
           >
-            {label}
+            {option.label}
           </Checkbox>
-        )}
+        ))}
       </ToggleGroup>
     );
   }
diff --git a/app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/widget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/widget/index.tsx
index e75189a06f58..f7977faa0ce1 100644
--- a/app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/widget/index.tsx
+++ b/app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/widget/index.tsx
@@ -1,4 +1,4 @@
-import { ComboBox } from "@appsmith/wds";
+import { ComboBox, ListBoxItem } from "@appsmith/wds";
 import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
 import type { SetterConfig, Stylesheet } from "entities/AppTheming";
 import isNumber from "lodash/isNumber";
@@ -20,7 +20,6 @@ import {
 } from "../config";
 import { validateInput } from "./helpers";
 import type { WDSComboBoxWidgetProps } from "./types";
-import type { ComboBoxItem } from "@appsmith/wds/src/components/ComboBox/src/types";
 
 const isTrueObject = (item: unknown): item is Record<string, unknown> => {
   return Object.prototype.toString.call(item) === "[object Object]";
@@ -143,9 +142,7 @@ class WDSComboBoxWidget extends BaseWidget<
     commitBatchMetaUpdates();
   };
 
-  optionsToItems = (
-    options: WDSComboBoxWidgetProps["options"],
-  ): ComboBoxItem[] => {
+  optionsToItems = (options: WDSComboBoxWidgetProps["options"]) => {
     if (Array.isArray(options)) {
       const items = options.map((option) => ({
         label: option["label"] as string,
@@ -179,11 +176,16 @@ class WDSComboBoxWidget extends BaseWidget<
         contextualHelp={labelTooltip}
         errorMessage={validation.errorMessage}
         isInvalid={validation.validationStatus === "invalid"}
-        items={this.optionsToItems(options)}
         onSelectionChange={this.handleSelectionChange}
         placeholder={placeholderText}
         selectedKey={selectedOptionValue}
-      />
+      >
+        {this.optionsToItems(options).map((option) => (
+          <ListBoxItem key={option.id} textValue={option.label}>
+            {option.label}
+          </ListBoxItem>
+        ))}
+      </ComboBox>
     );
   }
 }
diff --git a/app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/component/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/component/index.tsx
index 775a7be1e2ad..465c83a33e52 100644
--- a/app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/component/index.tsx
+++ b/app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/component/index.tsx
@@ -31,6 +31,7 @@ export function CurrencyInputComponent(props: CurrencyInputComponentProps) {
       errorMessage={props.validationStatus === "invalid" ? errorMessage : ""}
       excludeFromTabOrder={props.excludeFromTabOrder}
       isDisabled={props.isDisabled}
+      isInvalid={validationStatus === "invalid"}
       isReadOnly={props.isReadOnly}
       isRequired={props.isRequired}
       label={props.label}
@@ -39,7 +40,6 @@ export function CurrencyInputComponent(props: CurrencyInputComponentProps) {
       onKeyDown={props.onKeyDown}
       placeholder={props.placeholder}
       prefix={prefix}
-      validationState={validationStatus}
       value={props.value}
     />
   );
diff --git a/app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/component/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/component/index.tsx
index 0f91268297b7..0c1f7e86421d 100644
--- a/app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/component/index.tsx
+++ b/app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/component/index.tsx
@@ -94,9 +94,10 @@ function InputComponent(props: InputComponentProps) {
       autoFocus={props.autoFocus}
       contextualHelp={props.tooltip}
       defaultValue={props.defaultValue}
-      errorMessage={props.validationStatus === "invalid" ? errorMessage : ""}
+      errorMessage={validationStatus === "invalid" ? errorMessage : ""}
       excludeFromTabOrder={props.excludeFromTabOrder}
       isDisabled={props.isDisabled}
+      isInvalid={props.validationStatus === "invalid"}
       isReadOnly={props.isReadOnly}
       isRequired={props.isRequired}
       label={props.label}
@@ -112,7 +113,6 @@ function InputComponent(props: InputComponentProps) {
       spellCheck={props.spellCheck}
       suffix={endIcon}
       type={type}
-      validationState={validationStatus}
       value={props.value}
     />
   );
diff --git a/app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/config/propertyPaneConfig/contentConfig.ts
index 4af8b7bb0c5d..52525d150834 100644
--- a/app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/config/propertyPaneConfig/contentConfig.ts
+++ b/app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/config/propertyPaneConfig/contentConfig.ts
@@ -88,7 +88,7 @@ export const propertyPaneContentConfig = [
         controlType: "OPEN_CONFIG_PANEL",
         buttonConfig: {
           label: "Configure",
-          icon: "settings-2-line",
+          icon: "settings-v3",
         },
         label: "Configure menu items",
         isBindProperty: false,
diff --git a/app/client/src/modules/ui-builder/ui/wds/WDSModalWidget/widget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSModalWidget/widget/index.tsx
index 7af7d3e668c5..cd5410d2c10b 100644
--- a/app/client/src/modules/ui-builder/ui/wds/WDSModalWidget/widget/index.tsx
+++ b/app/client/src/modules/ui-builder/ui/wds/WDSModalWidget/widget/index.tsx
@@ -140,16 +140,17 @@ class WDSModalWidget extends BaseWidget<ModalWidgetProps, WidgetState> {
 
     return (
       <Modal
-        dataAttributes={{
+        isOpen={this.state.isVisible as boolean}
+        onClose={this.onModalClose}
+        overlayProps={{
           [AnvilDataAttributes.MODAL_SIZE]: this.props.size,
           [AnvilDataAttributes.WIDGET_NAME]: this.props.widgetName,
           [AnvilDataAttributes.IS_SELECTED_WIDGET]: this.props.isWidgetSelected
             ? "true"
             : "false",
         }}
-        isOpen={this.state.isVisible as boolean}
-        onClose={this.onModalClose}
         setOpen={(val) => this.setState({ isVisible: val })}
+        size={this.props.size}
       >
         {this.state.isVisible && (
           <ModalContent className={modalClassNames.trim()}>
diff --git a/app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/component/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/component/index.tsx
index a6e1346618ff..c6185f25d0a6 100644
--- a/app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/component/index.tsx
+++ b/app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/component/index.tsx
@@ -23,6 +23,7 @@ export function PhoneInputComponent(props: PhoneInputComponentProps) {
       errorMessage={props.errorMessage}
       excludeFromTabOrder={props.excludeFromTabOrder}
       isDisabled={props.isDisabled}
+      isInvalid={props.validationStatus === "invalid"}
       isReadOnly={props.isReadOnly}
       isRequired={props.isRequired}
       label={props.label}
@@ -31,7 +32,6 @@ export function PhoneInputComponent(props: PhoneInputComponentProps) {
       onKeyDown={props.onKeyDown}
       placeholder={props.placeholder}
       prefix={prefix}
-      validationState={props.validationStatus}
       value={props.value}
     />
   );
diff --git a/app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/widget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/widget/index.tsx
index 50c3a90c3ff3..5c35fdb46373 100644
--- a/app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/widget/index.tsx
+++ b/app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/widget/index.tsx
@@ -6,7 +6,7 @@ import type {
 import isNumber from "lodash/isNumber";
 import BaseWidget from "widgets/BaseWidget";
 import type { WidgetState } from "widgets/BaseWidget";
-import { RadioGroup } from "@appsmith/wds";
+import { Radio, RadioGroup } from "@appsmith/wds";
 import type { SetterConfig, Stylesheet } from "entities/AppTheming";
 import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
 
@@ -139,10 +139,15 @@ class WDSRadioGroupWidget extends BaseWidget<
         contextualHelp={labelTooltip}
         errorMessage={validation.errorMessage}
         isInvalid={validation.validationStatus === "invalid"}
-        items={options}
         onChange={this.onRadioSelectionChange}
         value={selectedOptionValue}
-      />
+      >
+        {options.map((option) => (
+          <Radio key={option.value} value={option.value}>
+            {option.label}
+          </Radio>
+        ))}
+      </RadioGroup>
     );
   }
 }
diff --git a/app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/widget/types.ts b/app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/widget/types.ts
index 31daabb7fa6a..e82dab862fd4 100644
--- a/app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/widget/types.ts
+++ b/app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/widget/types.ts
@@ -2,7 +2,10 @@ import type { RadioGroupProps } from "@appsmith/wds";
 import type { WidgetProps } from "widgets/BaseWidget";
 
 export interface RadioGroupWidgetProps extends WidgetProps {
-  options: RadioGroupProps["items"];
+  options: {
+    label: string;
+    value: string;
+  }[];
   selectedOptionValue: string;
   onSelectionChange: string;
   defaultOptionValue: string;
diff --git a/app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/widget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/widget/index.tsx
index 20908c881993..11398d323b1a 100644
--- a/app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/widget/index.tsx
+++ b/app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/widget/index.tsx
@@ -1,4 +1,4 @@
-import { Select } from "@appsmith/wds";
+import { Select, ListBoxItem } from "@appsmith/wds";
 import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
 import type { SetterConfig, Stylesheet } from "entities/AppTheming";
 import isNumber from "lodash/isNumber";
@@ -20,7 +20,6 @@ import {
 } from "../config";
 import { validateInput } from "./helpers";
 import type { WDSSelectWidgetProps } from "./types";
-import type { FieldListPopoverItem } from "@appsmith/wds";
 
 const isTrueObject = (item: unknown): item is Record<string, unknown> => {
   return Object.prototype.toString.call(item) === "[object Object]";
@@ -135,9 +134,7 @@ class WDSSelectWidget extends BaseWidget<WDSSelectWidgetProps, WidgetState> {
     commitBatchMetaUpdates();
   };
 
-  optionsToSelectItems = (
-    options: WDSSelectWidgetProps["options"],
-  ): FieldListPopoverItem[] => {
+  optionsToSelectItems = (options: WDSSelectWidgetProps["options"]) => {
     if (Array.isArray(options)) {
       const items = options.map((option) => ({
         label: option[this.props.optionLabel || "label"] as string,
@@ -171,11 +168,16 @@ class WDSSelectWidget extends BaseWidget<WDSSelectWidgetProps, WidgetState> {
         contextualHelp={labelTooltip}
         errorMessage={validation.errorMessage}
         isInvalid={validation.validationStatus === "invalid"}
-        items={this.optionsToSelectItems(options)}
         onSelectionChange={this.handleChange}
         placeholder={placeholderText}
         selectedKey={selectedOptionValue}
-      />
+      >
+        {this.optionsToSelectItems(options).map((option) => (
+          <ListBoxItem key={option.id} textValue={option.label}>
+            {option.label}
+          </ListBoxItem>
+        ))}
+      </Select>
     );
   }
 }
diff --git a/app/client/src/modules/ui-builder/ui/wds/WDSSwitchGroupWidget/widget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSSwitchGroupWidget/widget/index.tsx
index 86a582860e5a..e0fb819b345f 100644
--- a/app/client/src/modules/ui-builder/ui/wds/WDSSwitchGroupWidget/widget/index.tsx
+++ b/app/client/src/modules/ui-builder/ui/wds/WDSSwitchGroupWidget/widget/index.tsx
@@ -2,9 +2,9 @@ import React from "react";
 import xor from "lodash/xor";
 import BaseWidget from "widgets/BaseWidget";
 import type { WidgetState } from "widgets/BaseWidget";
+import { Switch, ToggleGroup } from "@appsmith/wds";
 import type { SetterConfig } from "entities/AppTheming";
 import type { AnvilConfig } from "WidgetProvider/constants";
-import { Switch, ToggleGroup } from "@appsmith/wds";
 import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
 
 import {
@@ -118,20 +118,19 @@ class WDSSwitchGroupWidget extends BaseWidget<
       <ToggleGroup
         {...rest}
         contextualHelp={labelTooltip}
-        items={options}
         onChange={this.onChange}
         value={selectedValues}
       >
-        {({ index, label, value }) => (
+        {options.map((option) => (
           <Switch
             excludeFromTabOrder={disableWidgetInteraction}
-            key={`${widgetId}-option-${index}`}
+            key={`${widgetId}-option-${option.value}`}
             labelPosition={labelPosition}
-            value={value}
+            value={option.value}
           >
-            {label}
+            {option.label}
           </Switch>
-        )}
+        ))}
       </ToggleGroup>
     );
   }
diff --git a/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/cellComponents/HeaderCell.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/cellComponents/HeaderCell.tsx
index 446a52ddec5b..67fbdcc34a58 100644
--- a/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/cellComponents/HeaderCell.tsx
+++ b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/cellComponents/HeaderCell.tsx
@@ -3,7 +3,15 @@ import React, { useCallback, memo } from "react";
 
 import { MULTISELECT_CHECKBOX_WIDTH, StickyType } from "../Constants";
 import { isColumnTypeEditable } from "modules/ui-builder/ui/wds/WDSTableWidget/widget/utilities";
-import { Flex, Icon, IconButton, Menu, MenuTrigger, Text } from "@appsmith/wds";
+import {
+  Flex,
+  Icon,
+  IconButton,
+  Menu,
+  MenuItem,
+  MenuTrigger,
+  Text,
+} from "@appsmith/wds";
 
 interface HeaderProps {
   canFreezeColumn?: boolean;
@@ -192,13 +200,16 @@ const HeaderCellComponent = (props: HeaderProps) => {
               size="small"
               variant="ghost"
             />
-            <Menu
-              items={[
+            <Menu onAction={onActionOnMenu}>
+              {[
                 { id: "sort-asc", label: "Sort column ascending" },
                 { id: "sort-desc", label: "Sort column descending" },
-              ]}
-              onAction={onActionOnMenu}
-            />
+              ].map((item) => (
+                <MenuItem key={item.id} textValue={item.label}>
+                  {item.label}
+                </MenuItem>
+              ))}
+            </Menu>
           </MenuTrigger>
         </Flex>
       )}
diff --git a/app/client/src/modules/ui-builder/ui/wds/constants.ts b/app/client/src/modules/ui-builder/ui/wds/constants.ts
index 94cd6d91555d..8f897732e6b0 100644
--- a/app/client/src/modules/ui-builder/ui/wds/constants.ts
+++ b/app/client/src/modules/ui-builder/ui/wds/constants.ts
@@ -1,4 +1,6 @@
+// use a relative path since the constants is used in cypress that does not support aliases
 import { getCanvasClassName } from "../../../../utils/generators";
+import { WDS_EE_WIDGET_MAP } from "../../../../ee/modules/ui-builder/ui/wds/constants";
 
 export const anvilWidgets = {
   SECTION_WIDGET: "SECTION_WIDGET",
@@ -62,6 +64,8 @@ export const WDS_V2_WIDGET_MAP = {
 
   // Anvil layout widgets
   ZONE_WIDGET: anvilWidgets.ZONE_WIDGET,
+
+  ...WDS_EE_WIDGET_MAP,
 };
 // getCanvasClassName adds class name to denote that this is scrollable canvas
 export const WDS_MODAL_WIDGET_CLASSNAME = `appsmith-modal-body ${getCanvasClassName()}`;
diff --git a/app/client/src/navigation/FocusElements.ts b/app/client/src/navigation/FocusElements.ts
index 94b5c071d2d2..fe3b1fb66efe 100644
--- a/app/client/src/navigation/FocusElements.ts
+++ b/app/client/src/navigation/FocusElements.ts
@@ -2,7 +2,8 @@ import type { ReduxAction } from "ee/constants/ReduxActionConstants";
 import type { AppState } from "ee/reducers";
 
 export enum FocusElement {
-  ApiPaneConfigTabs = "ApiPaneConfigTabs",
+  PluginActionConfigTabs = "PluginActionConfigTabs",
+  PluginActionFormData = "PluginActionFormData",
   CodeEditorHistory = "CodeEditorHistory",
   EntityCollapsibleState = "EntityCollapsibleState",
   EntityExplorerWidth = "EntityExplorerWidth",
@@ -10,8 +11,6 @@ export enum FocusElement {
   DatasourceViewMode = "DatasourceViewMode",
   SelectedDatasource = "SelectedDatasource",
   DebuggerContext = "DebuggerContext",
-  ApiRightPaneTabs = "ApiRightPaneTabs",
-  QueryPaneConfigTabs = "QueryPaneConfigTabs",
   JSPaneConfigTabs = "JSPaneConfigTabs",
   PropertySections = "PropertySections",
   PropertyField = "PropertyField",
@@ -26,8 +25,7 @@ export enum FocusElement {
   SelectedJSObject = "SelectedJSObject",
   SelectedEntity = "SelectedEntity",
   IDETabs = "IDETabs",
-  QueryDebugger = "QueryDebugger",
-  ApiDebugger = "ApiDebugger",
+  PluginActionDebugger = "PluginActionDebugger",
   JSDebugger = "JSDebugger",
 }
 
diff --git a/app/client/src/navigation/FocusEntity.ts b/app/client/src/navigation/FocusEntity.ts
index e85b0ab64662..fcccac7a79a9 100644
--- a/app/client/src/navigation/FocusEntity.ts
+++ b/app/client/src/navigation/FocusEntity.ts
@@ -278,7 +278,10 @@ export function identifyEntityFromPath(path: string): FocusEntityInfo {
   }
 
   if (match.params.entity) {
-    if (match.params.entity === "libraries") {
+    if (
+      match.params.entity === "libraries" ||
+      match.params.entity === "packages"
+    ) {
       return {
         entity: FocusEntity.LIBRARY,
         id: "",
diff --git a/app/client/src/pages/AppViewer/AppViewerButton.tsx b/app/client/src/pages/AppViewer/AppViewerButton.tsx
index 42c2af78eaa9..8fb4c134e3a9 100644
--- a/app/client/src/pages/AppViewer/AppViewerButton.tsx
+++ b/app/client/src/pages/AppViewer/AppViewerButton.tsx
@@ -14,7 +14,7 @@ import { getTypographyByKey } from "@appsmith/ads-old";
 const StyledButton = styled(Button)<{
   primaryColor: string;
   navColorStyle: NavigationSetting["colorStyle"];
-  varient?: ButtonVariant;
+  variant?: ButtonVariant;
   insideSidebar?: boolean;
   isMinimal?: boolean;
 }>`
@@ -87,7 +87,7 @@ const StyledButton = styled(Button)<{
   }}
 
   // Secondary button styles (such as the sign in button)
-  ${({ insideSidebar = false, navColorStyle, primaryColor, varient }) => {
+  ${({ insideSidebar = false, navColorStyle, primaryColor, variant }) => {
     const styles = getSignInButtonStyles(primaryColor, navColorStyle);
 
     let secondaryVarientStyles = `
@@ -123,7 +123,7 @@ const StyledButton = styled(Button)<{
       `;
     }
 
-    return varient === ButtonVariantTypes.SECONDARY
+    return variant === ButtonVariantTypes.SECONDARY
       ? secondaryVarientStyles
       : "";
   }}
diff --git a/app/client/src/pages/AppViewer/Navigation/TopStacked.tsx b/app/client/src/pages/AppViewer/Navigation/TopStacked.tsx
index 728dce23ce1b..0931df56b1b0 100644
--- a/app/client/src/pages/AppViewer/Navigation/TopStacked.tsx
+++ b/app/client/src/pages/AppViewer/Navigation/TopStacked.tsx
@@ -112,6 +112,7 @@ export function TopStacked(props: NavigationProps) {
       {tabsScrollable && (
         <ScrollBtnContainer
           className="left-0 scroll-arrows"
+          isIconButton
           kind="tertiary"
           onMouseDown={() => startScrolling(true)}
           onMouseLeave={stopScrolling}
@@ -153,6 +154,7 @@ export function TopStacked(props: NavigationProps) {
       {tabsScrollable && (
         <ScrollBtnContainer
           className="right-0 scroll-arrows"
+          isIconButton
           kind="tertiary"
           onMouseDown={() => startScrolling(false)}
           onMouseLeave={stopScrolling}
diff --git a/app/client/src/pages/AppViewer/PrimaryCTA.tsx b/app/client/src/pages/AppViewer/PrimaryCTA.tsx
index 5153588a2b20..9e2816166454 100644
--- a/app/client/src/pages/AppViewer/PrimaryCTA.tsx
+++ b/app/client/src/pages/AppViewer/PrimaryCTA.tsx
@@ -198,7 +198,7 @@ function PrimaryCTA(props: Props) {
           }}
           primaryColor={primaryColor}
           text={createMessage(FORK_APP)}
-          varient={ButtonVariantTypes.SECONDARY}
+          variant={ButtonVariantTypes.SECONDARY}
         />
       );
     }
@@ -220,7 +220,7 @@ function PrimaryCTA(props: Props) {
             }}
             primaryColor={primaryColor}
             text={createMessage(FORK_APP)}
-            varient={ButtonVariantTypes.SECONDARY}
+            variant={ButtonVariantTypes.SECONDARY}
           />
           <ForkApplicationModal
             applicationId={currentApplication?.id || ""}
@@ -255,7 +255,7 @@ function PrimaryCTA(props: Props) {
           }}
           primaryColor={primaryColor}
           text={createMessage(SIGN_IN)}
-          varient={ButtonVariantTypes.SECONDARY}
+          variant={ButtonVariantTypes.SECONDARY}
         />
       );
     }
diff --git a/app/client/src/pages/AppViewer/index.tsx b/app/client/src/pages/AppViewer/index.tsx
index bde4699342c4..abe1ebbf3884 100644
--- a/app/client/src/pages/AppViewer/index.tsx
+++ b/app/client/src/pages/AppViewer/index.tsx
@@ -28,10 +28,7 @@ import { useSelector } from "react-redux";
 import BrandingBadge from "./BrandingBadge";
 import { setAppViewHeaderHeight } from "actions/appViewActions";
 import { CANVAS_SELECTOR } from "constants/WidgetConstants";
-import {
-  setupPublishedPage,
-  fetchPublishedPageResourcesAction,
-} from "actions/pageActions";
+import { fetchPublishedPageResources } from "actions/pageActions";
 import usePrevious from "utils/hooks/usePrevious";
 import { getIsBranchUpdated } from "../utils";
 import { APP_MODE } from "entities/App";
@@ -165,10 +162,12 @@ function AppViewer(props: Props) {
         )?.pageId;
 
         if (pageId) {
-          dispatch(setupPublishedPage(pageId, true));
-
-          // Used for fetching page resources
-          dispatch(fetchPublishedPageResourcesAction(basePageId));
+          dispatch(
+            fetchPublishedPageResources({
+              basePageId,
+              pageId,
+            }),
+          );
         }
       }
     }
diff --git a/app/client/src/pages/Applications/ApplicationCard.tsx b/app/client/src/pages/Applications/ApplicationCard.tsx
index 4e6d0890caa7..484b7bb6eacf 100644
--- a/app/client/src/pages/Applications/ApplicationCard.tsx
+++ b/app/client/src/pages/Applications/ApplicationCard.tsx
@@ -53,6 +53,10 @@ import { getCurrentUser } from "actions/authActions";
 import Card, { ContextMenuTrigger } from "components/common/Card";
 import { generateEditedByText } from "./helpers";
 import { noop } from "lodash";
+import { getLatestGitBranchFromLocal } from "utils/storage";
+import { getCurrentUser as getCurrentUserSelector } from "selectors/usersSelectors";
+import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
+import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
 
 interface ApplicationCardProps {
   application: ApplicationPayload;
@@ -98,6 +102,7 @@ export function ApplicationCard(props: ApplicationCardProps) {
   const theme = useContext(ThemeContext);
   const isSavingName = useSelector(getIsSavingAppName);
   const isErroredSavingName = useSelector(getIsErroredSavingAppName);
+  const currentUser = useSelector(getCurrentUserSelector);
   const initialsAndColorCode = getInitialsAndColorCode(
     props.application.name,
     theme.colors.appCardColors,
@@ -116,7 +121,40 @@ export function ApplicationCard(props: ApplicationCardProps) {
   const dispatch = useDispatch();
 
   const applicationId = props.application?.id;
+  const baseApplicationId = props.application?.baseId;
   const showGitBadge = props.application?.gitApplicationMetadata?.branchName;
+  const [editorParams, setEditorParams] = useState({});
+  const isGitPersistBranchEnabled = useFeatureFlag(
+    FEATURE_FLAG.release_git_persist_branch_enabled,
+  );
+
+  useEffect(() => {
+    (async () => {
+      const storedLatestBranch = await getLatestGitBranchFromLocal(
+        currentUser?.email ?? "",
+        baseApplicationId,
+      );
+
+      if (isGitPersistBranchEnabled && storedLatestBranch) {
+        setEditorParams({ branch: storedLatestBranch });
+      } else if (showGitBadge) {
+        setEditorParams({ branch: showGitBadge });
+      }
+    })();
+  }, [
+    baseApplicationId,
+    currentUser?.email,
+    showGitBadge,
+    isGitPersistBranchEnabled,
+  ]);
+
+  const viewerParams = useMemo(() => {
+    if (showGitBadge) {
+      return { branch: showGitBadge };
+    } else {
+      return {};
+    }
+  }, [showGitBadge]);
 
   useEffect(() => {
     let colorCode;
@@ -273,15 +311,6 @@ export function ApplicationCard(props: ApplicationCardProps) {
     initials += props.application.name[1].toUpperCase() || "";
   }
 
-  // should show correct branch of application when edit mode
-  // TODO: Fix this the next time the file is edited
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const params: any = {};
-
-  if (showGitBadge) {
-    params.branch = showGitBadge;
-  }
-
   const handleMenuOnClose = (open: boolean) => {
     if (!open && !isDeleting) {
       setIsMenuOpen(false);
@@ -437,16 +466,16 @@ export function ApplicationCard(props: ApplicationCardProps) {
 
     if (!basePageId) return "";
 
-    return builderURL({ basePageId, params });
-  }, [props.application.defaultBasePageId, params]);
+    return builderURL({ basePageId, params: editorParams });
+  }, [props.application.defaultBasePageId, editorParams]);
 
   const viewModeURL = useMemo(() => {
     const basePageId = props.application.defaultBasePageId;
 
     if (!basePageId) return "";
 
-    return viewerURL({ basePageId, params });
-  }, [props.application.defaultBasePageId, params]);
+    return viewerURL({ basePageId, params: viewerParams });
+  }, [props.application.defaultBasePageId, viewerParams]);
 
   const launchApp = useCallback(() => {
     setURLParams();
@@ -463,11 +492,11 @@ export function ApplicationCard(props: ApplicationCardProps) {
     history.push(
       viewerURL({
         basePageId: props.application.defaultBasePageId,
-        params,
+        params: viewerParams,
       }),
     );
     dispatch(getCurrentUser());
-  }, [props.application.defaultPageId]);
+  }, [dispatch, props.application.defaultBasePageId, viewerParams]);
 
   return (
     <Card
diff --git a/app/client/src/pages/Editor/APIEditor/ApiEditorContext.tsx b/app/client/src/pages/Editor/APIEditor/ApiEditorContext.tsx
index 1a2d9d517898..28cca89f39e0 100644
--- a/app/client/src/pages/Editor/APIEditor/ApiEditorContext.tsx
+++ b/app/client/src/pages/Editor/APIEditor/ApiEditorContext.tsx
@@ -5,7 +5,6 @@ import type { SaveActionNameParams } from "PluginActionEditor";
 
 interface ApiEditorContextContextProps {
   moreActionsMenu?: React.ReactNode;
-  handleDeleteClick: () => void;
   handleRunClick: (paginationField?: PaginationField) => void;
   actionRightPaneBackLink?: React.ReactNode;
   // TODO: Fix this the next time the file is edited
@@ -14,7 +13,6 @@ interface ApiEditorContextContextProps {
   saveActionName: (
     params: SaveActionNameParams,
   ) => ReduxAction<SaveActionNameParams>;
-  closeEditorLink?: React.ReactNode;
   showRightPaneTabbedSection?: boolean;
   actionRightPaneAdditionSections?: React.ReactNode;
   notification?: React.ReactNode | string;
@@ -31,8 +29,6 @@ export function ApiEditorContextProvider({
   actionRightPaneAdditionSections,
   actionRightPaneBackLink,
   children,
-  closeEditorLink,
-  handleDeleteClick,
   handleRunClick,
   moreActionsMenu,
   notification,
@@ -44,8 +40,6 @@ export function ApiEditorContextProvider({
     () => ({
       actionRightPaneAdditionSections,
       actionRightPaneBackLink,
-      closeEditorLink,
-      handleDeleteClick,
       showRightPaneTabbedSection,
       handleRunClick,
       moreActionsMenu,
@@ -56,8 +50,6 @@ export function ApiEditorContextProvider({
     [
       actionRightPaneBackLink,
       actionRightPaneAdditionSections,
-      closeEditorLink,
-      handleDeleteClick,
       showRightPaneTabbedSection,
       handleRunClick,
       moreActionsMenu,
diff --git a/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx b/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx
index 979c4edf1cb1..a024ab6b386f 100644
--- a/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx
+++ b/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx
@@ -3,11 +3,7 @@ import { useSelector } from "react-redux";
 import styled from "styled-components";
 import FormLabel from "components/editorComponents/FormLabel";
 import FormRow from "components/editorComponents/FormRow";
-import type {
-  ActionResponse,
-  PaginationField,
-  SuggestedWidget,
-} from "api/ActionAPI";
+import type { ActionResponse, PaginationField } from "api/ActionAPI";
 import type { Action, PaginationType } from "entities/Action";
 import ApiResponseView from "components/editorComponents/ApiResponseView";
 import type { AppState } from "ee/reducers";
@@ -15,12 +11,11 @@ import ActionNameEditor from "components/editorComponents/ActionNameEditor";
 import { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig";
 import { Button } from "@appsmith/ads";
 import { useParams } from "react-router";
-import type { Datasource } from "entities/Datasource";
 import equal from "fast-deep-equal/es6";
 import { getPlugin } from "ee/selectors/entitiesSelector";
 import type { AutoGeneratedHeader } from "./helpers";
 import { noop } from "lodash";
-import { DEFAULT_DATASOURCE_NAME } from "constants/ApiEditorConstants/ApiEditorConstants";
+import { DEFAULT_DATASOURCE_NAME } from "PluginActionEditor/constants/ApiEditorConstants";
 import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
 import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
 import {
@@ -28,13 +23,10 @@ import {
   getHasManageActionPermission,
 } from "ee/utils/BusinessFeatures/permissionPageHelpers";
 import { ApiEditorContext } from "./ApiEditorContext";
-import ActionRightPane from "components/editorComponents/ActionRightPane";
 import RunHistory from "ee/components/RunHistory";
-import {
-  HintMessages,
-  InfoFields,
-  RequestTabs,
-} from "PluginActionEditor/components/PluginActionForm/components/CommonEditorForm";
+import { HintMessages } from "PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/HintMessages";
+import { InfoFields } from "PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/InfoFields";
+import { RequestTabs } from "PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/RequestTabs";
 import { getSavingStatusForActionName } from "selectors/actionSelectors";
 import { getAssetUrl } from "ee/utils/airgapHelpers";
 import { ActionUrlIcon } from "../Explorer/ExplorerIcons";
@@ -109,6 +101,7 @@ const TabbedViewContainer = styled.div`
   overflow: auto;
   position: relative;
   height: 100%;
+  padding: 0 var(--ads-v2-spaces-7);
 `;
 
 const Wrapper = styled.div`
@@ -116,6 +109,7 @@ const Wrapper = styled.div`
   flex-direction: row;
   height: 100%;
   position: relative;
+  overflow: hidden;
 `;
 
 const MainContainer = styled.div`
@@ -130,7 +124,6 @@ export interface CommonFormProps {
   actionResponse?: ActionResponse;
   pluginId: string;
   onRunClick: (paginationField?: PaginationField) => void;
-  onDeleteClick: () => void;
   isRunning: boolean;
   isDeleting: boolean;
   paginationType: PaginationType;
@@ -148,23 +141,11 @@ export interface CommonFormProps {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   datasourceParams?: any;
   actionName: string;
-  apiId: string;
   apiName: string;
   // TODO: Fix this the next time the file is edited
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   settingsConfig: any;
   hintMessages?: Array<string>;
-  // TODO: Fix this the next time the file is edited
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  datasources?: any;
-  currentPageId?: string;
-  applicationId?: string;
-  hasResponse: boolean;
-  responseDataTypes: { key: string; title: string }[];
-  responseDisplayFormat: { title: string; value: string };
-  suggestedWidgets?: SuggestedWidget[];
-  updateDatasource: (datasource: Datasource) => void;
-  currentActionDatasourceId: string;
   autoGeneratedActionConfigHeaders?: AutoGeneratedHeader[];
 }
 
@@ -177,9 +158,6 @@ type CommonFormPropsWithExtraParams = CommonFormProps & {
   // TODO: Fix this the next time the file is edited
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   handleSubmit: any;
-  // defaultSelectedTabIndex
-  defaultTabSelected?: number;
-  closeEditorLink?: React.ReactNode;
   httpsMethods: { value: string }[];
 };
 
@@ -215,7 +193,6 @@ function CommonEditorForm(props: CommonFormPropsWithExtraParams) {
     actionConfigurationParams,
     actionResponse,
     autoGeneratedActionConfigHeaders,
-    closeEditorLink,
     formName,
     handleSubmit,
     hintMessages,
@@ -287,7 +264,6 @@ function CommonEditorForm(props: CommonFormPropsWithExtraParams) {
 
   return (
     <MainContainer>
-      {closeEditorLink}
       <Form
         data-testid={`t--action-form-${plugin?.type}`}
         onSubmit={handleSubmit(noop)}
@@ -363,7 +339,7 @@ function CommonEditorForm(props: CommonFormPropsWithExtraParams) {
               <ApiResponseView
                 actionResponse={actionResponse}
                 currentActionConfig={currentActionConfig}
-                disabled={!isExecutePermitted}
+                isRunDisabled={blockExecution}
                 isRunning={isRunning}
                 onRunClick={onRunClick}
                 theme={theme}
@@ -371,9 +347,7 @@ function CommonEditorForm(props: CommonFormPropsWithExtraParams) {
               <RunHistory />
             </SecondaryWrapper>
           </div>
-          <ActionRightPane
-            additionalSections={actionRightPaneAdditionSections}
-          />
+          {actionRightPaneAdditionSections}
         </Wrapper>
       </Form>
     </MainContainer>
diff --git a/app/client/src/pages/Editor/APIEditor/Editor.tsx b/app/client/src/pages/Editor/APIEditor/Editor.tsx
index f939edc0be27..1e6fab13010d 100644
--- a/app/client/src/pages/Editor/APIEditor/Editor.tsx
+++ b/app/client/src/pages/Editor/APIEditor/Editor.tsx
@@ -21,7 +21,12 @@ import Spinner from "components/editorComponents/Spinner";
 import type { CSSProperties } from "styled-components";
 import styled from "styled-components";
 import CenteredWrapper from "components/designSystems/appsmith/CenteredWrapper";
-import { changeApi } from "actions/apiPaneActions";
+import {
+  changeApi,
+  isActionDeleting,
+  isActionRunning,
+  isPluginActionCreating,
+} from "PluginActionEditor/store";
 import * as Sentry from "@sentry/react";
 import EntityNotFoundPane from "pages/Editor/EntityNotFoundPane";
 import type { ApplicationPayload } from "entities/Application";
@@ -182,7 +187,6 @@ class ApiEditor extends React.Component<Props> {
             }
             isDeleting={isDeleting}
             isRunning={isRunning}
-            onDeleteClick={this.context.handleDeleteClick}
             onRunClick={this.context.handleRunClick}
             paginationType={paginationType}
             pluginId={pluginId}
@@ -200,7 +204,6 @@ class ApiEditor extends React.Component<Props> {
             isDeleting={isDeleting}
             isRunning={isRunning}
             match={this.props.match}
-            onDeleteClick={this.context.handleDeleteClick}
             onRunClick={this.context.handleRunClick}
             paginationType={paginationType}
             pluginId={pluginId}
@@ -226,9 +229,10 @@ class ApiEditor extends React.Component<Props> {
 
 const formStyles: CSSProperties = {
   position: "relative",
-  height: "100%",
   display: "flex",
   flexDirection: "column",
+  flexGrow: "1",
+  overflow: "auto",
 };
 
 // TODO: Fix this the next time the file is edited
@@ -237,7 +241,9 @@ const mapStateToProps = (state: AppState, props: any): ReduxStateProps => {
   const apiAction = getActionByBaseId(state, props?.match?.params?.baseApiId);
   const apiName = apiAction?.name ?? "";
   const apiId = apiAction?.id ?? "";
-  const { isCreating, isDeleting, isRunning } = state.ui.apiPane;
+  const isCreating = isPluginActionCreating(state);
+  const isDeleting = isActionDeleting(apiId)(state);
+  const isRunning = isActionRunning(apiId)(state);
   const pluginId = _.get(apiAction, "pluginId", "");
 
   return {
@@ -251,9 +257,9 @@ const mapStateToProps = (state: AppState, props: any): ReduxStateProps => {
     pluginId,
     paginationType: _.get(apiAction, "actionConfiguration.paginationType"),
     apiAction,
-    isRunning: isRunning[apiId],
-    isDeleting: isDeleting[apiId],
-    isCreating: isCreating,
+    isRunning,
+    isDeleting,
+    isCreating,
     applicationId: getCurrentApplicationId(state),
   };
 };
diff --git a/app/client/src/pages/Editor/APIEditor/GraphQL/GraphQLEditorForm.tsx b/app/client/src/pages/Editor/APIEditor/GraphQL/GraphQLEditorForm.tsx
index cc502267e6f5..27fa575fb872 100644
--- a/app/client/src/pages/Editor/APIEditor/GraphQL/GraphQLEditorForm.tsx
+++ b/app/client/src/pages/Editor/APIEditor/GraphQL/GraphQLEditorForm.tsx
@@ -1,77 +1,27 @@
-import React, { useCallback, useContext, useRef } from "react";
+import React from "react";
 import { connect } from "react-redux";
 import type { InjectedFormProps } from "redux-form";
-import { change, formValueSelector, reduxForm } from "redux-form";
-import classNames from "classnames";
-import styled from "styled-components";
+import { formValueSelector, reduxForm } from "redux-form";
 import { API_EDITOR_FORM_NAME } from "ee/constants/forms";
 import type { Action } from "entities/Action";
 import type { AppState } from "ee/reducers";
-import { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig";
-import useHorizontalResize from "utils/hooks/useHorizontalResize";
 import get from "lodash/get";
-import type { Datasource } from "entities/Datasource";
 import {
   getActionByBaseId,
   getActionData,
 } from "ee/selectors/entitiesSelector";
-import { isEmpty } from "lodash";
 import type { CommonFormProps } from "../CommonEditorForm";
 import CommonEditorForm from "../CommonEditorForm";
-import QueryEditor from "./QueryEditor";
-import { tailwindLayers } from "constants/Layers";
-import VariableEditor from "./VariableEditor";
-import Pagination from "./Pagination";
-import { ApiEditorContext } from "../ApiEditorContext";
-import { actionResponseDisplayDataFormats } from "pages/Editor/utils";
-import { GRAPHQL_HTTP_METHOD_OPTIONS } from "constants/ApiEditorConstants/GraphQLEditorConstants";
-
-const ResizeableDiv = styled.div`
-  display: flex;
-  height: 100%;
-  flex-shrink: 0;
-`;
-
-const BodyWrapper = styled.div`
-  display: flex;
-  height: 100%;
-  overflow: hidden;
-  &&&& .CodeMirror {
-    height: 100%;
-    border-top: 1px solid var(--ads-v2-color-border);
-    border-bottom: 1px solid var(--ads-v2-color-border);
-    border-radius: 0;
-    padding: 0;
-  }
-  & .CodeMirror-scroll {
-    margin: 0px;
-    padding: 0px;
-    overflow: auto !important;
-  }
-`;
-
-const ResizerHandler = styled.div<{ resizing: boolean }>`
-  width: 6px;
-  height: 100%;
-  margin-left: 2px;
-  border-right: 1px solid var(--ads-v2-color-border);
-  background: ${(props) =>
-    props.resizing ? "var(--ads-v2-color-border)" : "transparent"};
-  &:hover {
-    background: var(--ads-v2-color-border);
-    border-color: transparent;
-  }
-`;
+import Pagination from "PluginActionEditor/components/PluginActionForm/components/GraphQLEditor/Pagination";
+import { GRAPHQL_HTTP_METHOD_OPTIONS } from "PluginActionEditor/constants/GraphQLEditorConstants";
+import PostBodyData from "PluginActionEditor/components/PluginActionForm/components/GraphQLEditor/PostBodyData";
 
 type APIFormProps = {
-  httpMethodFromForm: string;
   actionConfigurationBody: string;
 } & CommonFormProps;
 
 type Props = APIFormProps & InjectedFormProps<Action, APIFormProps>;
 
-const DEFAULT_GRAPHQL_VARIABLE_WIDTH = 300;
-
 /**
  * Graphql Editor form which uses the Common Editor and pass on the differentiating components from the API Editor.
  * @param props using type Props
@@ -79,73 +29,17 @@ const DEFAULT_GRAPHQL_VARIABLE_WIDTH = 300;
  */
 function GraphQLEditorForm(props: Props) {
   const { actionName } = props;
-  const theme = EditorTheme.LIGHT;
-  const sizeableRef = useRef<HTMLDivElement>(null);
-  const [variableEditorWidth, setVariableEditorWidth] = React.useState(
-    DEFAULT_GRAPHQL_VARIABLE_WIDTH,
-  );
-
-  const { closeEditorLink } = useContext(ApiEditorContext);
-
-  /**
-   * Variable Editor's resizeable handler for the changing of width
-   */
-  const onVariableEditorWidthChange = useCallback((newWidth) => {
-    setVariableEditorWidth(newWidth);
-  }, []);
-
-  const { onMouseDown, onMouseUp, onTouchStart, resizing } =
-    useHorizontalResize(
-      sizeableRef,
-      onVariableEditorWidthChange,
-      undefined,
-      true,
-    );
 
   return (
     <CommonEditorForm
       {...props}
-      bodyUIComponent={
-        <BodyWrapper>
-          <QueryEditor
-            dataTreePath={`${actionName}.config.body`}
-            height="100%"
-            name="actionConfiguration.body"
-            theme={theme}
-          />
-          <div
-            className={`w-2 h-full -ml-2 group  cursor-ew-resize ${tailwindLayers.resizer}`}
-            onMouseDown={onMouseDown}
-            onTouchEnd={onMouseUp}
-            onTouchStart={onTouchStart}
-          >
-            <ResizerHandler
-              className={classNames({
-                "transform transition": true,
-              })}
-              resizing={resizing}
-            />
-          </div>
-          <ResizeableDiv
-            ref={sizeableRef}
-            style={{
-              width: `${variableEditorWidth}px`,
-              paddingRight: "2px",
-            }}
-          >
-            <VariableEditor actionName={actionName} theme={theme} />
-          </ResizeableDiv>
-        </BodyWrapper>
-      }
-      closeEditorLink={closeEditorLink}
-      defaultTabSelected={2}
+      bodyUIComponent={<PostBodyData actionName={actionName} />}
       formName={API_EDITOR_FORM_NAME}
       httpsMethods={GRAPHQL_HTTP_METHOD_OPTIONS}
       paginationUIComponent={
         <Pagination
           actionName={actionName}
           formName={API_EDITOR_FORM_NAME}
-          onTestClick={props.onRunClick}
           paginationType={props.paginationType}
           query={props.actionConfigurationBody}
         />
@@ -156,26 +50,10 @@ function GraphQLEditorForm(props: Props) {
 
 const selector = formValueSelector(API_EDITOR_FORM_NAME);
 
-interface ReduxDispatchProps {
-  updateDatasource: (datasource: Datasource) => void;
-}
-
-// TODO: Fix this the next time the file is edited
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const mapDispatchToProps = (dispatch: any): ReduxDispatchProps => ({
-  updateDatasource: (datasource) => {
-    dispatch(change(API_EDITOR_FORM_NAME, "datasource", datasource));
-  },
-});
-
 export default connect(
   // TODO: Fix this the next time the file is edited
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   (state: AppState, props: { pluginId: string; match?: any }) => {
-    const httpMethodFromForm = selector(
-      state,
-      "actionConfiguration.httpMethod",
-    );
     const actionConfigurationHeaders =
       selector(state, "actionConfiguration.headers") || [];
     const actionConfigurationParams =
@@ -201,50 +79,22 @@ export default connect(
       get(datasourceFromAction, "datasourceConfiguration.queryParameters") ||
       [];
 
-    const currentActionDatasourceId = selector(state, "datasource.id");
-
     const actionConfigurationBody =
       selector(state, "actionConfiguration.body") || "";
 
-    let hasResponse = false;
-    let suggestedWidgets;
     const actionResponse = getActionData(state, apiId);
 
-    if (actionResponse) {
-      hasResponse =
-        !isEmpty(actionResponse.statusCode) &&
-        actionResponse.statusCode[0] === "2";
-      suggestedWidgets = actionResponse.suggestedWidgets;
-    }
-
-    const actionData = getActionData(state, apiId);
-    const { responseDataTypes, responseDisplayFormat } =
-      actionResponseDisplayDataFormats(actionData);
-
     return {
       actionName,
       actionResponse,
-      apiId,
-      httpMethodFromForm,
       actionConfigurationHeaders,
       actionConfigurationParams,
       actionConfigurationBody,
-      currentActionDatasourceId,
       datasourceHeaders,
       datasourceParams,
       hintMessages,
-      datasources: state.entities.datasources.list.filter(
-        (d) => d.pluginId === props.pluginId,
-      ),
-      currentPageId: state.entities.pageList.currentPageId,
-      applicationId: state.entities.pageList.applicationId,
-      responseDataTypes,
-      responseDisplayFormat,
-      suggestedWidgets,
-      hasResponse,
     };
   },
-  mapDispatchToProps,
 )(
   // TODO: Fix this the next time the file is edited
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/app/client/src/pages/Editor/APIEditor/GraphQL/QueryEditor.tsx b/app/client/src/pages/Editor/APIEditor/GraphQL/QueryEditor.tsx
deleted file mode 100644
index 442d1669b085..000000000000
--- a/app/client/src/pages/Editor/APIEditor/GraphQL/QueryEditor.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import React from "react";
-import { Field } from "redux-form";
-// // Codemirror GraphQL plugins
-import "codemirror-graphql/hint";
-import "codemirror-graphql/info";
-import "codemirror-graphql/jump";
-import "codemirror-graphql/mode";
-
-import QueryWrapper from "./QueryWrapperWithCSS";
-import type { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig";
-import {
-  CodeEditorBorder,
-  EditorModes,
-  EditorSize,
-  TabBehaviour,
-} from "components/editorComponents/CodeEditor/EditorConfig";
-import styled from "styled-components";
-import { Text, TextType } from "@appsmith/ads-old";
-import LazyCodeEditor from "components/editorComponents/LazyCodeEditor";
-
-const QueryHeader = styled.div`
-  display: flex;
-  width: 100%;
-  background: var(--ads-v2-color-bg-subtle);
-  padding: 8px 16px;
-`;
-
-interface QueryProps {
-  // Path to store the value in the actual data object
-  dataTreePath: string;
-  // Height for the editor
-  height: string;
-  // Name of the field of the form
-  name: string;
-  // Theme to be used in CodeEditor
-  theme: EditorTheme;
-}
-
-/**
- * Query Editor is for writing Graphql query using the Codemirror Editor which we use
- * @param props Props that are required by the CodeEditor to render the query editor
- * @returns Component with Editor
- */
-function QueryEditor(props: QueryProps) {
-  const editorProps = {
-    mode: EditorModes.GRAPHQL_WITH_BINDING,
-    tabBehaviour: TabBehaviour.INDENT,
-    size: EditorSize.EXTENDED,
-    showLineNumbers: true,
-  };
-
-  return (
-    <QueryWrapper className="t--graphql-query-editor">
-      <QueryHeader>
-        <Text color={"var(--ads-v2-color-fg)"} type={TextType.H6}>
-          Query
-        </Text>
-      </QueryHeader>
-      <Field
-        border={CodeEditorBorder.NONE}
-        borderLess
-        component={LazyCodeEditor}
-        evaluatedPopUpLabel="Query"
-        {...props}
-        {...editorProps}
-      />
-    </QueryWrapper>
-  );
-}
-
-export default QueryEditor;
diff --git a/app/client/src/pages/Editor/APIEditor/GraphQL/QueryWrapperWithCSS.tsx b/app/client/src/pages/Editor/APIEditor/GraphQL/QueryWrapperWithCSS.tsx
deleted file mode 100644
index 37882af84dbb..000000000000
--- a/app/client/src/pages/Editor/APIEditor/GraphQL/QueryWrapperWithCSS.tsx
+++ /dev/null
@@ -1,250 +0,0 @@
-// import { Colors } from "constants/Colors";
-import styled from "styled-components";
-
-const QueryWrapper = styled.div`
-  display: flex;
-  flex-direction: column;
-  width: 100%;
-  padding-left: 2px;
-  /* This CSS is adopted from GraphiQL to maintain the consistency with the GraphiQL playground */
-  /* COLORS */
-
-  /* Comment */
-  .cm-comment {
-    color: #999;
-  }
-
-  /* Punctuation */
-  .cm-punctuation {
-    color: #555;
-  }
-
-  /* Keyword */
-  .cm-keyword,
-  span.cm-m-graphql.cm-attribute {
-    color: #b11a04;
-  }
-
-  /* OperationName, FragmentName */
-  .cm-def {
-    color: #d2054e;
-  }
-
-  /* FieldName */
-  .cm-property {
-    color: #1f61a0;
-  }
-
-  /* FieldAlias */
-  .cm-qualifier {
-    color: #1c92a9;
-  }
-
-  /* ArgumentName and ObjectFieldName */
-  .cm-attribute {
-    color: #8b2bb9;
-  }
-
-  /* Number */
-  .cm-number {
-    color: #2882f9;
-  }
-
-  /* String */
-  .cm-string {
-    color: #d64292;
-  }
-
-  /* Boolean */
-  .cm-builtin {
-    color: #d47509;
-  }
-
-  /* EnumValue */
-  .cm-string-2 {
-    color: #0b7fc7;
-  }
-
-  /* Variable */
-  .cm-variable {
-    color: #397d13;
-  }
-
-  /* Directive */
-  .cm-meta {
-    color: #b33086;
-  }
-
-  /* Type */
-  .cm-atom {
-    color: #ca9800;
-  }
-
-  /* CURSOR */
-
-  /* DEFAULT THEME */
-
-  .cm-s-default .cm-keyword {
-    color: #708;
-  }
-
-  .cm-s-default .cm-atom {
-    color: #219;
-  }
-
-  .cm-s-default .cm-number {
-    color: #164;
-  }
-
-  .cm-s-default .cm-def {
-    color: #00f;
-  }
-
-  .cm-s-default .cm-variable-2 {
-    color: #05a;
-  }
-
-  .cm-s-default .cm-variable-3 {
-    color: #085;
-  }
-
-  .cm-s-default .cm-comment {
-    color: #a50;
-  }
-
-  .cm-s-default .cm-string {
-    color: #a11;
-  }
-
-  .cm-s-default .cm-string-2 {
-    color: #f50;
-  }
-
-  .cm-s-default .cm-meta {
-    color: #555;
-  }
-
-  .cm-s-default .cm-qualifier {
-    color: #555;
-  }
-
-  .cm-s-default .cm-builtin {
-    color: #30a;
-  }
-
-  .cm-s-default .cm-bracket {
-    color: #997;
-  }
-
-  .cm-s-default .cm-tag {
-    color: #170;
-  }
-
-  .cm-s-default .cm-attribute {
-    color: #00c;
-  }
-
-  .cm-s-default .cm-header {
-    color: blue;
-  }
-
-  .cm-s-default .cm-quote {
-    color: #090;
-  }
-
-  .cm-s-default .cm-hr {
-    color: #999;
-  }
-
-  .cm-s-default .cm-link {
-    color: #00c;
-  }
-
-  .cm-negative {
-    color: #d44;
-  }
-
-  .cm-positive {
-    color: #292;
-  }
-
-  .cm-header,
-  .cm-strong {
-    font-weight: bold;
-  }
-
-  .cm-em {
-    font-style: italic;
-  }
-
-  .cm-link {
-    text-decoration: underline;
-  }
-
-  .cm-strikethrough {
-    text-decoration: line-through;
-  }
-
-  .cm-s-default .cm-error {
-    color: #f00;
-  }
-
-  .cm-invalidchar {
-    color: #f00;
-  }
-
-  .CodeMirror-composing {
-    border-bottom: 2px solid;
-  }
-
-  /* Default styles for common addons */
-
-  div.CodeMirror span.CodeMirror-matchingbracket {
-    color: #0f0;
-  }
-
-  .CodeMirror-matchingtag {
-    background: rgba(255, 150, 0, 0.3);
-  }
-
-  .CodeMirror-activeline-background {
-    background: #e8f2ff;
-  }
-
-  /* STOP */
-
-  .CodeMirror-info .type-name {
-    color: #ca9800;
-  }
-
-  .CodeMirror-info .field-name {
-    color: #1f61a0;
-  }
-
-  .CodeMirror-info .enum-value {
-    color: #0b7fc7;
-  }
-
-  .CodeMirror-info .arg-name {
-    color: #8b2bb9;
-  }
-
-  .CodeMirror-info .directive-name {
-    color: #b33086;
-  }
-
-  .CodeMirror-jump-token {
-    text-decoration: underline;
-    cursor: pointer;
-  }
-
-  &&&&& .CodeMirror {
-    border: 0;
-  }
-
-  &&& .CodeMirror-gutters {
-    background: var(--ads-v2-color-bg-subtle);
-  }
-`;
-
-export default QueryWrapper;
diff --git a/app/client/src/pages/Editor/APIEditor/GraphQL/VariableEditor.tsx b/app/client/src/pages/Editor/APIEditor/GraphQL/VariableEditor.tsx
deleted file mode 100644
index 157978191e93..000000000000
--- a/app/client/src/pages/Editor/APIEditor/GraphQL/VariableEditor.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-import React from "react";
-import type { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig";
-import {
-  CodeEditorBorder,
-  EditorModes,
-  EditorSize,
-  TabBehaviour,
-} from "components/editorComponents/CodeEditor/EditorConfig";
-import styled from "styled-components";
-import { Text, TextType } from "@appsmith/ads-old";
-import DynamicTextField from "components/editorComponents/form/fields/DynamicTextField";
-import { AutocompleteDataType } from "utils/autocomplete/AutocompleteDataType";
-
-const VariableWrapper = styled.div`
-  display: flex;
-  flex-direction: column;
-  width: 100%;
-  flex-shrink: 0;
-  &&&&& .CodeMirror {
-    border: 0px;
-  }
-  &&& .CodeMirror-gutters {
-    background: var(--ads-v2-color-bg-subtle);
-  }
-`;
-
-const VariableHeader = styled.div`
-  display: flex;
-  width: 100%;
-  background: var(--ads-v2-color-bg-subtle);
-  padding: 8px 16px;
-`;
-
-const EXPECTED_VARIABLE = {
-  type: "object",
-  example:
-    '{\n  "name":"{{ inputName.property }}",\n  "preference":"{{ dropdownName.property }}"\n}',
-  autocompleteDataType: AutocompleteDataType.OBJECT,
-};
-
-interface VariableProps {
-  // Name of the action to define the path to the config property
-  actionName: string;
-  // Theme to be used in CodeEditor
-  theme: EditorTheme;
-}
-
-/**
- * Variable Editor is for writing Graphql variables using the Codemirror Editor which we use for JSON
- * @param props Props that are required by the CodeEditor to render the variable editor
- * @returns Component with Editor
- */
-function VariableEditor(props: VariableProps) {
-  return (
-    <VariableWrapper className="t--graphql-variable-editor">
-      <VariableHeader>
-        <Text color={"var(--ads-v2-color-fg)"} type={TextType.H6}>
-          Query variables
-        </Text>
-      </VariableHeader>
-      <DynamicTextField
-        border={CodeEditorBorder.NONE}
-        borderLess
-        dataTreePath={`${props.actionName}.config.pluginSpecifiedTemplates[1].value`}
-        evaluatedPopUpLabel={"Query variables"}
-        expected={EXPECTED_VARIABLE}
-        height="100%"
-        mode={EditorModes.JSON_WITH_BINDING}
-        name="actionConfiguration.pluginSpecifiedTemplates[1].value"
-        placeholder={`${EXPECTED_VARIABLE.example}\n\n\\\\Take widget inputs using {{ }}`}
-        showLightningMenu={false}
-        showLineNumbers
-        size={EditorSize.EXTENDED}
-        tabBehaviour={TabBehaviour.INDENT}
-        theme={props.theme}
-      />
-    </VariableWrapper>
-  );
-}
-
-export default VariableEditor;
diff --git a/app/client/src/pages/Editor/APIEditor/RestAPIForm.tsx b/app/client/src/pages/Editor/APIEditor/RestAPIForm.tsx
index 1435dca07e8d..893fe98c2524 100644
--- a/app/client/src/pages/Editor/APIEditor/RestAPIForm.tsx
+++ b/app/client/src/pages/Editor/APIEditor/RestAPIForm.tsx
@@ -1,28 +1,20 @@
-import React, { useContext } from "react";
+import React from "react";
 import { connect } from "react-redux";
 import type { InjectedFormProps } from "redux-form";
-import { change, formValueSelector, reduxForm } from "redux-form";
+import { formValueSelector, reduxForm } from "redux-form";
 import { API_EDITOR_FORM_NAME } from "ee/constants/forms";
 import type { Action } from "entities/Action";
-import PostBodyData from "./PostBodyData";
+import PostBodyData from "PluginActionEditor/components/PluginActionForm/components/ApiEditor/PostBodyData";
 import type { AppState } from "ee/reducers";
 import { getApiName } from "selectors/formSelectors";
 import { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig";
 import get from "lodash/get";
-import type { Datasource } from "entities/Datasource";
-import {
-  getAction,
-  getActionData,
-  getActionResponses,
-} from "ee/selectors/entitiesSelector";
-import { isEmpty } from "lodash";
+import { getAction, getActionResponses } from "ee/selectors/entitiesSelector";
 import type { CommonFormProps } from "./CommonEditorForm";
 import CommonEditorForm from "./CommonEditorForm";
-import Pagination from "./Pagination";
+import Pagination from "PluginActionEditor/components/PluginActionForm/components/ApiEditor/Pagination";
 import { getCurrentEnvironmentId } from "ee/selectors/environmentSelectors";
-import { ApiEditorContext } from "./ApiEditorContext";
-import { actionResponseDisplayDataFormats } from "../utils";
-import { HTTP_METHOD_OPTIONS } from "constants/ApiEditorConstants/CommonApiConstants";
+import { HTTP_METHOD_OPTIONS } from "PluginActionEditor/constants/CommonApiConstants";
 
 type APIFormProps = {
   httpMethodFromForm: string;
@@ -31,7 +23,6 @@ type APIFormProps = {
 type Props = APIFormProps & InjectedFormProps<Action, APIFormProps>;
 
 function ApiEditorForm(props: Props) {
-  const { closeEditorLink } = useContext(ApiEditorContext);
   const { actionName } = props;
   const theme = EditorTheme.LIGHT;
 
@@ -41,7 +32,6 @@ function ApiEditorForm(props: Props) {
       bodyUIComponent={
         <PostBodyData dataTreePath={`${actionName}.config`} theme={theme} />
       }
-      closeEditorLink={closeEditorLink}
       formName={API_EDITOR_FORM_NAME}
       httpsMethods={HTTP_METHOD_OPTIONS}
       paginationUIComponent={
@@ -58,19 +48,7 @@ function ApiEditorForm(props: Props) {
 
 const selector = formValueSelector(API_EDITOR_FORM_NAME);
 
-interface ReduxDispatchProps {
-  updateDatasource: (datasource: Datasource) => void;
-}
-
-// TODO: Fix this the next time the file is edited
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const mapDispatchToProps = (dispatch: any): ReduxDispatchProps => ({
-  updateDatasource: (datasource) => {
-    dispatch(change(API_EDITOR_FORM_NAME, "datasource", datasource));
-  },
-});
-
-export default connect((state: AppState, props: { pluginId: string }) => {
+export default connect((state: AppState) => {
   const httpMethodFromForm = selector(state, "actionConfiguration.httpMethod");
   const actionConfigurationHeaders =
     selector(state, "actionConfiguration.headers") || [];
@@ -110,19 +88,6 @@ export default connect((state: AppState, props: { pluginId: string }) => {
 
   const responses = getActionResponses(state);
   const actionResponse = responses[apiId];
-  let hasResponse = false;
-  let suggestedWidgets;
-
-  if (actionResponse) {
-    hasResponse =
-      !isEmpty(actionResponse.statusCode) &&
-      actionResponse.statusCode[0] === "2";
-    suggestedWidgets = actionResponse.suggestedWidgets;
-  }
-
-  const actionData = getActionData(state, apiId);
-  const { responseDataTypes, responseDisplayFormat } =
-    actionResponseDisplayDataFormats(actionData);
 
   return {
     actionName,
@@ -136,17 +101,8 @@ export default connect((state: AppState, props: { pluginId: string }) => {
     datasourceHeaders,
     datasourceParams,
     hintMessages,
-    datasources: state.entities.datasources.list.filter(
-      (d) => d.pluginId === props.pluginId,
-    ),
-    currentPageId: state.entities.pageList.currentPageId,
-    applicationId: state.entities.pageList.applicationId,
-    responseDataTypes,
-    responseDisplayFormat,
-    suggestedWidgets,
-    hasResponse,
   };
-}, mapDispatchToProps)(
+})(
   reduxForm<Action, APIFormProps>({
     form: API_EDITOR_FORM_NAME,
     enableReinitialize: true,
diff --git a/app/client/src/pages/Editor/APIEditor/index.tsx b/app/client/src/pages/Editor/APIEditor/index.tsx
index 31328d250556..8e97ac8ec2c7 100644
--- a/app/client/src/pages/Editor/APIEditor/index.tsx
+++ b/app/client/src/pages/Editor/APIEditor/index.tsx
@@ -8,11 +8,7 @@ import {
   getPluginSettingConfigs,
   getPlugins,
 } from "ee/selectors/entitiesSelector";
-import {
-  deleteAction,
-  runAction,
-  saveActionName,
-} from "actions/pluginActionActions";
+import { runAction, saveActionName } from "actions/pluginActionActions";
 import AnalyticsUtil from "ee/utils/AnalyticsUtil";
 import Editor from "./Editor";
 import BackToCanvas from "components/common/BackToCanvas";
@@ -42,7 +38,6 @@ import { resolveIcon } from "../utils";
 import { ENTITY_ICON_SIZE, EntityIcon } from "../Explorer/ExplorerIcons";
 import { getIDEViewMode } from "selectors/ideSelectors";
 import { EditorViewMode } from "ee/entities/IDE/constants";
-import { AppPluginActionEditor } from "pages/Editor/AppPluginActionEditor";
 
 type ApiEditorWrapperProps = RouteComponentProps<APIEditorRouteParams>;
 
@@ -162,33 +157,15 @@ function ApiEditorWrapper(props: ApiEditorWrapperProps) {
     return <BackToCanvas basePageId={basePageId} />;
   }, [basePageId]);
 
-  const handleDeleteClick = useCallback(() => {
-    AnalyticsUtil.logEvent("DELETE_API_CLICK", {
-      apiName,
-      apiID: action?.id,
-      pageName,
-    });
-    dispatch(deleteAction({ id: action?.id ?? "", name: apiName }));
-  }, [pages, basePageId, apiName, action?.id, dispatch, pageName]);
-
   const notification = useMemo(() => {
     if (!isConverting) return null;
 
     return <ConvertEntityNotification icon={icon} name={action?.name || ""} />;
   }, [action?.name, isConverting, icon]);
 
-  const isActionRedesignEnabled = useFeatureFlag(
-    FEATURE_FLAG.release_actions_redesign_enabled,
-  );
-
-  if (isActionRedesignEnabled) {
-    return <AppPluginActionEditor />;
-  }
-
   return (
     <ApiEditorContextProvider
       actionRightPaneBackLink={actionRightPaneBackLink}
-      handleDeleteClick={handleDeleteClick}
       handleRunClick={handleRunClick}
       moreActionsMenu={moreActionsMenu}
       notification={notification}
diff --git a/app/client/src/pages/Editor/ActionForm/Section/index.tsx b/app/client/src/pages/Editor/ActionForm/Section/index.tsx
deleted file mode 100644
index 9d5cfbbd1cb3..000000000000
--- a/app/client/src/pages/Editor/ActionForm/Section/index.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import React from "react";
-import styles from "./styles.module.css";
-
-interface SectionProps {
-  children: React.ReactNode;
-  isStandalone?: boolean;
-}
-
-const Section: React.FC<SectionProps> = ({
-  children,
-  isStandalone = false,
-}) => {
-  return (
-    <div className={styles.section} data-standalone={isStandalone.toString()}>
-      {children}
-    </div>
-  );
-};
-
-export { Section };
diff --git a/app/client/src/pages/Editor/ActionForm/Section/styles.module.css b/app/client/src/pages/Editor/ActionForm/Section/styles.module.css
deleted file mode 100644
index e3d2a2d2f309..000000000000
--- a/app/client/src/pages/Editor/ActionForm/Section/styles.module.css
+++ /dev/null
@@ -1,16 +0,0 @@
-.section {
-  display: flex;
-  flex-direction: column;
-  gap: var(--ads-v2-spaces-4);
-  width: 100%;
-  max-width: 800px;
-  justify-content: center;
-
-  &[data-standalone="false"] {
-    padding-block: var(--ads-v2-spaces-6);
-  }
-
-  &[data-standalone="false"]:not(:last-child) {
-    border-bottom: 1px solid var(--ads-v2-color-border);
-  }
-}
diff --git a/app/client/src/pages/Editor/ActionForm/Zone/index.tsx b/app/client/src/pages/Editor/ActionForm/Zone/index.tsx
deleted file mode 100644
index 8e54c210c00a..000000000000
--- a/app/client/src/pages/Editor/ActionForm/Zone/index.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from "react";
-import styles from "./styles.module.css";
-
-interface ZoneProps {
-  children: React.ReactNode;
-  layout?: "single_column" | "double_column";
-}
-
-const Zone: React.FC<ZoneProps> = ({ children, layout = "single_column" }) => {
-  return (
-    <div className={styles.zone} data-layout={layout}>
-      {children}
-    </div>
-  );
-};
-
-export { Zone };
diff --git a/app/client/src/pages/Editor/ActionSettings.tsx b/app/client/src/pages/Editor/ActionSettings.tsx
index 003b085d3971..7b1ce7df8d67 100644
--- a/app/client/src/pages/Editor/ActionSettings.tsx
+++ b/app/client/src/pages/Editor/ActionSettings.tsx
@@ -4,6 +4,7 @@ import FormControl from "./FormControl";
 import log from "loglevel";
 import type { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig";
 import styled from "styled-components";
+import { Text } from "@appsmith/ads";
 
 interface ActionSettingsProps {
   // TODO: Fix this the next time the file is edited
@@ -13,32 +14,44 @@ interface ActionSettingsProps {
   theme?: EditorTheme;
 }
 
-const FormRow = styled.div`
-  margin-bottom: ${(props) => props.theme.spaces[10] + 1}px;
-`;
-
 const ActionSettingsWrapper = styled.div`
   width: 100%;
   max-width: 600px;
   padding-bottom: 1px;
-  .form-config-top {
-    flex-grow: 1;
-  }
+  display: flex;
+  flex-direction: column;
+  gap: var(--ads-v2-spaces-4);
+
   .t--form-control-SWITCH {
     display: flex;
     flex-shrink: 0;
     align-items: center;
     margin-left: 24px;
   }
+
+  .form-config-top {
+    flex-grow: 1;
+    .form-label {
+      min-width: unset;
+      width: 100%;
+      line-height: 1.43;
+    }
+  }
 `;
 
 function ActionSettings(props: ActionSettingsProps): JSX.Element {
   return (
     <ActionSettingsWrapper>
-      {/* TODO: Fix this the next time the file is edited */}
-      {/* eslint-disable-next-line @typescript-eslint/no-explicit-any */}
-      {props.actionSettingsConfig.map((section: any) =>
-        renderEachConfig(section, props.formName),
+      {!props.actionSettingsConfig ? (
+        <Text color="var(--ads-v2-color-fg-error)" kind="heading-m">
+          Error: No settings config found
+        </Text>
+      ) : (
+        /* TODO: Fix this the next time the file is edited */
+        /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
+        props.actionSettingsConfig.map((section: any) =>
+          renderEachConfig(section, props.formName),
+        )
       )}
     </ActionSettingsWrapper>
   );
@@ -55,9 +68,11 @@ const renderEachConfig = (section: any, formName: string): any => {
         const { configProperty } = formControlOrSection;
 
         return (
-          <FormRow key={configProperty}>
-            <FormControl config={formControlOrSection} formName={formName} />
-          </FormRow>
+          <FormControl
+            config={formControlOrSection}
+            formName={formName}
+            key={configProperty}
+          />
         );
       } catch (e) {
         log.error(e);
diff --git a/app/client/src/ce/pages/Editor/AppPluginActionEditor/components/AppPluginActionToolbar.tsx b/app/client/src/pages/Editor/AppPluginActionEditor/components/AppPluginActionToolbar.tsx
similarity index 55%
rename from app/client/src/ce/pages/Editor/AppPluginActionEditor/components/AppPluginActionToolbar.tsx
rename to app/client/src/pages/Editor/AppPluginActionEditor/components/AppPluginActionToolbar.tsx
index 8606cee42fb3..6e17b78ba5a4 100644
--- a/app/client/src/ce/pages/Editor/AppPluginActionEditor/components/AppPluginActionToolbar.tsx
+++ b/app/client/src/pages/Editor/AppPluginActionEditor/components/AppPluginActionToolbar.tsx
@@ -1,9 +1,9 @@
 import React from "react";
 import { PluginActionToolbar } from "PluginActionEditor";
-import AppPluginActionMenu from "./PluginActionMoreActions";
+import { ToolbarMenu } from "./ToolbarMenu";
 
 const AppPluginActionToolbar = () => {
-  return <PluginActionToolbar menuContent={<AppPluginActionMenu />} />;
+  return <PluginActionToolbar menuContent={<ToolbarMenu />} />;
 };
 
 export default AppPluginActionToolbar;
diff --git a/app/client/src/ce/pages/Editor/AppPluginActionEditor/components/ConvertToModule/ConvertToModuleCTA.tsx b/app/client/src/pages/Editor/AppPluginActionEditor/components/ConvertToModule/ConvertToModuleCTA.tsx
similarity index 100%
rename from app/client/src/ce/pages/Editor/AppPluginActionEditor/components/ConvertToModule/ConvertToModuleCTA.tsx
rename to app/client/src/pages/Editor/AppPluginActionEditor/components/ConvertToModule/ConvertToModuleCTA.tsx
diff --git a/app/client/src/ce/pages/Editor/AppPluginActionEditor/components/ConvertToModule/ConvertToModuleCallout.tsx b/app/client/src/pages/Editor/AppPluginActionEditor/components/ConvertToModule/ConvertToModuleCallout.tsx
similarity index 100%
rename from app/client/src/ce/pages/Editor/AppPluginActionEditor/components/ConvertToModule/ConvertToModuleCallout.tsx
rename to app/client/src/pages/Editor/AppPluginActionEditor/components/ConvertToModule/ConvertToModuleCallout.tsx
diff --git a/app/client/src/ce/pages/Editor/AppPluginActionEditor/components/ConvertToModule/ConvertToModuleDisabler.tsx b/app/client/src/pages/Editor/AppPluginActionEditor/components/ConvertToModule/ConvertToModuleDisabler.tsx
similarity index 100%
rename from app/client/src/ce/pages/Editor/AppPluginActionEditor/components/ConvertToModule/ConvertToModuleDisabler.tsx
rename to app/client/src/pages/Editor/AppPluginActionEditor/components/ConvertToModule/ConvertToModuleDisabler.tsx
diff --git a/app/client/src/ce/pages/Editor/AppPluginActionEditor/components/ConvertToModule/index.tsx b/app/client/src/pages/Editor/AppPluginActionEditor/components/ConvertToModule/index.tsx
similarity index 100%
rename from app/client/src/ce/pages/Editor/AppPluginActionEditor/components/ConvertToModule/index.tsx
rename to app/client/src/pages/Editor/AppPluginActionEditor/components/ConvertToModule/index.tsx
diff --git a/app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/Copy.tsx b/app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/Copy.tsx
new file mode 100644
index 000000000000..2847f3481bf9
--- /dev/null
+++ b/app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/Copy.tsx
@@ -0,0 +1,49 @@
+import { useDispatch, useSelector } from "react-redux";
+import { getPageList } from "ee/selectors/entitiesSelector";
+import { usePluginActionContext } from "PluginActionEditor";
+import React, { useCallback } from "react";
+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 {
+  disabled?: boolean;
+}
+
+export const Copy = ({ disabled }: Props) => {
+  const menuPages = useSelector(getPageList);
+  const { action } = usePluginActionContext();
+  const dispatch = useDispatch();
+
+  const copyActionToPage = useCallback(
+    (pageId: string) =>
+      dispatch(
+        copyActionRequest({
+          id: action.id,
+          destinationEntityId: pageId,
+          name: action.name,
+        }),
+      ),
+    [action.id, action.name, dispatch],
+  );
+
+  return (
+    <MenuSub>
+      <MenuSubTrigger disabled={disabled} startIcon="duplicate">
+        {createMessage(CONTEXT_COPY)}
+      </MenuSubTrigger>
+      <MenuSubContent>
+        {menuPages.map((page) => {
+          return (
+            <PageMenuItem
+              key={page.basePageId}
+              onSelect={copyActionToPage}
+              page={page}
+            />
+          );
+        })}
+      </MenuSubContent>
+    </MenuSub>
+  );
+};
diff --git a/app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/Delete.tsx b/app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/Delete.tsx
new file mode 100644
index 000000000000..41c0243856b2
--- /dev/null
+++ b/app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/Delete.tsx
@@ -0,0 +1,40 @@
+import { useHandleDeleteClick } from "PluginActionEditor/hooks";
+import React, { useCallback, useState } from "react";
+import {
+  CONFIRM_CONTEXT_DELETE,
+  CONTEXT_DELETE,
+  createMessage,
+} from "ee/constants/messages";
+import { MenuItem } from "@appsmith/ads";
+
+interface Props {
+  disabled?: boolean;
+}
+
+export const Delete = ({ disabled }: Props) => {
+  const { handleDeleteClick } = useHandleDeleteClick();
+  const [confirmDelete, setConfirmDelete] = useState(false);
+
+  const handleSelect = useCallback(
+    (e?: Event) => {
+      e?.preventDefault();
+      confirmDelete ? handleDeleteClick({}) : setConfirmDelete(true);
+    },
+    [confirmDelete, handleDeleteClick],
+  );
+
+  const menuLabel = confirmDelete
+    ? createMessage(CONFIRM_CONTEXT_DELETE)
+    : createMessage(CONTEXT_DELETE);
+
+  return (
+    <MenuItem
+      className="t--apiFormDeleteBtn error-menuitem"
+      disabled={disabled}
+      onSelect={handleSelect}
+      startIcon="trash"
+    >
+      {menuLabel}
+    </MenuItem>
+  );
+};
diff --git a/app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/Move.tsx b/app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/Move.tsx
new file mode 100644
index 000000000000..a73e52e8bb05
--- /dev/null
+++ b/app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/Move.tsx
@@ -0,0 +1,65 @@
+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";
+import { moveActionRequest } from "actions/pluginActionActions";
+import {
+  MenuItem,
+  MenuSub,
+  MenuSubContent,
+  MenuSubTrigger,
+} from "@appsmith/ads";
+import { CONTEXT_MOVE, createMessage } from "ee/constants/messages";
+import { PageMenuItem } from "./PageMenuItem";
+
+interface Props {
+  disabled?: boolean;
+}
+
+export const Move = ({ disabled }: Props) => {
+  const dispatch = useDispatch();
+  const { action } = usePluginActionContext();
+
+  const currentPageId = useSelector(getCurrentPageId);
+  const allPages = useSelector(getPageList);
+  const menuPages = useMemo(() => {
+    return allPages.filter((page) => page.pageId !== currentPageId);
+  }, [allPages, currentPageId]);
+
+  const moveActionToPage = useCallback(
+    (destinationPageId: string) =>
+      dispatch(
+        moveActionRequest({
+          id: action.id,
+          destinationPageId,
+          originalPageId: currentPageId,
+          name: action.name,
+        }),
+      ),
+    [dispatch, action.id, action.name, currentPageId],
+  );
+
+  return (
+    <MenuSub>
+      <MenuSubTrigger disabled={disabled} startIcon="swap-horizontal">
+        {createMessage(CONTEXT_MOVE)}
+      </MenuSubTrigger>
+      <MenuSubContent>
+        {menuPages.length > 1 ? (
+          menuPages.map((page) => {
+            return (
+              <PageMenuItem
+                key={page.basePageId}
+                onSelect={moveActionToPage}
+                page={page}
+              />
+            );
+          })
+        ) : (
+          <MenuItem key="no-pages">No pages</MenuItem>
+        )}
+      </MenuSubContent>
+    </MenuSub>
+  );
+};
diff --git a/app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/PageMenuItem.tsx b/app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/PageMenuItem.tsx
new file mode 100644
index 000000000000..129f9c9a2edf
--- /dev/null
+++ b/app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/PageMenuItem.tsx
@@ -0,0 +1,14 @@
+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;
+}) => {
+  const handleOnSelect = useCallback(() => {
+    props.onSelect(props.page.pageId);
+  }, [props]);
+
+  return <MenuItem onSelect={handleOnSelect}>{props.page.pageName}</MenuItem>;
+};
diff --git a/app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/Rename.tsx b/app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/Rename.tsx
new file mode 100644
index 000000000000..471b6041b26e
--- /dev/null
+++ b/app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/Rename.tsx
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 000000000000..27121fbacdd3
--- /dev/null
+++ b/app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/ToolbarMenu.tsx
@@ -0,0 +1,43 @@
+import React from "react";
+import { MenuSeparator } from "@appsmith/ads";
+import {
+  getHasDeleteActionPermission,
+  getHasManageActionPermission,
+} from "ee/utils/BusinessFeatures/permissionPageHelpers";
+import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
+import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
+import {
+  usePluginActionContext,
+  DocsMenuItem as Docs,
+} from "PluginActionEditor";
+import { ConvertToModuleCTA } from "../ConvertToModule";
+import { Move } from "./Move";
+import { Copy } from "./Copy";
+import { Delete } from "./Delete";
+import { RenameMenuItem } from "IDE";
+
+export const ToolbarMenu = () => {
+  const { action } = usePluginActionContext();
+
+  const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
+  const isChangePermitted = getHasManageActionPermission(
+    isFeatureEnabled,
+    action.userPermissions,
+  );
+  const isDeletePermitted = getHasDeleteActionPermission(
+    isFeatureEnabled,
+    action.userPermissions,
+  );
+
+  return (
+    <>
+      <RenameMenuItem disabled={!isChangePermitted} entityId={action.id} />
+      <ConvertToModuleCTA />
+      <Copy disabled={!isChangePermitted} />
+      <Move disabled={!isChangePermitted} />
+      <Docs />
+      <MenuSeparator />
+      <Delete disabled={!isDeletePermitted} />
+    </>
+  );
+};
diff --git a/app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/index.ts b/app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/index.ts
new file mode 100644
index 000000000000..2b4a2600ac1b
--- /dev/null
+++ b/app/client/src/pages/Editor/AppPluginActionEditor/components/ToolbarMenu/index.ts
@@ -0,0 +1 @@
+export { ToolbarMenu } from "./ToolbarMenu";
diff --git a/app/client/src/pages/Editor/AppPluginActionEditor/index.ts b/app/client/src/pages/Editor/AppPluginActionEditor/index.ts
deleted file mode 100644
index 8413ee6ce3fa..000000000000
--- a/app/client/src/pages/Editor/AppPluginActionEditor/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as AppPluginActionEditor } from "ee/pages/Editor/AppPluginActionEditor/AppPluginActionEditor";
diff --git a/app/client/src/ce/pages/Editor/AppPluginActionEditor/AppPluginActionEditor.tsx b/app/client/src/pages/Editor/AppPluginActionEditor/index.tsx
similarity index 71%
rename from app/client/src/ce/pages/Editor/AppPluginActionEditor/AppPluginActionEditor.tsx
rename to app/client/src/pages/Editor/AppPluginActionEditor/index.tsx
index bad7cdba93c1..80f758bbca49 100644
--- a/app/client/src/ce/pages/Editor/AppPluginActionEditor/AppPluginActionEditor.tsx
+++ b/app/client/src/pages/Editor/AppPluginActionEditor/index.tsx
@@ -9,10 +9,15 @@ import {
   ConvertToModuleCallout,
 } from "./components/ConvertToModule";
 import AppPluginActionToolbar from "./components/AppPluginActionToolbar";
+import { useLocation } from "react-router";
+import { identifyEntityFromPath } from "navigation/FocusEntity";
 
 const AppPluginActionEditor = () => {
+  const { pathname } = useLocation();
+  const entity = identifyEntityFromPath(pathname);
+
   return (
-    <PluginActionEditor>
+    <PluginActionEditor actionId={entity.id}>
       <ConvertToModuleDisabler>
         <AppPluginActionToolbar />
         <ConvertToModuleCallout />
diff --git a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/index.tsx b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/index.tsx
index f9ab07a72fd3..4b36172798b2 100644
--- a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/index.tsx
+++ b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/index.tsx
@@ -126,7 +126,7 @@ function AppSettings() {
   const SectionHeadersConfig: SectionHeaderProps[] = [
     {
       id: "t--general-settings-header",
-      icon: "settings-2-line",
+      icon: "settings-v3",
       isSelected: selectedTab.type === AppSettingsTabs.General,
       name: createMessage(GENERAL_SETTINGS_SECTION_HEADER),
       onClick: () => {
diff --git a/app/client/src/pages/Editor/CanvasLayoutConversion/hooks/useShowSnapShotBanner.ts b/app/client/src/pages/Editor/CanvasLayoutConversion/hooks/useShowSnapShotBanner.ts
index 6c430b98450c..ed09ba647cc4 100644
--- a/app/client/src/pages/Editor/CanvasLayoutConversion/hooks/useShowSnapShotBanner.ts
+++ b/app/client/src/pages/Editor/CanvasLayoutConversion/hooks/useShowSnapShotBanner.ts
@@ -1,7 +1,7 @@
 import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
 import { EditorState } from "ee/entities/IDE/constants";
 import { getReadableSnapShotDetails } from "layoutSystems/autolayout/utils/AutoLayoutUtils";
-import { useCurrentAppState } from "pages/Editor/IDE/hooks";
+import { useCurrentAppState } from "pages/Editor/IDE/hooks/useCurrentAppState";
 import { useSelector } from "react-redux";
 import { getIsAppSettingsPaneWithNavigationTabOpen } from "selectors/appSettingsPaneSelectors";
 import { getSnapshotUpdatedTime } from "selectors/autoLayoutSelectors";
diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/ChatBot/ChatBot.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/ChatBot/ChatBot.tsx
new file mode 100644
index 000000000000..ae3c98e9c82f
--- /dev/null
+++ b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/ChatBot/ChatBot.tsx
@@ -0,0 +1,103 @@
+import React, {
+  useCallback,
+  useContext,
+  useEffect,
+  useMemo,
+  useRef,
+} from "react";
+import type { ContentProps } from "../CodeEditors/types";
+import { CustomWidgetBuilderContext } from "../..";
+import {
+  CUSTOM_WIDGET_AI_BOT_MESSAGE_RESPONSE_DEBOUNCE_TIMEOUT,
+  CUSTOM_WIDGET_AI_BOT_URL,
+  CUSTOM_WIDGET_AI_CHAT_TYPE,
+  CUSTOM_WIDGET_AI_INITIALISED_MESSAGE,
+} from "../../constants";
+import { isObject } from "lodash";
+
+export const ChatBot = (props: ContentProps) => {
+  const ref = useRef<HTMLIFrameElement>(null);
+  const lastUpdateFromBot = useRef<number>(0);
+  const { bulkUpdate, parentEntityId, uncompiledSrcDoc, widgetId } = useContext(
+    CustomWidgetBuilderContext,
+  );
+
+  const handleSrcDocUpdates = useCallback(() => {
+    // Don't send updates back to bot if the last update came from the bot within the last 100ms
+    if (
+      Date.now() - lastUpdateFromBot.current <
+      CUSTOM_WIDGET_AI_BOT_MESSAGE_RESPONSE_DEBOUNCE_TIMEOUT
+    ) {
+      return;
+    }
+
+    // Send src doc to the chatbot iframe
+    if (ref.current && ref.current.contentWindow && uncompiledSrcDoc) {
+      ref.current.contentWindow.postMessage(
+        {
+          html_code: uncompiledSrcDoc.html,
+          css_code: uncompiledSrcDoc.css,
+          js_code: uncompiledSrcDoc.js,
+          chatType: CUSTOM_WIDGET_AI_CHAT_TYPE,
+        },
+        "*",
+      );
+    }
+  }, [uncompiledSrcDoc]);
+
+  const updateContents = useCallback(
+    (
+      event: MessageEvent<
+        string | { html_code?: string; css_code?: string; js_code?: string }
+      >,
+    ) => {
+      const iframeWindow =
+        ref.current?.contentWindow || ref.current?.contentDocument?.defaultView;
+
+      // Accept messages only from the current iframe
+      if (event.source !== iframeWindow) return;
+
+      if (event.data === CUSTOM_WIDGET_AI_INITIALISED_MESSAGE) {
+        handleSrcDocUpdates();
+
+        return;
+      }
+
+      if (!bulkUpdate) return;
+
+      if (isObject(event.data)) {
+        lastUpdateFromBot.current = Date.now();
+
+        bulkUpdate({
+          html: event.data.html_code || "",
+          css: event.data.css_code || "",
+          js: event.data.js_code || "",
+        });
+      }
+    },
+    [bulkUpdate, handleSrcDocUpdates],
+  );
+
+  useEffect(
+    function addEventListenerForBotUpdates() {
+      // add a listener to update the contents
+      window.addEventListener("message", updateContents, false);
+
+      // clean up
+      return () => window.removeEventListener("message", updateContents, false);
+    },
+    [updateContents],
+  );
+
+  useEffect(handleSrcDocUpdates, [handleSrcDocUpdates]);
+
+  const instanceId = `${widgetId}-${parentEntityId}`;
+
+  const srcUrl = useMemo(() => {
+    return CUSTOM_WIDGET_AI_BOT_URL(instanceId);
+  }, [instanceId]);
+
+  return (
+    <iframe height={`${props.height}px`} ref={ref} src={srcUrl} width="100%" />
+  );
+};
diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/index.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/index.tsx
index 8b78e09196f8..4003d2eae0cf 100644
--- a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/index.tsx
+++ b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/index.tsx
@@ -1,7 +1,6 @@
 import React from "react";
 import styles from "./styles.module.css";
 import WidgetName from "./widgetName";
-import LayoutControls from "./layoutControls";
 import ReferenceTrigger from "./referenceTrigger";
 import { CodeTemplates } from "./CodeTemplates";
 
@@ -11,7 +10,6 @@ export default function Header() {
       <div className={styles.headerControlsLeft}>
         <WidgetName />
         <CodeTemplates />
-        <LayoutControls />
       </div>
       <div className={styles.headerControlsRight}>
         <ReferenceTrigger />
diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/layoutControls.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/layoutControls.tsx
deleted file mode 100644
index 1b748d6c58ec..000000000000
--- a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/layoutControls.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import { SegmentedControl } from "@appsmith/ads";
-import React, { useContext } from "react";
-import { CustomWidgetBuilderContext } from "../..";
-import styles from "./styles.module.css";
-import styled from "styled-components";
-import { CUSTOM_WIDGET_FEATURE, createMessage } from "ee/constants/messages";
-import AnalyticsUtil from "ee/utils/AnalyticsUtil";
-
-const StyledSegmentedControl = styled(SegmentedControl)`
-  & .ads-v2-icon {
-    transform: rotate(90deg);
-  }
-`;
-
-export default function LayoutControls() {
-  const { selectedLayout, selectLayout, widgetId } = useContext(
-    CustomWidgetBuilderContext,
-  );
-
-  const onChange = (value: string) => {
-    selectLayout?.(value);
-
-    AnalyticsUtil.logEvent("CUSTOM_WIDGET_BUILDER_LAYOUT_CHANGED", {
-      widgetId: widgetId,
-      layoutName: value,
-    });
-  };
-
-  return (
-    <div className={styles.layoutControl}>
-      <StyledSegmentedControl
-        onChange={onChange}
-        options={[
-          {
-            label: createMessage(CUSTOM_WIDGET_FEATURE.layout.split),
-            startIcon: "layout-column-line",
-            value: "split",
-          },
-          {
-            label: createMessage(CUSTOM_WIDGET_FEATURE.layout.tab),
-            startIcon: "layout-left-2-line",
-            value: "tabs",
-          },
-        ]}
-        value={selectedLayout}
-      />
-    </div>
-  );
-}
diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Layouts/SplitLayout/index.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Layouts/SplitLayout/index.tsx
deleted file mode 100644
index 9f0b9d6f2f34..000000000000
--- a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Layouts/SplitLayout/index.tsx
+++ /dev/null
@@ -1,112 +0,0 @@
-import React, { useEffect, useMemo, useRef, useState } from "react";
-import styles from "./styles.module.css";
-import type { ContentProps } from "../../CodeEditors/types";
-import { Icon } from "@appsmith/ads";
-import { set } from "lodash";
-import classNames from "classnames";
-import { useLocalStorage } from "utils/hooks/localstorage";
-
-interface Row {
-  title: string;
-  titleControls?: React.ReactNode;
-  children: (props: ContentProps) => React.ReactNode;
-}
-
-interface Props {
-  rows: Array<Row>;
-}
-
-const HEADER_HEIGHT = 38;
-
-const CUSTOM_WIDGET_SPLIT_VIEW_VISIBILITY =
-  "CUSTOM_WIDGET_SPLIT_VIEW_VISIBILITY";
-
-export default function SplitLayout(props: Props) {
-  const { rows } = props;
-  const containerRef = useRef<HTMLDivElement>(null);
-  const [height, setHeight] = React.useState(0);
-  const [loading, setLoading] = useState(true);
-  const [isRowCollapsed, setIsRowCollapsed] = useLocalStorage(
-    CUSTOM_WIDGET_SPLIT_VIEW_VISIBILITY,
-    Array(rows.length).fill(false),
-  );
-
-  useEffect(() => {
-    if (containerRef.current) {
-      setHeight(
-        window.innerHeight - containerRef.current.getBoundingClientRect().top,
-      );
-
-      setLoading(false);
-    }
-
-    const handler = () => {
-      if (containerRef.current) {
-        setHeight(
-          window.innerHeight - containerRef.current.getBoundingClientRect().top,
-        );
-      }
-    };
-
-    window.addEventListener("resize", handler);
-
-    return () => {
-      window.removeEventListener("resize", handler);
-    };
-  }, []);
-
-  const computedHeight = useMemo(() => {
-    const expandedRows = isRowCollapsed.filter((row: boolean) => !row).length;
-
-    return (height - HEADER_HEIGHT * rows.length) / expandedRows;
-  }, [isRowCollapsed, height]);
-
-  return (
-    <div className={styles.wrapper} ref={containerRef}>
-      {!loading &&
-        rows.map((row, index) => (
-          <div className={classNames(styles.editor)} key={row.title}>
-            <div
-              className={classNames(
-                styles.editorHeader,
-                isRowCollapsed[index] && index === rows.length - 1
-                  ? styles.hasBorder
-                  : "",
-              )}
-              onClick={() =>
-                setIsRowCollapsed(
-                  set([...isRowCollapsed], index, !isRowCollapsed[index]),
-                )
-              }
-            >
-              <div>{row.title}</div>
-              <div className={styles.editorHeaderControls}>
-                {row.titleControls}
-                <Icon
-                  name={
-                    !isRowCollapsed[index]
-                      ? "arrow-down-s-line"
-                      : "arrow-up-s-line"
-                  }
-                  size="lg"
-                  style={{ cursor: "pointer" }}
-                />
-              </div>
-            </div>
-
-            {!isRowCollapsed[index] && (
-              <div
-                className={styles.editorBody}
-                style={{ height: computedHeight }}
-              >
-                {row.children({
-                  height: computedHeight,
-                  width: "100%",
-                })}
-              </div>
-            )}
-          </div>
-        ))}
-    </div>
-  );
-}
diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Layouts/SplitLayout/styles.module.css b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Layouts/SplitLayout/styles.module.css
deleted file mode 100644
index 4d8bad087006..000000000000
--- a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Layouts/SplitLayout/styles.module.css
+++ /dev/null
@@ -1,25 +0,0 @@
-.editorHeader {
-  height: 38px;
-  display: flex;
-  align-items: center;
-  padding: 0 10px;
-  border-top: 1px solid var(--ads-v2-color-gray-300);
-  font-weight: 500;
-  justify-content: space-between;
-  cursor: pointer;
-}
-
-.editorHeaderControls {
-  display: flex;
-  gap: 1rem;
-  justify-content: right;
-}
-
-.editorBody {
-  border-top: 1px solid var(--ads-v2-color-gray-300);
-  overflow: hidden;
-}
-
-.hasBorder {
-  border-bottom: 1px solid var(--ads-v2-color-gray-300);
-}
diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Layouts/TabsLayout/index.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Layouts/TabsLayout/index.tsx
index 42bab0b4974a..fbd8fc6b9827 100644
--- a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Layouts/TabsLayout/index.tsx
+++ b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Layouts/TabsLayout/index.tsx
@@ -3,6 +3,10 @@ import styles from "./styles.module.css";
 import { Tab, TabPanel, Tabs, TabsList } from "@appsmith/ads";
 import type { ContentProps } from "../../CodeEditors/types";
 import useLocalStorageState from "utils/hooks/useLocalStorageState";
+import classNames from "classnames";
+import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
+import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
+import { CUSTOM_WIDGET_BUILDER_TABS } from "../../../constants";
 
 interface Props {
   tabs: Array<{
@@ -17,9 +21,15 @@ const LOCAL_STORAGE_KEYS = "custom-widget-layout-tabs-state";
 export default function TabLayout(props: Props) {
   const { tabs } = props;
 
+  const isDefaultAITab = useFeatureFlag(
+    FEATURE_FLAG.release_custom_widget_ai_builder,
+  );
+
   const [selectedTab, setSelectedTab] = useLocalStorageState<string>(
     LOCAL_STORAGE_KEYS,
-    tabs[0].title,
+    isDefaultAITab
+      ? CUSTOM_WIDGET_BUILDER_TABS.AI
+      : CUSTOM_WIDGET_BUILDER_TABS.JS,
   );
 
   useEffect(() => {
@@ -88,7 +98,10 @@ export default function TabLayout(props: Props) {
           </TabsList>
           {tabs.map((tab) => (
             <TabPanel
-              className={styles.tabPanel}
+              className={classNames(styles.tabPanel, {
+                "data-[state=inactive]:hidden": selectedTab !== tab.title,
+              })}
+              forceMount
               key={tab.title}
               value={tab.title}
             >
diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Layouts/index.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Layouts/index.tsx
index 78456951a969..3f9112357369 100644
--- a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Layouts/index.tsx
+++ b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Layouts/index.tsx
@@ -1,8 +1,7 @@
-import React, { useContext, useMemo } from "react";
+import React, { useContext } from "react";
 import styles from "./styles.module.css";
 import { CustomWidgetBuilderContext } from "../..";
 import TabLayout from "./TabsLayout";
-import SplitLayout from "./SplitLayout";
 import type { ContentProps } from "../CodeEditors/types";
 
 interface Props {
@@ -18,17 +17,6 @@ export default function Layout(props: Props) {
 
   const context = useContext(CustomWidgetBuilderContext);
 
-  const layout = useMemo(() => {
-    switch (context.selectedLayout) {
-      case "tabs":
-        return <TabLayout tabs={content} />;
-      case "split":
-        return <SplitLayout rows={content} />;
-      default:
-        return <div>Tab Layout</div>;
-    }
-  }, [context.selectedLayout]);
-
   return (
     <div
       className={
@@ -37,7 +25,7 @@ export default function Layout(props: Props) {
           : styles.editorLayoutFullWidth
       }
     >
-      {layout}
+      <TabLayout tabs={content} />
     </div>
   );
 }
diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/index.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/index.tsx
index d72b4381a724..1b8da78be364 100644
--- a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/index.tsx
+++ b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/index.tsx
@@ -1,4 +1,4 @@
-import React, { useContext } from "react";
+import React, { useContext, useMemo } from "react";
 import styles from "./styles.module.css";
 import Layout from "./Layouts";
 import Header from "./Header";
@@ -8,9 +8,43 @@ import StyleEditor, { TitleControls } from "./CodeEditors/StyleEditor";
 import JSEditor from "./CodeEditors/JSEditor";
 import type { ContentProps } from "./CodeEditors/types";
 import References from "./References";
+import { ChatBot } from "./ChatBot/ChatBot";
+import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
+import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
+import { CUSTOM_WIDGET_BUILDER_TABS } from "../constants";
 
 export default function Editor() {
   const { isReferenceOpen } = useContext(CustomWidgetBuilderContext);
+  const isAIEnabled = useFeatureFlag(
+    FEATURE_FLAG.release_custom_widget_ai_builder,
+  );
+
+  const tabs = useMemo(() => {
+    const defaultTabs = [
+      {
+        title: CUSTOM_WIDGET_BUILDER_TABS.HTML,
+        children: (props: ContentProps) => <HTMLEditor {...props} />,
+      },
+      {
+        title: CUSTOM_WIDGET_BUILDER_TABS.STYLE,
+        titleControls: <TitleControls />,
+        children: (props: ContentProps) => <StyleEditor {...props} />,
+      },
+      {
+        title: CUSTOM_WIDGET_BUILDER_TABS.JS,
+        children: (props: ContentProps) => <JSEditor {...props} />,
+      },
+    ];
+
+    if (isAIEnabled) {
+      defaultTabs.push({
+        title: CUSTOM_WIDGET_BUILDER_TABS.AI,
+        children: (props: ContentProps) => <ChatBot {...props} />,
+      });
+    }
+
+    return defaultTabs;
+  }, [isAIEnabled]);
 
   return (
     <div>
@@ -18,23 +52,7 @@ export default function Editor() {
         <Header />
       </div>
       <div className={styles.contentRightBody}>
-        <Layout
-          content={[
-            {
-              title: "HTML",
-              children: (props: ContentProps) => <HTMLEditor {...props} />,
-            },
-            {
-              title: "Style",
-              titleControls: <TitleControls />,
-              children: (props: ContentProps) => <StyleEditor {...props} />,
-            },
-            {
-              title: "Javascript",
-              children: (props: ContentProps) => <JSEditor {...props} />,
-            },
-          ]}
-        />
+        <Layout content={tabs} />
         {isReferenceOpen && <References />}
       </div>
     </div>
diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Preview/Debugger/helpDropdown.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/Preview/Debugger/helpDropdown.tsx
index e050643192e8..1510b739a1ea 100644
--- a/app/client/src/pages/Editor/CustomWidgetBuilder/Preview/Debugger/helpDropdown.tsx
+++ b/app/client/src/pages/Editor/CustomWidgetBuilder/Preview/Debugger/helpDropdown.tsx
@@ -20,7 +20,12 @@ export default function HelpDropdown(props: DebuggerLog) {
   return (
     <Popover>
       <PopoverTrigger>
-        <Button kind="tertiary" size="sm" startIcon="question-line" />
+        <Button
+          isIconButton
+          kind="tertiary"
+          size="sm"
+          startIcon="question-line"
+        />
       </PopoverTrigger>
       <PopoverContent className={styles.consoleItemHelpContent}>
         <List
diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/constants.ts b/app/client/src/pages/Editor/CustomWidgetBuilder/constants.ts
index 77e18f5633f2..a98b116c8dfb 100644
--- a/app/client/src/pages/Editor/CustomWidgetBuilder/constants.ts
+++ b/app/client/src/pages/Editor/CustomWidgetBuilder/constants.ts
@@ -1,3 +1,8 @@
+import {
+  createMessage,
+  CUSTOM_WIDGET_BUILDER_TAB_TITLE,
+} from "ee/constants/messages";
+
 export const CUSTOM_WIDGET_BUILDER_EVENTS = {
   READY: "READY",
   READY_ACK: "READY_ACK",
@@ -13,12 +18,10 @@ export const CUSTOM_WIDGET_BUILDER_EVENTS = {
 export const LOCAL_STORAGE_KEYS_IS_REFERENCE_OPEN =
   "custom-widget-builder-context-state-is-reference-open";
 
-export const LOCAL_STORAGE_KEYS_SELECTED_LAYOUT =
-  "custom-widget-builder-context-state-selected-layout";
-
 export const DEFAULT_CONTEXT_VALUE = {
   name: "",
   widgetId: "",
+  parentEntityId: "",
   srcDoc: {
     html: "",
     js: "",
@@ -61,3 +64,19 @@ export const CUSTOM_WIDGET_DEFAULT_MODEL_DOC_URL = `${CUSTOM_WIDGET_DOC_URL}#def
 export const CUSTOM_WIDGET_ONREADY_DOC_URL = `${CUSTOM_WIDGET_DOC_URL}#onready`;
 
 export const CUSTOM_WIDGET_HEIGHT_DOC_URL = `${CUSTOM_WIDGET_DOC_URL}#height`;
+
+export const CUSTOM_WIDGET_AI_CHAT_TYPE = "CUSTOM_WIDGET";
+
+export const CUSTOM_WIDGET_AI_INITIALISED_MESSAGE = "CHAT_INITIALISED";
+
+export const CUSTOM_WIDGET_AI_BOT_URL = (instanceId: string) =>
+  `https://internal.appsmith.com/app/app-builder-bot/custom-widget-bot-672b2020d37b7d0b29dcfa71?embed=true&chatType=${CUSTOM_WIDGET_AI_CHAT_TYPE}&chatInstance=${instanceId}&url=${encodeURIComponent(window.location.origin)}`;
+
+export const CUSTOM_WIDGET_AI_BOT_MESSAGE_RESPONSE_DEBOUNCE_TIMEOUT = 100;
+
+export const CUSTOM_WIDGET_BUILDER_TABS = {
+  AI: createMessage(CUSTOM_WIDGET_BUILDER_TAB_TITLE.AI),
+  HTML: createMessage(CUSTOM_WIDGET_BUILDER_TAB_TITLE.HTML),
+  STYLE: createMessage(CUSTOM_WIDGET_BUILDER_TAB_TITLE.STYLE),
+  JS: createMessage(CUSTOM_WIDGET_BUILDER_TAB_TITLE.JS),
+};
diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/types.ts b/app/client/src/pages/Editor/CustomWidgetBuilder/types.ts
index 9cc3d5e76e8c..6aec321cc3cc 100644
--- a/app/client/src/pages/Editor/CustomWidgetBuilder/types.ts
+++ b/app/client/src/pages/Editor/CustomWidgetBuilder/types.ts
@@ -28,9 +28,9 @@ export interface CustomWidgetBuilderContextValueType {
   //Custom widget name
   name: string;
   widgetId: string;
+  parentEntityId: string;
 
   isReferenceOpen: boolean;
-  selectedLayout: string;
 
   //Compiled src doc
   srcDoc: SrcDoc;
@@ -57,7 +57,6 @@ export interface CustomWidgetBuilderContextValueType {
 
 export interface CustomWidgetBuilderContextFunctionType {
   toggleReference: () => void;
-  selectLayout: (layout: string) => void;
   close: () => void;
   update: (editor: string, value: string) => void;
   updateModel: (model: Record<string, unknown>) => void;
diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/useCustomBuilder.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/useCustomBuilder.tsx
index 583fb787239c..a1fdfc81bb78 100644
--- a/app/client/src/pages/Editor/CustomWidgetBuilder/useCustomBuilder.tsx
+++ b/app/client/src/pages/Editor/CustomWidgetBuilder/useCustomBuilder.tsx
@@ -3,7 +3,6 @@ import {
   CUSTOM_WIDGET_BUILDER_EVENTS,
   DEFAULT_CONTEXT_VALUE,
   LOCAL_STORAGE_KEYS_IS_REFERENCE_OPEN,
-  LOCAL_STORAGE_KEYS_SELECTED_LAYOUT,
 } from "./constants";
 import history from "utils/history";
 import useLocalStorageState from "utils/hooks/useLocalStorageState";
@@ -17,6 +16,8 @@ import {
 } from "./types";
 import { compileSrcDoc } from "./utility";
 import AnalyticsUtil from "ee/utils/AnalyticsUtil";
+import { useEditorType } from "ee/hooks";
+import { useParentEntityInfo } from "ee/hooks/datasourceEditorHooks";
 
 let connectionTimeout: number;
 
@@ -28,10 +29,8 @@ export function useCustomBuilder(): [CustomWidgetBuilderContextType, boolean] {
     true,
   );
 
-  const [selectedLayout, setSelectedLayout] = useLocalStorageState<string>(
-    LOCAL_STORAGE_KEYS_SELECTED_LAYOUT,
-    "tabs",
-  );
+  const editorType = useEditorType(location.pathname);
+  const { parentEntityId } = useParentEntityInfo(editorType);
 
   const [contextValue, setContextValue] =
     useState<CustomWidgetBuilderContextValueType>(DEFAULT_CONTEXT_VALUE);
@@ -93,9 +92,6 @@ export function useCustomBuilder(): [CustomWidgetBuilderContextType, boolean] {
       toggleReference: () => {
         setIsReferenceOpen(!isReferenceOpen);
       },
-      selectLayout: (layout) => {
-        setSelectedLayout(layout);
-      },
       close: () => {
         window.opener?.focus();
         window.close();
@@ -154,22 +150,16 @@ export function useCustomBuilder(): [CustomWidgetBuilderContextType, boolean] {
         });
       },
     }),
-    [
-      contextValue.uncompiledSrcDoc,
-      setIsReferenceOpen,
-      isReferenceOpen,
-      setSelectedLayout,
-    ],
+    [contextValue.uncompiledSrcDoc, setIsReferenceOpen, isReferenceOpen],
   );
 
   const context = useMemo(
     () => ({
       ...contextValue,
       isReferenceOpen,
-      selectedLayout,
       ...contextFunctions,
     }),
-    [contextValue, contextFunctions, isReferenceOpen, selectedLayout],
+    [contextValue, contextFunctions, isReferenceOpen],
   );
 
   useEffect(replay, [contextValue.srcDoc]);
@@ -186,6 +176,7 @@ export function useCustomBuilder(): [CustomWidgetBuilderContextType, boolean] {
               ...prev,
               name: event.data.name,
               widgetId: event.data.widgetId,
+              parentEntityId,
               srcDoc: event.data.srcDoc,
               uncompiledSrcDoc: event.data.uncompiledSrcDoc,
               initialSrcDoc: event.data.uncompiledSrcDoc,
@@ -223,6 +214,7 @@ export function useCustomBuilder(): [CustomWidgetBuilderContextType, boolean] {
               showConnectionLostMessage: false,
               name: event.data.name,
               widgetId: event.data.widgetId,
+              parentEntityId,
               srcDoc: event.data.srcDoc,
               uncompiledSrcDoc: event.data.uncompiledSrcDoc,
               initialSrcDoc: event.data.uncompiledSrcDoc,
diff --git a/app/client/src/pages/Editor/DataSourceEditor/Debugger.tsx b/app/client/src/pages/Editor/DataSourceEditor/Debugger.tsx
index 01d2634f678e..943bf78b5adb 100644
--- a/app/client/src/pages/Editor/DataSourceEditor/Debugger.tsx
+++ b/app/client/src/pages/Editor/DataSourceEditor/Debugger.tsx
@@ -13,7 +13,7 @@ import {
   showDebugger,
 } from "actions/debuggerActions";
 import EntityBottomTabs from "components/editorComponents/EntityBottomTabs";
-import { DEBUGGER_TAB_KEYS } from "components/editorComponents/Debugger/helpers";
+import { DEBUGGER_TAB_KEYS } from "components/editorComponents/Debugger/constants";
 import Errors from "components/editorComponents/Debugger/Errors";
 import DebuggerLogs from "components/editorComponents/Debugger/DebuggerLogs";
 import EntityDeps from "components/editorComponents/Debugger/EntityDependecies";
@@ -22,7 +22,7 @@ import {
   getErrorCount,
   getResponsePaneHeight,
 } from "selectors/debuggerSelectors";
-import { ActionExecutionResizerHeight } from "../APIEditor/constants";
+import { ActionExecutionResizerHeight } from "PluginActionEditor/components/PluginActionResponse/constants";
 import { IDEBottomView, ViewHideBehaviour } from "IDE";
 
 export const ResizerMainContainer = styled.div`
@@ -37,30 +37,38 @@ export const ResizerContentContainer = styled.div`
   flex: 1;
   position: relative;
   display: flex;
+
   &.db-form-resizer-content,
   &.saas-form-resizer-content,
   &.api-datasource-content-container {
     flex-direction: column;
     padding: 0 var(--ads-v2-spaces-7) 0 var(--ads-v2-spaces-7);
+
     & .t--ds-form-header {
       border-bottom: 1px solid var(--ads-v2-color-border);
     }
   }
+
   &.db-form-resizer-content.db-form-resizer-content-show-tabs,
   &.saas-form-resizer-content.saas-form-resizer-content-show-tabs {
     padding: 0;
+
     & .t--ds-form-header {
       border-bottom: none;
     }
   }
+
   &.saas-form-resizer-content.saas-form-resizer-content-show-tabs form {
     padding-bottom: 0;
   }
+
   border-top: none;
+
   .db-form-content-container {
     display: flex;
     flex-direction: column;
     width: 100%;
+
     form {
       flex-grow: 1;
     }
diff --git a/app/client/src/pages/Editor/DataSourceEditor/NewActionButton.tsx b/app/client/src/pages/Editor/DataSourceEditor/NewActionButton.tsx
index 99dc3bfbe520..7bf6677d6414 100644
--- a/app/client/src/pages/Editor/DataSourceEditor/NewActionButton.tsx
+++ b/app/client/src/pages/Editor/DataSourceEditor/NewActionButton.tsx
@@ -18,7 +18,7 @@ import {
   NEW_API_BUTTON_TEXT,
   NEW_QUERY_BUTTON_TEXT,
 } from "ee/constants/messages";
-import { createNewQueryAction } from "actions/apiPaneActions";
+import { createNewQueryAction } from "actions/pluginActionActions";
 import { useDispatch, useSelector } from "react-redux";
 import { getCurrentPageId, getPageList } from "selectors/editorSelectors";
 import type { Datasource } from "entities/Datasource";
@@ -155,7 +155,7 @@ function NewActionButton(props: NewActionButtonProps) {
       </MenuTrigger>
       <MenuContent
         align={"end"}
-        data-testId={"t--page-selection"}
+        data-testid={"t--page-selection"}
         height={pages.length <= 4 ? "fit-content" : "186px"}
         side={"bottom"}
       >
diff --git a/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx b/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx
index 4c0cfad1f82b..b93acce4e8d1 100644
--- a/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx
+++ b/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx
@@ -19,7 +19,7 @@ import type { ReduxAction } from "ee/constants/ReduxActionConstants";
 import {
   datasourceToFormValues,
   formValuesToDatasource,
-} from "transformers/RestAPIDatasourceFormTransformer";
+} from "PluginActionEditor/transformers/RestAPIDatasourceFormTransformer";
 import type {
   ApiDatasourceForm,
   AuthorizationCode,
diff --git a/app/client/src/pages/Editor/DataSourceEditor/index.tsx b/app/client/src/pages/Editor/DataSourceEditor/index.tsx
index abb3af295319..2d07855c50ee 100644
--- a/app/client/src/pages/Editor/DataSourceEditor/index.tsx
+++ b/app/client/src/pages/Editor/DataSourceEditor/index.tsx
@@ -81,7 +81,7 @@ import {
 } from "components/formControls/utils";
 import type { ControlProps } from "components/formControls/BaseControl";
 import type { ApiDatasourceForm } from "entities/Datasource/RestAPIForm";
-import { formValuesToDatasource } from "transformers/RestAPIDatasourceFormTransformer";
+import { formValuesToDatasource } from "PluginActionEditor/transformers/RestAPIDatasourceFormTransformer";
 import { DSFormHeader } from "./DSFormHeader";
 import type { PluginType } from "entities/Action";
 import { PluginPackageName } from "entities/Action";
diff --git a/app/client/src/pages/Editor/DatasourceInfo/DatasorceTabs.tsx b/app/client/src/pages/Editor/DatasourceInfo/DatasorceTabs.tsx
index 3960d00402a8..85f9d0ad59a7 100644
--- a/app/client/src/pages/Editor/DatasourceInfo/DatasorceTabs.tsx
+++ b/app/client/src/pages/Editor/DatasourceInfo/DatasorceTabs.tsx
@@ -19,6 +19,9 @@ import {
 } from "utils/editorContextUtils";
 import { getPlugin } from "ee/selectors/entitiesSelector";
 import GoogleSheetSchema from "./GoogleSheetSchema";
+import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
+import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
+import { getHasCreateDatasourceActionPermission } from "ee/utils/BusinessFeatures/permissionPageHelpers";
 
 const TabsContainer = styled(Tabs)`
   height: 100%;
@@ -72,38 +75,49 @@ const DatasourceTabs = (props: DatasourceTabProps) => {
         )
       : false;
 
+  const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
+
+  const canCreateDatasourceActions = getHasCreateDatasourceActionPermission(
+    isFeatureEnabled,
+    props.datasource?.userPermissions ?? [],
+  );
+
   return (
     <TabsContainer
       defaultValue={
-        isDatasourceValid || isPluginAuthorized
+        (isDatasourceValid || isPluginAuthorized) && canCreateDatasourceActions
           ? VIEW_MODE_TABS.VIEW_DATA
           : VIEW_MODE_TABS.CONFIGURATIONS
       }
     >
       <TabListWrapper className="t--datasource-tab-list">
-        <Tab value={VIEW_MODE_TABS.VIEW_DATA}>
-          {createMessage(DATASOURCE_VIEW_DATA_TAB)}
-        </Tab>
+        {canCreateDatasourceActions && (
+          <Tab value={VIEW_MODE_TABS.VIEW_DATA}>
+            {createMessage(DATASOURCE_VIEW_DATA_TAB)}
+          </Tab>
+        )}
         <Tab value={VIEW_MODE_TABS.CONFIGURATIONS}>
           {createMessage(DATASOURCE_CONFIGURATIONS_TAB)}
         </Tab>
       </TabListWrapper>
-      <TabPanelContainer
-        className="t--datasource-tab-container"
-        value={VIEW_MODE_TABS.VIEW_DATA}
-      >
-        {isGoogleSheetPlugin ? (
-          <GoogleSheetSchema
-            datasourceId={props.datasource.id}
-            pluginId={props.datasource?.pluginId}
-          />
-        ) : (
-          <DatasourceViewModeSchema
-            datasource={props.datasource}
-            setDatasourceViewModeFlag={setDatasourceViewModeFlagClick}
-          />
-        )}
-      </TabPanelContainer>
+      {canCreateDatasourceActions && (
+        <TabPanelContainer
+          className="t--datasource-tab-container"
+          value={VIEW_MODE_TABS.VIEW_DATA}
+        >
+          {isGoogleSheetPlugin ? (
+            <GoogleSheetSchema
+              datasourceId={props.datasource.id}
+              pluginId={props.datasource?.pluginId}
+            />
+          ) : (
+            <DatasourceViewModeSchema
+              datasource={props.datasource}
+              setDatasourceViewModeFlag={setDatasourceViewModeFlagClick}
+            />
+          )}
+        </TabPanelContainer>
+      )}
       <ConfigurationsTabPanelContainer
         className="t--datasource-tab-container"
         value={VIEW_MODE_TABS.CONFIGURATIONS}
diff --git a/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructureContainer.tsx b/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructureContainer.tsx
index 7d69704b5f19..10845233b577 100644
--- a/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructureContainer.tsx
+++ b/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructureContainer.tsx
@@ -7,18 +7,17 @@ import {
 import type { DatasourceStructure as DatasourceStructureType } from "entities/Datasource";
 import { DatasourceStructureContext } from "entities/Datasource";
 import type { ReactElement } from "react";
-import React, { memo, useCallback, useEffect, useState } from "react";
+import React, { memo, useEffect, useState } from "react";
 import DatasourceStructure from "./DatasourceStructure";
-import { Button, Flex, SearchInput, Text } from "@appsmith/ads";
+import { Flex, SearchInput, Text } from "@appsmith/ads";
 import { getIsFetchingDatasourceStructure } from "ee/selectors/entitiesSelector";
-import { useDispatch, useSelector } from "react-redux";
+import { useSelector } from "react-redux";
 import type { AppState } from "ee/reducers";
 import ItemLoadingIndicator from "./ItemLoadingIndicator";
 import DatasourceStructureNotFound from "./DatasourceStructureNotFound";
 import AnalyticsUtil from "ee/utils/AnalyticsUtil";
 import { PluginName } from "entities/Action";
 import { DatasourceStructureSearchContainer } from "./SchemaViewModeCSS";
-import { refreshDatasourceStructure } from "actions/datasourceActions";
 
 interface Props {
   datasourceId: string;
@@ -31,26 +30,15 @@ interface Props {
   onEntityTableClick?: (table: string) => void;
   tableName?: string;
   customEditDatasourceFn?: () => void;
-  showRefresh?: boolean;
 }
 
 // leaving out DynamoDB and Firestore because they have a schema but not templates
 export const SCHEMALESS_PLUGINS: Array<string> = [
-  PluginName.SMTP,
-  PluginName.TWILIO,
-  PluginName.HUBSPOT,
-  PluginName.ELASTIC_SEARCH,
-  PluginName.AIRTABLE,
   PluginName.GRAPHQL,
   PluginName.REST_API,
-  PluginName.REDIS,
-  PluginName.GOOGLE_SHEETS,
-  PluginName.OPEN_AI,
-  PluginName.APPSMITH_AI,
 ];
 
 const Container = (props: Props) => {
-  const dispatch = useDispatch();
   const isLoading = useSelector((state: AppState) =>
     getIsFetchingDatasourceStructure(state, props.datasourceId),
   );
@@ -60,10 +48,6 @@ const Container = (props: Props) => {
     DatasourceStructureType | undefined
   >(props.datasourceStructure);
 
-  const refreshStructure = useCallback(() => {
-    dispatch(refreshDatasourceStructure(props.datasourceId, props.context));
-  }, []);
-
   useEffect(() => {
     if (datasourceStructure !== props.datasourceStructure) {
       setDatasourceStructure(props.datasourceStructure);
@@ -145,16 +129,6 @@ const Container = (props: Props) => {
       <DatasourceStructureSearchContainer
         className={`t--search-container--${props.context.toLowerCase()}`}
       >
-        {props.showRefresh ? (
-          <Button
-            className="datasourceStructure-refresh"
-            isIconButton
-            kind="tertiary"
-            onClick={refreshStructure}
-            size="md"
-            startIcon="refresh"
-          />
-        ) : null}
         <SearchInput
           className="datasourceStructure-search"
           endIcon="close"
diff --git a/app/client/src/pages/Editor/DatasourceInfo/DatasourceViewModeSchema.tsx b/app/client/src/pages/Editor/DatasourceInfo/DatasourceViewModeSchema.tsx
index f7bb63c49aa2..6464e0a52675 100644
--- a/app/client/src/pages/Editor/DatasourceInfo/DatasourceViewModeSchema.tsx
+++ b/app/client/src/pages/Editor/DatasourceInfo/DatasourceViewModeSchema.tsx
@@ -13,7 +13,7 @@ import {
   DATASOURCE_GENERATE_PAGE_BUTTON,
   createMessage,
 } from "ee/constants/messages";
-import Table from "pages/Editor/QueryEditor/Table";
+import Table from "PluginActionEditor/components/PluginActionResponse/components/Table";
 import { generateTemplateToUpdatePage } from "actions/pageActions";
 import {
   getCurrentApplicationId,
@@ -246,7 +246,7 @@ const DatasourceViewModeSchema = (props: Props) => {
 
   return (
     <ViewModeSchemaContainer>
-      <DataWrapperContainer data-testId="datasource-schema-container">
+      <DataWrapperContainer data-testid="datasource-schema-container">
         <StructureContainer>
           {props.datasource && (
             <DatasourceStructureHeader
diff --git a/app/client/src/pages/Editor/DatasourceInfo/GoogleSheetSchema.tsx b/app/client/src/pages/Editor/DatasourceInfo/GoogleSheetSchema.tsx
index 53c06181a4fb..00a8479eef43 100644
--- a/app/client/src/pages/Editor/DatasourceInfo/GoogleSheetSchema.tsx
+++ b/app/client/src/pages/Editor/DatasourceInfo/GoogleSheetSchema.tsx
@@ -10,7 +10,7 @@ import {
 import type { DropdownOptions } from "../GeneratePage/components/constants";
 import { DEFAULT_DROPDOWN_OPTION } from "../GeneratePage/components/constants";
 import { isEmpty } from "lodash";
-import Table from "pages/Editor/QueryEditor/Table";
+import Table from "PluginActionEditor/components/PluginActionResponse/components/Table";
 import {
   getCurrentApplicationId,
   getPagePermissions,
@@ -399,7 +399,7 @@ function GoogleSheetSchema(props: Props) {
   return (
     <ViewModeSchemaContainer>
       <DataWrapperContainer>
-        <StructureContainer data-testId="datasource-schema-container">
+        <StructureContainer data-testid="datasource-schema-container">
           {datasource && (
             <DatasourceStructureHeader
               datasource={datasource}
diff --git a/app/client/src/pages/Editor/DatasourceInfo/QueryTemplates.tsx b/app/client/src/pages/Editor/DatasourceInfo/QueryTemplates.tsx
index 71c1ad6c1e79..f28e38b74f2d 100644
--- a/app/client/src/pages/Editor/DatasourceInfo/QueryTemplates.tsx
+++ b/app/client/src/pages/Editor/DatasourceInfo/QueryTemplates.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useContext } from "react";
+import React, { useCallback } from "react";
 import { useDispatch, useSelector } from "react-redux";
 import { createActionRequest } from "actions/pluginActionActions";
 import type { AppState } from "ee/reducers";
@@ -21,15 +21,12 @@ import { integrationEditorURL } from "ee/RouteBuilder";
 import { MenuItem, Tag } from "@appsmith/ads";
 import type { Plugin } from "api/PluginApi";
 
-import WalkthroughContext from "components/featureWalkthrough/walkthroughContext";
-import { setFeatureWalkthroughShown } from "utils/storage";
 import styled from "styled-components";
 import { change, getFormValues } from "redux-form";
 import { QUERY_EDITOR_FORM_NAME } from "ee/constants/forms";
 import { diff } from "deep-diff";
 import { UndoRedoToastContext, showUndoRedoToast } from "utils/replayHelpers";
 import AnalyticsUtil from "ee/utils/AnalyticsUtil";
-import { FEATURE_WALKTHROUGH_KEYS } from "constants/WalkthroughConstants";
 import { SUGGESTED_TAG, createMessage } from "ee/constants/messages";
 import { transformTextToSentenceCase } from "pages/Editor/utils";
 
@@ -59,8 +56,6 @@ const TemplateMenuItem = styled(MenuItem)`
 
 export function QueryTemplates(props: QueryTemplatesProps) {
   const dispatch = useDispatch();
-  const { isOpened: isWalkthroughOpened, popFeature } =
-    useContext(WalkthroughContext) || {};
   const applicationId = useSelector(getCurrentApplicationId);
   const actions = useSelector((state: AppState) => state.entities.actions);
   const basePageId = useSelector(getCurrentBasePageId);
@@ -109,11 +104,6 @@ export function QueryTemplates(props: QueryTemplatesProps) {
         }),
       );
 
-      if (isWalkthroughOpened) {
-        popFeature && popFeature("SCHEMA_QUERY_CREATE");
-        setFeatureWalkthroughShown(FEATURE_WALKTHROUGH_KEYS.ds_schema, true);
-      }
-
       history.push(
         integrationEditorURL({
           basePageId,
@@ -166,14 +156,8 @@ export function QueryTemplates(props: QueryTemplatesProps) {
         datasourceId: props.datasourceId,
         pluginName: plugin?.name || "",
         templateCommand: template?.title,
-        isWalkthroughOpened,
       });
 
-      if (isWalkthroughOpened) {
-        popFeature && popFeature("SCHEMA_QUERY_UPDATE");
-        setFeatureWalkthroughShown(FEATURE_WALKTHROUGH_KEYS.ds_schema, true);
-      }
-
       showUndoRedoToast(
         currentAction.name,
         false,
diff --git a/app/client/src/pages/Editor/DatasourceInfo/SchemaViewModeCSS.tsx b/app/client/src/pages/Editor/DatasourceInfo/SchemaViewModeCSS.tsx
index 60a7f26d65bb..a353afbee7e7 100644
--- a/app/client/src/pages/Editor/DatasourceInfo/SchemaViewModeCSS.tsx
+++ b/app/client/src/pages/Editor/DatasourceInfo/SchemaViewModeCSS.tsx
@@ -213,5 +213,6 @@ export const DatasourceStructureSearchContainer = styled.div`
   }
   &.t--search-container--query-editor {
     padding-right: 0;
+    margin: 0;
   }
 `;
diff --git a/app/client/src/pages/Editor/EditorName/NavigationMenu.tsx b/app/client/src/pages/Editor/EditorName/NavigationMenu.tsx
index 8edf49d58baf..6679472c5e32 100644
--- a/app/client/src/pages/Editor/EditorName/NavigationMenu.tsx
+++ b/app/client/src/pages/Editor/EditorName/NavigationMenu.tsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useCallback } from "react";
 
 import type { noop } from "lodash";
 
@@ -13,9 +13,12 @@ interface NavigationMenuProps {
 
 export function NavigationMenu(props: NavigationMenuProps) {
   const { menuItems, setIsPopoverOpen } = props;
+  const handleInteractionOutside = useCallback(() => {
+    setIsPopoverOpen(false);
+  }, [setIsPopoverOpen]);
 
   return (
-    <MenuContent width="214px">
+    <MenuContent onInteractOutside={handleInteractionOutside} width="214px">
       {menuItems?.map((item, idx) => {
         return (
           <NavigationMenuItem
diff --git a/app/client/src/pages/Editor/EntityNavigation/ActionPane/ApiPaneNavigation.ts b/app/client/src/pages/Editor/EntityNavigation/ActionPane/ApiPaneNavigation.ts
index 2fa0dbb5cfe4..605b2aadd2f2 100644
--- a/app/client/src/pages/Editor/EntityNavigation/ActionPane/ApiPaneNavigation.ts
+++ b/app/client/src/pages/Editor/EntityNavigation/ActionPane/ApiPaneNavigation.ts
@@ -1,17 +1,16 @@
 import { call, delay, put } from "redux-saga/effects";
 import type { EntityInfo, IApiPaneNavigationConfig } from "../types";
 import { ActionPaneNavigation } from "./exports";
-import { API_EDITOR_TABS } from "constants/ApiEditorConstants/CommonApiConstants";
-import { setApiPaneConfigSelectedTabIndex } from "actions/apiPaneActions";
+import { API_EDITOR_TABS } from "PluginActionEditor/constants/CommonApiConstants";
+import { setPluginActionEditorSelectedTab } from "PluginActionEditor/store";
 import { NAVIGATION_DELAY } from "../costants";
-import { isNumber } from "lodash";
 
 export default class ApiPaneNavigation extends ActionPaneNavigation {
   constructor(entityInfo: EntityInfo) {
     super(entityInfo);
     this.getConfig = this.getConfig.bind(this);
     this.navigate = this.navigate.bind(this);
-    this.getTabIndex = this.getTabIndex.bind(this);
+    this.getTab = this.getTab.bind(this);
   }
 
   *getConfig() {
@@ -19,17 +18,18 @@ export default class ApiPaneNavigation extends ActionPaneNavigation {
 
     if (!this.entityInfo.propertyPath) return {};
 
-    const tabIndex: number | undefined = yield call(
-      this.getTabIndex,
+    const tab: string | undefined = yield call(
+      this.getTab,
       this.entityInfo.propertyPath,
     );
 
     config = {
-      tabIndex,
+      tab,
     };
 
     return config;
   }
+
   *navigate() {
     const config: IApiPaneNavigationConfig = yield call(this.getConfig);
 
@@ -37,17 +37,16 @@ export default class ApiPaneNavigation extends ActionPaneNavigation {
 
     if (!this.entityInfo.propertyPath) return;
 
-    if (isNumber(config.tabIndex)) {
-      yield put(setApiPaneConfigSelectedTabIndex(config.tabIndex));
+    if (config.tab) {
+      yield put(setPluginActionEditorSelectedTab(config.tab));
       yield delay(NAVIGATION_DELAY);
     }
 
     yield call(this.scrollToView, this.entityInfo.propertyPath);
   }
 
-  *getTabIndex(propertyPath: string) {
-    let currentTab;
-    let index;
+  *getTab(propertyPath: string) {
+    let currentTab: string | undefined;
     const modifiedProperty = propertyPath.replace(
       "config",
       "actionConfiguration",
@@ -79,10 +78,6 @@ export default class ApiPaneNavigation extends ActionPaneNavigation {
       }
     }
 
-    if (currentTab) {
-      index = Object.values(API_EDITOR_TABS).indexOf(currentTab);
-    }
-
-    return index;
+    return currentTab;
   }
 }
diff --git a/app/client/src/pages/Editor/EntityNavigation/ActionPane/QueryPaneNavigation.ts b/app/client/src/pages/Editor/EntityNavigation/ActionPane/QueryPaneNavigation.ts
index 68fc9ab0e9c0..2d3ee6dc9131 100644
--- a/app/client/src/pages/Editor/EntityNavigation/ActionPane/QueryPaneNavigation.ts
+++ b/app/client/src/pages/Editor/EntityNavigation/ActionPane/QueryPaneNavigation.ts
@@ -2,13 +2,15 @@ import { call, delay, put, race, select, take } from "redux-saga/effects";
 import type { EntityInfo, IQueryPaneNavigationConfig } from "../types";
 import { ActionPaneNavigation } from "./exports";
 import { NAVIGATION_DELAY } from "../costants";
-import { setQueryPaneConfigSelectedTabIndex } from "actions/queryPaneActions";
 import { EDITOR_TABS } from "constants/QueryEditorConstants";
 import { getFormEvaluationState } from "selectors/formSelectors";
 import type { FormEvaluationState } from "reducers/evaluationReducers/formEvaluationReducer";
 import { isEmpty } from "lodash";
 import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
-import { isActionSaving } from "ee/selectors/entitiesSelector";
+import {
+  isActionSaving,
+  setPluginActionEditorSelectedTab,
+} from "PluginActionEditor/store";
 
 export default class QueryPaneNavigation extends ActionPaneNavigation {
   constructor(entityInfo: EntityInfo) {
@@ -44,7 +46,7 @@ export default class QueryPaneNavigation extends ActionPaneNavigation {
     if (!this.entityInfo.propertyPath) return;
 
     if (config.tab) {
-      yield put(setQueryPaneConfigSelectedTabIndex(config.tab));
+      yield put(setPluginActionEditorSelectedTab(config.tab));
     }
 
     yield call(this.waitForFormUpdate);
diff --git a/app/client/src/pages/Editor/EntityNavigation/types.ts b/app/client/src/pages/Editor/EntityNavigation/types.ts
index 5d6a173e57d0..13de1aa9803e 100644
--- a/app/client/src/pages/Editor/EntityNavigation/types.ts
+++ b/app/client/src/pages/Editor/EntityNavigation/types.ts
@@ -33,7 +33,7 @@ export interface IMatchedSection {
 }
 
 export interface IApiPaneNavigationConfig {
-  tabIndex?: number;
+  tab?: string;
 }
 
 export interface IQueryPaneNavigationConfig {
diff --git a/app/client/src/pages/Editor/Explorer/Actions/ActionEntityContextMenu.test.tsx b/app/client/src/pages/Editor/Explorer/Actions/ActionEntityContextMenu.test.tsx
new file mode 100644
index 000000000000..4a5258016c8e
--- /dev/null
+++ b/app/client/src/pages/Editor/Explorer/Actions/ActionEntityContextMenu.test.tsx
@@ -0,0 +1,170 @@
+import React from "react";
+import { fireEvent, render, waitFor } from "@testing-library/react";
+import "@testing-library/jest-dom/extend-expect";
+import { Provider } from "react-redux";
+import { lightTheme } from "selectors/themeSelectors";
+import { ThemeProvider } from "styled-components";
+import configureStore from "redux-mock-store";
+import { PluginType } from "entities/Action";
+import {
+  ActionEntityContextMenu,
+  type EntityContextMenuProps,
+} from "./ActionEntityContextMenu";
+import { FilesContextProvider } from "../Files/FilesContextProvider";
+import { ActionParentEntityType } from "ee/entities/Engine/actionHelpers";
+import { act } from "react-dom/test-utils";
+import {
+  CONTEXT_COPY,
+  CONTEXT_DELETE,
+  CONTEXT_MOVE,
+  CONTEXT_RENAME,
+  CONTEXT_SHOW_BINDING,
+  createMessage,
+} from "ee/constants/messages";
+import {
+  ReduxActionTypes,
+  type ReduxAction,
+} from "ee/constants/ReduxActionConstants";
+
+const mockStore = configureStore([]);
+
+const page1Id = "605c435a91dea93f0eaf91ba";
+const page2Id = "605c435a91dea93f0eaf91bc";
+const basePage2Id = "605c435a91dea93f0eaf91bc";
+const defaultState = {
+  ui: {
+    selectedWorkspace: {
+      workspace: {},
+    },
+    workspaces: {
+      packagesList: [],
+    },
+    users: {
+      featureFlag: {
+        data: {},
+      },
+    },
+  },
+  entities: {
+    actions: [],
+    pageList: {
+      pages: [
+        {
+          pageId: page1Id,
+          basePageId: page2Id,
+          pageName: "Page1",
+          isDefault: true,
+          slug: "page-1",
+        },
+        {
+          pageId: page2Id,
+          basePageId: basePage2Id,
+          pageName: "Page2",
+          isDefault: false,
+          slug: "page-2",
+        },
+      ],
+    },
+  },
+};
+
+const defaultProps: EntityContextMenuProps = {
+  id: "test-action-id",
+  name: "test-action",
+  canManageAction: true,
+  canDeleteAction: true,
+  pluginType: PluginType.DB,
+};
+
+const defaultContext = {
+  editorId: "test-editor-id",
+  canCreateActions: true,
+  parentEntityId: "test-parent-entity-id",
+  parentEntityType: ActionParentEntityType.PAGE,
+};
+
+describe("ActionEntityContextMenu", () => {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  let store: any;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it("renders context menu with correct options for application editor", async () => {
+    store = mockStore(defaultState);
+    const { findByText, getByRole } = render(
+      <Provider store={store}>
+        <ThemeProvider theme={lightTheme}>
+          <FilesContextProvider {...defaultContext}>
+            <ActionEntityContextMenu {...defaultProps} />
+          </FilesContextProvider>
+        </ThemeProvider>
+      </Provider>,
+    );
+    const triggerToOpenMenu = getByRole("button");
+
+    act(() => {
+      fireEvent.click(triggerToOpenMenu);
+    });
+
+    await waitFor(() => {
+      expect(triggerToOpenMenu.parentNode).toHaveAttribute(
+        "aria-expanded",
+        "true",
+      );
+    });
+
+    // In context of pages, the copy to page option will be shown
+    const copyQueryToPageOptions = await findByText(
+      createMessage(CONTEXT_COPY),
+    );
+
+    expect(await findByText(createMessage(CONTEXT_RENAME))).toBeInTheDocument();
+    expect(await findByText(createMessage(CONTEXT_DELETE))).toBeInTheDocument();
+    expect(await findByText(createMessage(CONTEXT_MOVE))).toBeInTheDocument();
+    expect(
+      await findByText(createMessage(CONTEXT_SHOW_BINDING)),
+    ).toBeInTheDocument();
+    expect(copyQueryToPageOptions).toBeInTheDocument();
+
+    // Now we click on the copy to page option
+    act(() => {
+      fireEvent.click(copyQueryToPageOptions);
+    });
+
+    // Now a menu with the list of pages will show up
+    const copyQueryToPageSubOptionPage1 = await findByText("Page1");
+
+    expect(copyQueryToPageSubOptionPage1).toBeInTheDocument();
+    expect(await findByText("Page2")).toBeInTheDocument();
+
+    // Clicking on the page will trigger the correct action
+    act(() => {
+      fireEvent.click(copyQueryToPageSubOptionPage1);
+    });
+
+    let actions: Array<
+      ReduxAction<{
+        payload: {
+          id: string;
+          destinationEntityId: string;
+          name: string;
+        };
+      }>
+    > = [];
+
+    await waitFor(() => {
+      actions = store.getActions();
+    });
+
+    expect(actions.length).toBe(1);
+    expect(actions[0].type).toBe(ReduxActionTypes.COPY_ACTION_INIT);
+    expect(actions[0].payload).toEqual({
+      destinationEntityId: page1Id,
+      id: "test-action-id",
+      name: "test-action",
+    });
+  });
+  // TODO: add tests for all options rendered in the context menu
+});
diff --git a/app/client/src/pages/Editor/Explorer/Actions/ActionEntityContextMenu.tsx b/app/client/src/pages/Editor/Explorer/Actions/ActionEntityContextMenu.tsx
index e17e37c3c3fd..7e23af50883c 100644
--- a/app/client/src/pages/Editor/Explorer/Actions/ActionEntityContextMenu.tsx
+++ b/app/client/src/pages/Editor/Explorer/Actions/ActionEntityContextMenu.tsx
@@ -20,6 +20,7 @@ import {
   CONTEXT_NO_PAGE,
   CONTEXT_SHOW_BINDING,
   createMessage,
+  CONTEXT_DUPLICATE,
 } from "ee/constants/messages";
 import { builderURL } from "ee/RouteBuilder";
 
@@ -33,8 +34,9 @@ import { useConvertToModuleOptions } from "ee/pages/Editor/Explorer/hooks";
 import { MODULE_TYPE } from "ee/constants/ModuleConstants";
 import { PluginType } from "entities/Action";
 import { convertToBaseParentEntityIdSelector } from "selectors/pageListSelectors";
+import { ActionParentEntityType } from "ee/entities/Engine/actionHelpers";
 
-interface EntityContextMenuProps {
+export interface EntityContextMenuProps {
   id: string;
   name: string;
   className?: string;
@@ -45,7 +47,7 @@ interface EntityContextMenuProps {
 export function ActionEntityContextMenu(props: EntityContextMenuProps) {
   // Import the context
   const context = useContext(FilesContext);
-  const { menuItems, parentEntityId } = context;
+  const { menuItems, parentEntityId, parentEntityType } = context;
   const baseParentEntityId = useSelector((state) =>
     convertToBaseParentEntityIdSelector(state, parentEntityId),
   );
@@ -53,12 +55,12 @@ export function ActionEntityContextMenu(props: EntityContextMenuProps) {
   const { canDeleteAction, canManageAction } = props;
   const dispatch = useDispatch();
   const [confirmDelete, setConfirmDelete] = useState(false);
-  const copyActionToPage = useCallback(
-    (actionId: string, actionName: string, pageId: string) =>
+  const copyAction = useCallback(
+    (actionId: string, actionName: string, destinationEntityId: string) =>
       dispatch(
         copyActionRequest({
           id: actionId,
-          destinationPageId: pageId,
+          destinationEntityId,
           name: actionName,
         }),
       ),
@@ -129,14 +131,26 @@ export function ActionEntityContextMenu(props: EntityContextMenuProps) {
     menuItems.includes(ActionEntityContextMenuItemsEnum.COPY) &&
       canManageAction && {
         value: "copy",
-        onSelect: noop,
-        label: createMessage(CONTEXT_COPY),
-        children: menuPages.map((page) => {
-          return {
-            ...page,
-            onSelect: () => copyActionToPage(props.id, props.name, page.id),
-          };
-        }),
+        onSelect:
+          parentEntityType === ActionParentEntityType.PAGE
+            ? noop
+            : () => {
+                copyAction(props.id, props.name, parentEntityId);
+              },
+        label: createMessage(
+          parentEntityType === ActionParentEntityType.PAGE
+            ? CONTEXT_COPY
+            : CONTEXT_DUPLICATE,
+        ),
+        children:
+          parentEntityType === ActionParentEntityType.PAGE &&
+          menuPages.length > 0 &&
+          menuPages.map((page) => {
+            return {
+              ...page,
+              onSelect: () => copyAction(props.id, props.name, page.id),
+            };
+          }),
       },
     menuItems.includes(ActionEntityContextMenuItemsEnum.MOVE) &&
       canManageAction && {
diff --git a/app/client/src/pages/Editor/Explorer/Actions/MoreActionsMenu.tsx b/app/client/src/pages/Editor/Explorer/Actions/MoreActionsMenu.tsx
index 4311feaf459b..b87fbe468a13 100644
--- a/app/client/src/pages/Editor/Explorer/Actions/MoreActionsMenu.tsx
+++ b/app/client/src/pages/Editor/Explorer/Actions/MoreActionsMenu.tsx
@@ -63,7 +63,7 @@ export function MoreActionsMenu(props: EntityContextMenuProps) {
       dispatch(
         copyActionRequest({
           id: actionId,
-          destinationPageId: pageId,
+          destinationEntityId: pageId,
           name: actionName,
         }),
       ),
diff --git a/app/client/src/pages/Editor/Explorer/EntityExplorer.test.tsx b/app/client/src/pages/Editor/Explorer/EntityExplorer.test.tsx
index f5a753df35b3..04091582d3cd 100644
--- a/app/client/src/pages/Editor/Explorer/EntityExplorer.test.tsx
+++ b/app/client/src/pages/Editor/Explorer/EntityExplorer.test.tsx
@@ -72,7 +72,7 @@ describe("Entity Explorer tests", () => {
     );
   });
 
-  it("Should render Widgets tree in entity explorer", () => {
+  it("Should render Widgets tree in entity explorer", async () => {
     // TODO: Fix this the next time the file is edited
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const children: any = buildChildren([{ type: "TABS_WIDGET" }]);
@@ -88,9 +88,13 @@ describe("Entity Explorer tests", () => {
     );
     // TODO: Fix this the next time the file is edited
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const widgetsTree: any = component.queryByText("Widgets", {
-      selector: "div.t--entity-name",
-    });
+    const widgetsTree: Element = await component.findByText(
+      "Widgets",
+      {
+        selector: "div.t--entity-name",
+      },
+      { timeout: 3000 },
+    );
 
     act(() => {
       fireEvent.click(widgetsTree);
@@ -111,7 +115,7 @@ describe("Entity Explorer tests", () => {
       spyWidgetSelection.mockClear();
     });
 
-    it("Select widget on entity explorer", () => {
+    it("Select widget on entity explorer", async () => {
       // TODO: Fix this the next time the file is edited
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       const children: any = buildChildren([
@@ -128,8 +132,11 @@ describe("Entity Explorer tests", () => {
         </MockPageDSL>,
       );
       // TODO: Fix this the next time the file is edited
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const tabsWidget: any = component.queryByText(children[0].widgetName);
+      const tabsWidget: Element = await component.findByText(
+        children[0].widgetName,
+        undefined,
+        { timeout: 3000 },
+      );
 
       act(() => {
         fireEvent.click(tabsWidget);
@@ -144,7 +151,7 @@ describe("Entity Explorer tests", () => {
       );
     });
 
-    it("CMD + click Multi Select widget on entity explorer", () => {
+    it("CMD + click Multi Select widget on entity explorer", async () => {
       // TODO: Fix this the next time the file is edited
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       const children: any = buildChildren([
@@ -166,8 +173,11 @@ describe("Entity Explorer tests", () => {
         </MockPageDSL>,
       );
       // TODO: Fix this the next time the file is edited
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const checkBox: any = component.queryByText(children[0].widgetName);
+      const checkBox: Element = await component.findByText(
+        children[0].widgetName,
+        undefined,
+        { timeout: 3000 },
+      );
 
       act(() => {
         fireEvent.click(checkBox);
@@ -198,7 +208,7 @@ describe("Entity Explorer tests", () => {
       );
     });
 
-    it("Shift + Click Multi Select widget on entity explorer", () => {
+    it("Shift + Click Multi Select widget on entity explorer", async () => {
       // TODO: Fix this the next time the file is edited
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       const children: any = buildChildren([
@@ -211,8 +221,7 @@ describe("Entity Explorer tests", () => {
         { type: "BUTTON_WIDGET", parentId: "0", widgetId: "buttonWidgetId" },
       ]);
       // TODO: Fix this the next time the file is edited
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const dsl: any = widgetCanvasFactory.build({
+      const dsl = widgetCanvasFactory.build({
         children,
       });
       const component = render(
@@ -223,7 +232,11 @@ describe("Entity Explorer tests", () => {
 
       // TODO: Fix this the next time the file is edited
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const checkboxWidget: any = component.queryByText(children[0].widgetName);
+      const checkboxWidget: any = await component.findByText(
+        children[0].widgetName,
+        undefined,
+        { timeout: 3000 },
+      );
       // TODO: Fix this the next time the file is edited
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       const buttonWidget: any = component.queryByText(children[2].widgetName);
@@ -255,7 +268,7 @@ describe("Entity Explorer tests", () => {
       );
     });
 
-    it("Shift + Click Deselect Non Siblings", () => {
+    it("Shift + Click Deselect Non Siblings", async () => {
       const containerId = "containerWidgetId";
       const canvasId = "canvasWidgetId";
       // TODO: Fix this the next time the file is edited
@@ -311,9 +324,10 @@ describe("Entity Explorer tests", () => {
         </MockPageDSL>,
       );
       // TODO: Fix this the next time the file is edited
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const containerWidget: any = component.queryByText(
+      const containerWidget: Element = await component.findByText(
         containerChildren[0].widgetName,
+        undefined,
+        { timeout: 3000 },
       );
 
       act(() => {
diff --git a/app/client/src/pages/Editor/Explorer/ExplorerIcons.tsx b/app/client/src/pages/Editor/Explorer/ExplorerIcons.tsx
index 8aa0204af4ab..fe87497930b5 100644
--- a/app/client/src/pages/Editor/Explorer/ExplorerIcons.tsx
+++ b/app/client/src/pages/Editor/Explorer/ExplorerIcons.tsx
@@ -4,8 +4,10 @@ import { MenuIcons } from "icons/MenuIcons";
 import type { Plugin } from "api/PluginApi";
 import ImageAlt from "assets/images/placeholder-image.svg";
 import styled from "styled-components";
-import type { HTTP_METHOD } from "constants/ApiEditorConstants/CommonApiConstants";
-import { HTTP_METHODS_COLOR } from "constants/ApiEditorConstants/CommonApiConstants";
+import {
+  HTTP_METHODS_COLOR,
+  type HTTP_METHOD,
+} from "PluginActionEditor/constants/CommonApiConstants";
 import { PRIMARY_KEY, FOREIGN_KEY } from "constants/DatasourceEditorConstants";
 import { Icon } from "@appsmith/ads";
 import { getAssetUrl } from "ee/utils/airgapHelpers";
diff --git a/app/client/src/pages/Editor/Explorer/Files/Submenu.tsx b/app/client/src/pages/Editor/Explorer/Files/Submenu.tsx
index 5eef3792795d..bfa4c46ca1db 100644
--- a/app/client/src/pages/Editor/Explorer/Files/Submenu.tsx
+++ b/app/client/src/pages/Editor/Explorer/Files/Submenu.tsx
@@ -94,7 +94,7 @@ export function ExplorerMenuContent({
       </div>
       <SearchInput
         autoFocus
-        data-testId="t--search-file-operation"
+        data-testid="t--search-file-operation"
         onChange={onChange}
         placeholder="Search datasources"
         value={query}
diff --git a/app/client/src/pages/Editor/FirstTimeUserOnboarding/Modal.tsx b/app/client/src/pages/Editor/FirstTimeUserOnboarding/Modal.tsx
index a0a70f11d605..6cd288820d19 100644
--- a/app/client/src/pages/Editor/FirstTimeUserOnboarding/Modal.tsx
+++ b/app/client/src/pages/Editor/FirstTimeUserOnboarding/Modal.tsx
@@ -1,11 +1,29 @@
-import React from "react";
+import React, { lazy, Suspense } from "react";
 import { MenuContent } from "@appsmith/ads";
 import styled from "styled-components";
-import Checklist from "./Checklist";
 import HelpMenu from "./HelpMenu";
 import { useDispatch } from "react-redux";
 import { showSignpostingModal } from "actions/onboardingActions";
 
+import { retryPromise } from "utils/AppsmithUtils";
+import Skeleton from "widgets/Skeleton";
+
+const Checklist = lazy(async () =>
+  retryPromise(
+    async () =>
+      import(
+        /* webpackChunkName: "FirstTimeUserOnboardingChecklist" */ "./Checklist"
+      ),
+  ),
+);
+
+export const LazilyLoadedChecklist = () => {
+  return (
+    <Suspense fallback={<Skeleton />}>
+      <Checklist />
+    </Suspense>
+  );
+};
 const SIGNPOSTING_POPUP_WIDTH = "360px";
 
 const StyledMenuContent = styled(MenuContent)<{ animate: boolean }>`
@@ -48,7 +66,7 @@ function OnboardingModal(props: {
       width={SIGNPOSTING_POPUP_WIDTH}
     >
       <Wrapper>
-        {!props.showIntercomConsent && <Checklist />}
+        {!props.showIntercomConsent && <LazilyLoadedChecklist />}
         <HelpMenu
           setShowIntercomConsent={props.setShowIntercomConsent}
           showIntercomConsent={props.showIntercomConsent}
diff --git a/app/client/src/pages/Editor/FormConfig.tsx b/app/client/src/pages/Editor/FormConfig.tsx
index fa1a0a48ef7f..b71ebbe81a4f 100644
--- a/app/client/src/pages/Editor/FormConfig.tsx
+++ b/app/client/src/pages/Editor/FormConfig.tsx
@@ -41,6 +41,8 @@ const LabelWrapper = styled.div`
   .label-icon-wrapper {
     &.help {
       cursor: help;
+      text-decoration: underline dashed var(--ads-v2-color-border) from-font;
+      text-underline-position: under;
     }
   }
 `;
@@ -202,16 +204,14 @@ function renderFormConfigTop(props: {
   return (
     <div className="form-config-top" key={props.config.label}>
       {!nestedFormControl && // if the form control is a nested form control hide its label
-        (label?.length > 0 ||
-          encrypted ||
-          tooltipText ||
-          shouldRenderSubtitle) && (
+        (label?.length > 0 || encrypted || shouldRenderSubtitle) && (
           <>
             <FlexWrapper>
               <FormLabel
+                className="form-label"
                 config={props.config}
                 extraStyles={{
-                  marginBottom: shouldRenderSubtitle && "0px",
+                  marginBottom: (shouldRenderSubtitle || !subtitle) && "0px",
                   minWidth: !!props.changesViewType && "unset",
                 }}
               >
diff --git a/app/client/src/pages/Editor/FormControl.tsx b/app/client/src/pages/Editor/FormControl.tsx
index 6610130ee7f1..cf6af5749559 100644
--- a/app/client/src/pages/Editor/FormControl.tsx
+++ b/app/client/src/pages/Editor/FormControl.tsx
@@ -27,10 +27,11 @@ import {
 } from "ee/selectors/entitiesSelector";
 import { get } from "lodash";
 import { SQL_PLUGINS_DEFAULT_TEMPLATE_TYPE } from "constants/Datasource";
-import TemplateMenu from "./QueryEditor/TemplateMenu";
-import { SQL_DATASOURCES } from "../../constants/QueryEditorConstants";
+import TemplateMenu from "PluginActionEditor/components/PluginActionForm/components/UQIEditor/TemplateMenu";
+import { SQL_DATASOURCES } from "constants/QueryEditorConstants";
 import type { Datasource, DatasourceStructure } from "entities/Datasource";
 import { getCurrentEditingEnvironmentId } from "ee/selectors/environmentSelectors";
+import { selectFeatureFlags } from "ee/selectors/featureFlagsSelectors";
 
 export interface FormControlProps {
   config: ControlProps;
@@ -48,6 +49,7 @@ function FormControl(props: FormControlProps) {
 
   const dispatch = useDispatch();
   const currentEditingEnvId = useSelector(getCurrentEditingEnvironmentId);
+  const featureFlags = useSelector(selectFeatureFlags);
 
   // adding this to prevent excessive rerendering
   const [convertFormToRaw, setConvertFormToRaw] = useState(false);
@@ -60,7 +62,11 @@ function FormControl(props: FormControlProps) {
       .datasourceStorages[currentEditingEnvId];
   }
 
-  const hidden = isHidden(formValueForEvaluatingHiddenObj, props.config.hidden);
+  const hidden = isHidden(
+    formValueForEvaluatingHiddenObj,
+    props.config.hidden,
+    featureFlags,
+  );
   const configErrors: EvaluationError[] = useSelector(
     (state: AppState) =>
       getConfigErrors(state, {
@@ -172,7 +178,10 @@ function FormControl(props: FormControlProps) {
 
   const FormControlRenderMethod = (config = props.config) => {
     return FormControlFactory.createControl(
-      config,
+      {
+        ...config,
+        datasourceId: dsId,
+      },
       props.formName,
       props?.multipleConfig,
     );
diff --git a/app/client/src/pages/Editor/GlobalHotKeys/GlobalHotKeys.test.tsx b/app/client/src/pages/Editor/GlobalHotKeys/GlobalHotKeys.test.tsx
index 3d3149b681b2..3dac96b0f16d 100644
--- a/app/client/src/pages/Editor/GlobalHotKeys/GlobalHotKeys.test.tsx
+++ b/app/client/src/pages/Editor/GlobalHotKeys/GlobalHotKeys.test.tsx
@@ -55,9 +55,9 @@ describe("Canvas Hot Keys", () => {
   // TODO: Fix this the next time the file is edited
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   function UpdatedEditor({ dsl }: any) {
-    useMockDsl(dsl);
+    const hasLoaded = useMockDsl(dsl);
 
-    return <IDE />;
+    return hasLoaded ? <IDE /> : null;
   }
 
   // These need to be at the top to avoid imports not being mocked. ideally should be in setup.ts but will override for all other tests
@@ -140,7 +140,7 @@ describe("Canvas Hot Keys", () => {
         </MemoryRouter>,
         { initialState: store.getState(), sagasToRun: sagasToRunForTests },
       );
-      const canvasWidgets = component.queryAllByTestId("test-widget");
+      const canvasWidgets = await component.findAllByTestId("test-widget");
 
       expect(canvasWidgets.length).toBe(2);
       act(() => {
@@ -291,7 +291,7 @@ describe("Cut/Copy/Paste hotkey", () => {
     );
     // TODO: Fix this the next time the file is edited
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const artBoard: any = component.queryByTestId("t--canvas-artboard");
+    const artBoard: any = await component.findByTestId("t--canvas-artboard");
 
     // deselect all other widgets
     fireEvent.click(artBoard);
@@ -389,7 +389,7 @@ describe("Cut/Copy/Paste hotkey", () => {
     );
     // TODO: Fix this the next time the file is edited
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const artBoard: any = component.queryByTestId("t--canvas-artboard");
+    const artBoard: any = await component.findByTestId("t--canvas-artboard");
 
     // deselect all other widgets
     fireEvent.click(artBoard);
@@ -434,7 +434,7 @@ describe("Cut/Copy/Paste hotkey", () => {
 });
 
 describe("Undo/Redo hotkey", () => {
-  it("should dispatch undo Action on cmd + z", () => {
+  it("should dispatch undo Action on cmd + z", async () => {
     const dispatchSpy = jest.spyOn(store, "dispatch");
     const component = render(
       <MockPageDSL>
@@ -449,6 +449,9 @@ describe("Undo/Redo hotkey", () => {
       </MockPageDSL>,
     );
 
+    // wait for the dom to settle down by waitng for the canvas to be loaded
+    await component.findByTestId("t--canvas-artboard");
+
     dispatchSpy.mockClear();
 
     act(() => {
@@ -462,10 +465,11 @@ describe("Undo/Redo hotkey", () => {
       );
     });
 
-    expect(dispatchSpy).toBeCalledTimes(1);
-    expect(dispatchSpy).toBeCalledWith(undoAction());
+    await waitFor(() => {
+      expect(dispatchSpy).toBeCalledWith(undoAction());
+    });
   });
-  it("should dispatch redo Action on cmd + shift + z", () => {
+  it("should dispatch redo Action on cmd + shift + z", async () => {
     const dispatchSpy = jest.spyOn(store, "dispatch");
     const component = render(
       <MockPageDSL>
@@ -480,6 +484,9 @@ describe("Undo/Redo hotkey", () => {
       </MockPageDSL>,
     );
 
+    // wait for the dom to settle down by waitng for the canvas to be loaded
+    await component.findByTestId("t--canvas-artboard");
+
     dispatchSpy.mockClear();
 
     act(() => {
@@ -496,7 +503,7 @@ describe("Undo/Redo hotkey", () => {
     expect(dispatchSpy).toBeCalledTimes(1);
     expect(dispatchSpy).toBeCalledWith(redoAction());
   });
-  it("should dispatch redo Action on ctrl + y", () => {
+  it("should dispatch redo Action on ctrl + y", async () => {
     const dispatchSpy = jest.spyOn(store, "dispatch");
     const component = render(
       <MockPageDSL>
@@ -511,6 +518,9 @@ describe("Undo/Redo hotkey", () => {
       </MockPageDSL>,
     );
 
+    // wait for the dom to settle down by waitng for the canvas to be loaded
+    await component.findByTestId("t--canvas-artboard");
+
     dispatchSpy.mockClear();
 
     act(() => {
diff --git a/app/client/src/pages/Editor/HelpButton.tsx b/app/client/src/pages/Editor/HelpButton.tsx
index f0c656f875d8..186f2a8bb129 100644
--- a/app/client/src/pages/Editor/HelpButton.tsx
+++ b/app/client/src/pages/Editor/HelpButton.tsx
@@ -102,7 +102,7 @@ export function IntercomConsent({
   const instanceId = useSelector(getInstanceId);
   const dispatch = useDispatch();
 
-  const sendUserDataToIntercom = () => {
+  const sendUserDataToIntercom = async () => {
     const { email } = user || {};
 
     updateIntercomProperties(instanceId, user);
@@ -115,7 +115,7 @@ export function IntercomConsent({
     showIntercomConsent(false);
 
     if (user?.enableTelemetry) {
-      AnalyticsUtil.identifyUser(user, true);
+      await AnalyticsUtil.identifyUser(user, true);
       AnalyticsUtil.logEvent("SUPPORT_REQUEST_INITIATED", {
         email,
       });
diff --git a/app/client/src/pages/Editor/IDE/AppsmithIDE.test.tsx b/app/client/src/pages/Editor/IDE/AppsmithIDE.test.tsx
index 6ac8be02c3b0..e8256efff8aa 100644
--- a/app/client/src/pages/Editor/IDE/AppsmithIDE.test.tsx
+++ b/app/client/src/pages/Editor/IDE/AppsmithIDE.test.tsx
@@ -154,7 +154,7 @@ describe("Drag and Drop widgets into Main container", () => {
     }));
   });
 
-  it("Drag to move widgets", () => {
+  it("Drag to move widgets", async () => {
     // TODO: Fix this the next time the file is edited
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const children: any = buildChildren([
@@ -190,7 +190,8 @@ describe("Drag and Drop widgets into Main container", () => {
     const propPane = component.queryByTestId("t--propertypane");
 
     expect(propPane).toBeNull();
-    const canvasWidgets = component.queryAllByTestId("test-widget");
+
+    const canvasWidgets = await component.findAllByTestId("test-widget");
 
     expect(canvasWidgets.length).toBe(1);
     // TODO: Fix this the next time the file is edited
@@ -275,7 +276,7 @@ describe("Drag and Drop widgets into Main container", () => {
     expect(finalPositions.top).not.toEqual(initPositions.top);
   });
 
-  it("When widgets are moved out of main container bounds move them back to previous position", () => {
+  it("When widgets are moved out of main container bounds move them back to previous position", async () => {
     // TODO: Fix this the next time the file is edited
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const children: any = buildChildren([
@@ -310,7 +311,7 @@ describe("Drag and Drop widgets into Main container", () => {
     const propPane = component.queryByTestId("t--propertypane");
 
     expect(propPane).toBeNull();
-    const canvasWidgets = component.queryAllByTestId("test-widget");
+    const canvasWidgets = await component.findAllByTestId("test-widget");
 
     expect(canvasWidgets.length).toBe(1);
     // TODO: Fix this the next time the file is edited
@@ -499,7 +500,7 @@ describe("Drag and Drop widgets into Main container", () => {
   //   expect(finalPositions.top).toEqual(initPositions.top);
   // });
 
-  it("When widgets are out of bottom most bounds of parent canvas, canvas has to expand", () => {
+  it("When widgets are out of bottom most bounds of parent canvas, canvas has to expand", async () => {
     // TODO: Fix this the next time the file is edited
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const children: any = buildChildren([
@@ -544,7 +545,7 @@ describe("Drag and Drop widgets into Main container", () => {
     const propPane = component.queryByTestId("t--propertypane");
 
     expect(propPane).toBeNull();
-    const canvasWidgets = component.queryAllByTestId("test-widget");
+    const canvasWidgets = await component.findAllByTestId("test-widget");
 
     expect(canvasWidgets.length).toBe(2);
 
@@ -639,7 +640,7 @@ describe("Drag and Drop widgets into Main container", () => {
     );
   });
 
-  it("Drag and Drop widget into an empty canvas", () => {
+  it("Drag and Drop widget into an empty canvas", async () => {
     // TODO: Fix this the next time the file is edited
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const children: any = buildChildren([]);
@@ -675,7 +676,7 @@ describe("Drag and Drop widgets into Main container", () => {
 
     // TODO: Fix this the next time the file is edited
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const containerButton: any = component.queryAllByText("Container");
+    const containerButton: any = await component.findAllByText("Container");
 
     act(() => {
       fireEvent.dragStart(containerButton[0]);
@@ -733,7 +734,7 @@ describe("Drag and Drop widgets into Main container", () => {
     expect(newlyAddedCanvas.length).toBe(1);
   });
 
-  it("Disallow drag if widget not focused", () => {
+  it("Disallow drag if widget not focused", async () => {
     const initialState = store.getState() as unknown as Partial<AppState>;
     const containerId = generateReactKey();
     const canvasId = generateReactKey();
@@ -778,6 +779,8 @@ describe("Drag and Drop widgets into Main container", () => {
       </MemoryRouter>,
       { initialState, sagasToRun: sagasToRunForTests },
     );
+    // wait for the dom to settle down by waitng for the widget to be loaded
+    const canvasWidgets = await component.findAllByTestId("test-widget");
 
     // TODO: Fix this the next time the file is edited
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -790,8 +793,6 @@ describe("Drag and Drop widgets into Main container", () => {
       ".t--draggable-containerwidget",
     );
 
-    const canvasWidgets = component.queryAllByTestId("test-widget");
-
     expect(canvasWidgets.length).toBe(1);
 
     const initWidgetPosition = {
@@ -894,7 +895,7 @@ describe("Drag in a nested container", () => {
     }));
   });
 
-  it("container drags when focused on", () => {
+  it("container drags when focused on", async () => {
     mockGetIsFetchingPage.mockImplementation(() => false);
 
     const component = renderNestedComponent();
@@ -903,6 +904,8 @@ describe("Drag in a nested container", () => {
       .spyOn(uiSelectors, "getSelectedWidgets")
       .mockReturnValue(["container-id"]);
 
+    const canvasWidgets = await component.findAllByTestId("test-widget");
+
     // TODO: Fix this the next time the file is edited
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const containerWidget: any = component.container.querySelector(
@@ -914,8 +917,6 @@ describe("Drag in a nested container", () => {
       ".t--draggable-containerwidget",
     );
 
-    const canvasWidgets = component.queryAllByTestId("test-widget");
-
     expect(canvasWidgets.length).toBe(3);
 
     const initContainerWidgetPosition = {
@@ -975,7 +976,7 @@ describe("Drag in a nested container", () => {
     );
   });
 
-  it("nested widget drags when focused on", () => {
+  it("nested widget drags when focused on", async () => {
     mockGetIsFetchingPage.mockImplementation(() => false);
 
     const component = renderNestedComponent();
@@ -984,6 +985,8 @@ describe("Drag in a nested container", () => {
       .spyOn(uiSelectors, "getSelectedWidgets")
       .mockReturnValue(["text-widget"]);
 
+    const canvasWidgets = await component.findAllByTestId("test-widget");
+
     // TODO: Fix this the next time the file is edited
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const textWidget: any = component.container.querySelector(
@@ -995,8 +998,6 @@ describe("Drag in a nested container", () => {
       ".t--draggable-textwidget",
     );
 
-    const canvasWidgets = component.queryAllByTestId("test-widget");
-
     expect(canvasWidgets.length).toBe(3);
 
     const initTextWidgetPosition = {
@@ -1054,10 +1055,11 @@ describe("Drag in a nested container", () => {
     expect(finalTextWidgetPositions).not.toStrictEqual(initTextWidgetPosition);
   });
 
-  it("does not let disabledWidget drag and parent widget position stays same", () => {
+  it("does not let disabledWidget drag and parent widget position stays same", async () => {
     mockGetIsFetchingPage.mockImplementation(() => false);
 
     const component = renderNestedComponent();
+    const canvasWidgets = await component.findAllByTestId("test-widget");
 
     // TODO: Fix this the next time the file is edited
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -1090,8 +1092,6 @@ describe("Drag in a nested container", () => {
       top: inputWidget.style.top,
     };
 
-    const canvasWidgets = component.queryAllByTestId("test-widget");
-
     expect(canvasWidgets.length).toBe(3);
 
     act(() => {
diff --git a/app/client/src/pages/Editor/IDE/EditorPane/JS/JSRender.test.tsx b/app/client/src/pages/Editor/IDE/EditorPane/JS/JSRender.test.tsx
index b0decd243581..fa0c0f25f28c 100644
--- a/app/client/src/pages/Editor/IDE/EditorPane/JS/JSRender.test.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorPane/JS/JSRender.test.tsx
@@ -1,5 +1,5 @@
 import localStorage from "utils/localStorage";
-import { render } from "test/testUtils";
+import { render, waitFor } from "test/testUtils";
 import { Route } from "react-router-dom";
 import { BUILDER_PATH } from "ee/constants/routes/appRoutes";
 import IDE from "pages/Editor/IDE/index";
@@ -19,8 +19,8 @@ const basePageId = "0123456789abcdef00000000";
 describe("IDE Render: JS", () => {
   localStorage.setItem("SPLITPANE_ANNOUNCEMENT", "false");
   describe("JS Blank State", () => {
-    it("Renders Fullscreen Blank State", () => {
-      const { getByRole, getByText } = render(
+    it("Renders Fullscreen Blank State", async () => {
+      const { findByText, getByRole, getByText } = render(
         <Route path={BUILDER_PATH}>
           <IDE />
         </Route>,
@@ -31,7 +31,7 @@ describe("IDE Render: JS", () => {
       );
 
       // Main pane text
-      getByText(createMessage(EDITOR_PANE_TEXTS.js_blank_state));
+      await findByText(createMessage(EDITOR_PANE_TEXTS.js_blank_state));
 
       // Left pane text
       getByText(createMessage(EDITOR_PANE_TEXTS.js_blank_state_description));
@@ -68,8 +68,8 @@ describe("IDE Render: JS", () => {
       });
     });
 
-    it("Renders Fullscreen Add in Blank State", () => {
-      const { getByTestId, getByText } = render(
+    it("Renders Fullscreen Add in Blank State", async () => {
+      const { findByText, getByTestId, getByText } = render(
         <Route path={BUILDER_PATH}>
           <IDE />
         </Route>,
@@ -80,7 +80,7 @@ describe("IDE Render: JS", () => {
       );
 
       // Main pane text
-      getByText(createMessage(EDITOR_PANE_TEXTS.js_create_tab_title));
+      await findByText(createMessage(EDITOR_PANE_TEXTS.js_create_tab_title));
 
       // Left pane description
       getByText(createMessage(EDITOR_PANE_TEXTS.js_blank_state_description));
@@ -117,7 +117,7 @@ describe("IDE Render: JS", () => {
   });
 
   describe("JS Edit Render", () => {
-    it("Renders JS routes in Full screen", () => {
+    it("Renders JS routes in Full screen", async () => {
       const page = PageFactory.build();
       const js1 = JSObjectFactory.build({
         pageId: page.pageId,
@@ -143,6 +143,15 @@ describe("IDE Render: JS", () => {
         },
       );
 
+      await waitFor(
+        async () => {
+          const elements = getAllByText("JSObject1"); // Use the common test ID or selector
+
+          expect(elements).toHaveLength(3); // Wait until there are exactly 3 elements
+        },
+        { timeout: 3000, interval: 500 },
+      );
+
       // There will be 3 JSObject1 text (Left pane list, editor tab and Editor form)
       expect(getAllByText("JSObject1").length).toEqual(3);
       // Left pane active state
diff --git a/app/client/src/pages/Editor/IDE/EditorPane/Query/QueryRender.test.tsx b/app/client/src/pages/Editor/IDE/EditorPane/Query/QueryRender.test.tsx
index 3bc3dca089ba..65314ae7a727 100644
--- a/app/client/src/pages/Editor/IDE/EditorPane/Query/QueryRender.test.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorPane/Query/QueryRender.test.tsx
@@ -12,7 +12,7 @@ import { sagasToRunForTests } from "test/sagas";
 import userEvent from "@testing-library/user-event";
 import { getIDETestState } from "test/factories/AppIDEFactoryUtils";
 import { PageFactory } from "test/factories/PageFactory";
-import { screen } from "@testing-library/react";
+import { screen, waitFor } from "@testing-library/react";
 import { GoogleSheetFactory } from "test/factories/Actions/GoogleSheetFactory";
 
 const FeatureFlags = {
@@ -24,8 +24,8 @@ const basePageId = "0123456789abcdef00000000";
 describe("IDE URL rendering of Queries", () => {
   localStorage.setItem("SPLITPANE_ANNOUNCEMENT", "false");
   describe("Query Blank State", () => {
-    it("Renders Fullscreen Blank State", () => {
-      const { getByRole, getByText } = render(
+    it("Renders Fullscreen Blank State", async () => {
+      const { findByText, getByRole, getByText } = render(
         <Route path={BUILDER_PATH}>
           <IDE />
         </Route>,
@@ -36,7 +36,7 @@ describe("IDE URL rendering of Queries", () => {
       );
 
       // Main pane text
-      getByText(createMessage(EDITOR_PANE_TEXTS.query_blank_state));
+      await findByText(createMessage(EDITOR_PANE_TEXTS.query_blank_state));
 
       // Left pane text
       getByText(createMessage(EDITOR_PANE_TEXTS.query_blank_state_description));
@@ -69,8 +69,8 @@ describe("IDE URL rendering of Queries", () => {
       getByText(/new query \/ api/i);
     });
 
-    it("Renders Fullscreen Add in Blank State", () => {
-      const { getByTestId, getByText } = render(
+    it("Renders Fullscreen Add in Blank State", async () => {
+      const { findByText, getByTestId, getByText } = render(
         <Route path={BUILDER_PATH}>
           <IDE />
         </Route>,
@@ -81,7 +81,9 @@ describe("IDE URL rendering of Queries", () => {
       );
 
       // Create options are rendered
-      getByText(createMessage(EDITOR_PANE_TEXTS.queries_create_from_existing));
+      await findByText(
+        createMessage(EDITOR_PANE_TEXTS.queries_create_from_existing),
+      );
       getByText("New datasource");
       getByText("REST API");
       // Check new tab presence
@@ -130,7 +132,7 @@ describe("IDE URL rendering of Queries", () => {
   });
 
   describe("API Routes", () => {
-    it("Renders Api routes in Full screen", () => {
+    it("Renders Api routes in Full screen", async () => {
       const page = PageFactory.build();
       const anApi = APIFactory.build({ pageId: page.pageId });
       const state = getIDETestState({
@@ -153,6 +155,15 @@ describe("IDE URL rendering of Queries", () => {
         },
       );
 
+      await waitFor(
+        async () => {
+          const elements = getAllByText("Api1"); // Use the common test ID or selector
+
+          expect(elements).toHaveLength(3); // Wait until there are exactly 3 elements
+        },
+        { timeout: 3000, interval: 500 },
+      );
+
       // There will be 3 Api1 text (Left pane list, editor tab and Editor form)
       expect(getAllByText("Api1").length).toEqual(3);
       // Left pane active state
@@ -343,6 +354,14 @@ describe("IDE URL rendering of Queries", () => {
         },
       );
 
+      await waitFor(
+        async () => {
+          const elements = getAllByText("Query1"); // Use the common test ID or selector
+
+          expect(elements).toHaveLength(3); // Wait until there are exactly 3 elements
+        },
+        { timeout: 3000, interval: 500 },
+      );
       // There will be 3 Query1 text (Left pane list, editor tab and Editor form)
       expect(getAllByText("Query1").length).toBe(3);
       // Left pane active state
diff --git a/app/client/src/pages/Editor/IDE/EditorPane/UI/UIRender.test.tsx b/app/client/src/pages/Editor/IDE/EditorPane/UI/UIRender.test.tsx
index 5748a9a3f592..2bc26118bd81 100644
--- a/app/client/src/pages/Editor/IDE/EditorPane/UI/UIRender.test.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorPane/UI/UIRender.test.tsx
@@ -95,7 +95,7 @@ describe("IDE URL rendering: UI", () => {
     const url =
       `/app/applicationSlug/pageSlug-${pageId}/edit/widgets/` + widgetID;
 
-    const { getByTestId } = render(
+    const component = render(
       <Route path={BUILDER_PATH}>
         <UpdatedEditor dsl={dsl} />
       </Route>,
@@ -106,8 +106,11 @@ describe("IDE URL rendering: UI", () => {
       },
     );
 
+    // wait for the dom to settle down by waitng for the canvas to be loaded
+    await component.findByTestId("t--canvas-artboard");
+
     // check for list UI
-    getByTestId(`t--entity-item-${children[0].widgetName}`);
+    component.getByTestId(`t--entity-item-${children[0].widgetName}`);
   });
 
   it("Canvas: Check tabs rendering in side by side mode", () => {
diff --git a/app/client/src/pages/Editor/IDE/EditorTabs/AddTab.tsx b/app/client/src/pages/Editor/IDE/EditorTabs/AddTab.tsx
index bd961e01fd12..0cb19dbd8722 100644
--- a/app/client/src/pages/Editor/IDE/EditorTabs/AddTab.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorTabs/AddTab.tsx
@@ -25,13 +25,17 @@ const AddTab = ({
     onClose();
   };
 
+  const content = `New ${segment === EditorEntityTab.JS ? "JS" : "Query"}`;
+
   return (
     <FileTab
       isActive={segmentMode === EditorEntityTabState.Add && !isListActive}
       onClick={newTabClickCallback}
       onClose={(e) => onCloseClick(e)}
-      title={`New ${segment === EditorEntityTab.JS ? "JS" : "Query"}`}
-    />
+      title={content}
+    >
+      {content}
+    </FileTab>
   );
 };
 
diff --git a/app/client/src/pages/Editor/IDE/EditorTabs/EditableTab.tsx b/app/client/src/pages/Editor/IDE/EditorTabs/EditableTab.tsx
new file mode 100644
index 000000000000..672c1bf366c5
--- /dev/null
+++ b/app/client/src/pages/Editor/IDE/EditorTabs/EditableTab.tsx
@@ -0,0 +1,81 @@
+import React, { useCallback } from "react";
+
+import { FileTab } from "IDE/Components/FileTab";
+import { type EntityItem } from "ee/entities/IDE/constants";
+import { useCurrentEditorState } from "../hooks";
+
+import { useDispatch, useSelector } from "react-redux";
+import { useEventCallback } from "usehooks-ts";
+import { getIsSavingEntityName } from "ee/selectors/entitiesSelector";
+import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
+import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
+import {
+  getEditableTabPermissions,
+  saveEntityName,
+} from "ee/entities/IDE/utils";
+import { noop } from "lodash";
+import { EditableName, useIsRenaming } from "IDE";
+import { IconContainer } from "IDE/Components/FileTab/styles";
+
+interface EditableTabProps {
+  id: string;
+  onClick: () => void;
+  onClose: (id: string) => void;
+  entity?: EntityItem;
+  icon?: React.ReactNode;
+  isActive: boolean;
+  title: string;
+}
+
+export function EditableTab(props: EditableTabProps) {
+  const { entity, icon, id, isActive, onClick, onClose, title } = props;
+  const { segment } = useCurrentEditorState();
+
+  const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
+  const isChangePermitted = getEditableTabPermissions({
+    isFeatureEnabled,
+    entity,
+  });
+
+  const { enterEditMode, exitEditMode, isEditing } = useIsRenaming(id);
+
+  const isLoading = useSelector((state) =>
+    getIsSavingEntityName(state, { id, segment, entity }),
+  );
+
+  const handleClose = useEventCallback((e: React.MouseEvent) => {
+    e.stopPropagation();
+    onClose(id);
+  });
+
+  const handleDoubleClick = isChangePermitted ? enterEditMode : noop;
+
+  const dispatch = useDispatch();
+
+  const handleNameSave = useCallback(
+    (name: string) => {
+      dispatch(saveEntityName({ params: { id, name }, segment, entity }));
+      exitEditMode();
+    },
+    [entity, exitEditMode, id, segment],
+  );
+
+  return (
+    <FileTab
+      isActive={isActive}
+      onClick={onClick}
+      onClose={handleClose}
+      onDoubleClick={handleDoubleClick}
+      title={title}
+    >
+      <EditableName
+        exitEditing={exitEditMode}
+        icon={<IconContainer>{icon}</IconContainer>}
+        isEditing={isEditing}
+        isLoading={isLoading}
+        name={title}
+        onNameSave={handleNameSave}
+      />
+    </FileTab>
+  );
+}
diff --git a/app/client/src/pages/Editor/IDE/EditorTabs/FileTabs.test.tsx b/app/client/src/pages/Editor/IDE/EditorTabs/FileTabs.test.tsx
deleted file mode 100644
index f6c46822e6b5..000000000000
--- a/app/client/src/pages/Editor/IDE/EditorTabs/FileTabs.test.tsx
+++ /dev/null
@@ -1,85 +0,0 @@
-import React from "react";
-import { fireEvent, render } from "test/testUtils";
-import FileTabs from "./FileTabs";
-import { EditorState, type EntityItem } from "ee/entities/IDE/constants";
-import { PluginType } from "entities/Action";
-import { FocusEntity } from "navigation/FocusEntity";
-import { sanitizeString } from "utils/URLUtils";
-
-describe("FileTabs", () => {
-  const mockTabs: EntityItem[] = [
-    { key: "1", title: "File 1", type: PluginType.JS },
-    { key: "2", title: "File 2", type: PluginType.JS },
-    { key: "3", title: "File 3", type: PluginType.JS },
-    { key: "4", title: "File 4", type: PluginType.JS },
-  ];
-
-  const mockNavigateToTab = jest.fn();
-  const mockOnClose = jest.fn();
-  const activeEntity = {
-    entity: FocusEntity.API,
-    id: "File 1",
-    appState: EditorState.EDITOR,
-    params: {},
-  };
-
-  it("renders tabs correctly", () => {
-    const { getByTestId, getByText } = render(
-      <FileTabs
-        currentEntity={activeEntity}
-        navigateToTab={mockNavigateToTab}
-        onClose={mockOnClose}
-        tabs={mockTabs}
-      />,
-    );
-
-    // Check if each tab is rendered with correct content
-    mockTabs.forEach((tab) => {
-      const tabElement = getByTestId(`t--ide-tab-${sanitizeString(tab.title)}`);
-
-      expect(tabElement).not.toBeNull();
-
-      const tabTitleElement = getByText(tab.title);
-
-      expect(tabTitleElement).not.toBeNull();
-    });
-  });
-
-  it("check tab click", () => {
-    const { getByTestId } = render(
-      <FileTabs
-        currentEntity={activeEntity}
-        navigateToTab={mockNavigateToTab}
-        onClose={mockOnClose}
-        tabs={mockTabs}
-      />,
-    );
-    const tabElement = getByTestId(
-      `t--ide-tab-${sanitizeString(mockTabs[0].title)}`,
-    );
-
-    fireEvent.click(tabElement);
-
-    expect(mockNavigateToTab).toHaveBeenCalledWith(mockTabs[0]);
-  });
-
-  it("check for close click", () => {
-    const { getByTestId } = render(
-      <FileTabs
-        currentEntity={activeEntity}
-        navigateToTab={mockNavigateToTab}
-        onClose={mockOnClose}
-        tabs={mockTabs}
-      />,
-    );
-    const tabElement = getByTestId(
-      `t--ide-tab-${sanitizeString(mockTabs[1].title)}`,
-    );
-    const closeElement = tabElement.querySelector(
-      "[data-testid='t--tab-close-btn']",
-    ) as HTMLElement;
-
-    fireEvent.click(closeElement);
-    expect(mockOnClose).toHaveBeenCalledWith(mockTabs[1].key);
-  });
-});
diff --git a/app/client/src/pages/Editor/IDE/EditorTabs/FileTabs.tsx b/app/client/src/pages/Editor/IDE/EditorTabs/FileTabs.tsx
deleted file mode 100644
index 3d46bfba35df..000000000000
--- a/app/client/src/pages/Editor/IDE/EditorTabs/FileTabs.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import React from "react";
-
-import {
-  EditorEntityTabState,
-  type EntityItem,
-} from "ee/entities/IDE/constants";
-import { useCurrentEditorState } from "../hooks";
-import { FileTab } from "IDE/Components/FileTab";
-import type { FocusEntityInfo } from "navigation/FocusEntity";
-
-interface Props {
-  tabs: EntityItem[];
-  navigateToTab: (tab: EntityItem) => void;
-  onClose: (actionId?: string) => void;
-  currentEntity: FocusEntityInfo;
-  isListActive?: boolean;
-}
-
-const FileTabs = (props: Props) => {
-  const { currentEntity, isListActive, navigateToTab, onClose, tabs } = props;
-  const { segmentMode } = useCurrentEditorState();
-
-  const onCloseClick = (e: React.MouseEvent, id?: string) => {
-    e.stopPropagation();
-    onClose(id);
-  };
-
-  return (
-    <>
-      {tabs.map((tab: EntityItem) => (
-        <FileTab
-          icon={tab.icon}
-          isActive={
-            currentEntity.id === tab.key &&
-            segmentMode !== EditorEntityTabState.Add &&
-            !isListActive
-          }
-          key={tab.key}
-          onClick={() => navigateToTab(tab)}
-          onClose={(e) => onCloseClick(e, tab.key)}
-          title={tab.title}
-        />
-      ))}
-    </>
-  );
-};
-
-export default FileTabs;
diff --git a/app/client/src/pages/Editor/IDE/EditorTabs/List.tsx b/app/client/src/pages/Editor/IDE/EditorTabs/List.tsx
index 0884b47f778b..e73b42762e14 100644
--- a/app/client/src/pages/Editor/IDE/EditorTabs/List.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorTabs/List.tsx
@@ -8,6 +8,9 @@ import ListQuery from "../EditorPane/Query/List";
 import ListJSObjects from "../EditorPane/JS/List";
 
 const ListContainer = styled(Flex)`
+  position: absolute;
+  top: 32px;
+  padding-top: 4px;
   & .t--entity-item {
     grid-template-columns: 0 auto 1fr auto auto auto auto auto;
     height: 32px;
@@ -24,7 +27,6 @@ export const List = () => {
   return (
     <ListContainer
       bg="var(--ads-v2-color-bg)"
-      className="absolute top-[36px]" // space for tabs on top and then some padding
       data-testid="t--editorpane-list-view"
       h="calc(100% - 32px)"
       w="100%"
diff --git a/app/client/src/pages/Editor/IDE/EditorTabs/constants.ts b/app/client/src/pages/Editor/IDE/EditorTabs/constants.ts
index 69720db02512..9b06326a3fe7 100644
--- a/app/client/src/pages/Editor/IDE/EditorTabs/constants.ts
+++ b/app/client/src/pages/Editor/IDE/EditorTabs/constants.ts
@@ -37,3 +37,10 @@ export const TabSelectors: Record<
     itemUrlSelector: () => "",
   },
 };
+
+export const SCROLL_AREA_OPTIONS = {
+  overflow: {
+    x: "scroll",
+    y: "hidden",
+  },
+} as const;
diff --git a/app/client/src/pages/Editor/IDE/EditorTabs/index.tsx b/app/client/src/pages/Editor/IDE/EditorTabs/index.tsx
index 333b1be56c70..eeea9f8e7eb6 100644
--- a/app/client/src/pages/Editor/IDE/EditorTabs/index.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorTabs/index.tsx
@@ -1,17 +1,21 @@
-import React, { useEffect, useState } from "react";
-import { shallowEqual, useSelector } from "react-redux";
+import React, { useEffect } from "react";
+import { shallowEqual, useDispatch, useSelector } from "react-redux";
 import { Flex, ScrollArea, ToggleButton } from "@appsmith/ads";
-import { getIDEViewMode, getIsSideBySideEnabled } from "selectors/ideSelectors";
+import {
+  getIDEViewMode,
+  getIsSideBySideEnabled,
+  getListViewActiveState,
+} from "selectors/ideSelectors";
 import type { EntityItem } from "ee/entities/IDE/constants";
 import {
   EditorEntityTab,
   EditorEntityTabState,
   EditorViewMode,
 } from "ee/entities/IDE/constants";
-import FileTabs from "./FileTabs";
+
 import Container from "./Container";
 import { useCurrentEditorState, useIDETabClickHandlers } from "../hooks";
-import { TabSelectors } from "./constants";
+import { SCROLL_AREA_OPTIONS, TabSelectors } from "./constants";
 import { AddButton } from "./AddButton";
 import { Announcement } from "../EditorPane/components/Announcement";
 import { useLocation } from "react-router";
@@ -19,37 +23,44 @@ import { identifyEntityFromPath } from "navigation/FocusEntity";
 import { List } from "./List";
 import { ScreenModeToggle } from "./ScreenModeToggle";
 import { AddTab } from "./AddTab";
+import { setListViewActiveState } from "actions/ideActions";
+
+import { useEventCallback } from "usehooks-ts";
+
+import { EditableTab } from "./EditableTab";
 
 const EditorTabs = () => {
-  const [showListView, setShowListView] = useState(false);
   const isSideBySideEnabled = useSelector(getIsSideBySideEnabled);
   const ideViewMode = useSelector(getIDEViewMode);
   const { segment, segmentMode } = useCurrentEditorState();
   const { closeClickHandler, tabClickHandler } = useIDETabClickHandlers();
   const tabsConfig = TabSelectors[segment];
+  const entities = useSelector(tabsConfig.listSelector, shallowEqual);
   const files = useSelector(tabsConfig.tabsSelector, shallowEqual);
+  const isListViewActive = useSelector(getListViewActiveState);
 
   const location = useLocation();
+  const dispatch = useDispatch();
   const currentEntity = identifyEntityFromPath(location.pathname);
 
   // Turn off list view while changing segment, files
   useEffect(() => {
-    setShowListView(false);
-  }, [currentEntity.id, currentEntity.entity, files, segmentMode]);
+    dispatch(setListViewActiveState(false));
+  }, [currentEntity.id, currentEntity.entity, files, segmentMode, dispatch]);
 
   // Show list view if all tabs is closed
   useEffect(() => {
     if (files.length === 0 && segmentMode !== EditorEntityTabState.Add) {
-      setShowListView(true);
+      dispatch(setListViewActiveState(true));
     }
-  }, [files, segmentMode, currentEntity.entity]);
+  }, [files, segmentMode, currentEntity.entity, dispatch]);
 
   // scroll to the active tab
   useEffect(() => {
-    const activetab = document.querySelector(".editor-tab.active");
+    const activeTab = document.querySelector(".editor-tab.active");
 
-    if (activetab) {
-      activetab.scrollIntoView({
+    if (activeTab) {
+      activeTab.scrollIntoView({
         inline: "nearest",
       });
     }
@@ -68,24 +79,25 @@ const EditorTabs = () => {
     }
   }, [files]);
 
-  if (!isSideBySideEnabled) return null;
-
-  if (segment === EditorEntityTab.UI) return null;
-
-  const handleHamburgerClick = () => {
+  const handleHamburgerClick = useEventCallback(() => {
     if (files.length === 0 && segmentMode !== EditorEntityTabState.Add) return;
 
-    setShowListView(!showListView);
-  };
+    dispatch(setListViewActiveState(!isListViewActive));
+  });
 
-  const onTabClick = (tab: EntityItem) => {
-    setShowListView(false);
+  // TODO: this returns a new function every time, needs to be recomposed
+  const handleTabClick = useEventCallback((tab: EntityItem) => () => {
+    dispatch(setListViewActiveState(false));
     tabClickHandler(tab);
-  };
+  });
 
-  const newTabClickHandler = () => {
-    setShowListView(false);
-  };
+  const handleNewTabClick = useEventCallback(() => {
+    dispatch(setListViewActiveState(false));
+  });
+
+  if (!isSideBySideEnabled) return null;
+
+  if (segment === EditorEntityTab.UI) return null;
 
   return (
     <>
@@ -94,7 +106,7 @@ const EditorTabs = () => {
           <ToggleButton
             data-testid="t--list-toggle"
             icon="hamburger"
-            isSelected={showListView}
+            isSelected={isListViewActive}
             onClick={handleHamburgerClick}
             size="md"
           />
@@ -102,13 +114,8 @@ const EditorTabs = () => {
         <ScrollArea
           className="h-[32px] top-[0.5px]"
           data-testid="t--editor-tabs"
-          options={{
-            overflow: {
-              x: "scroll",
-              y: "hidden",
-            },
-          }}
-          size={"sm"}
+          options={SCROLL_AREA_OPTIONS}
+          size="sm"
         >
           <Flex
             className="items-center"
@@ -116,28 +123,42 @@ const EditorTabs = () => {
             gap="spaces-2"
             height="100%"
           >
-            <FileTabs
-              currentEntity={currentEntity}
-              isListActive={showListView}
-              navigateToTab={onTabClick}
-              onClose={closeClickHandler}
-              tabs={files}
-            />
+            {files.map((tab) => {
+              const entity = entities.find((entity) => entity.key === tab.key);
+
+              return (
+                <EditableTab
+                  entity={entity}
+                  icon={tab.icon}
+                  id={tab.key}
+                  isActive={
+                    currentEntity.id === tab.key &&
+                    segmentMode !== EditorEntityTabState.Add &&
+                    !isListViewActive
+                  }
+                  key={tab.key}
+                  onClick={handleTabClick(tab)}
+                  onClose={closeClickHandler}
+                  title={tab.title}
+                />
+              );
+            })}
             <AddTab
-              isListActive={showListView}
-              newTabClickCallback={newTabClickHandler}
+              isListActive={isListViewActive}
+              newTabClickCallback={handleNewTabClick}
               onClose={closeClickHandler}
             />
           </Flex>
         </ScrollArea>
-
         {files.length > 0 ? <AddButton /> : null}
         {/* Switch screen mode button */}
         <ScreenModeToggle />
       </Container>
 
       {/* Overflow list */}
-      {showListView && ideViewMode === EditorViewMode.SplitScreen && <List />}
+      {isListViewActive && ideViewMode === EditorViewMode.SplitScreen && (
+        <List />
+      )}
 
       {/* Announcement modal */}
       {ideViewMode === EditorViewMode.SplitScreen && <Announcement />}
diff --git a/app/client/src/pages/Editor/IDE/Header/index.tsx b/app/client/src/pages/Editor/IDE/Header/index.tsx
index 0c234913f066..ee4365196a5c 100644
--- a/app/client/src/pages/Editor/IDE/Header/index.tsx
+++ b/app/client/src/pages/Editor/IDE/Header/index.tsx
@@ -70,13 +70,14 @@ import { useHref } from "pages/Editor/utils";
 import { viewerURL } from "ee/RouteBuilder";
 import HelpBar from "components/editorComponents/GlobalSearch/HelpBar";
 import { EditorTitle } from "./EditorTitle";
-import { useCurrentAppState } from "pages/Editor/IDE/hooks";
+import { useCurrentAppState } from "../hooks/useCurrentAppState";
 import { EditorState } from "ee/entities/IDE/constants";
 import { EditorSaveIndicator } from "pages/Editor/EditorSaveIndicator";
 import type { Page } from "entities/Page";
 import { IDEHeader, IDEHeaderTitle } from "IDE";
 import { APPLICATIONS_URL } from "constants/routes";
 import { useNavigationMenuData } from "../../EditorName/useNavigationMenuData";
+import useLibraryHeaderTitle from "ee/pages/Editor/IDE/Header/useLibraryHeaderTitle";
 
 const StyledDivider = styled(Divider)`
   height: 50%;
@@ -92,6 +93,8 @@ interface HeaderTitleProps {
 }
 
 const HeaderTitleComponent = ({ appState, currentPage }: HeaderTitleProps) => {
+  const libraryHeaderTitle = useLibraryHeaderTitle();
+
   switch (appState) {
     case EditorState.DATA:
       return (
@@ -110,12 +113,7 @@ const HeaderTitleComponent = ({ appState, currentPage }: HeaderTitleProps) => {
         />
       );
     case EditorState.LIBRARIES:
-      return (
-        <IDEHeaderTitle
-          key={appState}
-          title={createMessage(HEADER_TITLES.LIBRARIES)}
-        />
-      );
+      return <IDEHeaderTitle key={appState} title={libraryHeaderTitle} />;
     default:
       return <EditorTitle key={appState} title={currentPage?.pageName || ""} />;
   }
diff --git a/app/client/src/pages/Editor/IDE/Layout/hooks/useGridLayoutTemplate.ts b/app/client/src/pages/Editor/IDE/Layout/hooks/useGridLayoutTemplate.ts
index 08e2fa5f4966..789a3837ebfa 100644
--- a/app/client/src/pages/Editor/IDE/Layout/hooks/useGridLayoutTemplate.ts
+++ b/app/client/src/pages/Editor/IDE/Layout/hooks/useGridLayoutTemplate.ts
@@ -2,7 +2,8 @@ import React from "react";
 import type { AnimatedGridUnit } from "components/AnimatedGridLayout";
 import { useSelector } from "react-redux";
 import useWindowDimensions from "utils/hooks/useWindowDimensions";
-import { useCurrentAppState, useCurrentEditorState } from "../../hooks";
+import { useCurrentEditorState } from "../../hooks";
+import { useCurrentAppState } from "../../hooks/useCurrentAppState";
 import { getPropertyPaneWidth } from "selectors/propertyPaneSelectors";
 import { previewModeSelector } from "selectors/editorSelectors";
 import { getIDEViewMode } from "selectors/ideSelectors";
@@ -15,6 +16,7 @@ import {
 import {
   APP_SETTINGS_PANE_WIDTH,
   APP_SIDEBAR_WIDTH,
+  APP_LIBRARIES_PANE_WIDTH,
 } from "constants/AppConstants";
 import { useEditorStateLeftPaneWidth } from "./useEditorStateLeftPaneWidth";
 import { type Area, Areas, SIDEBAR_WIDTH } from "../constants";
@@ -96,10 +98,10 @@ function useGridLayoutTemplate(): ReturnValue {
           } else {
             setColumns([
               SIDEBAR_WIDTH,
-              "255px",
+              `${APP_LIBRARIES_PANE_WIDTH}px`,
               (windowWidth -
                 APP_SIDEBAR_WIDTH -
-                255 +
+                APP_LIBRARIES_PANE_WIDTH +
                 "px") as AnimatedGridUnit,
               "0px",
             ]);
diff --git a/app/client/src/pages/Editor/IDE/LeftPane/LibrarySidePane.tsx b/app/client/src/pages/Editor/IDE/LeftPane/JSLibrariesSection.tsx
similarity index 56%
rename from app/client/src/pages/Editor/IDE/LeftPane/LibrarySidePane.tsx
rename to app/client/src/pages/Editor/IDE/LeftPane/JSLibrariesSection.tsx
index b5444a9a0400..23c238595413 100644
--- a/app/client/src/pages/Editor/IDE/LeftPane/LibrarySidePane.tsx
+++ b/app/client/src/pages/Editor/IDE/LeftPane/JSLibrariesSection.tsx
@@ -1,13 +1,13 @@
-import React from "react";
-import AddLibraryPopover from "./AddLibraryPopover";
-import PaneHeader from "./PaneHeader";
-import { useSelector } from "react-redux";
+import React, { useMemo } from "react";
+
+import PaneHeader from "pages/Editor/IDE/LeftPane/PaneHeader";
+import AddLibraryPopover from "pages/Editor/IDE/LeftPane/AddLibraryPopover";
 import { selectLibrariesForExplorer } from "ee/selectors/entitiesSelector";
+import { useSelector } from "react-redux";
 import { animated, useTransition } from "react-spring";
 import { LibraryEntity } from "pages/Editor/Explorer/Libraries";
-import { Flex } from "@appsmith/ads";
 
-const LibrarySidePane = () => {
+function JSLibrariesSection() {
   const libraries = useSelector(selectLibrariesForExplorer);
   const transitions = useTransition(libraries, {
     keys: (lib) => lib.name,
@@ -16,24 +16,18 @@ const LibrarySidePane = () => {
     leave: { opacity: 1 },
   });
 
+  const rightIcon = useMemo(() => <AddLibraryPopover />, []);
+
   return (
-    <Flex
-      borderRight="1px solid var(--ads-v2-color-border)"
-      flexDirection="column"
-      height="100%"
-      width={"100%"}
-    >
-      <PaneHeader
-        rightIcon={<AddLibraryPopover />}
-        title="Installed Libraries"
-      />
+    <>
+      <PaneHeader rightIcon={rightIcon} title="Installed Libraries" />
       {transitions((style, lib) => (
         <animated.div style={style}>
           <LibraryEntity lib={lib} />
         </animated.div>
       ))}
-    </Flex>
+    </>
   );
-};
+}
 
-export default LibrarySidePane;
+export default JSLibrariesSection;
diff --git a/app/client/src/pages/Editor/IDE/LeftPane/index.tsx b/app/client/src/pages/Editor/IDE/LeftPane/index.tsx
index 585632bc81e6..60a8eb743cb2 100644
--- a/app/client/src/pages/Editor/IDE/LeftPane/index.tsx
+++ b/app/client/src/pages/Editor/IDE/LeftPane/index.tsx
@@ -1,9 +1,10 @@
-import React from "react";
+import React, { useMemo } from "react";
 import styled from "styled-components";
 import { Switch, useRouteMatch } from "react-router";
 import { SentryRoute } from "ee/AppRouter";
 import {
   APP_LIBRARIES_EDITOR_PATH,
+  APP_PACKAGES_EDITOR_PATH,
   APP_SETTINGS_EDITOR_PATH,
   DATA_SOURCES_EDITOR_ID_PATH,
   DATA_SOURCES_EDITOR_LIST_PATH,
@@ -12,8 +13,8 @@ import {
 } from "constants/routes";
 import AppSettingsPane from "./AppSettings";
 import DataSidePane from "./DataSidePane";
-import LibrarySidePane from "./LibrarySidePane";
 import EditorPane from "../EditorPane";
+import LibrarySidePane from "ee/pages/Editor/IDE/LeftPane/LibrarySidePane";
 
 export const LeftPaneContainer = styled.div<{ showRightBorder?: boolean }>`
   height: 100%;
@@ -26,23 +27,32 @@ export const LeftPaneContainer = styled.div<{ showRightBorder?: boolean }>`
 const LeftPane = () => {
   const { path } = useRouteMatch();
 
+  const dataSidePanePaths = useMemo(
+    () => [
+      `${path}${DATA_SOURCES_EDITOR_LIST_PATH}`,
+      `${path}${DATA_SOURCES_EDITOR_ID_PATH}`,
+      `${path}${INTEGRATION_EDITOR_PATH}`,
+      `${path}${SAAS_GSHEET_EDITOR_ID_PATH}`,
+    ],
+    [path],
+  );
+
+  const librarySidePanePaths = useMemo(
+    () => [
+      `${path}${APP_LIBRARIES_EDITOR_PATH}`,
+      `${path}${APP_PACKAGES_EDITOR_PATH}`,
+    ],
+    [path],
+  );
+
   return (
     <LeftPaneContainer showRightBorder={false}>
       <Switch>
-        <SentryRoute
-          component={DataSidePane}
-          exact
-          path={[
-            `${path}${DATA_SOURCES_EDITOR_LIST_PATH}`,
-            `${path}${DATA_SOURCES_EDITOR_ID_PATH}`,
-            `${path}${INTEGRATION_EDITOR_PATH}`,
-            `${path}${SAAS_GSHEET_EDITOR_ID_PATH}`,
-          ]}
-        />
+        <SentryRoute component={DataSidePane} exact path={dataSidePanePaths} />
         <SentryRoute
           component={LibrarySidePane}
           exact
-          path={`${path}${APP_LIBRARIES_EDITOR_PATH}`}
+          path={librarySidePanePaths}
         />
         <SentryRoute
           component={AppSettingsPane}
diff --git a/app/client/src/pages/Editor/IDE/Sidebar.tsx b/app/client/src/pages/Editor/IDE/Sidebar.tsx
index 430993da9b6d..455de72a5c99 100644
--- a/app/client/src/pages/Editor/IDE/Sidebar.tsx
+++ b/app/client/src/pages/Editor/IDE/Sidebar.tsx
@@ -3,7 +3,7 @@ import { useDispatch, useSelector } from "react-redux";
 import { builderURL } from "ee/RouteBuilder";
 import { getCurrentBasePageId } from "selectors/editorSelectors";
 import history, { NavigationMethod } from "utils/history";
-import { useCurrentAppState } from "./hooks";
+import { useCurrentAppState } from "./hooks/useCurrentAppState";
 import { getCurrentWorkspaceId } from "ee/selectors/selectedWorkspaceSelectors";
 import { fetchWorkspace } from "ee/actions/workspaceActions";
 import { IDESidebar, Condition } from "IDE";
diff --git a/app/client/src/pages/Editor/IDE/hooks.ts b/app/client/src/pages/Editor/IDE/hooks.ts
index 128cb08caa06..c6cb404b919c 100644
--- a/app/client/src/pages/Editor/IDE/hooks.ts
+++ b/app/client/src/pages/Editor/IDE/hooks.ts
@@ -3,7 +3,6 @@ import type { EntityItem } from "ee/entities/IDE/constants";
 import {
   EditorEntityTab,
   EditorEntityTabState,
-  EditorState,
 } from "ee/entities/IDE/constants";
 import { useLocation } from "react-router";
 import { FocusEntity, identifyEntityFromPath } from "navigation/FocusEntity";
@@ -29,18 +28,6 @@ import { closeQueryActionTab } from "actions/pluginActionActions";
 import { getCurrentBasePageId } from "selectors/editorSelectors";
 import { getCurrentEntityInfo } from "../utils";
 
-export const useCurrentAppState = () => {
-  const [appState, setAppState] = useState(EditorState.EDITOR);
-  const { pathname } = useLocation();
-  const entityInfo = identifyEntityFromPath(pathname);
-
-  useEffect(() => {
-    setAppState(entityInfo.appState);
-  }, [entityInfo.appState]);
-
-  return appState;
-};
-
 export const useCurrentEditorState = () => {
   const [selectedSegment, setSelectedSegment] = useState<EditorEntityTab>(
     EditorEntityTab.UI,
@@ -180,11 +167,13 @@ export const useIDETabClickHandlers = () => {
     (item: EntityItem) => {
       const navigateToUrl = tabsConfig.itemUrlSelector(item, basePageId);
 
-      history.push(navigateToUrl, {
-        invokedBy: NavigationMethod.EditorTabs,
-      });
+      if (navigateToUrl !== history.location.pathname) {
+        history.push(navigateToUrl, {
+          invokedBy: NavigationMethod.EditorTabs,
+        });
+      }
     },
-    [segment, basePageId],
+    [tabsConfig, basePageId],
   );
 
   const closeClickHandler = useCallback(
diff --git a/app/client/src/pages/Editor/IDE/hooks/useCurrentAppState.ts b/app/client/src/pages/Editor/IDE/hooks/useCurrentAppState.ts
new file mode 100644
index 000000000000..db1061cdc149
--- /dev/null
+++ b/app/client/src/pages/Editor/IDE/hooks/useCurrentAppState.ts
@@ -0,0 +1,16 @@
+import { useEffect, useState } from "react";
+import { EditorState } from "ee/entities/IDE/constants";
+import { useLocation } from "react-router";
+import { identifyEntityFromPath } from "navigation/FocusEntity";
+
+export const useCurrentAppState = () => {
+  const [appState, setAppState] = useState(EditorState.EDITOR);
+  const { pathname } = useLocation();
+  const entityInfo = identifyEntityFromPath(pathname);
+
+  useEffect(() => {
+    setAppState(entityInfo.appState);
+  }, [entityInfo.appState]);
+
+  return appState;
+};
diff --git a/app/client/src/pages/Editor/IntegrationEditor/CreateNewDatasourceTab.tsx b/app/client/src/pages/Editor/IntegrationEditor/CreateNewDatasourceTab.tsx
index 5c304abc7b06..8bbdc69257f4 100644
--- a/app/client/src/pages/Editor/IntegrationEditor/CreateNewDatasourceTab.tsx
+++ b/app/client/src/pages/Editor/IntegrationEditor/CreateNewDatasourceTab.tsx
@@ -39,6 +39,7 @@ import { useEditorType } from "ee/hooks";
 import { useParentEntityInfo } from "ee/hooks/datasourceEditorHooks";
 import AIDataSources from "./AIDataSources";
 import Debugger from "../DataSourceEditor/Debugger";
+import { isPluginActionCreating } from "PluginActionEditor/store";
 
 const NewIntegrationsContainer = styled.div`
   ${thinScrollbar};
@@ -381,7 +382,7 @@ const mapStateToProps = (state: AppState) => {
   return {
     dataSources: getDatasources(state),
     mockDatasources: getMockDatasources(state),
-    isCreating: state.ui.apiPane.isCreating,
+    isCreating: isPluginActionCreating(state),
     applicationId: getCurrentApplicationId(state),
     canCreateDatasource,
     showDebugger,
diff --git a/app/client/src/pages/Editor/JSEditor/AppJSEditorContextMenu.tsx b/app/client/src/pages/Editor/JSEditor/AppJSEditorContextMenu.tsx
index 9ec5c9811001..6538da16c979 100644
--- a/app/client/src/pages/Editor/JSEditor/AppJSEditorContextMenu.tsx
+++ b/app/client/src/pages/Editor/JSEditor/AppJSEditorContextMenu.tsx
@@ -12,6 +12,7 @@ import {
   CONFIRM_CONTEXT_DELETE,
   CONTEXT_MOVE,
   createMessage,
+  CONTEXT_RENAME,
 } from "ee/constants/messages";
 import { getPageListAsOptions } from "ee/selectors/entitiesSelector";
 import {
@@ -32,6 +33,7 @@ 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";
 
 interface AppJSEditorContextMenuProps {
   pageId: string;
@@ -56,6 +58,13 @@ 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);
+  }, []);
+
   const copyJSCollectionToPage = useCallback(
     (actionId: string, actionName: string, pageId: string) => {
       dispatch(
@@ -96,6 +105,14 @@ export function AppJSEditorContextMenu({
 
   const menuPages = useSelector(getPageListAsOptions, equal);
 
+  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",
@@ -169,7 +186,7 @@ export function AppJSEditorContextMenu({
     className: "t--apiFormDeleteBtn error-menuitem",
   };
 
-  const options: ContextMenuOption[] = [];
+  const options: ContextMenuOption[] = [renameOption];
 
   if (isChangePermitted) {
     options.push(copyOption);
diff --git a/app/client/src/pages/Editor/JSEditor/Form.tsx b/app/client/src/pages/Editor/JSEditor/Form.tsx
index a2cc86b4072f..68028eb4ebaf 100644
--- a/app/client/src/pages/Editor/JSEditor/Form.tsx
+++ b/app/client/src/pages/Editor/JSEditor/Form.tsx
@@ -2,15 +2,8 @@ import type { ChangeEvent } from "react";
 import React, { useCallback, useEffect, useMemo, useState } from "react";
 import type { JSAction } from "entities/JSCollection";
 import type { DropdownOnSelect } from "@appsmith/ads-old";
-import {
-  CodeEditorBorder,
-  EditorModes,
-  EditorSize,
-  EditorTheme,
-  TabBehaviour,
-} from "components/editorComponents/CodeEditor/EditorConfig";
-import type { JSObjectNameEditorProps } from "./JSObjectNameEditor";
-import JSObjectNameEditor from "./JSObjectNameEditor";
+import { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig";
+import type { JSObjectNameEditorProps } from "./JSEditorToolbar/JSObjectNameEditor";
 import {
   setActiveJSAction,
   setJsPaneConfigSelectedTab,
@@ -23,7 +16,6 @@ import { useLocation } from "react-router";
 import JSResponseView from "components/editorComponents/JSResponseView";
 import { isEmpty } from "lodash";
 import equal from "fast-deep-equal/es6";
-import { JSFunctionRun } from "./JSFunctionRun";
 import type { AppState } from "ee/reducers";
 import {
   getActiveJSActionId,
@@ -31,26 +23,13 @@ import {
   getJSActions,
   getJSCollectionParseErrors,
 } from "ee/selectors/entitiesSelector";
-import type { JSActionDropdownOption } from "./utils";
 import {
-  convertJSActionsToDropdownOptions,
-  convertJSActionToDropdownOption,
   getActionFromJsCollection,
-  getJSActionOption,
   getJSFunctionLineGutter,
   getJSPropertyLineFromName,
 } from "./utils";
-import JSFunctionSettingsView from "./JSFunctionSettings";
-import type { JSFunctionSettingsProps } from "./JSFunctionSettings";
 import JSObjectHotKeys from "./JSObjectHotKeys";
-import {
-  ActionButtons,
-  Form,
-  FormWrapper,
-  NameWrapper,
-  StyledFormRow,
-  TabbedViewContainer,
-} from "./styledComponents";
+import { Form, FormWrapper } from "./styledComponents";
 import { getJSPaneConfigSelectedTab } from "selectors/jsPaneSelectors";
 import type { EventLocation } from "ee/utils/analyticsUtilTypes";
 import {
@@ -59,10 +38,8 @@ import {
 } from "actions/editorContextActions";
 import history from "utils/history";
 import { CursorPositionOrigin } from "ee/reducers/uiReducers/editorContextReducer";
-import LazyCodeEditor from "components/editorComponents/LazyCodeEditor";
 import styled from "styled-components";
-import { Tab, TabPanel, Tabs, TabsList } from "@appsmith/ads";
-import { JSEditorTab } from "reducers/uiReducers/jsPaneReducer";
+import type { JSEditorTab } from "reducers/uiReducers/jsPaneReducer";
 import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
 import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
 import {
@@ -70,8 +47,17 @@ import {
   getHasManageActionPermission,
 } from "ee/utils/BusinessFeatures/permissionPageHelpers";
 import type { JSCollectionData } from "ee/reducers/entityReducers/jsActionsReducer";
-import { DEBUGGER_TAB_KEYS } from "../../../components/editorComponents/Debugger/helpers";
+import { DEBUGGER_TAB_KEYS } from "components/editorComponents/Debugger/constants";
 import RunHistory from "ee/components/RunHistory";
+import { JSEditorForm as EditorForm } from "./JSEditorForm";
+import {
+  JSEditorToolbar,
+  type JSActionDropdownOption,
+  convertJSActionToDropdownOption,
+  getJSActionOption,
+} from "./JSEditorToolbar";
+import type { JSFunctionSettingsProps } from "./JSEditorToolbar/components/old/JSFunctionSettings";
+
 interface JSFormProps {
   jsCollectionData: JSCollectionData;
   contextMenu: React.ReactNode;
@@ -82,6 +68,7 @@ interface JSFormProps {
   hideContextMenuOnEditor?: boolean;
   hideEditIconOnEditor?: boolean;
   notification?: React.ReactNode;
+  showNameEditor?: boolean;
 }
 
 type Props = JSFormProps;
@@ -99,6 +86,7 @@ const SecondaryWrapper = styled.div`
   flex-direction: column;
   flex: 1;
   overflow: hidden;
+
   &&& {
     .ads-v2-tabs,
     &.js-editor-tab {
@@ -121,6 +109,7 @@ function JSEditorForm({
   notification,
   onUpdateSettings,
   saveJSObjectName,
+  showNameEditor = false,
   showSettings = true,
 }: Props) {
   const theme = EditorTheme.LIGHT;
@@ -347,33 +336,28 @@ function JSEditorForm({
       >
         {backLink}
         <Form onSubmit={(event) => event.preventDefault()}>
-          <StyledFormRow className="form-row-header">
-            <NameWrapper className="t--nameOfJSObject">
-              <JSObjectNameEditor
-                disabled={!isChangePermitted || hideEditIconOnEditor}
-                saveJSObjectName={saveJSObjectName}
-              />
-            </NameWrapper>
-            <ActionButtons className="t--formActionButtons">
-              {!hideContextMenuOnEditor && contextMenu}
-              <JSFunctionRun
-                disabled={disableRunFunctionality || !isExecutePermitted}
-                isLoading={isExecutingCurrentJSAction}
-                jsCollection={currentJSCollection}
-                onButtonClick={(
-                  event:
-                    | React.MouseEvent<HTMLElement, MouseEvent>
-                    | KeyboardEvent,
-                ) => {
-                  handleRunAction(event, "JS_OBJECT_MAIN_RUN_BUTTON");
-                }}
-                onSelect={handleJSActionOptionSelection}
-                options={convertJSActionsToDropdownOptions(jsActions)}
-                selected={selectedJSActionOption}
-                showTooltip={!selectedJSActionOption.data}
-              />
-            </ActionButtons>
-          </StyledFormRow>
+          <JSEditorToolbar
+            changePermitted={isChangePermitted}
+            contextMenu={contextMenu}
+            disableRunFunctionality={disableRunFunctionality}
+            executePermitted={isExecutePermitted}
+            hideContextMenuOnEditor={hideContextMenuOnEditor}
+            hideEditIconOnEditor={hideEditIconOnEditor}
+            jsActions={jsActions}
+            jsCollection={currentJSCollection}
+            loading={isExecutingCurrentJSAction}
+            onButtonClick={(
+              event: React.MouseEvent<HTMLElement, MouseEvent> | KeyboardEvent,
+            ) => {
+              handleRunAction(event, "JS_OBJECT_MAIN_RUN_BUTTON");
+            }}
+            onSelect={handleJSActionOptionSelection}
+            onUpdateSettings={onUpdateSettings}
+            saveJSObjectName={saveJSObjectName}
+            selected={selectedJSActionOption}
+            showNameEditor={showNameEditor}
+            showSettings={showSettings}
+          />
           {notification && (
             <StyledNotificationWrapper>
               {notification}
@@ -382,73 +366,22 @@ function JSEditorForm({
           <Wrapper>
             <div className="flex flex-1 w-full">
               <SecondaryWrapper>
-                <TabbedViewContainer isExecuting={isExecutingCurrentJSAction}>
-                  <Tabs
-                    defaultValue={JSEditorTab.CODE}
-                    onValueChange={(string) =>
-                      setSelectedConfigTab(string as JSEditorTab)
-                    }
-                    value={selectedConfigTab}
-                  >
-                    <TabsList>
-                      <Tab
-                        data-testid={`t--js-editor-` + JSEditorTab.CODE}
-                        value={JSEditorTab.CODE}
-                      >
-                        Code
-                      </Tab>
-                      {showSettings && (
-                        <Tab
-                          data-testid={`t--js-editor-` + JSEditorTab.SETTINGS}
-                          value={JSEditorTab.SETTINGS}
-                        >
-                          Settings
-                        </Tab>
-                      )}
-                    </TabsList>
-                    <TabPanel value={JSEditorTab.CODE}>
-                      <div className="js-editor-tab">
-                        <LazyCodeEditor
-                          AIAssisted
-                          blockCompletions={blockCompletions}
-                          border={CodeEditorBorder.NONE}
-                          borderLess
-                          className={"js-editor"}
-                          customGutter={JSGutters}
-                          dataTreePath={`${currentJSCollection.name}.body`}
-                          disabled={!isChangePermitted}
-                          folding
-                          height={"100%"}
-                          hideEvaluatedValue
-                          input={{
-                            value: currentJSCollection.body,
-                            onChange: handleEditorChange,
-                          }}
-                          isJSObject
-                          jsObjectName={currentJSCollection.name}
-                          mode={EditorModes.JAVASCRIPT}
-                          placeholder="Let's write some code!"
-                          showLightningMenu={false}
-                          showLineNumbers
-                          size={EditorSize.EXTENDED}
-                          tabBehaviour={TabBehaviour.INDENT}
-                          theme={theme}
-                        />
-                      </div>
-                    </TabPanel>
-                    {showSettings && (
-                      <TabPanel value={JSEditorTab.SETTINGS}>
-                        <div className="js-editor-tab">
-                          <JSFunctionSettingsView
-                            actions={jsActions}
-                            disabled={!isChangePermitted}
-                            onUpdateSettings={onUpdateSettings}
-                          />
-                        </div>
-                      </TabPanel>
-                    )}
-                  </Tabs>
-                </TabbedViewContainer>
+                <EditorForm
+                  actions={jsActions}
+                  blockCompletions={blockCompletions}
+                  changePermitted={isChangePermitted}
+                  currentJSCollection={currentJSCollection}
+                  customGutter={JSGutters}
+                  executing={isExecutingCurrentJSAction}
+                  onChange={handleEditorChange}
+                  onUpdateSettings={onUpdateSettings}
+                  onValueChange={(string) =>
+                    setSelectedConfigTab(string as JSEditorTab)
+                  }
+                  showSettings={showSettings}
+                  theme={theme}
+                  value={selectedConfigTab}
+                />
                 <JSResponseView
                   currentFunction={activeResponse}
                   disabled={disableRunFunctionality || !isExecutePermitted}
diff --git a/app/client/src/pages/Editor/JSEditor/JSBlankState.tsx b/app/client/src/pages/Editor/JSEditor/JSBlankState.tsx
index acf141ca0bec..303f41b1893b 100644
--- a/app/client/src/pages/Editor/JSEditor/JSBlankState.tsx
+++ b/app/client/src/pages/Editor/JSEditor/JSBlankState.tsx
@@ -26,4 +26,4 @@ const JSBlankState = () => {
   );
 };
 
-export { JSBlankState };
+export default JSBlankState;
diff --git a/app/client/src/pages/Editor/JSEditor/JSEditorContextMenu.tsx b/app/client/src/pages/Editor/JSEditor/JSEditorContextMenu.tsx
index 058cd9ee4ac7..1341754a9cfb 100644
--- a/app/client/src/pages/Editor/JSEditor/JSEditorContextMenu.tsx
+++ b/app/client/src/pages/Editor/JSEditor/JSEditorContextMenu.tsx
@@ -12,6 +12,8 @@ import {
   MenuTrigger,
   Text,
 } from "@appsmith/ads";
+import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
+import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
 
 export interface ContextMenuOption {
   id?: string;
@@ -35,6 +37,10 @@ export function JSEditorContextMenu({
   onMenuClose,
   options,
 }: EntityContextMenuProps) {
+  const isActionRedesignEnabled = useFeatureFlag(
+    FEATURE_FLAG.release_actions_redesign_enabled,
+  );
+
   if (options.length === 0) {
     return null;
   }
@@ -53,11 +59,11 @@ export function JSEditorContextMenu({
           data-testid="more-action-trigger"
           isIconButton
           kind="tertiary"
-          size="md"
-          startIcon="context-menu"
+          size={isActionRedesignEnabled ? "sm" : "md"}
+          startIcon={isActionRedesignEnabled ? "more-2-fill" : "context-menu"}
         />
       </MenuTrigger>
-      <MenuContent avoidCollisions>
+      <MenuContent align="end" avoidCollisions>
         {options.map((option, index) => {
           if (option.children) {
             return (
diff --git a/app/client/src/pages/Editor/JSEditor/JSEditorForm/JSEditorForm.tsx b/app/client/src/pages/Editor/JSEditor/JSEditorForm/JSEditorForm.tsx
new file mode 100644
index 000000000000..b7ab3ad48447
--- /dev/null
+++ b/app/client/src/pages/Editor/JSEditor/JSEditorForm/JSEditorForm.tsx
@@ -0,0 +1,89 @@
+import React from "react";
+import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
+import type { JSEditorTab } from "reducers/uiReducers/jsPaneReducer";
+import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
+import {
+  type BlockCompletion,
+  CodeEditorBorder,
+  EditorModes,
+  EditorSize,
+  type EditorTheme,
+  TabBehaviour,
+} from "components/editorComponents/CodeEditor/EditorConfig";
+import type { CodeEditorGutter } from "components/editorComponents/CodeEditor";
+import type { JSAction, JSCollection } from "entities/JSCollection";
+import { OldJSEditorForm } from "./old/JSEditorForm";
+import type { OnUpdateSettingsProps } from "../JSEditorToolbar";
+import LazyCodeEditor from "components/editorComponents/LazyCodeEditor";
+import { Flex } from "@appsmith/ads";
+
+interface Props {
+  executing: boolean;
+  onValueChange: (value: string) => void;
+  value: JSEditorTab;
+  showSettings: undefined | boolean;
+  blockCompletions: Array<BlockCompletion>;
+  customGutter: CodeEditorGutter;
+  currentJSCollection: JSCollection;
+  changePermitted: boolean;
+  onChange: (valueOrEvent: React.ChangeEvent | string) => void;
+  theme: EditorTheme.LIGHT;
+  actions: JSAction[];
+  onUpdateSettings?: (props: OnUpdateSettingsProps) => void;
+}
+
+export const JSEditorForm = (props: Props) => {
+  const isActionRedesignEnabled = useFeatureFlag(
+    FEATURE_FLAG.release_actions_redesign_enabled,
+  );
+
+  if (!isActionRedesignEnabled) {
+    return (
+      <OldJSEditorForm
+        actions={props.actions}
+        blockCompletions={props.blockCompletions}
+        changePermitted={props.changePermitted}
+        currentJSCollection={props.currentJSCollection}
+        customGutter={props.customGutter}
+        executing={props.executing}
+        onChange={props.onChange}
+        onUpdateSettings={props.onUpdateSettings}
+        onValueChange={props.onValueChange}
+        showSettings={props.showSettings}
+        theme={props.theme}
+        value={props.value}
+      />
+    );
+  }
+
+  return (
+    <Flex flex="1" overflowY="scroll">
+      <LazyCodeEditor
+        AIAssisted
+        blockCompletions={props.blockCompletions}
+        border={CodeEditorBorder.NONE}
+        borderLess
+        className={"js-editor"}
+        customGutter={props.customGutter}
+        dataTreePath={`${props.currentJSCollection.name}.body`}
+        disabled={!props.changePermitted}
+        folding
+        height={"100%"}
+        hideEvaluatedValue
+        input={{
+          value: props.currentJSCollection.body,
+          onChange: props.onChange,
+        }}
+        isJSObject
+        jsObjectName={props.currentJSCollection.name}
+        mode={EditorModes.JAVASCRIPT}
+        placeholder="Let's write some code!"
+        showLightningMenu={false}
+        showLineNumbers
+        size={EditorSize.EXTENDED}
+        tabBehaviour={TabBehaviour.INDENT}
+        theme={props.theme}
+      />
+    </Flex>
+  );
+};
diff --git a/app/client/src/pages/Editor/JSEditor/JSEditorForm/index.ts b/app/client/src/pages/Editor/JSEditor/JSEditorForm/index.ts
new file mode 100644
index 000000000000..cd9030a6b5b7
--- /dev/null
+++ b/app/client/src/pages/Editor/JSEditor/JSEditorForm/index.ts
@@ -0,0 +1 @@
+export { JSEditorForm } from "./JSEditorForm";
diff --git a/app/client/src/pages/Editor/JSEditor/JSEditorForm/old/JSEditorForm.tsx b/app/client/src/pages/Editor/JSEditor/JSEditorForm/old/JSEditorForm.tsx
new file mode 100644
index 000000000000..69ddf446b370
--- /dev/null
+++ b/app/client/src/pages/Editor/JSEditor/JSEditorForm/old/JSEditorForm.tsx
@@ -0,0 +1,104 @@
+import { JSEditorTab } from "reducers/uiReducers/jsPaneReducer";
+import React from "react";
+import type {
+  BlockCompletion,
+  EditorTheme,
+} from "components/editorComponents/CodeEditor/EditorConfig";
+import {
+  CodeEditorBorder,
+  EditorModes,
+  EditorSize,
+  TabBehaviour,
+} from "components/editorComponents/CodeEditor/EditorConfig";
+import { TabbedViewContainer } from "../../styledComponents";
+import { Tab, TabPanel, Tabs, TabsList } from "@appsmith/ads";
+import LazyCodeEditor from "components/editorComponents/LazyCodeEditor";
+import type { CodeEditorGutter } from "components/editorComponents/CodeEditor";
+import type { JSAction, JSCollection } from "entities/JSCollection";
+import { type OnUpdateSettingsProps } from "../../JSEditorToolbar";
+import { JSFunctionSettings } from "../../JSEditorToolbar/components/JSFunctionSettings";
+
+interface Props {
+  executing: boolean;
+  onValueChange: (value: string) => void;
+  value: JSEditorTab;
+  showSettings: undefined | boolean;
+  blockCompletions: Array<BlockCompletion>;
+  customGutter: CodeEditorGutter;
+  currentJSCollection: JSCollection;
+  changePermitted: boolean;
+  onChange: (valueOrEvent: React.ChangeEvent | string) => void;
+  theme: EditorTheme.LIGHT;
+  actions: JSAction[];
+  onUpdateSettings?: (props: OnUpdateSettingsProps) => void;
+}
+
+export function OldJSEditorForm(props: Props) {
+  return (
+    <TabbedViewContainer isExecuting={props.executing}>
+      <Tabs
+        defaultValue={JSEditorTab.CODE}
+        onValueChange={props.onValueChange}
+        value={props.value}
+      >
+        <TabsList>
+          <Tab
+            data-testid={`t--js-editor-` + JSEditorTab.CODE}
+            value={JSEditorTab.CODE}
+          >
+            Code
+          </Tab>
+          {props.showSettings && (
+            <Tab
+              data-testid={`t--js-editor-` + JSEditorTab.SETTINGS}
+              value={JSEditorTab.SETTINGS}
+            >
+              Settings
+            </Tab>
+          )}
+        </TabsList>
+        <TabPanel value={JSEditorTab.CODE}>
+          <div className="js-editor-tab">
+            <LazyCodeEditor
+              AIAssisted
+              blockCompletions={props.blockCompletions}
+              border={CodeEditorBorder.NONE}
+              borderLess
+              className={"js-editor"}
+              customGutter={props.customGutter}
+              dataTreePath={`${props.currentJSCollection.name}.body`}
+              disabled={!props.changePermitted}
+              folding
+              height={"100%"}
+              hideEvaluatedValue
+              input={{
+                value: props.currentJSCollection.body,
+                onChange: props.onChange,
+              }}
+              isJSObject
+              jsObjectName={props.currentJSCollection.name}
+              mode={EditorModes.JAVASCRIPT}
+              placeholder="Let's write some code!"
+              showLightningMenu={false}
+              showLineNumbers
+              size={EditorSize.EXTENDED}
+              tabBehaviour={TabBehaviour.INDENT}
+              theme={props.theme}
+            />
+          </div>
+        </TabPanel>
+        {props.showSettings && (
+          <TabPanel value={JSEditorTab.SETTINGS}>
+            <div className="js-editor-tab">
+              <JSFunctionSettings
+                actions={props.actions}
+                disabled={!props.changePermitted}
+                onUpdateSettings={props.onUpdateSettings}
+              />
+            </div>
+          </TabPanel>
+        )}
+      </Tabs>
+    </TabbedViewContainer>
+  );
+}
diff --git a/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/JSEditorToolbar.test.tsx b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/JSEditorToolbar.test.tsx
new file mode 100644
index 000000000000..f02f85509733
--- /dev/null
+++ b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/JSEditorToolbar.test.tsx
@@ -0,0 +1,109 @@
+import React from "react";
+import "@testing-library/jest-dom";
+import { render, screen, fireEvent } from "test/testUtils";
+import { JSEditorToolbar } from "./JSEditorToolbar";
+import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
+import { JSObjectFactory } from "test/factories/Actions/JSObject";
+
+jest.mock("utils/hooks/useFeatureFlag");
+
+const mockUseFeatureFlag = useFeatureFlag as jest.Mock;
+
+const JSObject = JSObjectFactory.build();
+
+const defaultProps = {
+  changePermitted: true,
+  hideEditIconOnEditor: false,
+  saveJSObjectName: jest.fn(),
+  hideContextMenuOnEditor: false,
+  contextMenu: <div>ContextMenu</div>,
+  disableRunFunctionality: false,
+  executePermitted: true,
+  loading: false,
+  jsCollection: JSObject,
+  onButtonClick: jest.fn(),
+  onSelect: jest.fn(),
+  jsActions: JSObject.actions,
+  selected: {
+    label: "JSObject1.myFun1",
+    value: "myFunc1_id",
+    data: JSObject.actions[0],
+  },
+  onUpdateSettings: jest.fn(),
+  showSettings: true,
+};
+
+describe("JSEditorToolbar", () => {
+  it("renders JSHeader when action redesign is disabled", () => {
+    mockUseFeatureFlag.mockReturnValue(false);
+    render(<JSEditorToolbar {...defaultProps} />);
+    // Old header shows the name of the JS object
+    // since we don't provide the name via props, it has the placeholder text
+    expect(
+      screen.getByText("Name of the JS Object in camelCase"),
+    ).toBeInTheDocument();
+  });
+
+  it("renders IDEToolbar with JSFunctionRun and JSFunctionSettings when action redesign is enabled", () => {
+    mockUseFeatureFlag.mockReturnValue(true);
+    render(<JSEditorToolbar {...defaultProps} />);
+
+    // Assert the Function select is a popup menu
+    expect(screen.getByText("JSObject1.myFun1")).toBeInTheDocument();
+    expect(
+      screen.getByRole("button", { name: "JSObject1.myFun1" }),
+    ).toHaveAttribute("aria-haspopup", "menu");
+
+    // Assert the Run button is rendered
+    expect(screen.getByRole("button", { name: "Run" })).toBeInTheDocument();
+
+    // Assert the settings button is present
+    expect(screen.getByTestId("t--js-editor-SETTINGS")).toHaveAttribute(
+      "aria-haspopup",
+      "dialog",
+    );
+
+    // Assert that the context menu is present
+    expect(screen.getByText("ContextMenu")).toBeInTheDocument();
+  });
+
+  it("does not render JSFunctionSettings when showSettings is false", () => {
+    mockUseFeatureFlag.mockReturnValue(true);
+    // Props can control the settings button visibility
+    render(<JSEditorToolbar {...defaultProps} showSettings={false} />);
+    expect(
+      screen.queryByTestId("t--js-editor-SETTINGS"),
+    ).not.toBeInTheDocument();
+  });
+
+  it("does not render context menu when hideContextMenuOnEditor is true", () => {
+    mockUseFeatureFlag.mockReturnValue(true);
+    // Props can control the context menu visibility
+    render(<JSEditorToolbar {...defaultProps} hideContextMenuOnEditor />);
+    expect(screen.queryByText("ContextMenu")).not.toBeInTheDocument();
+  });
+
+  it("disables JSFunctionRun when disableRunFunctionality is true", () => {
+    mockUseFeatureFlag.mockReturnValue(true);
+    // Props can control the run button's disabled state
+    render(<JSEditorToolbar {...defaultProps} disableRunFunctionality />);
+    expect(screen.getByRole("button", { name: "Run" })).toHaveAttribute(
+      "disabled",
+    );
+  });
+
+  it("disables JSFunctionRun when executePermitted is false", () => {
+    mockUseFeatureFlag.mockReturnValue(true);
+    render(<JSEditorToolbar {...defaultProps} executePermitted={false} />);
+    expect(screen.getByRole("button", { name: "Run" })).toHaveAttribute(
+      "disabled",
+    );
+  });
+
+  it("calls onButtonClick when JSFunctionRun button is clicked", () => {
+    mockUseFeatureFlag.mockReturnValue(true);
+    render(<JSEditorToolbar {...defaultProps} />);
+    fireEvent.click(screen.getByRole("button", { name: "Run" }));
+    expect(defaultProps.onButtonClick).toHaveBeenCalled();
+  });
+});
diff --git a/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/JSEditorToolbar.tsx b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/JSEditorToolbar.tsx
new file mode 100644
index 000000000000..d2c6237ebf3c
--- /dev/null
+++ b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/JSEditorToolbar.tsx
@@ -0,0 +1,104 @@
+import React, { useState } from "react";
+import { IDEToolbar, ToolbarSettingsPopover } from "IDE";
+import { JSFunctionRun } from "./components/JSFunctionRun";
+import type { JSActionDropdownOption } from "./types";
+import type { SaveActionNameParams } from "PluginActionEditor";
+import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { JSAction, JSCollection } from "entities/JSCollection";
+import type { DropdownOnSelect } from "@appsmith/ads-old";
+import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
+import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
+import { createMessage, JS_EDITOR_SETTINGS } from "ee/constants/messages";
+import { JSHeader } from "./JSHeader";
+import { JSFunctionSettings } from "./components/JSFunctionSettings";
+import type { JSFunctionSettingsProps } from "./components/old/JSFunctionSettings";
+import { convertJSActionsToDropdownOptions } from "./utils";
+import { JSObjectNameEditor } from "./JSObjectNameEditor";
+
+interface Props {
+  changePermitted: boolean;
+  hideEditIconOnEditor?: boolean;
+  saveJSObjectName: (
+    params: SaveActionNameParams,
+  ) => ReduxAction<SaveActionNameParams>;
+  hideContextMenuOnEditor?: boolean;
+  contextMenu: React.ReactNode;
+  disableRunFunctionality: boolean;
+  executePermitted: boolean;
+  loading: boolean;
+  jsCollection: JSCollection;
+  onButtonClick: (
+    event: React.MouseEvent<HTMLElement, MouseEvent> | KeyboardEvent,
+  ) => void;
+  onSelect: DropdownOnSelect;
+  jsActions: JSAction[];
+  selected: JSActionDropdownOption;
+  onUpdateSettings: JSFunctionSettingsProps["onUpdateSettings"];
+  showNameEditor?: boolean;
+  showSettings: boolean;
+}
+
+/**
+ * JSEditorToolbar component.
+ *
+ * This component renders a toolbar for the JS editor. It conditionally renders
+ * different components based on the `release_actions_redesign_enabled` feature flag.
+ *
+ */
+export const JSEditorToolbar = (props: Props) => {
+  // Check if the action redesign feature flag is enabled
+  const isActionRedesignEnabled = useFeatureFlag(
+    FEATURE_FLAG.release_actions_redesign_enabled,
+  );
+
+  const [isOpen, setIsOpen] = useState(false);
+
+  // If the action redesign is not enabled, render the JSHeader component
+  if (!isActionRedesignEnabled) {
+    return <JSHeader {...props} />;
+  }
+
+  // Render the IDEToolbar with JSFunctionRun and JSFunctionSettings components
+  return (
+    <IDEToolbar>
+      <IDEToolbar.Left>
+        {props.showNameEditor && (
+          <JSObjectNameEditor
+            disabled={!props.changePermitted || props.hideEditIconOnEditor}
+            saveJSObjectName={props.saveJSObjectName}
+          />
+        )}
+      </IDEToolbar.Left>
+      <IDEToolbar.Right>
+        <div className="t--formActionButtons">
+          <JSFunctionRun
+            disabled={props.disableRunFunctionality || !props.executePermitted}
+            isLoading={props.loading}
+            jsCollection={props.jsCollection}
+            onButtonClick={props.onButtonClick}
+            onSelect={props.onSelect}
+            options={convertJSActionsToDropdownOptions(props.jsActions)}
+            selected={props.selected}
+            showTooltip={!props.selected.data}
+          />
+        </div>
+        {props.showSettings ? (
+          <ToolbarSettingsPopover
+            dataTestId={"t--js-editor-SETTINGS"}
+            handleOpenChange={setIsOpen}
+            isOpen={isOpen}
+            title={createMessage(JS_EDITOR_SETTINGS.TITLE)}
+          >
+            <JSFunctionSettings
+              actions={props.jsActions}
+              disabled={!props.changePermitted}
+              onUpdateSettings={props.onUpdateSettings}
+            />
+          </ToolbarSettingsPopover>
+        ) : null}
+
+        {props.hideContextMenuOnEditor ? null : props.contextMenu}
+      </IDEToolbar.Right>
+    </IDEToolbar>
+  );
+};
diff --git a/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/JSHeader.tsx b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/JSHeader.tsx
new file mode 100644
index 000000000000..35465e7e8e0f
--- /dev/null
+++ b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/JSHeader.tsx
@@ -0,0 +1,59 @@
+import React from "react";
+import { JSFunctionRun } from "./components/JSFunctionRun";
+import type { JSActionDropdownOption } from "./types";
+import { ActionButtons, NameWrapper, StyledFormRow } from "../styledComponents";
+import type { SaveActionNameParams } from "PluginActionEditor";
+import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { JSAction, JSCollection } from "entities/JSCollection";
+import type { DropdownOnSelect } from "@appsmith/ads-old";
+import { JSObjectNameEditor } from "./JSObjectNameEditor";
+import { Flex } from "@appsmith/ads";
+import { convertJSActionsToDropdownOptions } from "./utils";
+
+interface Props {
+  changePermitted: boolean;
+  hideEditIconOnEditor?: boolean;
+  saveJSObjectName: (
+    params: SaveActionNameParams,
+  ) => ReduxAction<SaveActionNameParams>;
+  hideContextMenuOnEditor?: boolean;
+  contextMenu: React.ReactNode;
+  disableRunFunctionality: boolean;
+  executePermitted: boolean;
+  loading: boolean;
+  jsCollection: JSCollection;
+  onButtonClick: (
+    event: React.MouseEvent<HTMLElement, MouseEvent> | KeyboardEvent,
+  ) => void;
+  onSelect: DropdownOnSelect;
+  jsActions: JSAction[];
+  selected: JSActionDropdownOption;
+}
+
+export const JSHeader = (props: Props) => {
+  return (
+    <Flex paddingTop="spaces-5">
+      <StyledFormRow className="form-row-header">
+        <NameWrapper className="t--nameOfJSObject">
+          <JSObjectNameEditor
+            disabled={!props.changePermitted || props.hideEditIconOnEditor}
+            saveJSObjectName={props.saveJSObjectName}
+          />
+        </NameWrapper>
+        <ActionButtons className="t--formActionButtons">
+          {!props.hideContextMenuOnEditor && props.contextMenu}
+          <JSFunctionRun
+            disabled={props.disableRunFunctionality || !props.executePermitted}
+            isLoading={props.loading}
+            jsCollection={props.jsCollection}
+            onButtonClick={props.onButtonClick}
+            onSelect={props.onSelect}
+            options={convertJSActionsToDropdownOptions(props.jsActions)}
+            selected={props.selected}
+            showTooltip={!props.selected.data}
+          />
+        </ActionButtons>
+      </StyledFormRow>
+    </Flex>
+  );
+};
diff --git a/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/JSObjectNameEditor/JSObjectNameEditor.tsx b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/JSObjectNameEditor/JSObjectNameEditor.tsx
new file mode 100644
index 000000000000..224f77384916
--- /dev/null
+++ b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/JSObjectNameEditor/JSObjectNameEditor.tsx
@@ -0,0 +1,143 @@
+import React, { useCallback, useMemo } from "react";
+import { useDispatch, useSelector } from "react-redux";
+import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
+import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
+import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import { getSavingStatusForJSObjectName } from "selectors/actionSelectors";
+import { getAssetUrl } from "ee/utils/airgapHelpers";
+import { Text as ADSText, Flex } from "@appsmith/ads";
+import styled from "styled-components";
+import { noop } from "lodash";
+import { useParams } from "react-router";
+import type { AppState } from "ee/reducers";
+import {
+  getJsCollectionByBaseId,
+  getPlugin,
+} from "ee/selectors/entitiesSelector";
+import { JSObjectNameEditor as OldJSObjectNameEditor } from "./old/JSObjectNameEditor";
+import { EditableName, useIsRenaming } from "IDE";
+
+export interface SaveActionNameParams {
+  id: string;
+  name: string;
+}
+
+export interface JSObjectNameEditorProps {
+  disabled?: boolean;
+  saveJSObjectName: (
+    params: SaveActionNameParams,
+  ) => ReduxAction<SaveActionNameParams>;
+}
+
+export const NameWrapper = styled(Flex)`
+  height: 100%;
+  position: relative;
+  font-size: 12px;
+  color: var(--ads-v2-color-fg);
+  cursor: pointer;
+  gap: var(--ads-v2-spaces-2);
+  align-items: center;
+  justify-content: center;
+  padding: var(--ads-v2-spaces-3);
+`;
+
+export const IconContainer = styled.div`
+  height: 12px;
+  width: 12px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-shrink: 0;
+
+  img {
+    width: 12px;
+  }
+`;
+
+export const Text = styled(ADSText)`
+  min-width: 3ch;
+  padding: 0 var(--ads-v2-spaces-1);
+  font-weight: 500;
+`;
+
+export const JSObjectNameEditor = ({
+  disabled,
+  saveJSObjectName,
+}: JSObjectNameEditorProps) => {
+  const params = useParams<{
+    baseCollectionId?: string;
+    baseQueryId?: string;
+  }>();
+
+  const currentJSObjectConfig = useSelector((state: AppState) =>
+    getJsCollectionByBaseId(state, params.baseCollectionId || ""),
+  );
+
+  const currentPlugin = useSelector((state: AppState) =>
+    getPlugin(state, currentJSObjectConfig?.pluginId || ""),
+  );
+
+  const isLoading = useSelector(
+    (state) =>
+      getSavingStatusForJSObjectName(state, currentJSObjectConfig?.id || "")
+        .isSaving,
+  );
+
+  const name = currentJSObjectConfig?.name || "";
+
+  const { enterEditMode, exitEditMode, isEditing } = useIsRenaming(
+    currentJSObjectConfig?.id || "",
+  );
+
+  const handleDoubleClick = disabled ? noop : enterEditMode;
+
+  const dispatch = useDispatch();
+
+  const handleSaveName = useCallback(
+    (name: string) => {
+      if (currentJSObjectConfig) {
+        dispatch(saveJSObjectName({ id: currentJSObjectConfig.id, name }));
+      }
+    },
+    [currentJSObjectConfig, saveJSObjectName],
+  );
+
+  const isActionRedesignEnabled = useFeatureFlag(
+    FEATURE_FLAG.release_actions_redesign_enabled,
+  );
+
+  const icon = useMemo(() => {
+    if (!currentPlugin) return null;
+
+    return (
+      <IconContainer>
+        <img
+          alt={currentPlugin.name}
+          src={getAssetUrl(currentPlugin.iconLocation)}
+        />
+      </IconContainer>
+    );
+  }, [currentPlugin]);
+
+  if (!isActionRedesignEnabled) {
+    return (
+      <OldJSObjectNameEditor
+        disabled={disabled}
+        saveJSObjectName={saveJSObjectName}
+      />
+    );
+  }
+
+  return (
+    <NameWrapper onDoubleClick={handleDoubleClick}>
+      <EditableName
+        exitEditing={exitEditMode}
+        icon={icon}
+        isEditing={isEditing}
+        isLoading={isLoading}
+        name={name}
+        onNameSave={handleSaveName}
+      />
+    </NameWrapper>
+  );
+};
diff --git a/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/JSObjectNameEditor/index.tsx b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/JSObjectNameEditor/index.tsx
new file mode 100644
index 000000000000..6dd2a6a8ae90
--- /dev/null
+++ b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/JSObjectNameEditor/index.tsx
@@ -0,0 +1,4 @@
+export {
+  JSObjectNameEditor,
+  type JSObjectNameEditorProps,
+} from "./JSObjectNameEditor";
diff --git a/app/client/src/pages/Editor/JSEditor/JSObjectNameEditor.tsx b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/JSObjectNameEditor/old/JSObjectNameEditor.tsx
similarity index 88%
rename from app/client/src/pages/Editor/JSEditor/JSObjectNameEditor.tsx
rename to app/client/src/pages/Editor/JSEditor/JSEditorToolbar/JSObjectNameEditor/old/JSObjectNameEditor.tsx
index ff1a598bc1ba..53e1e920850a 100644
--- a/app/client/src/pages/Editor/JSEditor/JSObjectNameEditor.tsx
+++ b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/JSObjectNameEditor/old/JSObjectNameEditor.tsx
@@ -10,7 +10,7 @@ import {
 } from "ee/selectors/entitiesSelector";
 import {
   ACTION_NAME_PLACEHOLDER,
-  JSOBJECT_ID_NOT_FOUND_IN_URL,
+  JS_OBJECT_ID_NOT_FOUND_IN_URL,
   createMessage,
 } from "ee/constants/messages";
 import EditableText, {
@@ -28,13 +28,6 @@ import type { ReduxAction } from "ee/constants/ReduxActionConstants";
 import type { SaveActionNameParams } from "PluginActionEditor";
 
 export interface JSObjectNameEditorProps {
-  /*
-    This prop checks if page is API Pane or Query Pane or Curl Pane
-    So, that we can toggle between ads editable-text component and existing editable-text component
-    Right now, it's optional so that it doesn't impact any other pages other than API Pane.
-    In future, when default component will be ads editable-text, then we can remove this prop.
-  */
-  page?: string;
   disabled?: boolean;
   saveJSObjectName: (
     params: SaveActionNameParams,
@@ -62,7 +55,7 @@ export function JSObjectNameEditor(props: JSObjectNameEditorProps) {
   return (
     <NameEditorComponent
       id={currentJSObjectConfig?.id}
-      idUndefinedErrorMessage={JSOBJECT_ID_NOT_FOUND_IN_URL}
+      idUndefinedErrorMessage={JS_OBJECT_ID_NOT_FOUND_IN_URL}
       name={currentJSObjectConfig?.name}
       onSaveName={props.saveJSObjectName}
       saveStatus={saveStatus}
diff --git a/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/components/JSFunctionItem.tsx b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/components/JSFunctionItem.tsx
new file mode 100644
index 000000000000..4b2913086726
--- /dev/null
+++ b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/components/JSFunctionItem.tsx
@@ -0,0 +1,22 @@
+import React, { useCallback } from "react";
+import { MenuItem } from "@appsmith/ads";
+import type { JSActionDropdownOption } from "../types";
+import * as Styled from "./styles";
+
+export const JSFunctionItem = ({
+  onSelect,
+  option,
+}: {
+  option: JSActionDropdownOption;
+  onSelect: (option: JSActionDropdownOption) => void;
+}) => {
+  const onFunctionSelect = useCallback(() => {
+    onSelect(option);
+  }, [onSelect, option]);
+
+  return (
+    <MenuItem onSelect={onFunctionSelect} size="sm">
+      <Styled.MenuTitle>{option.label}</Styled.MenuTitle>
+    </MenuItem>
+  );
+};
diff --git a/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/components/JSFunctionRun.test.tsx b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/components/JSFunctionRun.test.tsx
new file mode 100644
index 000000000000..18df40c66a77
--- /dev/null
+++ b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/components/JSFunctionRun.test.tsx
@@ -0,0 +1,83 @@
+import React from "react";
+import "@testing-library/jest-dom";
+import { render, screen, fireEvent } from "test/testUtils";
+import { JSFunctionRun } from "./JSFunctionRun";
+import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
+import { JSObjectFactory } from "test/factories/Actions/JSObject";
+import { convertJSActionsToDropdownOptions } from "../utils";
+
+jest.mock("utils/hooks/useFeatureFlag");
+const mockUseFeatureFlag = useFeatureFlag as jest.Mock;
+
+const JSObject = JSObjectFactory.build();
+
+const mockProps = {
+  disabled: false,
+  isLoading: false,
+  jsCollection: JSObject,
+  onButtonClick: jest.fn(),
+  onSelect: jest.fn(),
+  options: convertJSActionsToDropdownOptions(JSObject.actions),
+  selected: {
+    label: JSObject.actions[0].name,
+    value: JSObject.actions[0].name,
+    data: JSObject.actions[0],
+  },
+  showTooltip: false,
+};
+
+describe("JSFunctionRun", () => {
+  it("renders OldJSFunctionRun when feature flag is disabled", () => {
+    mockUseFeatureFlag.mockReturnValue(false);
+    render(<JSFunctionRun {...mockProps} />);
+    expect(screen.getByText("myFun1")).toBeInTheDocument();
+    expect(screen.getByRole("button", { name: "Run" })).toBeInTheDocument();
+  });
+
+  it("renders new JSFunctionRun when feature flag is enabled", () => {
+    mockUseFeatureFlag.mockReturnValue(true);
+    render(<JSFunctionRun {...mockProps} />);
+    // Assert the Function select is a popup menu
+    expect(screen.getByText("myFun1")).toBeInTheDocument();
+    expect(screen.getByRole("button", { name: "myFun1" })).toHaveAttribute(
+      "aria-haspopup",
+      "menu",
+    );
+  });
+
+  // This test is skipped because menu does not open in the test environment
+  // eslint-disable-next-line jest/no-disabled-tests
+  it.skip("calls onSelect when a menu item is selected", () => {
+    mockUseFeatureFlag.mockReturnValue(true);
+    render(<JSFunctionRun {...mockProps} />);
+    // click the button to open the menu
+    fireEvent.click(screen.getByRole("button", { name: "myFun1" }));
+
+    fireEvent.click(screen.getByText("myFun2"));
+    expect(mockProps.onSelect).toHaveBeenCalledWith("myFun2");
+  });
+
+  it("disables the button when props.disabled is true", () => {
+    mockUseFeatureFlag.mockReturnValue(true);
+    render(<JSFunctionRun {...mockProps} disabled />);
+    expect(screen.getByRole("button", { name: "myFun1" })).toBeDisabled();
+  });
+
+  // This test is skipped because tooltip does not show in the test environment
+  // eslint-disable-next-line jest/no-disabled-tests
+  it.skip("shows tooltip when showTooltip is true", () => {
+    mockUseFeatureFlag.mockReturnValue(true);
+    render(<JSFunctionRun {...mockProps} showTooltip />);
+    fireEvent.mouseOver(screen.getByText("Run"));
+    expect(
+      screen.getByText("No JS function to run in TestCollection"),
+    ).toBeInTheDocument();
+  });
+
+  it("calls onButtonClick when run button is clicked", () => {
+    mockUseFeatureFlag.mockReturnValue(true);
+    render(<JSFunctionRun {...mockProps} />);
+    fireEvent.click(screen.getByText("Run"));
+    expect(mockProps.onButtonClick).toHaveBeenCalled();
+  });
+});
diff --git a/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/components/JSFunctionRun.tsx b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/components/JSFunctionRun.tsx
new file mode 100644
index 000000000000..f4b9ff413a75
--- /dev/null
+++ b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/components/JSFunctionRun.tsx
@@ -0,0 +1,99 @@
+import React, { useCallback } from "react";
+import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
+import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
+import { JSFunctionRun as OldJSFunctionRun } from "./old/JSFunctionRun";
+import type { JSCollection } from "entities/JSCollection";
+import {
+  Button,
+  Flex,
+  Menu,
+  MenuContent,
+  MenuTrigger,
+  Tooltip,
+} from "@appsmith/ads";
+import type { JSActionDropdownOption } from "../types";
+import { RUN_BUTTON_DEFAULTS, testLocators } from "../constants";
+import { createMessage, NO_JS_FUNCTION_TO_RUN } from "ee/constants/messages";
+import { JSFunctionItem } from "./JSFunctionItem";
+
+interface Props {
+  disabled: boolean;
+  isLoading: boolean;
+  jsCollection: JSCollection;
+  onButtonClick: (event: React.MouseEvent<HTMLElement, MouseEvent>) => void;
+  onSelect: (value: string | undefined) => void;
+  options: JSActionDropdownOption[];
+  selected: JSActionDropdownOption;
+  showTooltip: boolean;
+}
+
+/**
+ * JSFunctionRun component renders a button and a dropdown menu for running JS functions.
+ * It conditionally renders the old or new version of the component based on a feature flag.
+ *
+ */
+export const JSFunctionRun = (props: Props) => {
+  const { onSelect } = props;
+
+  const isActionRedesignEnabled = useFeatureFlag(
+    FEATURE_FLAG.release_actions_redesign_enabled,
+  );
+
+  // Callback function to handle function selection from the dropdown menu
+  const onFunctionSelect = useCallback(
+    (option: JSActionDropdownOption) => {
+      if (onSelect) {
+        onSelect(option.value);
+      }
+    },
+    [onSelect],
+  );
+
+  if (!isActionRedesignEnabled) {
+    return <OldJSFunctionRun {...props} />;
+  }
+
+  // Render the new version of the component
+  return (
+    <Flex gap="spaces-2">
+      <Menu>
+        <MenuTrigger>
+          <Button
+            endIcon="arrow-down-s-line"
+            isDisabled={props.disabled}
+            kind="tertiary"
+            size="sm"
+            startIcon="js-function"
+          >
+            {props.selected.label}
+          </Button>
+        </MenuTrigger>
+        <MenuContent align="end">
+          {props.options.map((option) => (
+            <JSFunctionItem
+              key={option.label}
+              onSelect={onFunctionSelect}
+              option={option}
+            />
+          ))}
+        </MenuContent>
+      </Menu>
+
+      <Tooltip
+        content={createMessage(NO_JS_FUNCTION_TO_RUN, props.jsCollection.name)}
+        isDisabled={!props.showTooltip}
+        placement="topRight"
+      >
+        <Button
+          className={testLocators.runJSAction}
+          isDisabled={props.disabled}
+          isLoading={props.isLoading}
+          onClick={props.onButtonClick}
+          size="sm"
+        >
+          {RUN_BUTTON_DEFAULTS.CTA_TEXT}
+        </Button>
+      </Tooltip>
+    </Flex>
+  );
+};
diff --git a/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/components/JSFunctionSettings.test.tsx b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/components/JSFunctionSettings.test.tsx
new file mode 100644
index 000000000000..3662a47e06c4
--- /dev/null
+++ b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/components/JSFunctionSettings.test.tsx
@@ -0,0 +1,79 @@
+import React from "react";
+import "@testing-library/jest-dom";
+import { render, screen } from "test/testUtils";
+import { JSFunctionSettings } from "./JSFunctionSettings";
+import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
+import { JSObjectFactory } from "test/factories/Actions/JSObject";
+
+// Mock the useFeatureFlag hook
+jest.mock("utils/hooks/useFeatureFlag");
+const mockUseFeatureFlag = useFeatureFlag as jest.Mock;
+
+const JSObject = JSObjectFactory.build();
+
+const actions = JSObject.actions;
+
+describe("JSFunctionSettings", () => {
+  const onUpdateSettings = jest.fn();
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it("disables the switch when the component is disabled", () => {
+    mockUseFeatureFlag.mockReturnValue(true);
+
+    render(
+      <JSFunctionSettings
+        actions={actions}
+        disabled
+        onUpdateSettings={onUpdateSettings}
+      />,
+    );
+
+    expect(screen.getByLabelText(actions[0].name)).toBeDisabled();
+  });
+
+  it("renders the correct number of switches for the actions", () => {
+    mockUseFeatureFlag.mockReturnValue(true);
+
+    render(
+      <JSFunctionSettings
+        actions={actions}
+        disabled={false}
+        onUpdateSettings={onUpdateSettings}
+      />,
+    );
+
+    expect(screen.getAllByRole("switch")).toHaveLength(actions.length);
+  });
+
+  it("renders the switch state correctly", () => {
+    mockUseFeatureFlag.mockReturnValue(true);
+
+    const updatedJSActions = [
+      {
+        ...actions[0],
+        executeOnLoad: true,
+      },
+      {
+        ...actions[1],
+        executeOnLoad: false,
+      },
+    ];
+
+    render(
+      <JSFunctionSettings
+        actions={updatedJSActions}
+        disabled={false}
+        onUpdateSettings={onUpdateSettings}
+      />,
+    );
+
+    const switchElement1 = screen.getByLabelText(updatedJSActions[0].name);
+    const switchElement2 = screen.getByLabelText(updatedJSActions[1].name);
+
+    expect(switchElement1).toBeChecked();
+    expect(switchElement2).not.toBeChecked();
+  });
+});
diff --git a/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/components/JSFunctionSettings.tsx b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/components/JSFunctionSettings.tsx
new file mode 100644
index 000000000000..6251e8b43a1e
--- /dev/null
+++ b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/components/JSFunctionSettings.tsx
@@ -0,0 +1,102 @@
+import React, { useCallback, useState } from "react";
+import { Flex, Switch, Text } from "@appsmith/ads";
+import JSFunctionSettingsView, {
+  type JSFunctionSettingsProps,
+} from "./old/JSFunctionSettings";
+import type { JSAction } from "entities/JSCollection";
+import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
+import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
+import { createMessage, JS_EDITOR_SETTINGS } from "ee/constants/messages";
+import AnalyticsUtil from "ee/utils/AnalyticsUtil";
+
+interface Props {
+  disabled: boolean;
+  actions: JSAction[];
+  onUpdateSettings: JSFunctionSettingsProps["onUpdateSettings"];
+}
+
+interface FunctionSettingsRowProps extends Omit<Props, "actions"> {
+  action: JSAction;
+}
+
+const FunctionSettingRow = (props: FunctionSettingsRowProps) => {
+  const [executeOnPageLoad, setExecuteOnPageLoad] = useState(
+    String(props.action.executeOnLoad),
+  );
+
+  const onChange = useCallback(
+    (isSelected: boolean) => {
+      const value = String(isSelected);
+
+      setExecuteOnPageLoad(value);
+      props.onUpdateSettings?.({
+        value: value === "true",
+        propertyName: "executeOnLoad",
+        action: props.action,
+      });
+
+      AnalyticsUtil.logEvent("JS_OBJECT_SETTINGS_CHANGED", {
+        toggleSetting: "ON_PAGE_LOAD",
+        toggleValue: value,
+      });
+    },
+    [props],
+  );
+
+  return (
+    <Flex
+      className={`t--async-js-function-settings ${props.action.name}-on-page-load-setting`}
+      gap="spaces-4"
+      key={props.action.id}
+      w="100%"
+    >
+      <Switch
+        defaultSelected={JSON.parse(executeOnPageLoad)}
+        isDisabled={props.disabled}
+        isSelected={JSON.parse(executeOnPageLoad)}
+        name={`execute-on-page-load-${props.action.id}`}
+        onChange={onChange}
+      >
+        {props.action.name}
+      </Switch>
+    </Flex>
+  );
+};
+
+/**
+ * JSFunctionSettings component renders a button and a popover for configuring JS function settings.
+ * It conditionally renders the old or new version of the component based on a feature flag.
+ */
+export const JSFunctionSettings = (props: Props) => {
+  const isActionRedesignEnabled = useFeatureFlag(
+    FEATURE_FLAG.release_actions_redesign_enabled,
+  );
+
+  // If the feature flag is disabled, render the old version of the component
+  if (!isActionRedesignEnabled) {
+    return (
+      <JSFunctionSettingsView
+        actions={props.actions}
+        disabled={props.disabled}
+        onUpdateSettings={props.onUpdateSettings}
+      />
+    );
+  }
+
+  // Render the new version of the component
+  return (
+    <Flex flexDirection="column" gap="spaces-4" w="100%">
+      <Text kind="heading-xs">
+        {createMessage(JS_EDITOR_SETTINGS.ON_LOAD_TITLE)}
+      </Text>
+      {props.actions.map((action) => (
+        <FunctionSettingRow
+          action={action}
+          disabled={props.disabled}
+          key={action.id}
+          onUpdateSettings={props.onUpdateSettings}
+        />
+      ))}
+    </Flex>
+  );
+};
diff --git a/app/client/src/pages/Editor/JSEditor/JSFunctionRun.tsx b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/components/old/JSFunctionRun.tsx
similarity index 96%
rename from app/client/src/pages/Editor/JSEditor/JSFunctionRun.tsx
rename to app/client/src/pages/Editor/JSEditor/JSEditorToolbar/components/old/JSFunctionRun.tsx
index 43083bc612a6..aa1d28f99bab 100644
--- a/app/client/src/pages/Editor/JSEditor/JSFunctionRun.tsx
+++ b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/components/old/JSFunctionRun.tsx
@@ -4,8 +4,8 @@ import type { JSCollection } from "entities/JSCollection";
 import type { SelectProps } from "@appsmith/ads";
 import { Button, Option, Select, Tooltip, Text } from "@appsmith/ads";
 import { createMessage, NO_JS_FUNCTION_TO_RUN } from "ee/constants/messages";
-import type { JSActionDropdownOption } from "./utils";
-import { RUN_BUTTON_DEFAULTS, testLocators } from "./constants";
+import type { JSActionDropdownOption } from "../../types";
+import { RUN_BUTTON_DEFAULTS, testLocators } from "../../constants";
 
 interface Props {
   disabled: boolean;
diff --git a/app/client/src/pages/Editor/JSEditor/JSFunctionSettings.tsx b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/components/old/JSFunctionSettings.tsx
similarity index 96%
rename from app/client/src/pages/Editor/JSEditor/JSFunctionSettings.tsx
rename to app/client/src/pages/Editor/JSEditor/JSEditorToolbar/components/old/JSFunctionSettings.tsx
index 07d7bdaa1f54..07c2235c605c 100644
--- a/app/client/src/pages/Editor/JSEditor/JSFunctionSettings.tsx
+++ b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/components/old/JSFunctionSettings.tsx
@@ -1,15 +1,19 @@
 import {
+  createMessage,
   FUNCTION_SETTINGS_HEADING,
   NO_JS_FUNCTIONS,
-  createMessage,
 } from "ee/constants/messages";
 import type { JSAction } from "entities/JSCollection";
 import React, { useCallback, useState } from "react";
 import styled from "styled-components";
-import { CONFIRM_BEFORE_CALLING_HEADING, SETTINGS_HEADINGS } from "./constants";
+import {
+  CONFIRM_BEFORE_CALLING_HEADING,
+  SETTINGS_HEADINGS,
+} from "../../../constants";
 import AnalyticsUtil from "ee/utils/AnalyticsUtil";
-import { Icon, Tooltip, Switch } from "@appsmith/ads";
-import RemoveConfirmationModal from "./RemoveConfirmBeforeCallingDialog";
+import { Icon, Switch, Tooltip } from "@appsmith/ads";
+import RemoveConfirmationModal from "../../../RemoveConfirmBeforeCallingDialog";
+import type { OnUpdateSettingsProps } from "../../types";
 
 interface SettingsHeadingProps {
   text: string;
@@ -20,12 +24,6 @@ interface SettingsHeadingProps {
   hidden?: boolean;
 }
 
-export interface OnUpdateSettingsProps {
-  value: boolean | number;
-  propertyName: string;
-  action: JSAction;
-}
-
 interface SettingsItemProps {
   headingCount: number;
   action: JSAction;
diff --git a/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/components/styles.ts b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/components/styles.ts
new file mode 100644
index 000000000000..2671337911d3
--- /dev/null
+++ b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/components/styles.ts
@@ -0,0 +1,9 @@
+import styled from "styled-components";
+import { Text } from "@appsmith/ads";
+
+export const MenuTitle = styled(Text)`
+  --button-font-weight: bold;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  max-width: 30ch;
+`;
diff --git a/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/constants.ts b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/constants.ts
new file mode 100644
index 000000000000..474a06152042
--- /dev/null
+++ b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/constants.ts
@@ -0,0 +1,15 @@
+export const RUN_BUTTON_DEFAULTS = {
+  HEIGHT: "30px",
+  CTA_TEXT: "Run",
+  // space between button and dropdown
+  GAP_SIZE: "10px",
+  DROPDOWN_HIGHLIGHT_BG: "#E7E7E7",
+};
+export const testLocators = {
+  runJSAction: "run-js-action",
+};
+export const NO_FUNCTION_DROPDOWN_OPTION = {
+  label: "No function available",
+  value: "",
+  data: null,
+};
diff --git a/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/index.ts b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/index.ts
new file mode 100644
index 000000000000..88dc44b167cc
--- /dev/null
+++ b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/index.ts
@@ -0,0 +1,8 @@
+export { JSEditorToolbar } from "./JSEditorToolbar";
+
+export {
+  type OnUpdateSettingsProps,
+  type JSActionDropdownOption,
+} from "./types";
+
+export { convertJSActionToDropdownOption, getJSActionOption } from "./utils";
diff --git a/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/types.ts b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/types.ts
new file mode 100644
index 000000000000..8b15f8f26712
--- /dev/null
+++ b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/types.ts
@@ -0,0 +1,12 @@
+import type { JSAction } from "entities/JSCollection";
+import type { DropdownOption } from "@appsmith/ads-old";
+
+export interface OnUpdateSettingsProps {
+  value: boolean | number;
+  propertyName: string;
+  action: JSAction;
+}
+
+export interface JSActionDropdownOption extends DropdownOption {
+  data: JSAction | null;
+}
diff --git a/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/utils.ts b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/utils.ts
new file mode 100644
index 000000000000..4fe6a993d80d
--- /dev/null
+++ b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/utils.ts
@@ -0,0 +1,33 @@
+import type { JSAction } from "entities/JSCollection";
+import type { JSActionDropdownOption } from "./types";
+import { NO_FUNCTION_DROPDOWN_OPTION } from "./constants";
+
+export const convertJSActionsToDropdownOptions = (
+  JSActions: JSAction[],
+): JSActionDropdownOption[] => {
+  return JSActions.map(convertJSActionToDropdownOption);
+};
+export const convertJSActionToDropdownOption = (
+  JSAction: JSAction,
+): JSActionDropdownOption => ({
+  label: JSAction.name,
+  value: JSAction.id,
+  data: JSAction,
+});
+/**
+ * Returns dropdown option based on priority and availability
+ */
+export const getJSActionOption = (
+  activeJSAction: JSAction | null,
+  jsActions: JSAction[],
+): JSActionDropdownOption => {
+  let jsActionOption: JSActionDropdownOption = NO_FUNCTION_DROPDOWN_OPTION;
+
+  if (activeJSAction) {
+    jsActionOption = convertJSActionToDropdownOption(activeJSAction);
+  } else if (jsActions.length) {
+    jsActionOption = convertJSActionToDropdownOption(jsActions[0]);
+  }
+
+  return jsActionOption;
+};
diff --git a/app/client/src/pages/Editor/JSEditor/constants.ts b/app/client/src/pages/Editor/JSEditor/constants.ts
index da8b12eb319d..06974b6fc5d1 100644
--- a/app/client/src/pages/Editor/JSEditor/constants.ts
+++ b/app/client/src/pages/Editor/JSEditor/constants.ts
@@ -1,23 +1,3 @@
-import type { JSActionDropdownOption } from "./utils";
-
-export const RUN_BUTTON_DEFAULTS = {
-  HEIGHT: "30px",
-  CTA_TEXT: "Run",
-  // space between button and dropdown
-  GAP_SIZE: "10px",
-  DROPDOWN_HIGHLIGHT_BG: "#E7E7E7",
-};
-export const NO_SELECTION_DROPDOWN_OPTION: JSActionDropdownOption = {
-  label: "No function selected",
-  value: "",
-  data: null,
-};
-export const NO_FUNCTION_DROPDOWN_OPTION: JSActionDropdownOption = {
-  label: "No function available",
-  value: "",
-  data: null,
-};
-
 export const CONFIRM_BEFORE_CALLING_HEADING = {
   text: "Confirm before calling ",
   hasInfo: true,
@@ -47,7 +27,3 @@ export const RUN_GUTTER_ID = "run-gutter";
 export const RUN_GUTTER_CLASSNAME = "run-marker-gutter";
 export const JS_OBJECT_HOTKEYS_CLASSNAME = "js-object-hotkeys";
 export const ANIMATE_RUN_GUTTER = "animate-run-marker";
-
-export const testLocators = {
-  runJSAction: "run-js-action",
-};
diff --git a/app/client/src/pages/Editor/JSEditor/index.tsx b/app/client/src/pages/Editor/JSEditor/index.tsx
index b9893d17f7d1..6fcd8956119b 100644
--- a/app/client/src/pages/Editor/JSEditor/index.tsx
+++ b/app/client/src/pages/Editor/JSEditor/index.tsx
@@ -13,9 +13,8 @@ import styled from "styled-components";
 import EntityNotFoundPane from "../EntityNotFoundPane";
 import AppJSEditorContextMenu from "./AppJSEditorContextMenu";
 import { updateFunctionProperty } from "actions/jsPaneActions";
-import type { OnUpdateSettingsProps } from "./JSFunctionSettings";
+import type { OnUpdateSettingsProps } from "./JSEditorToolbar";
 import { saveJSObjectName } from "actions/jsActionActions";
-
 const LoadingContainer = styled(CenteredWrapper)`
   height: 50%;
 `;
diff --git a/app/client/src/pages/Editor/JSEditor/styledComponents.ts b/app/client/src/pages/Editor/JSEditor/styledComponents.ts
index d0ac8808b8fa..f84f96e2a064 100644
--- a/app/client/src/pages/Editor/JSEditor/styledComponents.ts
+++ b/app/client/src/pages/Editor/JSEditor/styledComponents.ts
@@ -14,13 +14,16 @@ export const CodeEditorWithGutterStyles = css`
     background: var(--ads-v2-color-bg-subtle);
     margin-left: 5px;
   }
+
   .${RUN_GUTTER_CLASSNAME} {
     cursor: pointer;
     color: var(--ads-v2-color-fg-brand);
   }
+
   .CodeMirror-linenumbers {
     width: max-content;
   }
+
   .CodeMirror-linenumber {
     text-align: right;
     padding-left: 0;
@@ -34,6 +37,7 @@ export const CodeEditorWithGutterStyles = css`
 export const FormWrapper = styled.div`
   height: calc(100vh - ${IDE_HEADER_HEIGHT}px);
   overflow: hidden;
+
   .${JS_OBJECT_HOTKEYS_CLASSNAME} {
     width: 100%;
     height: 100%;
@@ -45,17 +49,18 @@ export const Form = styled.form`
   flex-direction: column;
   height: 100%;
   overflow: hidden;
+
   .t--no-binding-prompt {
     display: none;
   }
+
   flex: 1;
-  padding: var(--ads-v2-spaces-5) 0 0;
 `;
 
 export const StyledFormRow = styled(FormRow)`
   padding: 0 var(--ads-v2-spaces-7) var(--ads-v2-spaces-5)
     var(--ads-v2-spaces-7);
-  flex: 0;
+  flex: 1;
 `;
 
 export const NameWrapper = styled.div`
@@ -96,24 +101,29 @@ export const TabbedViewContainer = styled.div<{ isExecuting: boolean }>`
   ${FormRow} {
     min-height: auto;
     padding: ${(props) => props.theme.spaces[0]}px;
+
     & > * {
       margin-right: 0px;
     }
   }
+
   &&&& {
     ul.ads-v2-tabs__list {
       padding: 0px ${(props) => props.theme.spaces[11]}px;
       background-color: ${(props) =>
         props.theme.colors.apiPane.responseBody.bg};
     }
+
     .ads-v2-tabs__panel {
       ${CodeEditorWithGutterStyles};
       height: calc(100% - 38px);
       margin-top: 0px;
       background-color: var(--ads-v2-color-bg);
+
       .CodeEditorTarget {
         outline: none;
       }
+
       ${(props) =>
         props.isExecuting &&
         `
diff --git a/app/client/src/pages/Editor/JSEditor/utils.test.ts b/app/client/src/pages/Editor/JSEditor/utils.test.ts
index d661dae1088c..7c6926fd5fce 100644
--- a/app/client/src/pages/Editor/JSEditor/utils.test.ts
+++ b/app/client/src/pages/Editor/JSEditor/utils.test.ts
@@ -1,12 +1,11 @@
 import type { JSAction } from "entities/JSCollection";
 import { uniqueId } from "lodash";
-import { NO_FUNCTION_DROPDOWN_OPTION } from "./constants";
+import { getJSFunctionStartLineFromCode, isCursorWithinNode } from "./utils";
 import {
   convertJSActionToDropdownOption,
   getJSActionOption,
-  getJSFunctionStartLineFromCode,
-  isCursorWithinNode,
-} from "./utils";
+} from "./JSEditorToolbar/utils";
+import { NO_FUNCTION_DROPDOWN_OPTION } from "./JSEditorToolbar/constants";
 
 const BASE_JS_OBJECT_BODY = `export default {
 	myVar1: [],
@@ -20,7 +19,7 @@ const BASE_JS_OBJECT_BODY = `export default {
 		await Api3.run()
 		await Api3.run()
 		return Api3.data
-	}	
+	}
 }`;
 
 const BASE_JS_OBJECT_BODY_WITH_LITERALS = `export default {
@@ -35,7 +34,7 @@ const BASE_JS_OBJECT_BODY_WITH_LITERALS = `export default {
 		await Api3.run()
 		await Api3.run()
 		return Api3.data
-	}	
+	}
 }`;
 
 const BASE_JS_ACTION = (useLiterals = false) => {
diff --git a/app/client/src/pages/Editor/JSEditor/utils.ts b/app/client/src/pages/Editor/JSEditor/utils.ts
index 879b83494e95..ae88de91d66f 100644
--- a/app/client/src/pages/Editor/JSEditor/utils.ts
+++ b/app/client/src/pages/Editor/JSEditor/utils.ts
@@ -3,18 +3,13 @@ import { parse } from "acorn";
 import { ancestor } from "acorn-walk";
 import type { CodeEditorGutter } from "components/editorComponents/CodeEditor";
 import type { JSAction, JSCollection } from "entities/JSCollection";
-import {
-  RUN_GUTTER_CLASSNAME,
-  RUN_GUTTER_ID,
-  NO_FUNCTION_DROPDOWN_OPTION,
-} from "./constants";
-import type { DropdownOption } from "@appsmith/ads-old";
+import { RUN_GUTTER_CLASSNAME, RUN_GUTTER_ID } from "./constants";
 import { find, memoize } from "lodash";
 import type { PropertyNode } from "@shared/ast";
 import {
+  ECMA_VERSION,
   isLiteralNode,
   isPropertyNode,
-  ECMA_VERSION,
   NodeTypes,
   SourceType,
 } from "@shared/ast";
@@ -22,10 +17,6 @@ import type { EventLocation } from "ee/utils/analyticsUtilTypes";
 import log from "loglevel";
 import type CodeMirror from "codemirror";
 
-export interface JSActionDropdownOption extends DropdownOption {
-  data: JSAction | null;
-}
-
 export const getAST = memoize((code: string, sourceType: SourceType) =>
   parse(code, {
     ecmaVersion: ECMA_VERSION,
@@ -224,20 +215,6 @@ export const getJSFunctionLineGutter = (
   };
 };
 
-export const convertJSActionsToDropdownOptions = (
-  JSActions: JSAction[],
-): JSActionDropdownOption[] => {
-  return JSActions.map(convertJSActionToDropdownOption);
-};
-
-export const convertJSActionToDropdownOption = (
-  JSAction: JSAction,
-): JSActionDropdownOption => ({
-  label: JSAction.name,
-  value: JSAction.id,
-  data: JSAction,
-});
-
 export const getActionFromJsCollection = (
   actionId: string | null,
   jsCollection: JSCollection,
@@ -246,21 +223,3 @@ export const getActionFromJsCollection = (
 
   return jsCollection.actions.find((action) => action.id === actionId) || null;
 };
-
-/**
- * Returns dropdown option based on priority and availability
- */
-export const getJSActionOption = (
-  activeJSAction: JSAction | null,
-  jsActions: JSAction[],
-): JSActionDropdownOption => {
-  let jsActionOption = NO_FUNCTION_DROPDOWN_OPTION;
-
-  if (activeJSAction) {
-    jsActionOption = convertJSActionToDropdownOption(activeJSAction);
-  } else if (jsActions.length) {
-    jsActionOption = convertJSActionToDropdownOption(jsActions[0]);
-  }
-
-  return jsActionOption;
-};
diff --git a/app/client/src/pages/Editor/PropertyPane/PropertyControlsGenerator.tsx b/app/client/src/pages/Editor/PropertyPane/PropertyControlsGenerator.tsx
index 6e5a7c02be46..4b0452cb9b4f 100644
--- a/app/client/src/pages/Editor/PropertyPane/PropertyControlsGenerator.tsx
+++ b/app/client/src/pages/Editor/PropertyPane/PropertyControlsGenerator.tsx
@@ -17,8 +17,6 @@ import { evaluateHiddenProperty } from "./helpers";
 import type { EnhancementFns } from "selectors/widgetEnhancementSelectors";
 import { getWidgetEnhancementSelector } from "selectors/widgetEnhancementSelectors";
 import equal from "fast-deep-equal/es6";
-import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
-import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
 
 export interface PropertyControlsGeneratorProps {
   id: string;
@@ -106,10 +104,6 @@ function PropertyControlsGenerator(props: PropertyControlsGeneratorProps) {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const widgetProps: any = useSelector(getWidgetPropsForPropertyPane);
 
-  const isCollapseAllExceptDataEnabled: boolean = useFeatureFlag(
-    FEATURE_FLAG.ab_learnability_discoverability_collapse_all_except_data_enabled,
-  );
-
   const enhancementSelector = getWidgetEnhancementSelector(
     widgetProps?.widgetId,
   );
@@ -136,11 +130,11 @@ function PropertyControlsGenerator(props: PropertyControlsGeneratorProps) {
   ) : (
     <>
       {generatePropertyControl(
-        searchResults as readonly PropertyPaneConfig[],
+        searchResults,
         props,
         isSearchResult,
         enhancements,
-        isCollapseAllExceptDataEnabled,
+        true,
       )}
     </>
   );
diff --git a/app/client/src/pages/Editor/QueryEditor/Editor.tsx b/app/client/src/pages/Editor/QueryEditor/Editor.tsx
index 8e6322c78a77..abb9038a2cdb 100644
--- a/app/client/src/pages/Editor/QueryEditor/Editor.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/Editor.tsx
@@ -41,6 +41,11 @@ import { merge } from "lodash";
 import { getPathAndValueFromActionDiffObject } from "../../../utils/getPathAndValueFromActionDiffObject";
 import { getCurrentEnvironmentDetails } from "ee/selectors/environmentSelectors";
 import { QueryEditorContext } from "./QueryEditorContext";
+import {
+  isActionDeleting,
+  isActionRunning,
+  isPluginActionCreating,
+} from "PluginActionEditor/store";
 
 const EmptyStateContainer = styled.div`
   display: flex;
@@ -253,7 +258,7 @@ class QueryEditor extends React.Component<Props> {
 const mapStateToProps = (state: AppState, props: OwnProps): ReduxStateProps => {
   const { baseApiId, baseQueryId } = props.match.params;
   const baseActionId = baseQueryId || baseApiId || "";
-  const { runErrorMessage } = state.ui.queryPane;
+  const { runErrorMessage } = state.ui.pluginActionEditor;
   const { plugins } = state.entities;
 
   const { editorConfigs } = plugins;
@@ -272,6 +277,10 @@ const mapStateToProps = (state: AppState, props: OwnProps): ReduxStateProps => {
     pluginId = action.pluginId;
   }
 
+  const isCreating = isPluginActionCreating(state);
+  const isDeleting = isActionDeleting(actionId)(state);
+  const isRunning = isActionRunning(actionId)(state);
+
   // TODO: Fix this the next time the file is edited
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   let editorConfig: any;
@@ -319,12 +328,12 @@ const mapStateToProps = (state: AppState, props: OwnProps): ReduxStateProps => {
       ? getDatasourceByPluginId(state, action?.pluginId)
       : getDBAndRemoteDatasources(state),
     responses: getActionResponses(state),
-    isRunning: state.ui.queryPane.isRunning[actionId],
-    isDeleting: state.ui.queryPane.isDeleting[actionId],
+    isCreating,
+    isRunning,
+    isDeleting,
     isSaas: !!baseApiId,
     formData,
     editorConfig,
-    isCreating: state.ui.apiPane.isCreating,
     uiComponent,
     applicationId: getCurrentApplicationId(state),
     actionObjectDiff,
diff --git a/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx b/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx
index 85b6d5651183..d82a9640211c 100644
--- a/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx
@@ -17,24 +17,29 @@ import {
 import { useParams } from "react-router";
 import type { AppState } from "ee/reducers";
 import { thinScrollbar } from "constants/DefaultTheme";
-import ActionRightPane from "components/editorComponents/ActionRightPane";
 import type { ActionResponse } from "api/ActionAPI";
 import type { Plugin } from "api/PluginApi";
 import type { UIComponentTypes } from "api/PluginApi";
-import { EDITOR_TABS } from "constants/QueryEditorConstants";
+import { EDITOR_TABS, SQL_DATASOURCES } from "constants/QueryEditorConstants";
 import type { FormEvalOutput } from "reducers/evaluationReducers/formEvaluationReducer";
-import { getQueryPaneConfigSelectedTabIndex } from "selectors/queryPaneSelectors";
-import { setQueryPaneConfigSelectedTabIndex } from "actions/queryPaneActions";
+import {
+  getPluginActionConfigSelectedTab,
+  setPluginActionEditorSelectedTab,
+} from "PluginActionEditor/store";
 import type { SourceEntity } from "entities/AppsmithConsole";
 import { ENTITY_TYPE as SOURCE_ENTITY_TYPE } from "ee/entities/AppsmithConsole/utils";
-import { DocsLink, openDoc } from "../../../constants/DocumentationLinks";
+import { DocsLink, openDoc } from "constants/DocumentationLinks";
 import { QueryEditorContext } from "./QueryEditorContext";
 import QueryDebuggerTabs from "./QueryDebuggerTabs";
-import useShowSchema from "components/editorComponents/ActionRightPane/useShowSchema";
+import useShowSchema from "PluginActionEditor/components/PluginActionResponse/hooks/useShowSchema";
 import { doesPluginRequireDatasource } from "ee/entities/Engine/actionHelpers";
-import FormRender from "./FormRender";
+import FormRender from "PluginActionEditor/components/PluginActionForm/components/UQIEditor/FormRender";
 import QueryEditorHeader from "./QueryEditorHeader";
 import RunHistory from "ee/components/RunHistory";
+import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
+import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
+import { getHasExecuteActionPermission } from "ee/utils/BusinessFeatures/permissionPageHelpers";
+import { getPluginNameFromId } from "ee/selectors/entitiesSelector";
 
 const QueryFormContainer = styled.form`
   flex: 1;
@@ -197,7 +202,7 @@ export function EditorJSONtoForm(props: Props) {
     uiComponent,
   } = props;
 
-  const { actionRightPaneAdditionSections, closeEditorLink, notification } =
+  const { actionRightPaneAdditionSections, notification } =
     useContext(QueryEditorContext);
 
   const params = useParams<{ baseApiId?: string; baseQueryId?: string }>();
@@ -230,11 +235,43 @@ export function EditorJSONtoForm(props: Props) {
     id: currentActionConfig ? currentActionConfig.id : "",
   };
 
-  const selectedConfigTab = useSelector(getQueryPaneConfigSelectedTabIndex);
+  const selectedTab = useSelector(getPluginActionConfigSelectedTab);
+
+  const setSelectedConfigTab = useCallback(
+    (selectedIndex: string) => {
+      dispatch(setPluginActionEditorSelectedTab(selectedIndex));
+    },
+    [dispatch],
+  );
+
+  const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
+  const isExecutePermitted = getHasExecuteActionPermission(
+    isFeatureEnabled,
+    currentActionConfig?.userPermissions,
+  );
+
+  // get the current action's plugin name
+  const currentActionPluginName = useSelector((state: AppState) =>
+    getPluginNameFromId(state, currentActionConfig?.pluginId || ""),
+  );
+
+  let actionBody = "";
 
-  const setSelectedConfigTab = useCallback((selectedIndex: string) => {
-    dispatch(setQueryPaneConfigSelectedTabIndex(selectedIndex));
-  }, []);
+  if (!!currentActionConfig?.actionConfiguration) {
+    if ("formData" in currentActionConfig?.actionConfiguration) {
+      // if the action has a formData (the action is postUQI e.g. Oracle)
+      actionBody =
+        currentActionConfig.actionConfiguration.formData?.body?.data || "";
+    } else {
+      // if the action is pre UQI, the path is different e.g. mySQL
+      actionBody = currentActionConfig.actionConfiguration?.body || "";
+    }
+  }
+
+  // if (the body is empty and the action is an sql datasource) or the user does not have permission, block action execution.
+  const blockExecution =
+    (!actionBody && SQL_DATASOURCES.includes(currentActionPluginName)) ||
+    !isExecutePermitted;
 
   // when switching between different redux forms, make sure this redux form has been initialized before rendering anything.
   // the initialized prop below comes from redux-form.
@@ -243,107 +280,104 @@ export function EditorJSONtoForm(props: Props) {
   }
 
   return (
-    <>
-      {closeEditorLink}
-      <QueryFormContainer onSubmit={handleSubmit(noop)}>
-        <QueryEditorHeader
-          dataSources={dataSources}
-          formName={formName}
-          isRunning={isRunning}
-          onCreateDatasourceClick={onCreateDatasourceClick}
-          onRunClick={onRunClick}
-          plugin={plugin}
-        />
-        {notification && (
-          <StyledNotificationWrapper>{notification}</StyledNotificationWrapper>
-        )}
-        <Wrapper>
-          <div className="flex flex-1 w-full">
-            <SecondaryWrapper>
-              <TabContainerView>
-                <Tabs
-                  onValueChange={setSelectedConfigTab}
-                  value={selectedConfigTab || EDITOR_TABS.QUERY}
+    <QueryFormContainer onSubmit={handleSubmit(noop)}>
+      <QueryEditorHeader
+        dataSources={dataSources}
+        formName={formName}
+        isRunDisabled={blockExecution}
+        isRunning={isRunning}
+        onCreateDatasourceClick={onCreateDatasourceClick}
+        onRunClick={onRunClick}
+        plugin={plugin}
+      />
+      {notification && (
+        <StyledNotificationWrapper>{notification}</StyledNotificationWrapper>
+      )}
+      <Wrapper>
+        <div className="flex flex-1 w-full">
+          <SecondaryWrapper>
+            <TabContainerView>
+              <Tabs
+                onValueChange={setSelectedConfigTab}
+                value={selectedTab || EDITOR_TABS.QUERY}
+              >
+                <TabsListWrapper>
+                  <TabsList>
+                    <Tab
+                      data-testid={`t--query-editor-` + EDITOR_TABS.QUERY}
+                      value={EDITOR_TABS.QUERY}
+                    >
+                      Query
+                    </Tab>
+                    <Tab
+                      data-testid={`t--query-editor-` + EDITOR_TABS.SETTINGS}
+                      value={EDITOR_TABS.SETTINGS}
+                    >
+                      Settings
+                    </Tab>
+                  </TabsList>
+                </TabsListWrapper>
+                <TabPanelWrapper
+                  className="tab-panel"
+                  value={EDITOR_TABS.QUERY}
                 >
-                  <TabsListWrapper>
-                    <TabsList>
-                      <Tab
-                        data-testid={`t--query-editor-` + EDITOR_TABS.QUERY}
-                        value={EDITOR_TABS.QUERY}
-                      >
-                        Query
-                      </Tab>
-                      <Tab
-                        data-testid={`t--query-editor-` + EDITOR_TABS.SETTINGS}
-                        value={EDITOR_TABS.SETTINGS}
-                      >
-                        Settings
-                      </Tab>
-                    </TabsList>
-                  </TabsListWrapper>
-                  <TabPanelWrapper
-                    className="tab-panel"
-                    value={EDITOR_TABS.QUERY}
+                  <SettingsWrapper
+                    data-testid={`t--action-form-${plugin?.type}`}
                   >
-                    <SettingsWrapper
-                      data-testid={`t--action-form-${plugin?.type}`}
-                    >
-                      <FormRender
-                        editorConfig={editorConfig}
-                        formData={props.formData}
-                        formEvaluationState={props.formEvaluationState}
-                        formName={formName}
-                        uiComponent={uiComponent}
-                      />
-                    </SettingsWrapper>
-                  </TabPanelWrapper>
-                  <TabPanelWrapper value={EDITOR_TABS.SETTINGS}>
-                    <SettingsWrapper>
-                      <ActionSettings
-                        actionSettingsConfig={settingConfig}
-                        formName={formName}
-                      />
-                    </SettingsWrapper>
-                  </TabPanelWrapper>
-                </Tabs>
-                {documentationLink && (
-                  <Tooltip
-                    content={createMessage(DOCUMENTATION_TOOLTIP)}
-                    placement="top"
+                    <FormRender
+                      editorConfig={editorConfig}
+                      formData={props.formData}
+                      formEvaluationState={props.formEvaluationState}
+                      formName={formName}
+                      uiComponent={uiComponent}
+                    />
+                  </SettingsWrapper>
+                </TabPanelWrapper>
+                <TabPanelWrapper value={EDITOR_TABS.SETTINGS}>
+                  <SettingsWrapper>
+                    <ActionSettings
+                      actionSettingsConfig={settingConfig}
+                      formName={formName}
+                    />
+                  </SettingsWrapper>
+                </TabPanelWrapper>
+              </Tabs>
+              {documentationLink && (
+                <Tooltip
+                  content={createMessage(DOCUMENTATION_TOOLTIP)}
+                  placement="top"
+                >
+                  <DocumentationButton
+                    className="t--datasource-documentation-link"
+                    kind="tertiary"
+                    onClick={(e: React.MouseEvent) => {
+                      e.stopPropagation();
+                      handleDocumentationClick();
+                    }}
+                    size="sm"
+                    startIcon="book-line"
                   >
-                    <DocumentationButton
-                      className="t--datasource-documentation-link"
-                      kind="tertiary"
-                      onClick={(e: React.MouseEvent) => {
-                        e.stopPropagation();
-                        handleDocumentationClick();
-                      }}
-                      size="sm"
-                      startIcon="book-line"
-                    >
-                      {createMessage(DOCUMENTATION)}
-                    </DocumentationButton>
-                  </Tooltip>
-                )}
-              </TabContainerView>
-              <QueryDebuggerTabs
-                actionName={actionName}
-                actionResponse={actionResponse}
-                actionSource={actionSource}
-                currentActionConfig={currentActionConfig}
-                isRunning={isRunning}
-                onRunClick={onRunClick}
-                runErrorMessage={runErrorMessage}
-                showSchema={showSchema}
-              />
-              <RunHistory />
-            </SecondaryWrapper>
-          </div>
-          <ActionRightPane
-            additionalSections={actionRightPaneAdditionSections}
-          />
-        </Wrapper>
-      </QueryFormContainer>
-    </>
+                    {createMessage(DOCUMENTATION)}
+                  </DocumentationButton>
+                </Tooltip>
+              )}
+            </TabContainerView>
+            <QueryDebuggerTabs
+              actionName={actionName}
+              actionResponse={actionResponse}
+              actionSource={actionSource}
+              currentActionConfig={currentActionConfig}
+              isRunDisabled={blockExecution}
+              isRunning={isRunning}
+              onRunClick={onRunClick}
+              runErrorMessage={runErrorMessage}
+              showSchema={showSchema}
+            />
+            <RunHistory />
+          </SecondaryWrapper>
+        </div>
+        {actionRightPaneAdditionSections}
+      </Wrapper>
+    </QueryFormContainer>
   );
 }
diff --git a/app/client/src/pages/Editor/QueryEditor/QueriesBlankState.tsx b/app/client/src/pages/Editor/QueryEditor/QueriesBlankState.tsx
index 2b6aae11ce00..0f23cd2c0751 100644
--- a/app/client/src/pages/Editor/QueryEditor/QueriesBlankState.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/QueriesBlankState.tsx
@@ -26,4 +26,4 @@ const QueriesBlankState = () => {
   );
 };
 
-export { QueriesBlankState };
+export default QueriesBlankState;
diff --git a/app/client/src/pages/Editor/QueryEditor/QueryDebuggerTabs.test.tsx b/app/client/src/pages/Editor/QueryEditor/QueryDebuggerTabs.test.tsx
index 6d31b9f64f03..047147748aff 100644
--- a/app/client/src/pages/Editor/QueryEditor/QueryDebuggerTabs.test.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/QueryDebuggerTabs.test.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { render } from "@testing-library/react";
+import { render, screen } from "@testing-library/react";
 import configureStore from "redux-mock-store";
 import { Provider } from "react-redux";
 import { ThemeProvider } from "styled-components";
@@ -10,9 +10,36 @@ import { EditorViewMode } from "ee/entities/IDE/constants";
 import "@testing-library/jest-dom/extend-expect";
 import QueryDebuggerTabs from "./QueryDebuggerTabs";
 import { ENTITY_TYPE } from "ee/entities/AppsmithConsole/utils";
+import type { ActionResponse } from "api/ActionAPI";
 
 const mockStore = configureStore([]);
 
+const mockSuccessResponse: ActionResponse = {
+  body: ["Record 1", "Record 2"],
+  statusCode: "200",
+  dataTypes: [],
+  duration: "3000",
+  size: "200",
+  isExecutionSuccess: true,
+  headers: {
+    "Content-Type": ["application/json"],
+    "Cache-Control": ["no-cache"],
+  },
+};
+
+const mockFailedResponse: ActionResponse = {
+  body: [{ response: "Failed" }],
+  statusCode: "200",
+  dataTypes: [],
+  duration: "3000",
+  size: "200",
+  isExecutionSuccess: false,
+  headers: {
+    "Content-Type": ["application/json"],
+    "Cache-Control": ["no-cache"],
+  },
+};
+
 const storeState = {
   ...unitTestBaseMockStore,
   evaluations: {
@@ -24,6 +51,7 @@ const storeState = {
     },
     datasources: {
       structure: {},
+      list: [],
     },
   },
   ui: {
@@ -42,7 +70,7 @@ const storeState = {
         errorCount: 0,
       },
     },
-    queryPane: {
+    pluginActionEditor: {
       debugger: {
         open: true,
         responseTabHeight: 200,
@@ -53,9 +81,7 @@ const storeState = {
 };
 
 describe("ApiResponseView", () => {
-  // TODO: Fix this the next time the file is edited
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  let store: any;
+  let store = mockStore(storeState);
 
   beforeEach(() => {
     store = mockStore(storeState);
@@ -87,4 +113,59 @@ describe("ApiResponseView", () => {
         ?.classList.contains("select-text"),
     ).toBe(true);
   });
+  it("should show record count as result if the query response returns records", () => {
+    render(
+      <Provider store={store}>
+        <ThemeProvider theme={lightTheme}>
+          <Router>
+            <QueryDebuggerTabs
+              actionName="Query1"
+              actionResponse={mockSuccessResponse}
+              actionSource={{
+                id: "ID1",
+                name: "Query1",
+                type: ENTITY_TYPE.ACTION,
+              }}
+              isRunning={false}
+              onRunClick={() => {}}
+            />
+          </Router>
+        </ThemeProvider>
+      </Provider>,
+    );
+
+    const expectedResultText = "Result: 2 Records";
+    const resultTextElement = screen.getByTestId("result-text");
+
+    expect(resultTextElement).toBeInTheDocument();
+    expect(resultTextElement?.textContent).toContain(expectedResultText);
+  });
+
+  it("should show error as result if the query response returns the error", () => {
+    render(
+      <Provider store={store}>
+        <ThemeProvider theme={lightTheme}>
+          <Router>
+            <QueryDebuggerTabs
+              actionName="Query1"
+              actionResponse={mockFailedResponse}
+              actionSource={{
+                id: "ID1",
+                name: "Query1",
+                type: ENTITY_TYPE.ACTION,
+              }}
+              isRunning={false}
+              onRunClick={() => {}}
+            />
+          </Router>
+        </ThemeProvider>
+      </Provider>,
+    );
+
+    const expectedResultText = "Result: Error";
+    const resultTextElement = screen.getByTestId("result-text");
+
+    expect(resultTextElement).toBeInTheDocument();
+    expect(resultTextElement?.textContent).toContain(expectedResultText);
+  });
 });
diff --git a/app/client/src/pages/Editor/QueryEditor/QueryDebuggerTabs.tsx b/app/client/src/pages/Editor/QueryEditor/QueryDebuggerTabs.tsx
index 160ce631ac03..9dd4c29ead0a 100644
--- a/app/client/src/pages/Editor/QueryEditor/QueryDebuggerTabs.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/QueryDebuggerTabs.tsx
@@ -5,7 +5,7 @@ import { useDispatch, useSelector } from "react-redux";
 import styled from "styled-components";
 import { getErrorCount } from "selectors/debuggerSelectors";
 import { Text, TextType } from "@appsmith/ads-old";
-import { DEBUGGER_TAB_KEYS } from "components/editorComponents/Debugger/helpers";
+import { DEBUGGER_TAB_KEYS } from "components/editorComponents/Debugger/constants";
 import {
   DEBUGGER_ERRORS,
   DEBUGGER_LOGS,
@@ -14,25 +14,28 @@ import {
 } from "ee/constants/messages";
 import DebuggerLogs from "components/editorComponents/Debugger/DebuggerLogs";
 import ErrorLogs from "components/editorComponents/Debugger/Errors";
-import Schema from "components/editorComponents/Debugger/Schema";
+import Schema from "PluginActionEditor/components/PluginActionResponse/components/Schema";
 import type { ActionResponse } from "api/ActionAPI";
 import { isString } from "lodash";
 import type { SourceEntity } from "entities/AppsmithConsole";
 import type { Action } from "entities/Action";
-import QueryResponseTab from "./QueryResponseTab";
+import QueryResponseTab from "PluginActionEditor/components/PluginActionResponse/components/QueryResponseTab";
 import {
+  getDatasource,
   getDatasourceStructureById,
   getPluginDatasourceComponentFromId,
 } from "ee/selectors/entitiesSelector";
 import { DatasourceComponentTypes } from "api/PluginApi";
 import { fetchDatasourceStructure } from "actions/datasourceActions";
 import { DatasourceStructureContext } from "entities/Datasource";
-import { getQueryPaneDebuggerState } from "selectors/queryPaneSelectors";
-import { setQueryPaneDebuggerState } from "actions/queryPaneActions";
+import {
+  getPluginActionDebuggerState,
+  setPluginActionEditorDebuggerState,
+} from "PluginActionEditor/store";
 import { actionResponseDisplayDataFormats } from "../utils";
 import { getIDEViewMode } from "selectors/ideSelectors";
 import { EditorViewMode } from "ee/entities/IDE/constants";
-import { IDEBottomView, ViewHideBehaviour } from "../../../IDE";
+import { IDEBottomView, ViewHideBehaviour } from "IDE";
 
 const ResultsCount = styled.div`
   position: absolute;
@@ -41,9 +44,14 @@ const ResultsCount = styled.div`
   color: var(--ads-v2-color-fg);
 `;
 
+const ErrorText = styled(Text)`
+  color: var(--ads-v2-colors-action-error-label-default-fg);
+`;
+
 interface QueryDebuggerTabsProps {
   actionSource: SourceEntity;
   currentActionConfig?: Action;
+  isRunDisabled?: boolean;
   isRunning: boolean;
   actionName: string; // Check what and how to get
   runErrorMessage?: string;
@@ -57,6 +65,7 @@ function QueryDebuggerTabs({
   actionResponse,
   actionSource,
   currentActionConfig,
+  isRunDisabled = false,
   isRunning,
   onRunClick,
   runErrorMessage,
@@ -68,7 +77,7 @@ function QueryDebuggerTabs({
   const dispatch = useDispatch();
 
   const { open, responseTabHeight, selectedTab } = useSelector(
-    getQueryPaneDebuggerState,
+    getPluginActionDebuggerState,
   );
 
   const { responseDisplayFormat } =
@@ -93,6 +102,10 @@ function QueryDebuggerTabs({
     ),
   );
 
+  const datasource = useSelector((state) =>
+    getDatasource(state, currentActionConfig?.datasource?.id ?? ""),
+  );
+
   useEffect(() => {
     if (
       currentActionConfig?.datasource?.id &&
@@ -107,7 +120,12 @@ function QueryDebuggerTabs({
         ),
       );
     }
-  }, []);
+  }, [
+    currentActionConfig,
+    datasourceStructure,
+    dispatch,
+    pluginDatasourceForm,
+  ]);
 
   // These useEffects are used to open the response tab by default for page load queries
   // as for page load queries, query response is available and can be shown in response tab
@@ -121,25 +139,30 @@ function QueryDebuggerTabs({
       !showResponseOnFirstLoad
     ) {
       dispatch(
-        setQueryPaneDebuggerState({
+        setPluginActionEditorDebuggerState({
           open: true,
           selectedTab: DEBUGGER_TAB_KEYS.RESPONSE_TAB,
         }),
       );
       setShowResponseOnFirstLoad(true);
     }
-  }, [responseDisplayFormat, actionResponse, showResponseOnFirstLoad]);
+  }, [
+    responseDisplayFormat,
+    actionResponse,
+    showResponseOnFirstLoad,
+    dispatch,
+  ]);
 
   useEffect(() => {
     if (showSchema && !selectedTab) {
       dispatch(
-        setQueryPaneDebuggerState({
+        setPluginActionEditorDebuggerState({
           open: true,
           selectedTab: DEBUGGER_TAB_KEYS.SCHEMA_TAB,
         }),
       );
     }
-  }, [showSchema, currentActionConfig?.id, selectedTab]);
+  }, [showSchema, selectedTab, dispatch]);
 
   // When multiple page load queries exist, we want to response tab by default for all of them
   // Hence this useEffect will reset showResponseOnFirstLoad flag used to track whether to show response tab or not
@@ -170,17 +193,27 @@ function QueryDebuggerTabs({
     }
   }
 
-  const setQueryResponsePaneHeight = useCallback((height: number) => {
-    dispatch(setQueryPaneDebuggerState({ responseTabHeight: height }));
-  }, []);
+  const setQueryResponsePaneHeight = useCallback(
+    (height: number) => {
+      dispatch(
+        setPluginActionEditorDebuggerState({ responseTabHeight: height }),
+      );
+    },
+    [dispatch],
+  );
 
   const onToggle = useCallback(() => {
-    dispatch(setQueryPaneDebuggerState({ open: !open }));
-  }, [open]);
+    dispatch(setPluginActionEditorDebuggerState({ open: !open }));
+  }, [dispatch, open]);
 
-  const setSelectedResponseTab = useCallback((tabKey: string) => {
-    dispatch(setQueryPaneDebuggerState({ open: true, selectedTab: tabKey }));
-  }, []);
+  const setSelectedResponseTab = useCallback(
+    (tabKey: string) => {
+      dispatch(
+        setPluginActionEditorDebuggerState({ open: true, selectedTab: tabKey }),
+      );
+    },
+    [dispatch],
+  );
 
   const ideViewMode = useSelector(getIDEViewMode);
 
@@ -204,13 +237,14 @@ function QueryDebuggerTabs({
 
   if (currentActionConfig) {
     responseTabs.unshift({
-      key: "response",
+      key: DEBUGGER_TAB_KEYS.RESPONSE_TAB,
       title: createMessage(DEBUGGER_RESPONSE),
       panelComponent: (
         <QueryResponseTab
           actionName={actionName}
           actionSource={actionSource}
           currentActionConfig={currentActionConfig}
+          isRunDisabled={isRunDisabled}
           isRunning={isRunning}
           onRunClick={onRunClick}
           runErrorMessage={runErrorMessage}
@@ -221,13 +255,13 @@ function QueryDebuggerTabs({
 
   if (showSchema && currentActionConfig && currentActionConfig.datasource) {
     responseTabs.unshift({
-      key: "schema",
+      key: DEBUGGER_TAB_KEYS.SCHEMA_TAB,
       title: "Schema",
       panelComponent: (
         <Schema
           currentActionId={currentActionConfig.id}
           datasourceId={currentActionConfig.datasource.id || ""}
-          datasourceName={currentActionConfig.datasource.name || ""}
+          datasourceName={datasource?.name || ""}
         />
       ),
     });
@@ -244,11 +278,15 @@ function QueryDebuggerTabs({
     >
       {output && !!output.length && (
         <ResultsCount>
-          <Text type={TextType.P3}>
+          <Text data-testid="result-text" type={TextType.P3}>
             Result:
-            <Text type={TextType.H5}>{` ${output.length} Record${
-              output.length > 1 ? "s" : ""
-            }`}</Text>
+            {actionResponse?.isExecutionSuccess ? (
+              <Text type={TextType.H5}>{` ${output.length} Record${
+                output.length > 1 ? "s" : ""
+              }`}</Text>
+            ) : (
+              <ErrorText type={TextType.H5}>{" Error"}</ErrorText>
+            )}
           </Text>
         </ResultsCount>
       )}
diff --git a/app/client/src/pages/Editor/QueryEditor/QueryEditorContext.tsx b/app/client/src/pages/Editor/QueryEditor/QueryEditorContext.tsx
index c5089fc6bdfc..88d21b626452 100644
--- a/app/client/src/pages/Editor/QueryEditor/QueryEditorContext.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/QueryEditorContext.tsx
@@ -11,7 +11,6 @@ interface QueryEditorContextContextProps {
   saveActionName: (
     params: SaveActionNameParams,
   ) => ReduxAction<SaveActionNameParams>;
-  closeEditorLink?: React.ReactNode;
   actionRightPaneAdditionSections?: React.ReactNode;
   showSuggestedWidgets?: boolean;
   notification?: string | React.ReactNode;
@@ -29,7 +28,6 @@ export function QueryEditorContextProvider({
   actionRightPaneBackLink,
   changeQueryPage,
   children,
-  closeEditorLink,
   moreActionsMenu,
   notification,
   onCreateDatasourceClick,
@@ -42,7 +40,6 @@ export function QueryEditorContextProvider({
       actionRightPaneBackLink,
       actionRightPaneAdditionSections,
       changeQueryPage,
-      closeEditorLink,
       moreActionsMenu,
       onCreateDatasourceClick,
       onEntityNotFoundBackClick,
@@ -54,7 +51,6 @@ export function QueryEditorContextProvider({
       actionRightPaneBackLink,
       actionRightPaneAdditionSections,
       changeQueryPage,
-      closeEditorLink,
       moreActionsMenu,
       onCreateDatasourceClick,
       onEntityNotFoundBackClick,
diff --git a/app/client/src/pages/Editor/QueryEditor/QueryEditorHeader.tsx b/app/client/src/pages/Editor/QueryEditor/QueryEditorHeader.tsx
index 38f9a9b3d72e..7a5f31e923eb 100644
--- a/app/client/src/pages/Editor/QueryEditor/QueryEditorHeader.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/QueryEditorHeader.tsx
@@ -5,22 +5,14 @@ import { StyledFormRow } from "./EditorJSONtoForm";
 import styled from "styled-components";
 import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
 import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
-import {
-  getHasExecuteActionPermission,
-  getHasManageActionPermission,
-} from "ee/utils/BusinessFeatures/permissionPageHelpers";
+import { getHasManageActionPermission } from "ee/utils/BusinessFeatures/permissionPageHelpers";
 import { useActiveActionBaseId } from "ee/pages/Editor/Explorer/hooks";
 import { useSelector } from "react-redux";
-import {
-  getActionByBaseId,
-  getPlugin,
-  getPluginNameFromId,
-} from "ee/selectors/entitiesSelector";
+import { getActionByBaseId, getPlugin } from "ee/selectors/entitiesSelector";
 import { QueryEditorContext } from "./QueryEditorContext";
 import type { Plugin } from "api/PluginApi";
 import type { Datasource } from "entities/Datasource";
 import type { AppState } from "ee/reducers";
-import { SQL_DATASOURCES } from "constants/QueryEditorConstants";
 import DatasourceSelector from "./DatasourceSelector";
 import { getSavingStatusForActionName } from "selectors/actionSelectors";
 import { getAssetUrl } from "ee/utils/airgapHelpers";
@@ -51,6 +43,7 @@ interface Props {
   formName: string;
   dataSources: Datasource[];
   onCreateDatasourceClick: () => void;
+  isRunDisabled?: boolean;
   isRunning: boolean;
   onRunClick: () => void;
 }
@@ -59,6 +52,7 @@ const QueryEditorHeader = (props: Props) => {
   const {
     dataSources,
     formName,
+    isRunDisabled = false,
     isRunning,
     onCreateDatasourceClick,
     onRunClick,
@@ -78,9 +72,8 @@ const QueryEditorHeader = (props: Props) => {
     currentActionConfig?.userPermissions,
   );
 
-  const isExecutePermitted = getHasExecuteActionPermission(
-    isFeatureEnabled,
-    currentActionConfig?.userPermissions,
+  const isDatasourceSelectorEnabled = useFeatureFlag(
+    FEATURE_FLAG.release_ide_datasource_selector_enabled,
   );
 
   const currentPlugin = useSelector((state: AppState) =>
@@ -95,29 +88,6 @@ const QueryEditorHeader = (props: Props) => {
 
   const icon = ActionUrlIcon(iconUrl);
 
-  // get the current action's plugin name
-  const currentActionPluginName = useSelector((state: AppState) =>
-    getPluginNameFromId(state, currentActionConfig?.pluginId || ""),
-  );
-
-  let actionBody = "";
-
-  if (!!currentActionConfig?.actionConfiguration) {
-    if ("formData" in currentActionConfig?.actionConfiguration) {
-      // if the action has a formData (the action is postUQI e.g. Oracle)
-      actionBody =
-        currentActionConfig.actionConfiguration.formData?.body?.data || "";
-    } else {
-      // if the action is pre UQI, the path is different e.g. mySQL
-      actionBody = currentActionConfig.actionConfiguration?.body || "";
-    }
-  }
-
-  // if (the body is empty and the action is an sql datasource) or the user does not have permission, block action execution.
-  const blockExecution =
-    (!actionBody && SQL_DATASOURCES.includes(currentActionPluginName)) ||
-    !isExecutePermitted;
-
   return (
     <StyledFormRow>
       <NameWrapper>
@@ -131,17 +101,19 @@ const QueryEditorHeader = (props: Props) => {
       </NameWrapper>
       <ActionsWrapper>
         {moreActionsMenu}
-        <DatasourceSelector
-          currentActionConfig={currentActionConfig}
-          dataSources={dataSources}
-          formName={formName}
-          onCreateDatasourceClick={onCreateDatasourceClick}
-          plugin={plugin}
-        />
+        {isDatasourceSelectorEnabled && (
+          <DatasourceSelector
+            currentActionConfig={currentActionConfig}
+            dataSources={dataSources}
+            formName={formName}
+            onCreateDatasourceClick={onCreateDatasourceClick}
+            plugin={plugin}
+          />
+        )}
         <Button
           className="t--run-query"
           data-guided-tour-iid="run-query"
-          isDisabled={blockExecution}
+          isDisabled={isRunDisabled}
           isLoading={isRunning}
           onClick={onRunClick}
           size="md"
diff --git a/app/client/src/pages/Editor/QueryEditor/index.tsx b/app/client/src/pages/Editor/QueryEditor/index.tsx
index 03457a6228ea..a47dd30fc0b5 100644
--- a/app/client/src/pages/Editor/QueryEditor/index.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/index.tsx
@@ -13,7 +13,7 @@ import {
   getIsEditorInitialized,
   getPagePermissions,
 } from "selectors/editorSelectors";
-import { changeQuery } from "actions/queryPaneActions";
+import { changeQuery } from "PluginActionEditor/store";
 import { DatasourceCreateEntryPoints } from "constants/Datasource";
 import {
   getActionByBaseId,
@@ -41,7 +41,6 @@ import { resolveIcon } from "../utils";
 import { ENTITY_ICON_SIZE, EntityIcon } from "../Explorer/ExplorerIcons";
 import { getIDEViewMode } from "selectors/ideSelectors";
 import { EditorViewMode } from "ee/entities/IDE/constants";
-import { AppPluginActionEditor } from "../AppPluginActionEditor";
 import { saveActionName } from "actions/pluginActionActions";
 
 type QueryEditorProps = RouteComponentProps<QueryEditorRouteParams>;
@@ -187,14 +186,6 @@ function QueryEditor(props: QueryEditorProps) {
     );
   }, [action?.name, isConverting, icon]);
 
-  const isActionRedesignEnabled = useFeatureFlag(
-    FEATURE_FLAG.release_actions_redesign_enabled,
-  );
-
-  if (isActionRedesignEnabled) {
-    return <AppPluginActionEditor />;
-  }
-
   return (
     <QueryEditorContextProvider
       actionRightPaneBackLink={actionRightPaneBackLink}
diff --git a/app/client/src/pages/Editor/SaaSEditor/DatasourceForm.tsx b/app/client/src/pages/Editor/SaaSEditor/DatasourceForm.tsx
index 414c920f5aac..94e34ba1c05b 100644
--- a/app/client/src/pages/Editor/SaaSEditor/DatasourceForm.tsx
+++ b/app/client/src/pages/Editor/SaaSEditor/DatasourceForm.tsx
@@ -662,17 +662,6 @@ class DatasourceSaaSEditor extends JSONtoForm<Props, State> {
                 >
                   {(!viewMode || createFlow || isInsideReconnectModal) && (
                     <>
-                      {/* This adds information banner when creating google sheets datasource,
-              this info banner explains why appsmith requires permissions from users google account */}
-                      {datasource && isGoogleSheetPlugin && createFlow ? (
-                        <AuthMessage
-                          actionType={ActionType.DOCUMENTATION}
-                          calloutType="info"
-                          datasource={datasource}
-                          description={googleSheetsInfoMessage}
-                          pageId={pageId}
-                        />
-                      ) : null}
                       {/* This adds error banner for google sheets datasource if the datasource is unauthorised */}
                       {datasource &&
                       isGoogleSheetPlugin &&
@@ -688,6 +677,17 @@ class DatasourceSaaSEditor extends JSONtoForm<Props, State> {
                         ? map(sections, this.renderMainSection)
                         : null}
                       {""}
+                      {/* This adds information banner when creating google sheets datasource,
+              this info banner explains why appsmith requires permissions from users google account */}
+                      {datasource && isGoogleSheetPlugin && createFlow ? (
+                        <AuthMessage
+                          actionType={ActionType.DOCUMENTATION}
+                          calloutType="info"
+                          datasource={datasource}
+                          description={googleSheetsInfoMessage}
+                          pageId={pageId}
+                        />
+                      ) : null}
                     </>
                   )}
                   {viewMode &&
diff --git a/app/client/src/pages/Editor/SaaSEditor/__data__/FinalState.json b/app/client/src/pages/Editor/SaaSEditor/__data__/FinalState.json
index 4fb222168063..4b5715857c53 100644
--- a/app/client/src/pages/Editor/SaaSEditor/__data__/FinalState.json
+++ b/app/client/src/pages/Editor/SaaSEditor/__data__/FinalState.json
@@ -1288,8 +1288,8 @@
                 }
               },
               {
-                "label": "Use Prepared Statement",
-                "info": "Prepared statements prevent SQL injections on your queries but do not support dynamic bindings outside values in your SQL",
+                "label": "Use prepared statements",
+                "tooltipText": "Prepared statements prevent SQL injections on your queries but do not support dynamic bindings outside values in your SQL",
                 "configProperty": "actionConfiguration.pluginSpecifiedTemplates[0].value",
                 "controlType": "SWITCH",
                 "initialValue": true
@@ -2543,20 +2543,19 @@
             "id": 1,
             "children": [
               {
-                "label": "Run query on page load",
+                "label": "Run the query on page load",
                 "configProperty": "executeOnLoad",
-                "controlType": "SWITCH",
-                "info": "Will refresh data each time the page is loaded"
+                "controlType": "SWITCH"
               },
               {
-                "label": "Request confirmation before running query",
+                "label": "Request confirmation before running this query",
                 "configProperty": "confirmBeforeExecute",
                 "controlType": "SWITCH",
-                "info": "Ask confirmation from the user each time before refreshing data"
+                "tooltipText": "Ask confirmation from the user each time before refreshing data"
               },
               {
                 "label": "Smart BSON substitution",
-                "info": "Turning on this property fixes the BSON substitution of bindings in the Mongo BSON document by adding/removing quotes intelligently and reduces developer errors",
+                "tooltipText": "Turning on this property fixes the BSON substitution of bindings in the Mongo BSON document by adding/removing quotes intelligently and reduces developer errors",
                 "configProperty": "actionConfiguration.formData.smartSubstitution",
                 "controlType": "SWITCH",
                 "initialValue": true
@@ -2577,20 +2576,19 @@
             "id": 1,
             "children": [
               {
-                "label": "Run query on page load",
+                "label": "Run the query on page load",
                 "configProperty": "executeOnLoad",
-                "controlType": "SWITCH",
-                "info": "Will refresh data each time the page is loaded"
+                "controlType": "SWITCH"
               },
               {
-                "label": "Request confirmation before running query",
+                "label": "Request confirmation before running this query",
                 "configProperty": "confirmBeforeExecute",
                 "controlType": "SWITCH",
-                "info": "Ask confirmation from the user each time before refreshing data"
+                "tooltipText": "Ask confirmation from the user each time before refreshing data"
               },
               {
-                "label": "Use Prepared Statement",
-                "info": "Prepared statements prevent SQL injections on your queries but do not support dynamic bindings outside values in your SQL",
+                "label": "Use prepared statements",
+                "tooltipText": "Prepared statements prevent SQL injections on your queries but do not support dynamic bindings outside values in your SQL",
                 "configProperty": "actionConfiguration.pluginSpecifiedTemplates[0].value",
                 "controlType": "SWITCH",
                 "initialValue": true
@@ -2611,28 +2609,27 @@
             "id": 1,
             "children": [
               {
-                "label": "Run API on page load",
+                "label": "Run the API on page load",
                 "configProperty": "executeOnLoad",
-                "controlType": "CHECKBOX",
-                "info": "Will refresh data each time the page is loaded"
+                "controlType": "CHECKBOX"
               },
               {
-                "label": "Request confirmation before running API",
+                "label": "Request confirmation before running this API",
                 "configProperty": "confirmBeforeExecute",
                 "controlType": "CHECKBOX",
-                "info": "Ask confirmation from the user each time before refreshing data"
+                "tooltipText": "Ask confirmation from the user each time before refreshing data"
               },
               {
                 "label": "Encode query params",
                 "configProperty": "actionConfiguration.encodeParamsToggle",
                 "controlType": "CHECKBOX",
-                "info": "Encode query params for all APIs. Also encode form body when Content-Type header is set to x-www-form-encoded"
+                "tooltipText": "Encode query params for all APIs. Also encode form body when Content-Type header is set to x-www-form-encoded"
               },
               {
                 "label": "Smart JSON substitution",
                 "configProperty": "actionConfiguration.pluginSpecifiedTemplates[0].value",
                 "controlType": "CHECKBOX",
-                "info": "Turning on this property fixes the JSON substitution of bindings in API body by adding/removing quotes intelligently and reduces developer errors",
+                "tooltipText": "Turning on this property fixes the JSON substitution of bindings in API body by adding/removing quotes intelligently and reduces developer errors",
                 "initialValue": true
               },
               {
@@ -2651,16 +2648,15 @@
             "id": 1,
             "children": [
               {
-                "label": "Run query on page load",
+                "label": "Run the query on page load",
                 "configProperty": "executeOnLoad",
-                "controlType": "SWITCH",
-                "info": "Will refresh data each time the page is loaded"
+                "controlType": "SWITCH"
               },
               {
-                "label": "Request confirmation before running query",
+                "label": "Request confirmation before running this query",
                 "configProperty": "confirmBeforeExecute",
                 "controlType": "SWITCH",
-                "info": "Ask confirmation from the user each time before refreshing data"
+                "tooltipText": "Ask confirmation from the user each time before refreshing data"
               },
               {
                 "label": "Query timeout (in milliseconds)",
@@ -2678,20 +2674,19 @@
             "id": 1,
             "children": [
               {
-                "label": "Run query on page load",
+                "label": "Run the query on page load",
                 "configProperty": "executeOnLoad",
-                "controlType": "SWITCH",
-                "info": "Will refresh data each time the page is loaded"
+                "controlType": "SWITCH"
               },
               {
-                "label": "Request confirmation before running query",
+                "label": "Request confirmation before running this query",
                 "configProperty": "confirmBeforeExecute",
                 "controlType": "SWITCH",
-                "info": "Ask confirmation from the user each time before refreshing data"
+                "tooltipText": "Ask confirmation from the user each time before refreshing data"
               },
               {
                 "label": "Smart JSON substitution",
-                "info": "Turning on this property fixes the JSON substitution of bindings in the Row objects by adding/removing quotes intelligently and reduces developer errors",
+                "tooltipText": "Turning on this property fixes the JSON substitution of bindings in the Row objects by adding/removing quotes intelligently and reduces developer errors",
                 "configProperty": "actionConfiguration.pluginSpecifiedTemplates[13].value",
                 "controlType": "SWITCH",
                 "initialValue": true
@@ -2712,20 +2707,19 @@
             "id": 1,
             "children": [
               {
-                "label": "Run query on page load",
+                "label": "Run the query on page load",
                 "configProperty": "executeOnLoad",
-                "controlType": "SWITCH",
-                "info": "Will refresh data each time the page is loaded"
+                "controlType": "SWITCH"
               },
               {
-                "label": "Request confirmation before running query",
+                "label": "Request confirmation before running this query",
                 "configProperty": "confirmBeforeExecute",
                 "controlType": "SWITCH",
-                "info": "Ask confirmation from the user each time before refreshing data"
+                "tooltipText": "Ask confirmation from the user each time before refreshing data"
               },
               {
                 "label": "Smart JSON substitution",
-                "info": "Turning on this property fixes the JSON substitution of bindings in the Content field by adding/removing quotes intelligently and reduces developer errors",
+                "tooltipText": "Turning on this property fixes the JSON substitution of bindings in the Content field by adding/removing quotes intelligently and reduces developer errors",
                 "configProperty": "actionConfiguration.formData.smartSubstitution",
                 "controlType": "SWITCH",
                 "initialValue": true
@@ -2746,20 +2740,19 @@
             "id": 1,
             "children": [
               {
-                "label": "Run query on page load",
+                "label": "Run the query on page load",
                 "configProperty": "executeOnLoad",
-                "controlType": "SWITCH",
-                "info": "Will refresh data each time the page is loaded"
+                "controlType": "SWITCH"
               },
               {
-                "label": "Request confirmation before running query",
+                "label": "Request confirmation before running this query",
                 "configProperty": "confirmBeforeExecute",
                 "controlType": "SWITCH",
-                "info": "Ask confirmation from the user each time before refreshing data"
+                "tooltipText": "Ask confirmation from the user each time before refreshing data"
               },
               {
                 "label": "Query timeout (in milliseconds)",
-                "info": "Maximum time after which the query will return",
+                "tooltipText": "Maximum time after which the query will return",
                 "configProperty": "actionConfiguration.timeoutInMillisecond",
                 "controlType": "INPUT_TEXT",
                 "dataType": "NUMBER"
diff --git a/app/client/src/pages/Editor/SaaSEditor/__data__/InitialState.json b/app/client/src/pages/Editor/SaaSEditor/__data__/InitialState.json
index 7db8a74685d7..0af22fb1d686 100644
--- a/app/client/src/pages/Editor/SaaSEditor/__data__/InitialState.json
+++ b/app/client/src/pages/Editor/SaaSEditor/__data__/InitialState.json
@@ -1287,8 +1287,8 @@
                 }
               },
               {
-                "label": "Use Prepared Statement",
-                "info": "Prepared statements prevent SQL injections on your queries but do not support dynamic bindings outside values in your SQL",
+                "label": "Use prepared statements",
+                "tooltipText": "Prepared statements prevent SQL injections on your queries but do not support dynamic bindings outside values in your SQL",
                 "configProperty": "actionConfiguration.pluginSpecifiedTemplates[0].value",
                 "controlType": "SWITCH",
                 "initialValue": true
@@ -2542,20 +2542,19 @@
             "id": 1,
             "children": [
               {
-                "label": "Run query on page load",
+                "label": "Run the query on page load",
                 "configProperty": "executeOnLoad",
-                "controlType": "SWITCH",
-                "info": "Will refresh data each time the page is loaded"
+                "controlType": "SWITCH"
               },
               {
-                "label": "Request confirmation before running query",
+                "label": "Request confirmation before running this query",
                 "configProperty": "confirmBeforeExecute",
                 "controlType": "SWITCH",
-                "info": "Ask confirmation from the user each time before refreshing data"
+                "tooltipText": "Ask confirmation from the user each time before refreshing data"
               },
               {
                 "label": "Smart BSON substitution",
-                "info": "Turning on this property fixes the BSON substitution of bindings in the Mongo BSON document by adding/removing quotes intelligently and reduces developer errors",
+                "tooltipText": "Turning on this property fixes the BSON substitution of bindings in the Mongo BSON document by adding/removing quotes intelligently and reduces developer errors",
                 "configProperty": "actionConfiguration.formData.smartSubstitution",
                 "controlType": "SWITCH",
                 "initialValue": true
@@ -2576,20 +2575,19 @@
             "id": 1,
             "children": [
               {
-                "label": "Run query on page load",
+                "label": "Run the query on page load",
                 "configProperty": "executeOnLoad",
-                "controlType": "SWITCH",
-                "info": "Will refresh data each time the page is loaded"
+                "controlType": "SWITCH"
               },
               {
-                "label": "Request confirmation before running query",
+                "label": "Request confirmation before running this query",
                 "configProperty": "confirmBeforeExecute",
                 "controlType": "SWITCH",
-                "info": "Ask confirmation from the user each time before refreshing data"
+                "tooltipText": "Ask confirmation from the user each time before refreshing data"
               },
               {
-                "label": "Use Prepared Statement",
-                "info": "Prepared statements prevent SQL injections on your queries but do not support dynamic bindings outside values in your SQL",
+                "label": "Use prepared statements",
+                "tooltipText": "Prepared statements prevent SQL injections on your queries but do not support dynamic bindings outside values in your SQL",
                 "configProperty": "actionConfiguration.pluginSpecifiedTemplates[0].value",
                 "controlType": "SWITCH",
                 "initialValue": true
@@ -2610,28 +2608,27 @@
             "id": 1,
             "children": [
               {
-                "label": "Run API on page load",
+                "label": "Run the API on page load",
                 "configProperty": "executeOnLoad",
-                "controlType": "CHECKBOX",
-                "info": "Will refresh data each time the page is loaded"
+                "controlType": "CHECKBOX"
               },
               {
-                "label": "Request confirmation before running API",
+                "label": "Request confirmation before running this API",
                 "configProperty": "confirmBeforeExecute",
                 "controlType": "CHECKBOX",
-                "info": "Ask confirmation from the user each time before refreshing data"
+                "tooltipText": "Ask confirmation from the user each time before refreshing data"
               },
               {
                 "label": "Encode query params",
                 "configProperty": "actionConfiguration.encodeParamsToggle",
                 "controlType": "CHECKBOX",
-                "info": "Encode query params for all APIs. Also encode form body when Content-Type header is set to x-www-form-encoded"
+                "tooltipText": "Encode query params for all APIs. Also encode form body when Content-Type header is set to x-www-form-encoded"
               },
               {
                 "label": "Smart JSON substitution",
                 "configProperty": "actionConfiguration.pluginSpecifiedTemplates[0].value",
                 "controlType": "CHECKBOX",
-                "info": "Turning on this property fixes the JSON substitution of bindings in API body by adding/removing quotes intelligently and reduces developer errors",
+                "tooltipText": "Turning on this property fixes the JSON substitution of bindings in API body by adding/removing quotes intelligently and reduces developer errors",
                 "initialValue": true
               },
               {
@@ -2650,16 +2647,15 @@
             "id": 1,
             "children": [
               {
-                "label": "Run query on page load",
+                "label": "Run the query on page load",
                 "configProperty": "executeOnLoad",
-                "controlType": "SWITCH",
-                "info": "Will refresh data each time the page is loaded"
+                "controlType": "SWITCH"
               },
               {
-                "label": "Request confirmation before running query",
+                "label": "Request confirmation before running this query",
                 "configProperty": "confirmBeforeExecute",
                 "controlType": "SWITCH",
-                "info": "Ask confirmation from the user each time before refreshing data"
+                "tooltipText": "Ask confirmation from the user each time before refreshing data"
               },
               {
                 "label": "Query timeout (in milliseconds)",
@@ -2677,20 +2673,19 @@
             "id": 1,
             "children": [
               {
-                "label": "Run query on page load",
+                "label": "Run the query on page load",
                 "configProperty": "executeOnLoad",
-                "controlType": "SWITCH",
-                "info": "Will refresh data each time the page is loaded"
+                "controlType": "SWITCH"
               },
               {
-                "label": "Request confirmation before running query",
+                "label": "Request confirmation before running this query",
                 "configProperty": "confirmBeforeExecute",
                 "controlType": "SWITCH",
-                "info": "Ask confirmation from the user each time before refreshing data"
+                "tooltipText": "Ask confirmation from the user each time before refreshing data"
               },
               {
                 "label": "Smart JSON substitution",
-                "info": "Turning on this property fixes the JSON substitution of bindings in the Row objects by adding/removing quotes intelligently and reduces developer errors",
+                "tooltipText": "Turning on this property fixes the JSON substitution of bindings in the Row objects by adding/removing quotes intelligently and reduces developer errors",
                 "configProperty": "actionConfiguration.pluginSpecifiedTemplates[13].value",
                 "controlType": "SWITCH",
                 "initialValue": true
@@ -2711,20 +2706,19 @@
             "id": 1,
             "children": [
               {
-                "label": "Run query on page load",
+                "label": "Run the query on page load",
                 "configProperty": "executeOnLoad",
-                "controlType": "SWITCH",
-                "info": "Will refresh data each time the page is loaded"
+                "controlType": "SWITCH"
               },
               {
-                "label": "Request confirmation before running query",
+                "label": "Request confirmation before running this query",
                 "configProperty": "confirmBeforeExecute",
                 "controlType": "SWITCH",
-                "info": "Ask confirmation from the user each time before refreshing data"
+                "tooltipText": "Ask confirmation from the user each time before refreshing data"
               },
               {
                 "label": "Smart JSON substitution",
-                "info": "Turning on this property fixes the JSON substitution of bindings in the Content field by adding/removing quotes intelligently and reduces developer errors",
+                "tooltipText": "Turning on this property fixes the JSON substitution of bindings in the Content field by adding/removing quotes intelligently and reduces developer errors",
                 "configProperty": "actionConfiguration.formData.smartSubstitution",
                 "controlType": "SWITCH",
                 "initialValue": true
@@ -2745,16 +2739,15 @@
             "id": 1,
             "children": [
               {
-                "label": "Run query on page load",
+                "label": "Run the query on page load",
                 "configProperty": "executeOnLoad",
-                "controlType": "SWITCH",
-                "info": "Will refresh data each time the page is loaded"
+                "controlType": "SWITCH"
               },
               {
-                "label": "Request confirmation before running query",
+                "label": "Request confirmation before running this query",
                 "configProperty": "confirmBeforeExecute",
                 "controlType": "SWITCH",
-                "info": "Ask confirmation from the user each time before refreshing data"
+                "tooltipText": "Ask confirmation from the user each time before refreshing data"
               },
               {
                 "label": "Query timeout (in milliseconds)",
diff --git a/app/client/src/pages/Editor/WidgetsEditor/WidgetEditorContainer.tsx b/app/client/src/pages/Editor/WidgetsEditor/WidgetEditorContainer.tsx
index 8c08f0e0779e..1bdf176c3748 100644
--- a/app/client/src/pages/Editor/WidgetsEditor/WidgetEditorContainer.tsx
+++ b/app/client/src/pages/Editor/WidgetsEditor/WidgetEditorContainer.tsx
@@ -2,7 +2,7 @@ import EditorContextProvider from "components/editorComponents/EditorContextProv
 import type { ReactNode } from "react";
 import React from "react";
 import classNames from "classnames";
-import { useCurrentAppState } from "pages/Editor/IDE/hooks";
+import { useCurrentAppState } from "pages/Editor/IDE/hooks/useCurrentAppState";
 import { useSelector } from "react-redux";
 import { getIsAppSettingsPaneWithNavigationTabOpen } from "selectors/appSettingsPaneSelectors";
 import { EditorState } from "ee/entities/IDE/constants";
diff --git a/app/client/src/pages/Editor/WidgetsEditor/components/CodeModeTooltip.tsx b/app/client/src/pages/Editor/WidgetsEditor/components/CodeModeTooltip.tsx
index 4ec87c34ee16..406e957eb828 100644
--- a/app/client/src/pages/Editor/WidgetsEditor/components/CodeModeTooltip.tsx
+++ b/app/client/src/pages/Editor/WidgetsEditor/components/CodeModeTooltip.tsx
@@ -5,7 +5,7 @@ import { useSelector } from "react-redux";
 import { getWidgetSelectionBlock } from "selectors/ui";
 import { retrieveCodeWidgetNavigationUsed } from "utils/storage";
 import { CANVAS_VIEW_MODE_TOOLTIP, createMessage } from "ee/constants/messages";
-import { useCurrentAppState } from "pages/Editor/IDE/hooks";
+import { useCurrentAppState } from "pages/Editor/IDE/hooks/useCurrentAppState";
 import { EditorState } from "ee/entities/IDE/constants";
 
 /**
diff --git a/app/client/src/pages/Editor/WidgetsEditor/components/NavigationAdjustedPageViewer.tsx b/app/client/src/pages/Editor/WidgetsEditor/components/NavigationAdjustedPageViewer.tsx
index 4659fda5eadb..7ec7cdd62ec4 100644
--- a/app/client/src/pages/Editor/WidgetsEditor/components/NavigationAdjustedPageViewer.tsx
+++ b/app/client/src/pages/Editor/WidgetsEditor/components/NavigationAdjustedPageViewer.tsx
@@ -1,7 +1,7 @@
 import type { ReactNode } from "react";
 import React from "react";
 import { EditorState } from "ee/entities/IDE/constants";
-import { useCurrentAppState } from "pages/Editor/IDE/hooks";
+import { useCurrentAppState } from "pages/Editor/IDE/hooks/useCurrentAppState";
 import { getIsAppSettingsPaneWithNavigationTabOpen } from "selectors/appSettingsPaneSelectors";
 import { useSelector } from "react-redux";
 import { combinedPreviewModeSelector } from "selectors/editorSelectors";
diff --git a/app/client/src/pages/Editor/WidgetsEditor/components/NavigationPreview.tsx b/app/client/src/pages/Editor/WidgetsEditor/components/NavigationPreview.tsx
index 7c942ec00098..0478d6f63439 100644
--- a/app/client/src/pages/Editor/WidgetsEditor/components/NavigationPreview.tsx
+++ b/app/client/src/pages/Editor/WidgetsEditor/components/NavigationPreview.tsx
@@ -4,7 +4,7 @@ import classNames from "classnames";
 import { useSelector } from "react-redux";
 import { combinedPreviewModeSelector } from "selectors/editorSelectors";
 import { Navigation } from "pages/AppViewer/Navigation";
-import { useCurrentAppState } from "pages/Editor/IDE/hooks";
+import { useCurrentAppState } from "pages/Editor/IDE/hooks/useCurrentAppState";
 import { EditorState } from "ee/entities/IDE/constants";
 import { getIsAppSettingsPaneWithNavigationTabOpen } from "selectors/appSettingsPaneSelectors";
 
diff --git a/app/client/src/pages/Editor/WidgetsEditor/components/WidgetEditorNavigation.tsx b/app/client/src/pages/Editor/WidgetsEditor/components/WidgetEditorNavigation.tsx
index f6d68ce67607..852c210685ee 100644
--- a/app/client/src/pages/Editor/WidgetsEditor/components/WidgetEditorNavigation.tsx
+++ b/app/client/src/pages/Editor/WidgetsEditor/components/WidgetEditorNavigation.tsx
@@ -1,7 +1,7 @@
 import React, { forwardRef, useEffect, useRef, useState } from "react";
 import NavigationPreview from "./NavigationPreview";
 import { EditorState } from "ee/entities/IDE/constants";
-import { useCurrentAppState } from "pages/Editor/IDE/hooks";
+import { useCurrentAppState } from "pages/Editor/IDE/hooks/useCurrentAppState";
 import {
   getAppSettingsPaneContext,
   getIsAppSettingsPaneWithNavigationTabOpen,
diff --git a/app/client/src/pages/Editor/__tests__/QueryEditorTable.test.tsx b/app/client/src/pages/Editor/__tests__/QueryEditorTable.test.tsx
index fc854b4d5135..71da172c95cc 100644
--- a/app/client/src/pages/Editor/__tests__/QueryEditorTable.test.tsx
+++ b/app/client/src/pages/Editor/__tests__/QueryEditorTable.test.tsx
@@ -1,8 +1,9 @@
 import React from "react";
 import { render, screen } from "test/testUtils";
 import "@testing-library/jest-dom";
-import Table from "../QueryEditor/Table";
-import { getScrollBarWidth } from "../QueryEditor/Table";
+import Table, {
+  getScrollBarWidth,
+} from "PluginActionEditor/components/PluginActionResponse/components/Table";
 
 function createEle() {
   return {
diff --git a/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx b/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx
index e1285d1011f2..0cfcd08976b5 100644
--- a/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx
+++ b/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx
@@ -215,7 +215,7 @@ const getQuickActionButtons = ({
     },
     {
       className: "t--bottom-git-settings",
-      icon: "settings-2-line",
+      icon: "settings-v3",
       onClick: settings,
       tooltipText: createMessage(GIT_SETTINGS),
     },
diff --git a/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx b/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx
index e63669a88fa6..774294428d35 100644
--- a/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx
+++ b/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx
@@ -613,7 +613,7 @@ function ReconnectDatasourceModal() {
   return (
     <Modal open={isModalOpen}>
       <ModalContentWrapper
-        data-testId="reconnect-datasource-modal"
+        data-testid="reconnect-datasource-modal"
         onClick={handleClose}
         onEscapeKeyDown={onClose}
         onInteractOutside={handleClose}
diff --git a/app/client/src/pages/Editor/gitSync/components/GitChangesList/StaticChange.tsx b/app/client/src/pages/Editor/gitSync/components/GitChangesList/StaticChange.tsx
index 118e5cf7b62b..a0dbc1228e79 100644
--- a/app/client/src/pages/Editor/gitSync/components/GitChangesList/StaticChange.tsx
+++ b/app/client/src/pages/Editor/gitSync/components/GitChangesList/StaticChange.tsx
@@ -49,7 +49,7 @@ const allStaticChangeDefs: Record<
   [StaticChangeKind.SETTINGS]: (status: GitStatusData) => ({
     condition: status.modified.includes("application.json"),
     message: "Application settings modified",
-    iconName: "settings-2-line",
+    iconName: "settings-v3",
   }),
   [StaticChangeKind.THEME]: (status: GitStatusData) => ({
     condition: status.modified.includes("theme.json"),
diff --git a/app/client/src/pages/Editor/gitSync/components/StatusLoader.tsx b/app/client/src/pages/Editor/gitSync/components/StatusLoader.tsx
index 281e39c8666f..74c08b109844 100644
--- a/app/client/src/pages/Editor/gitSync/components/StatusLoader.tsx
+++ b/app/client/src/pages/Editor/gitSync/components/StatusLoader.tsx
@@ -12,7 +12,7 @@ const LoaderWrapper = styled.div`
 
 function StatusLoader({ loaderMsg }: { loaderMsg: string }) {
   return (
-    <LoaderWrapper data-testId="t--git-merge-loader">
+    <LoaderWrapper data-testid="t--git-merge-loader">
       <SpinnerLoader size="md" />
       <Text kind={"body-m"} style={{ marginLeft: 8 }}>
         {loaderMsg}
diff --git a/app/client/src/pages/Templates/Template/RequestTemplate.test.tsx b/app/client/src/pages/Templates/Template/RequestTemplate.test.tsx
new file mode 100644
index 000000000000..c88f60a82838
--- /dev/null
+++ b/app/client/src/pages/Templates/Template/RequestTemplate.test.tsx
@@ -0,0 +1,63 @@
+import { createMessage } from "@appsmith/ads-old";
+import "@testing-library/jest-dom";
+import { fireEvent, render } from "@testing-library/react";
+import {
+  REQUEST_BUILDING_BLOCK,
+  REQUEST_TEMPLATE,
+} from "ee/constants/messages";
+import AnalyticsUtil from "ee/utils/AnalyticsUtil";
+import { unitTestBaseMockStore } from "layoutSystems/common/dropTarget/unitTestUtils";
+import React from "react";
+import { Provider } from "react-redux";
+import configureStore from "redux-mock-store";
+import { lightTheme } from "selectors/themeSelectors";
+import { ThemeProvider } from "styled-components";
+import RequestTemplate, {
+  REQUEST_TEMPLATE_URL,
+  type RequestTemplateProps,
+} from "./RequestTemplate";
+const mockStore = configureStore([]);
+
+const BaseComponentRender = (
+  props: RequestTemplateProps,
+  storeToUse = unitTestBaseMockStore,
+) => (
+  <Provider store={mockStore(storeToUse)}>
+    <ThemeProvider theme={lightTheme}>
+      <RequestTemplate {...props} />
+    </ThemeProvider>
+  </Provider>
+);
+
+describe("RequestTemplate", () => {
+  it("should display correct message based on isBuildingBlock prop", () => {
+    const { getByText } = render(
+      BaseComponentRender({ isBuildingBlock: true }),
+    );
+
+    expect(
+      getByText(createMessage(REQUEST_BUILDING_BLOCK)),
+    ).toBeInTheDocument();
+  });
+  it("should open REQUEST_TEMPLATE_URL in a new window when button is clicked", () => {
+    const openSpy = jest.spyOn(window, "open");
+    const { getByText } = render(
+      BaseComponentRender({ isBuildingBlock: false }),
+    );
+    const button = getByText(createMessage(REQUEST_TEMPLATE));
+
+    fireEvent.click(button);
+    expect(openSpy).toHaveBeenCalledWith(REQUEST_TEMPLATE_URL);
+  });
+
+  it('should trigger AnalyticsUtil logEvent with "REQUEST_NEW_TEMPLATE" when button is clicked', () => {
+    const logEventSpy = jest.spyOn(AnalyticsUtil, "logEvent");
+    const { getByText } = render(
+      BaseComponentRender({ isBuildingBlock: false }),
+    );
+    const button = getByText(createMessage(REQUEST_TEMPLATE));
+
+    fireEvent.click(button);
+    expect(logEventSpy).toHaveBeenCalledWith("REQUEST_NEW_TEMPLATE");
+  });
+});
diff --git a/app/client/src/pages/Templates/Template/RequestTemplate.tsx b/app/client/src/pages/Templates/Template/RequestTemplate.tsx
index 68fce42e6d83..10b8b14e7d76 100644
--- a/app/client/src/pages/Templates/Template/RequestTemplate.tsx
+++ b/app/client/src/pages/Templates/Template/RequestTemplate.tsx
@@ -1,16 +1,16 @@
-import React from "react";
-import styled from "styled-components";
-import { Text, TextType } from "@appsmith/ads-old";
 import { Button } from "@appsmith/ads";
+import { Text, TextType } from "@appsmith/ads-old";
 import RequestTemplateSvg from "assets/images/request-template.svg";
 import {
   COULDNT_FIND_TEMPLATE,
-  createMessage,
   COULDNT_FIND_TEMPLATE_DESCRIPTION,
-  REQUEST_TEMPLATE,
+  createMessage,
   REQUEST_BUILDING_BLOCK,
+  REQUEST_TEMPLATE,
 } from "ee/constants/messages";
 import AnalyticsUtil from "ee/utils/AnalyticsUtil";
+import React from "react";
+import styled from "styled-components";
 
 const Wrapper = styled.div`
   border: 1px solid var(--ads-v2-color-border);
@@ -48,10 +48,10 @@ const StyledImage = styled.img`
   border-radius: var(--ads-v2-border-radius);
 `;
 
-const REQUEST_TEMPLATE_URL =
+export const REQUEST_TEMPLATE_URL =
   "https://app.appsmith.com/app/request-templates/request-list-6241c12fc99df2369931a714";
 
-interface RequestTemplateProps {
+export interface RequestTemplateProps {
   isBuildingBlock?: boolean;
 }
 
diff --git a/app/client/src/pages/UserAuth/Login.tsx b/app/client/src/pages/UserAuth/Login.tsx
index 2dde2eff9ce4..76f59aa5a50e 100644
--- a/app/client/src/pages/UserAuth/Login.tsx
+++ b/app/client/src/pages/UserAuth/Login.tsx
@@ -51,7 +51,8 @@ import Helmet from "react-helmet";
 import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
 import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
 import { getHTMLPageTitle } from "ee/utils/BusinessFeatures/brandingPageHelpers";
-
+import * as Sentry from "@sentry/react";
+import { Severity } from "@sentry/react";
 const validate = (values: LoginFormValues, props: ValidateProps) => {
   const errors: LoginFormValues = {};
   const email = values[LOGIN_FORM_EMAIL_FIELD_NAME] || "";
@@ -113,6 +114,12 @@ export function Login(props: LoginFormProps) {
   if (queryParams.get("error")) {
     errorMessage = queryParams.get("message") || queryParams.get("error") || "";
     showError = true;
+    Sentry.captureException("Login failed", {
+      level: Severity.Error,
+      extra: {
+        error: new Error(errorMessage),
+      },
+    });
   }
 
   let loginURL = "/api/v1/" + LOGIN_SUBMIT_PATH;
diff --git a/app/client/src/pages/UserAuth/SignUp.tsx b/app/client/src/pages/UserAuth/SignUp.tsx
index fccce68f5e1f..0d5db6e3eec5 100644
--- a/app/client/src/pages/UserAuth/SignUp.tsx
+++ b/app/client/src/pages/UserAuth/SignUp.tsx
@@ -57,6 +57,8 @@ import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
 import { getHTMLPageTitle } from "ee/utils/BusinessFeatures/brandingPageHelpers";
 import log from "loglevel";
 import { SELF_HOSTING_DOC } from "constants/ThirdPartyConstants";
+import * as Sentry from "@sentry/react";
+import { Severity } from "@sentry/react";
 
 declare global {
   interface Window {
@@ -133,6 +135,12 @@ export function SignUp(props: SignUpFormProps) {
   if (queryParams.get("error")) {
     errorMessage = queryParams.get("error") || "";
     showError = true;
+    Sentry.captureException("Sign up failed", {
+      level: Severity.Error,
+      extra: {
+        error: new Error(errorMessage),
+      },
+    });
   }
 
   const signupURL = new URL(
diff --git a/app/client/src/pages/UserAuth/helpers.ts b/app/client/src/pages/UserAuth/helpers.ts
index 89ac86029809..aa901b8ca366 100644
--- a/app/client/src/pages/UserAuth/helpers.ts
+++ b/app/client/src/pages/UserAuth/helpers.ts
@@ -1,6 +1,7 @@
 import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 import { SubmissionError } from "redux-form";
 import { useCallback, useEffect, useState } from "react";
+import type { Dispatch } from "redux";
 import * as Sentry from "@sentry/react";
 import UserApi from "ee/api/UserApi";
 import { toast } from "@appsmith/ads";
@@ -24,48 +25,17 @@ export interface ResetPasswordFormValues {
   email?: string;
 }
 
-export type CreatePasswordFormValues = ResetPasswordFormValues;
-
 export interface ForgotPasswordFormValues {
   email?: string;
 }
 
-export const signupFormSubmitHandler = async (
-  values: SignupFormValues,
-  // TODO: Fix this the next time the file is edited
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  dispatch: any,
-  // TODO: Fix this the next time the file is edited
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-): Promise<any> => {
-  const { email, password } = values;
-
-  return new Promise((resolve, reject) => {
-    dispatch({
-      type: ReduxActionTypes.CREATE_USER_INIT,
-      payload: {
-        resolve,
-        reject,
-        email,
-        password,
-      },
-    });
-  }).catch((error) => {
-    throw new SubmissionError(error);
-  });
-};
-
 export const resetPasswordSubmitHandler = async (
   values: ResetPasswordFormValues,
-  // TODO: Fix this the next time the file is edited
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  dispatch: any,
-  // TODO: Fix this the next time the file is edited
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-): Promise<any> => {
+  dispatch: Dispatch,
+): Promise<undefined> => {
   const { email, password, token } = values;
 
-  return new Promise((resolve, reject) => {
+  return new Promise<undefined>((resolve, reject) => {
     dispatch({
       type: ReduxActionTypes.RESET_USER_PASSWORD_INIT,
       payload: {
@@ -81,43 +51,13 @@ export const resetPasswordSubmitHandler = async (
   });
 };
 
-export const createPasswordSubmitHandler = async (
-  values: CreatePasswordFormValues,
-  // TODO: Fix this the next time the file is edited
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  dispatch: any,
-  // TODO: Fix this the next time the file is edited
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-): Promise<any> => {
-  const { email, password, token } = values;
-
-  return new Promise((resolve, reject) => {
-    dispatch({
-      type: ReduxActionTypes.INVITED_USER_SIGNUP_INIT,
-      payload: {
-        resolve,
-        reject,
-        token,
-        email,
-        password,
-      },
-    });
-  }).catch((error) => {
-    throw new SubmissionError(error);
-  });
-};
-
 export const forgotPasswordSubmitHandler = async (
   values: ForgotPasswordFormValues,
-  // TODO: Fix this the next time the file is edited
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  dispatch: any,
-  // TODO: Fix this the next time the file is edited
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-): Promise<any> => {
+  dispatch: Dispatch,
+): Promise<undefined> => {
   const { email } = values;
 
-  return new Promise((resolve, reject) => {
+  return new Promise<undefined>((resolve, reject) => {
     dispatch({
       type: ReduxActionTypes.FORGOT_PASSWORD_INIT,
       payload: {
diff --git a/app/client/src/pages/common/SearchBar/ApplicationSearchItem.tsx b/app/client/src/pages/common/SearchBar/ApplicationSearchItem.tsx
index 2a7d6e96856a..5db5e6dbb305 100644
--- a/app/client/src/pages/common/SearchBar/ApplicationSearchItem.tsx
+++ b/app/client/src/pages/common/SearchBar/ApplicationSearchItem.tsx
@@ -36,7 +36,7 @@ const ApplicationSearchItem = (props: Props) => {
       </Text>
       {applicationsList.map((application: ApplicationPayload) => (
         <SearchListItem
-          data-testId={application.name}
+          data-testid={application.name}
           key={application.id}
           onClick={() => navigateToApplication(application.id)}
         >
diff --git a/app/client/src/pages/common/SearchBar/EntitySearchBar.tsx b/app/client/src/pages/common/SearchBar/EntitySearchBar.tsx
index 319c4e5bfe05..71e2c00ce521 100644
--- a/app/client/src/pages/common/SearchBar/EntitySearchBar.tsx
+++ b/app/client/src/pages/common/SearchBar/EntitySearchBar.tsx
@@ -36,6 +36,7 @@ import { getPackagesList } from "ee/selectors/packageSelectors";
 import Fuse from "fuse.js";
 import { useOutsideClick } from "ee/hooks";
 import type { PageDefaultMeta } from "ee/api/ApplicationApi";
+import log from "loglevel";
 
 const HeaderSection = styled.div`
   display: flex;
@@ -135,12 +136,34 @@ function EntitySearchBar(props: any) {
       (app: ApplicationPayload) => app.id === applicationId,
     );
 
-    const defaultPage = searchedApplication?.pages.find(
+    let defaultPage = searchedApplication?.pages.find(
       (page: PageDefaultMeta) => page.isDefault === true,
     );
-    const viewURL = viewerURL({
-      basePageId: defaultPage.baseId,
-    });
+
+    if (!defaultPage) {
+      defaultPage = searchedApplication?.pages[0];
+    }
+
+    if (!defaultPage) {
+      log.error("No default page or pages found for the application");
+    }
+
+    const isGitEnabled = !!searchedApplication?.gitApplicationMetadata;
+    let viewURL = null;
+
+    if (isGitEnabled) {
+      const defaultBranch =
+        searchedApplication?.gitApplicationMetadata?.defaultBranchName;
+
+      viewURL = viewerURL({
+        basePageId: defaultPage.baseId,
+        branch: defaultBranch,
+      });
+    } else {
+      viewURL = viewerURL({
+        basePageId: defaultPage.baseId,
+      });
+    }
 
     window.location.href = `${viewURL}`;
   }
diff --git a/app/client/src/pages/common/SearchBar/HomepageHeaderAction.tsx b/app/client/src/pages/common/SearchBar/HomepageHeaderAction.tsx
index 5776435651f5..8d259e9d7ae6 100644
--- a/app/client/src/pages/common/SearchBar/HomepageHeaderAction.tsx
+++ b/app/client/src/pages/common/SearchBar/HomepageHeaderAction.tsx
@@ -92,7 +92,7 @@ const HomepageHeaderAction = ({
               });
             }}
             size="md"
-            startIcon="settings-control"
+            startIcon="settings-v3"
           />
         </Tooltip>
       )}
diff --git a/app/client/src/pages/common/SearchBar/WorkspaceSearchItems.tsx b/app/client/src/pages/common/SearchBar/WorkspaceSearchItems.tsx
index a5444198d8bf..74eeee3dd2f4 100644
--- a/app/client/src/pages/common/SearchBar/WorkspaceSearchItems.tsx
+++ b/app/client/src/pages/common/SearchBar/WorkspaceSearchItems.tsx
@@ -33,7 +33,7 @@ const WorkspaceSearchItems = (props: Props) => {
       </Text>
       {workspacesList.map((workspace: Workspace) => (
         <SearchListItem
-          data-testId={workspace.name}
+          data-testid={workspace.name}
           key={workspace.id}
           onClick={() => {
             setIsDropdownOpen(false);
diff --git a/app/client/src/plugins/Linting/constants.ts b/app/client/src/plugins/Linting/constants.ts
index 6ea64ce2633e..492f104f1725 100644
--- a/app/client/src/plugins/Linting/constants.ts
+++ b/app/client/src/plugins/Linting/constants.ts
@@ -2,6 +2,11 @@ import { ECMA_VERSION } from "@shared/ast";
 import type { LintOptions } from "jshint";
 import isEntityFunction from "./utils/isEntityFunction";
 
+export enum LINTER_TYPE {
+  "JSHINT" = "JSHint",
+  "ESLINT" = "ESLint",
+}
+
 export const lintOptions = (globalData: Record<string, boolean>) =>
   ({
     indent: 2,
diff --git a/app/client/src/plugins/Linting/utils/getLintingErrors.ts b/app/client/src/plugins/Linting/utils/getLintingErrors.ts
index eccbe7d0afc0..9a01b0b8ded5 100644
--- a/app/client/src/plugins/Linting/utils/getLintingErrors.ts
+++ b/app/client/src/plugins/Linting/utils/getLintingErrors.ts
@@ -25,6 +25,7 @@ import {
   IGNORED_LINT_ERRORS,
   lintOptions,
   SUPPORTED_WEB_APIS,
+  LINTER_TYPE,
 } from "../constants";
 import type { getLintingErrorsProps } from "../types";
 import { JSLibraries } from "workers/common/JSLibrary";
@@ -38,9 +39,23 @@ import { generate } from "astring";
 import getInvalidModuleInputsError from "ee/plugins/Linting/utils/getInvalidModuleInputsError";
 import { objectKeys } from "@appsmith/utils";
 import { profileFn } from "UITelemetry/generateWebWorkerTraces";
+import { WorkerEnv } from "workers/Evaluation/handlers/workerEnv";
+import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
 
 const EvaluationScriptPositions: Record<string, Position> = {};
 
+function getLinterType() {
+  let linterType = LINTER_TYPE.JSHINT;
+
+  const flagValues = WorkerEnv.getFeatureFlags();
+
+  if (flagValues?.[FEATURE_FLAG.rollout_eslint_enabled]) {
+    linterType = LINTER_TYPE.ESLINT;
+  }
+
+  return linterType;
+}
+
 function getEvaluationScriptPosition(scriptType: EvaluationScriptType) {
   if (isEmpty(EvaluationScriptPositions)) {
     // We are computing position of <<script>> in our templates.
@@ -194,6 +209,7 @@ export default function getLintingErrors({
   scriptType,
   webworkerTelemetry,
 }: getLintingErrorsProps): LintError[] {
+  const linterType = getLinterType();
   const scriptPos = getEvaluationScriptPosition(scriptType);
   const lintingGlobalData = generateLintingGlobalData(data);
   const lintingOptions = lintOptions(lintingGlobalData);
@@ -202,7 +218,7 @@ export default function getLintingErrors({
     "Linter",
     // adding some metrics to compare the performance changes with eslint
     {
-      linter: "JSHint",
+      linter: linterType,
       linesOfCodeLinted: originalBinding.split("\n").length,
       codeSizeInChars: originalBinding.length,
     },
diff --git a/app/client/src/reducers/evaluationReducers/loadingEntitiesReducer.ts b/app/client/src/reducers/evaluationReducers/loadingEntitiesReducer.ts
index 9a22376cbdfa..05e6da8aea0b 100644
--- a/app/client/src/reducers/evaluationReducers/loadingEntitiesReducer.ts
+++ b/app/client/src/reducers/evaluationReducers/loadingEntitiesReducer.ts
@@ -1,6 +1,7 @@
 import { createReducer } from "utils/ReducerUtils";
 import type { ReduxAction } from "ee/constants/ReduxActionConstants";
 import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
+import { isEqual } from "lodash";
 
 export type LoadingEntitiesState = Set<string>;
 
@@ -10,7 +11,16 @@ const loadingEntitiesReducer = createReducer(initialState, {
   [ReduxActionTypes.SET_LOADING_ENTITIES]: (
     state: LoadingEntitiesState,
     action: ReduxAction<Set<string>>,
-  ): LoadingEntitiesState => action.payload,
+  ): LoadingEntitiesState => {
+    const newLoadingEntities = action.payload;
+
+    // its just a set with string properties time complexity of equal is not too bad
+    if (isEqual(state, newLoadingEntities)) {
+      return state;
+    }
+
+    return newLoadingEntities;
+  },
   [ReduxActionTypes.FETCH_PAGE_INIT]: () => initialState,
 });
 
diff --git a/app/client/src/reducers/uiReducers/appViewReducer.tsx b/app/client/src/reducers/uiReducers/appViewReducer.tsx
index 1d3671392f24..05ffcdbfcad3 100644
--- a/app/client/src/reducers/uiReducers/appViewReducer.tsx
+++ b/app/client/src/reducers/uiReducers/appViewReducer.tsx
@@ -26,6 +26,11 @@ const appViewReducer = createReducer(initialState, {
   [ReduxActionTypes.FETCH_PUBLISHED_PAGE_INIT]: (state: AppViewReduxState) => {
     return { ...state, isFetchingPage: true };
   },
+  [ReduxActionTypes.FETCH_PUBLISHED_PAGE_RESOURCES_INIT]: (
+    state: AppViewReduxState,
+  ) => {
+    return { ...state, isFetchingPage: true };
+  },
   [ReduxActionErrorTypes.FETCH_PUBLISHED_PAGE_ERROR]: (
     state: AppViewReduxState,
   ) => {
@@ -44,6 +49,14 @@ const appViewReducer = createReducer(initialState, {
       isFetchingPage: false,
     };
   },
+  [ReduxActionTypes.FETCH_PUBLISHED_PAGE_RESOURCES_SUCCESS]: (
+    state: AppViewReduxState,
+  ) => {
+    return {
+      ...state,
+      isFetchingPage: false,
+    };
+  },
   [ReduxActionTypes.SET_APP_VIEWER_HEADER_HEIGHT]: (
     state: AppViewReduxState,
     action: ReduxAction<number>,
diff --git a/app/client/src/reducers/uiReducers/datasourcePaneReducer.ts b/app/client/src/reducers/uiReducers/datasourcePaneReducer.ts
index 7d68494232d1..0790740e1fca 100644
--- a/app/client/src/reducers/uiReducers/datasourcePaneReducer.ts
+++ b/app/client/src/reducers/uiReducers/datasourcePaneReducer.ts
@@ -3,7 +3,7 @@ import type { ReduxAction } from "ee/constants/ReduxActionConstants";
 import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 import type { Datasource } from "entities/Datasource";
 import _ from "lodash";
-import { ActionExecutionResizerHeight } from "pages/Editor/APIEditor/constants";
+import { ActionExecutionResizerHeight } from "PluginActionEditor/components/PluginActionResponse/constants";
 
 const initialState: DatasourcePaneReduxState = {
   drafts: {},
diff --git a/app/client/src/reducers/uiReducers/debuggerReducer.ts b/app/client/src/reducers/uiReducers/debuggerReducer.ts
index 64e6b4df363f..022d72939b5b 100644
--- a/app/client/src/reducers/uiReducers/debuggerReducer.ts
+++ b/app/client/src/reducers/uiReducers/debuggerReducer.ts
@@ -4,7 +4,7 @@ import type { ReduxAction } from "ee/constants/ReduxActionConstants";
 import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 import { omit, isUndefined, isEmpty } from "lodash";
 import equal from "fast-deep-equal";
-import { ActionExecutionResizerHeight } from "pages/Editor/APIEditor/constants";
+import { ActionExecutionResizerHeight } from "PluginActionEditor/components/PluginActionResponse/constants";
 import { klona } from "klona";
 
 export const DefaultDebuggerContext = {
diff --git a/app/client/src/reducers/uiReducers/ideReducer.ts b/app/client/src/reducers/uiReducers/ideReducer.ts
index 8af4379c664e..5b6d03c3d1f6 100644
--- a/app/client/src/reducers/uiReducers/ideReducer.ts
+++ b/app/client/src/reducers/uiReducers/ideReducer.ts
@@ -13,7 +13,9 @@ export const IDETabsDefaultValue = {
 const initialState: IDEState = {
   view: EditorViewMode.FullScreen,
   tabs: {},
+  isListViewActive: false,
   showCreateModal: false,
+  renameEntity: "",
   ideCanvasSideBySideHover: {
     navigated: false,
     widgetTypes: [],
@@ -101,12 +103,30 @@ const ideReducer = createImmerReducer(initialState, {
   ) => {
     state.ideCanvasSideBySideHover.widgetTypes.push(action.payload);
   },
+  [ReduxActionTypes.SET_IS_LIST_VIEW_ACTIVE]: (
+    state: IDEState,
+    action: {
+      payload: boolean;
+    },
+  ) => {
+    state.isListViewActive = action.payload;
+  },
+  [ReduxActionTypes.SET_RENAME_ENTITY]: (
+    state: IDEState,
+    action: {
+      payload: string;
+    },
+  ) => {
+    state.renameEntity = action.payload;
+  },
 });
 
 export interface IDEState {
   view: EditorViewMode;
+  isListViewActive: boolean;
   tabs: ParentEntityIDETabs;
   showCreateModal: boolean;
+  renameEntity: string;
   ideCanvasSideBySideHover: IDECanvasSideBySideHover;
 }
 
diff --git a/app/client/src/reducers/uiReducers/jsPaneReducer.ts b/app/client/src/reducers/uiReducers/jsPaneReducer.ts
index 362f3d7443b2..c8d8af615f60 100644
--- a/app/client/src/reducers/uiReducers/jsPaneReducer.ts
+++ b/app/client/src/reducers/uiReducers/jsPaneReducer.ts
@@ -5,7 +5,7 @@ import {
   ReduxActionErrorTypes,
 } from "ee/constants/ReduxActionConstants";
 import type { JSCollection } from "entities/JSCollection";
-import { ActionExecutionResizerHeight } from "pages/Editor/APIEditor/constants";
+import { ActionExecutionResizerHeight } from "PluginActionEditor/components/PluginActionResponse/constants";
 
 export enum JSEditorTab {
   CODE = "CODE",
diff --git a/app/client/src/sagas/ActionExecution/PluginActionSaga.ts b/app/client/src/sagas/ActionExecution/PluginActionSaga.ts
index 0c220b23ec41..59c312ba893d 100644
--- a/app/client/src/sagas/ActionExecution/PluginActionSaga.ts
+++ b/app/client/src/sagas/ActionExecution/PluginActionSaga.ts
@@ -1,6 +1,7 @@
 import {
   all,
   call,
+  delay,
   put,
   select,
   take,
@@ -44,8 +45,6 @@ import {
   getDatasource,
   getJSCollectionFromAllEntities,
   getPlugin,
-  isActionDirty,
-  isActionSaving,
 } from "ee/selectors/entitiesSelector";
 import { getIsGitSyncModalOpen } from "selectors/gitSyncSelectors";
 import {
@@ -72,7 +71,7 @@ import {
 } from "sagas/ErrorSagas";
 import AnalyticsUtil from "ee/utils/AnalyticsUtil";
 import type { Action } from "entities/Action";
-import { ActionExecutionContext, PluginType } from "entities/Action";
+import { ActionExecutionContext } from "entities/Action";
 import LOG_TYPE from "entities/AppsmithConsole/logtype";
 import {
   ACTION_EXECUTION_CANCELLED,
@@ -99,7 +98,7 @@ import {
   getLayoutOnLoadActions,
   getLayoutOnLoadIssues,
 } from "selectors/editorSelectors";
-import * as log from "loglevel";
+import log from "loglevel";
 import { EMPTY_RESPONSE } from "components/editorComponents/emptyResponse";
 import type { AppState } from "ee/reducers";
 import { DEFAULT_EXECUTE_ACTION_TIMEOUT_MS } from "ee/constants/ApiConstants";
@@ -140,17 +139,13 @@ import { setDefaultActionDisplayFormat } from "./PluginActionSagaUtils";
 import { checkAndLogErrorsIfCyclicDependency } from "sagas/helper";
 import { toast } from "@appsmith/ads";
 import type { TRunDescription } from "workers/Evaluation/fns/actionFns";
-import { DEBUGGER_TAB_KEYS } from "components/editorComponents/Debugger/helpers";
+import { DEBUGGER_TAB_KEYS } from "components/editorComponents/Debugger/constants";
 import { FILE_SIZE_LIMIT_FOR_BLOBS } from "constants/WidgetConstants";
 import type { ActionData } from "ee/reducers/entityReducers/actionsReducer";
 import { handleStoreOperations } from "./StoreActionSaga";
 import { fetchPageAction } from "actions/pageActions";
 import type { Datasource } from "entities/Datasource";
 import { softRefreshDatasourceStructure } from "actions/datasourceActions";
-import {
-  changeQuery,
-  setQueryPaneDebuggerState,
-} from "actions/queryPaneActions";
 import {
   getCurrentEnvironmentDetails,
   getCurrentEnvironmentName,
@@ -171,7 +166,12 @@ import {
 } from "ee/utils/actionExecutionUtils";
 import type { JSAction, JSCollection } from "entities/JSCollection";
 import { getAllowedActionAnalyticsKeys } from "constants/AppsmithActionConstants/formConfig/ActionAnalyticsConfig";
-import { setApiPaneDebuggerState } from "../../actions/apiPaneActions";
+import {
+  changeQuery,
+  isActionDirty,
+  isActionSaving,
+  setPluginActionEditorDebuggerState,
+} from "PluginActionEditor/store";
 
 enum ActionResponseDataTypes {
   BINARY = "BINARY",
@@ -441,7 +441,11 @@ function* evaluateActionParams(
       const arrDatatype: Array<string> = [];
 
       // array of objects containing blob urls that is loops and individual object is checked for resolution of blob urls.
-      for (const val of value) {
+
+      const BATCH_CHUNK_SIZE = 100;
+
+      for (let j = 0; j < value.length; j++) {
+        const val = value[j];
         // TODO: Fix this the next time the file is edited
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const newVal: Record<string, any> = yield call(
@@ -474,6 +478,11 @@ function* evaluateActionParams(
           filePickerInstrumentation["fileSizes"].push(size);
           filePickerInstrumentation["fileTypes"].push(type);
         }
+
+        if ((j + 1) % BATCH_CHUNK_SIZE === 0) {
+          // Yield control back to the event loop and empty the stack trace
+          yield delay(0);
+        }
       }
 
       //Adding array datatype along with the datatype of first element of the array
@@ -801,7 +810,12 @@ export function* runActionSaga(
 
   // open response tab in debugger on exection of action.
   if (!reduxAction.payload.skipOpeningDebugger) {
-    yield call(openDebugger, plugin.type);
+    yield put(
+      setPluginActionEditorDebuggerState({
+        open: true,
+        selectedTab: DEBUGGER_TAB_KEYS.RESPONSE_TAB,
+      }),
+    );
   }
 
   let payload = EMPTY_RESPONSE;
@@ -1193,7 +1207,12 @@ function* executePageLoadAction(
     // open response tab in debugger on exection of action on page load.
     // Only if current page is the page on which the action is executed.
     if (window.location.pathname.includes(pageAction.id))
-      yield call(openDebugger, plugin.type);
+      yield put(
+        setPluginActionEditorDebuggerState({
+          open: true,
+          selectedTab: DEBUGGER_TAB_KEYS.RESPONSE_TAB,
+        }),
+      );
 
     if (isError) {
       AppsmithConsole.addErrors([
@@ -1417,7 +1436,7 @@ function* executePluginActionSaga(
   let response: ActionExecutionResponse;
 
   try {
-    response = yield ActionAPI.executeAction(formData, timeout, parentSpan);
+    response = yield ActionAPI.executeAction(formData, timeout);
 
     const isError = isErrorResponse(response);
 
@@ -1577,23 +1596,6 @@ function triggerFileUploadInstrumentation(
   });
 }
 
-//Open debugger with response tab selected.
-function* openDebugger(pluginType: PluginType) {
-  if (pluginType === PluginType.API) {
-    yield put(
-      setApiPaneDebuggerState({
-        open: true,
-        selectedTab: DEBUGGER_TAB_KEYS.RESPONSE_TAB,
-      }),
-    );
-  } else {
-    setQueryPaneDebuggerState({
-      open: true,
-      selectedTab: DEBUGGER_TAB_KEYS.RESPONSE_TAB,
-    });
-  }
-}
-
 // Function to clear the action responses for the actions which are not executeOnLoad.
 function* clearTriggerActionResponse() {
   const currentPageActions: ActionData[] = yield select(getCurrentActions);
diff --git a/app/client/src/sagas/ActionExecution/errorUtils.ts b/app/client/src/sagas/ActionExecution/errorUtils.ts
index 7ee5ddeb9bcd..822c6e5d0228 100644
--- a/app/client/src/sagas/ActionExecution/errorUtils.ts
+++ b/app/client/src/sagas/ActionExecution/errorUtils.ts
@@ -9,7 +9,7 @@ import type { ActionTriggerKeys } from "ee/workers/Evaluation/fns";
 import { getActionTriggerFunctionNames } from "ee/workers/Evaluation/fns";
 import AnalyticsUtil from "ee/utils/AnalyticsUtil";
 import { setDebuggerSelectedTab, showDebugger } from "actions/debuggerActions";
-import { DEBUGGER_TAB_KEYS } from "components/editorComponents/Debugger/helpers";
+import { DEBUGGER_TAB_KEYS } from "components/editorComponents/Debugger/constants";
 import store from "store";
 import showToast from "sagas/ToastSagas";
 import { call, put } from "redux-saga/effects";
diff --git a/app/client/src/sagas/ActionSagas.ts b/app/client/src/sagas/ActionSagas.ts
index 4672069bc12d..92e2a26ef931 100644
--- a/app/client/src/sagas/ActionSagas.ts
+++ b/app/client/src/sagas/ActionSagas.ts
@@ -1,58 +1,94 @@
-import type {
-  EvaluationReduxAction,
-  ReduxAction,
-} from "ee/constants/ReduxActionConstants";
-import {
-  ReduxActionErrorTypes,
-  ReduxActionTypes,
-} from "ee/constants/ReduxActionConstants";
+import { toast } from "@appsmith/ads";
+import { objectKeys } from "@appsmith/utils";
+import { fetchDatasourceStructure } from "actions/datasourceActions";
 import {
-  all,
-  call,
-  delay,
-  fork,
-  put,
-  race,
-  select,
-  take,
-  takeEvery,
-  takeLatest,
-} from "redux-saga/effects";
-import type { Datasource, DatasourceStructure } from "entities/Datasource";
-import type { ActionCreateUpdateResponse } from "api/ActionAPI";
-import ActionAPI from "api/ActionAPI";
-import type { ApiResponse } from "api/ApiResponses";
-import type { FetchPageRequest, FetchPageResponse } from "api/PageApi";
-import PageApi from "api/PageApi";
-import { updateCanvasWithDSL } from "ee/sagas/PageSagas";
+  setIdeEditorViewMode,
+  setShowQueryCreateNewModal,
+} from "actions/ideActions";
 import {
   closeQueryActionTab,
   closeQueryActionTabSuccess,
-  type FetchActionsPayload,
-  type SetActionPropertyPayload,
-} from "actions/pluginActionActions";
-import {
   copyActionError,
   copyActionSuccess,
   createActionInit,
   createActionSuccess,
+  createNewApiAction,
+  createNewQueryAction,
   deleteActionSuccess,
   fetchActionsForPage,
   fetchActionsForPageSuccess,
+  type FetchActionsPayload,
   moveActionError,
   moveActionSuccess,
+  type SetActionPropertyPayload,
   updateAction,
   updateActionData,
   updateActionProperty,
   updateActionSuccess,
 } from "actions/pluginActionActions";
-import { getDynamicBindingsChangesSaga } from "utils/DynamicBindingUtils";
-import { validateResponse } from "./ErrorSagas";
-import { transformRestAction } from "transformers/RestActionTransformer";
+import { setSnipingMode as setSnipingModeAction } from "actions/propertyPaneActions";
+import type { ActionCreateUpdateResponse } from "api/ActionAPI";
+import ActionAPI from "api/ActionAPI";
+import type { ApiResponse } from "api/ApiResponses";
+import type { FetchPageRequest, FetchPageResponse } from "api/PageApi";
+import PageApi from "api/PageApi";
+import type { Plugin } from "api/PluginApi";
+import { EditorModes } from "components/editorComponents/CodeEditor/EditorConfig";
 import {
-  getCurrentBasePageId,
-  getCurrentPageId,
-} from "selectors/editorSelectors";
+  fixActionPayloadForMongoQuery,
+  getConfigInitialValues,
+} from "components/formControls/utils";
+import { INTEGRATION_TABS } from "constants/routes";
+import {
+  API_EDITOR_FORM_NAME,
+  QUERY_EDITOR_FORM_NAME,
+} from "ee/constants/forms";
+import {
+  ACTION_COPY_SUCCESS,
+  ACTION_MOVE_SUCCESS,
+  createMessage,
+  ERROR_ACTION_COPY_FAIL,
+  ERROR_ACTION_MOVE_FAIL,
+  ERROR_ACTION_RENAME_FAIL,
+} from "ee/constants/messages";
+import type {
+  EvaluationReduxAction,
+  ReduxAction,
+} from "ee/constants/ReduxActionConstants";
+import {
+  ReduxActionErrorTypes,
+  ReduxActionTypes,
+} from "ee/constants/ReduxActionConstants";
+import { ENTITY_TYPE } from "ee/entities/AppsmithConsole/utils";
+import { CreateNewActionKey } from "ee/entities/Engine/actionHelpers";
+import { EditorViewMode, IDE_TYPE } from "ee/entities/IDE/constants";
+import { getIDETypeByUrl } from "ee/entities/IDE/utils";
+import type { ActionData } from "ee/reducers/entityReducers/actionsReducer";
+import {
+  apiEditorIdURL,
+  builderURL,
+  integrationEditorURL,
+  queryEditorIdURL,
+  saasEditorApiIdURL,
+} from "ee/RouteBuilder";
+import { updateActionAPICall } from "ee/sagas/ApiCallerSagas";
+import {
+  generateDestinationIdInfoForQueryDuplication,
+  resolveParentEntityMetadata,
+} from "ee/sagas/helpers";
+import { updateCanvasWithDSL } from "ee/sagas/PageSagas";
+import {
+  getAction,
+  getCurrentPageNameByActionId,
+  getDatasource,
+  getDatasources,
+  getDatasourceStructureById,
+  getEditorConfig,
+  getNewEntityName,
+  getPageNameByPageId,
+  getPlugin,
+  getSettingConfig,
+} from "ee/selectors/entitiesSelector";
 import AnalyticsUtil from "ee/utils/AnalyticsUtil";
 import type {
   Action,
@@ -63,90 +99,55 @@ import type {
   CreateActionDefaultsParams,
   SlashCommandPayload,
 } from "entities/Action";
-import { isGraphqlPlugin, ActionCreationSourceTypeEnum } from "entities/Action";
 import {
+  ActionCreationSourceTypeEnum,
   isAPIAction,
+  isGraphqlPlugin,
   PluginPackageName,
   PluginType,
   SlashCommand,
 } from "entities/Action";
-import type { ActionData } from "ee/reducers/entityReducers/actionsReducer";
-import {
-  getAction,
-  getCurrentPageNameByActionId,
-  getDatasource,
-  getDatasourceStructureById,
-  getDatasources,
-  getEditorConfig,
-  getPageNameByPageId,
-  getPlugin,
-  getSettingConfig,
-  getNewEntityName,
-} from "ee/selectors/entitiesSelector";
-import history from "utils/history";
-import { INTEGRATION_TABS } from "constants/routes";
-import {
-  ACTION_COPY_SUCCESS,
-  ACTION_MOVE_SUCCESS,
-  createMessage,
-  ERROR_ACTION_COPY_FAIL,
-  ERROR_ACTION_MOVE_FAIL,
-  ERROR_ACTION_RENAME_FAIL,
-} from "ee/constants/messages";
+import LOG_TYPE from "entities/AppsmithConsole/logtype";
+import type { Datasource, DatasourceStructure } from "entities/Datasource";
 import { get, isEmpty, merge } from "lodash";
+import { DEFAULT_API_ACTION_CONFIG } from "PluginActionEditor/constants/ApiEditorConstants";
+import { DEFAULT_GRAPHQL_ACTION_CONFIG } from "PluginActionEditor/constants/GraphQLEditorConstants";
+import { transformRestAction } from "PluginActionEditor/transformers/RestActionTransformer";
+import { getFormValues } from "redux-form";
 import {
-  fixActionPayloadForMongoQuery,
-  getConfigInitialValues,
-} from "components/formControls/utils";
-import AppsmithConsole from "utils/AppsmithConsole";
-import { ENTITY_TYPE } from "ee/entities/AppsmithConsole/utils";
-import LOG_TYPE from "entities/AppsmithConsole/logtype";
+  all,
+  call,
+  delay,
+  fork,
+  put,
+  race,
+  select,
+  take,
+  takeEvery,
+  takeLatest,
+} from "redux-saga/effects";
 import {
-  createNewApiAction,
-  createNewQueryAction,
-} from "actions/apiPaneActions";
-import type { Plugin } from "api/PluginApi";
+  getCurrentBasePageId,
+  getCurrentPageId,
+} from "selectors/editorSelectors";
+import { getIsSideBySideEnabled } from "selectors/ideSelectors";
+import { convertToBaseParentEntityIdSelector } from "selectors/pageListSelectors";
+import AppsmithConsole from "utils/AppsmithConsole";
+import { getDynamicBindingsChangesSaga } from "utils/DynamicBindingUtils";
+import { getDefaultTemplateActionConfig } from "utils/editorContextUtils";
 import { shouldBeDefined } from "utils/helpers";
+import history from "utils/history";
+import { setAIPromptTriggered } from "utils/storage";
+import { sendAnalyticsEventSaga } from "./AnalyticsSaga";
+import { validateResponse } from "./ErrorSagas";
+import FocusRetention from "./FocusRetentionSaga";
 import {
-  apiEditorIdURL,
-  builderURL,
-  integrationEditorURL,
-  queryEditorIdURL,
-  saasEditorApiIdURL,
-} from "ee/RouteBuilder";
-import {
-  RequestPayloadAnalyticsPath,
   checkAndLogErrorsIfCyclicDependency,
   enhanceRequestPayloadWithEventData,
   getFromServerWhenNoPrefetchedResult,
+  RequestPayloadAnalyticsPath,
 } from "./helper";
-import { setSnipingMode as setSnipingModeAction } from "actions/propertyPaneActions";
-import { toast } from "@appsmith/ads";
-import { getFormValues } from "redux-form";
-import {
-  API_EDITOR_FORM_NAME,
-  QUERY_EDITOR_FORM_NAME,
-} from "ee/constants/forms";
-import { DEFAULT_GRAPHQL_ACTION_CONFIG } from "constants/ApiEditorConstants/GraphQLEditorConstants";
-import { DEFAULT_API_ACTION_CONFIG } from "constants/ApiEditorConstants/ApiEditorConstants";
-import { fetchDatasourceStructure } from "actions/datasourceActions";
-import { setAIPromptTriggered } from "utils/storage";
-import { getDefaultTemplateActionConfig } from "utils/editorContextUtils";
-import { sendAnalyticsEventSaga } from "./AnalyticsSaga";
-import { EditorModes } from "components/editorComponents/CodeEditor/EditorConfig";
-import { updateActionAPICall } from "ee/sagas/ApiCallerSagas";
-import FocusRetention from "./FocusRetentionSaga";
-import { resolveParentEntityMetadata } from "ee/sagas/helpers";
 import { handleQueryEntityRedirect } from "./IDESaga";
-import { EditorViewMode, IDE_TYPE } from "ee/entities/IDE/constants";
-import { getIDETypeByUrl } from "ee/entities/IDE/utils";
-import {
-  setIdeEditorViewMode,
-  setShowQueryCreateNewModal,
-} from "actions/ideActions";
-import { getIsSideBySideEnabled } from "selectors/ideSelectors";
-import { CreateNewActionKey } from "ee/entities/Engine/actionHelpers";
-import { convertToBasePageIdSelector } from "selectors/pageListSelectors";
 
 export const DEFAULT_PREFIX = {
   QUERY: "Query",
@@ -281,9 +282,7 @@ export function* getPluginActionDefaultValues(pluginId: string) {
  */
 export function* createActionRequestSaga(
   actionPayload: ReduxAction<
-    // TODO: Fix this the next time the file is edited
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    Partial<Action> & { eventData: any; pluginId: string }
+    Partial<Action> & { eventData?: unknown; pluginId: string }
   >,
 ) {
   const payload = { ...actionPayload.payload };
@@ -312,13 +311,11 @@ export function* createActionRequestSaga(
       DEFAULT_PREFIX.QUERY;
     }
 
-    const name: string = yield select(getNewEntityName, {
+    payload.name = yield select(getNewEntityName, {
       prefix,
       parentEntityId,
       parentEntityKey,
     });
-
-    payload.name = name;
   }
 
   yield put(createActionInit(payload));
@@ -747,17 +744,35 @@ function* moveActionSaga(
 }
 
 function* copyActionSaga(
-  action: ReduxAction<{ id: string; destinationPageId: string; name: string }>,
+  action: ReduxAction<{
+    id: string;
+    destinationEntityId: string;
+    name: string;
+  }>,
 ) {
-  let actionObject: Action = yield select(getAction, action.payload.id);
+  const { destinationEntityId, id, name } = action.payload;
+  let actionObject: Action = yield select(getAction, id);
+
+  const { parentEntityId, parentEntityKey } =
+    resolveParentEntityMetadata(actionObject);
+
+  if (!parentEntityId || !parentEntityKey) return;
+
   const newName: string = yield select(getNewEntityName, {
-    prefix: action.payload.name,
-    parentEntityId: action.payload.destinationPageId,
-    parentEntityKey: CreateNewActionKey.PAGE,
+    prefix: name,
+    parentEntityId: destinationEntityId,
+    parentEntityKey,
     suffix: "Copy",
     startWithoutIndex: true,
   });
 
+  const destinationEntityIdInfo = generateDestinationIdInfoForQueryDuplication(
+    destinationEntityId,
+    parentEntityKey,
+  );
+
+  if (objectKeys(destinationEntityIdInfo).length === 0) return;
+
   try {
     if (!actionObject) throw new Error("Could not find action to copy");
 
@@ -770,7 +785,7 @@ function* copyActionSaga(
 
     const copyAction = Object.assign({}, actionObject, {
       name: newName,
-      pageId: action.payload.destinationPageId,
+      ...destinationEntityIdInfo,
     }) as Partial<Action>;
 
     // Indicates that source of action creation is copy action
@@ -783,11 +798,15 @@ function* copyActionSaga(
     const datasources: Datasource[] = yield select(getDatasources);
 
     const isValidResponse: boolean = yield validateResponse(response);
-    const pageName: string = yield select(
-      getPageNameByPageId,
-      // @ts-expect-error: pageId not present on ActionCreateUpdateResponse
-      response.data.pageId,
-    );
+    let pageName: string = "";
+
+    if (parentEntityKey === CreateNewActionKey.PAGE) {
+      pageName = yield select(
+        getPageNameByPageId,
+        // @ts-expect-error: pageId not present on ActionCreateUpdateResponse
+        response.data.pageId,
+      );
+    }
 
     if (isValidResponse) {
       toast.show(
@@ -803,12 +822,14 @@ function* copyActionSaga(
       const originalActionId = get(
         actionObject,
         `${RequestPayloadAnalyticsPath}.originalActionId`,
-        action.payload.id,
+        id,
       );
 
       AnalyticsUtil.logEvent("DUPLICATE_ACTION", {
         // @ts-expect-error: name not present on ActionCreateUpdateResponse
         actionName: response.data.name,
+        parentEntityId,
+        parentEntityKey,
         pageName: pageName,
         actionId: response.data.id,
         originalActionId,
@@ -838,7 +859,8 @@ function* copyActionSaga(
 
     yield put(
       copyActionError({
-        ...action.payload,
+        id,
+        destinationEntityIdInfo,
         show: true,
         error: {
           message: errorMessage,
@@ -1041,21 +1063,23 @@ function* toggleActionExecuteOnLoadSaga(
 }
 
 function* handleMoveOrCopySaga(actionPayload: ReduxAction<Action>) {
-  const {
-    baseId: baseActionId,
-    pageId,
-    pluginId,
-    pluginType,
-  } = actionPayload.payload;
+  const { baseId: baseActionId, pluginId, pluginType } = actionPayload.payload;
   const isApi = pluginType === PluginType.API;
   const isQuery = pluginType === PluginType.DB;
   const isSaas = pluginType === PluginType.SAAS;
-  const basePageId: string = yield select(convertToBasePageIdSelector, pageId);
+  const { parentEntityId } = resolveParentEntityMetadata(actionPayload.payload);
+
+  if (!parentEntityId) return;
+
+  const baseParentEntityId: string = yield select(
+    convertToBaseParentEntityIdSelector,
+    parentEntityId,
+  );
 
   if (isApi) {
     history.push(
       apiEditorIdURL({
-        basePageId,
+        baseParentEntityId,
         baseApiId: baseActionId,
       }),
     );
@@ -1064,7 +1088,7 @@ function* handleMoveOrCopySaga(actionPayload: ReduxAction<Action>) {
   if (isQuery) {
     history.push(
       queryEditorIdURL({
-        basePageId,
+        baseParentEntityId,
         baseQueryId: baseActionId,
       }),
     );
@@ -1078,7 +1102,7 @@ function* handleMoveOrCopySaga(actionPayload: ReduxAction<Action>) {
 
     history.push(
       saasEditorApiIdURL({
-        basePageId,
+        baseParentEntityId,
         pluginPackageName: plugin.packageName,
         baseApiId: baseActionId,
       }),
diff --git a/app/client/src/sagas/ApiPaneSagas.ts b/app/client/src/sagas/ApiPaneSagas.ts
index 96550ff7c817..c25e8f1942ac 100644
--- a/app/client/src/sagas/ApiPaneSagas.ts
+++ b/app/client/src/sagas/ApiPaneSagas.ts
@@ -25,11 +25,11 @@ import {
   HTTP_METHOD,
   POST_BODY_FORMAT_OPTIONS,
   POST_BODY_FORMAT_OPTIONS_ARRAY,
-} from "constants/ApiEditorConstants/CommonApiConstants";
-import { DEFAULT_CREATE_API_CONFIG } from "constants/ApiEditorConstants/ApiEditorConstants";
-import { DEFAULT_CREATE_GRAPHQL_CONFIG } from "constants/ApiEditorConstants/GraphQLEditorConstants";
+} from "PluginActionEditor/constants/CommonApiConstants";
+import { DEFAULT_CREATE_API_CONFIG } from "PluginActionEditor/constants/ApiEditorConstants";
+import { DEFAULT_CREATE_GRAPHQL_CONFIG } from "PluginActionEditor/constants/GraphQLEditorConstants";
 import history from "utils/history";
-import { initialize, autofill, change, reset } from "redux-form";
+import { autofill, change, initialize, reset } from "redux-form";
 import type { Property } from "api/ActionAPI";
 import { getQueryParams } from "utils/URLUtils";
 import { getPluginIdOfPackageName } from "sagas/selectors";
@@ -61,7 +61,10 @@ import {
 import { updateReplayEntity } from "actions/pageActions";
 import { ENTITY_TYPE } from "ee/entities/AppsmithConsole/utils";
 import type { Plugin } from "api/PluginApi";
-import { getDisplayFormat } from "selectors/apiPaneSelectors";
+import {
+  getPostBodyFormat,
+  setExtraFormData,
+} from "../PluginActionEditor/store";
 import { apiEditorIdURL, datasourcesEditorIdURL } from "ee/RouteBuilder";
 import { getCurrentBasePageId } from "selectors/editorSelectors";
 import { validateResponse } from "./ErrorSagas";
@@ -78,11 +81,12 @@ import {
   getApplicationByIdFromWorkspaces,
   getCurrentApplicationIdForCreateNewApp,
 } from "ee/selectors/applicationSelectors";
-import { DEFAULT_CREATE_APPSMITH_AI_CONFIG } from "constants/ApiEditorConstants/AppsmithAIEditorConstants";
+import { DEFAULT_CREATE_APPSMITH_AI_CONFIG } from "PluginActionEditor/constants/AppsmithAIEditorConstants";
 import { checkAndGetPluginFormConfigsSaga } from "./PluginSagas";
 import { convertToBasePageIdSelector } from "selectors/pageListSelectors";
 import type { ApplicationPayload } from "entities/Application";
 import { klonaLiteWithTelemetry } from "utils/helpers";
+import { POST_BODY_FORM_DATA_KEY } from "PluginActionEditor/store/constants";
 
 function* syncApiParamsSaga(
   actionPayload: ReduxActionWithMeta<string, { field: string }>,
@@ -134,10 +138,8 @@ function* syncApiParamsSaga(
   }
 }
 
-function* handleUpdateBodyContentType(
-  action: ReduxAction<{ title: string; apiId: string }>,
-) {
-  const { apiId, title } = action.payload;
+function* handleUpdateBodyContentType(action: ReduxAction<{ title: string }>) {
+  const { title } = action.payload;
   const { values } = yield select(getFormData, API_EDITOR_FORM_NAME);
 
   const displayFormatValue = POST_BODY_FORMAT_OPTIONS_ARRAY.find(
@@ -215,18 +217,14 @@ function* handleUpdateBodyContentType(
   // Quick Context: The extra formadata action is responsible for updating the current multi switch mode you see on api editor body tab
   // whenever a user selects a new content type through the tab e.g application/json, this action is dispatched to update that value, which is then read in the PostDataBody file
   // to show the appropriate content type section.
-  yield put({
-    type: ReduxActionTypes.SET_EXTRA_FORMDATA,
-    payload: {
-      id: apiId,
-      values: {
-        displayFormat: {
-          label: title,
-          value: title,
-        },
+  yield put(
+    setExtraFormData({
+      [POST_BODY_FORM_DATA_KEY]: {
+        label: title,
+        value: title,
       },
-    },
-  });
+    }),
+  );
 
   // help to prevent cyclic dependency error in case the bodyFormData is empty.
 
@@ -256,7 +254,8 @@ function* updateExtraFormDataSaga() {
   const { values } = formData;
 
   // when initializing, check if theres a display format present.
-  const extraFormData: GetFormData = yield select(getDisplayFormat, values.id);
+  const extraFormData: { label: string; value: string } =
+    yield select(getPostBodyFormat);
 
   const headers: Array<{ key: string; value: string }> =
     get(values, "actionConfiguration.headers") || [];
@@ -362,15 +361,11 @@ function* setApiBodyTabHeaderFormat(apiId: string, apiContentType?: string) {
     };
   }
 
-  yield put({
-    type: ReduxActionTypes.SET_EXTRA_FORMDATA,
-    payload: {
-      id: apiId,
-      values: {
-        displayFormat,
-      },
-    },
-  });
+  yield put(
+    setExtraFormData({
+      [POST_BODY_FORM_DATA_KEY]: displayFormat,
+    }),
+  );
 }
 
 function* formValueChangeSaga(
diff --git a/app/client/src/sagas/CurlImportSagas.ts b/app/client/src/sagas/CurlImportSagas.ts
index bee2fe553937..631b040469b2 100644
--- a/app/client/src/sagas/CurlImportSagas.ts
+++ b/app/client/src/sagas/CurlImportSagas.ts
@@ -10,7 +10,7 @@ import CurlImportApi from "api/ImportApi";
 import type { ApiResponse } from "api/ApiResponses";
 import AnalyticsUtil from "ee/utils/AnalyticsUtil";
 import { getCurrentWorkspaceId } from "ee/selectors/selectedWorkspaceSelectors";
-import transformCurlImport from "transformers/CurlImportTransformer";
+import transformCurlImport from "PluginActionEditor/transformers/CurlImportTransformer";
 import history from "utils/history";
 import { CURL } from "constants/AppsmithActionConstants/ActionConstants";
 import { apiEditorIdURL } from "ee/RouteBuilder";
diff --git a/app/client/src/sagas/DatasourcesSagas.ts b/app/client/src/sagas/DatasourcesSagas.ts
index 40cff1e2c294..a7496c2b5df6 100644
--- a/app/client/src/sagas/DatasourcesSagas.ts
+++ b/app/client/src/sagas/DatasourcesSagas.ts
@@ -33,7 +33,11 @@ import {
   getCurrentBasePageId,
   getCurrentPageId,
 } from "selectors/editorSelectors";
-import type { DatasourceGroupByPluginCategory } from "ee/selectors/entitiesSelector";
+import {
+  type DatasourceGroupByPluginCategory,
+  getActions,
+  getDatasourceByPluginId,
+} from "ee/selectors/entitiesSelector";
 import {
   getDatasource,
   getDatasourceActionRouteInfo,
@@ -80,7 +84,6 @@ import type {
 import {
   AuthenticationStatus,
   FilePickerActionStatus,
-  ToastMessageType,
 } from "entities/Datasource";
 import {
   INTEGRATION_TABS,
@@ -93,6 +96,10 @@ import {
   DATASOURCE_DB_FORM,
   DATASOURCE_REST_API_FORM,
 } from "ee/constants/forms";
+import type { ActionDataState } from "ee/reducers/entityReducers/actionsReducer";
+import { setIdeEditorViewMode } from "../actions/ideActions";
+import { EditorViewMode } from "ee/entities/IDE/constants";
+import { createActionRequestSaga } from "./ActionSagas";
 import { validateResponse } from "./ErrorSagas";
 import AnalyticsUtil from "ee/utils/AnalyticsUtil";
 import type { GetFormData } from "selectors/formSelectors";
@@ -121,7 +128,7 @@ import localStorage from "utils/localStorage";
 import log from "loglevel";
 import { APPSMITH_TOKEN_STORAGE_KEY } from "pages/Editor/SaaSEditor/constants";
 import { checkAndGetPluginFormConfigsSaga } from "sagas/PluginSagas";
-import { PluginPackageName, PluginType } from "entities/Action";
+import { type Action, PluginPackageName, PluginType } from "entities/Action";
 import LOG_TYPE from "entities/AppsmithConsole/logtype";
 import { isDynamicValue } from "utils/DynamicBindingUtils";
 import { getQueryParams } from "utils/URLUtils";
@@ -149,12 +156,10 @@ import {
   saasEditorDatasourceIdURL,
 } from "ee/RouteBuilder";
 import {
-  DATASOURCE_NAME_DEFAULT_PREFIX,
   GOOGLE_SHEET_FILE_PICKER_OVERLAY_CLASS,
   GOOGLE_SHEET_SPECIFIC_SHEETS_SCOPE,
   TEMP_DATASOURCE_ID,
 } from "constants/Datasource";
-import { getUntitledDatasourceSequence } from "utils/DatasourceSagaUtils";
 import { toast } from "@appsmith/ads";
 import { fetchPluginFormConfig } from "actions/pluginActions";
 import { addClassToDocumentRoot } from "pages/utils";
@@ -175,7 +180,11 @@ import { getCurrentGitBranch } from "selectors/gitSyncSelectors";
 import FocusRetention from "./FocusRetentionSaga";
 import { identifyEntityFromPath } from "../navigation/FocusEntity";
 import { MAX_DATASOURCE_SUGGESTIONS } from "constants/DatasourceEditorConstants";
-import { getFromServerWhenNoPrefetchedResult } from "./helper";
+import {
+  getFromServerWhenNoPrefetchedResult,
+  getInitialActionPayload,
+  getInitialDatasourcePayload,
+} from "./helper";
 import { executeGoogleApi } from "./loadGoogleApi";
 import type { ActionParentEntityTypeInterface } from "ee/entities/Engine/actionHelpers";
 import { getCurrentModuleId } from "ee/selectors/modulesSelector";
@@ -1061,9 +1070,6 @@ function* createTempDatasourceFromFormSaga(
   );
   const initialValues: unknown = yield call(getConfigInitialValues, formConfig);
 
-  const dsList: Datasource[] = yield select(getDatasources);
-  const sequence = getUntitledDatasourceSequence(dsList);
-
   let datasourceType = actionPayload?.payload?.type;
 
   if (!actionPayload?.payload.type) {
@@ -1076,25 +1082,11 @@ function* createTempDatasourceFromFormSaga(
   }
 
   const defaultEnvId = getDefaultEnvId();
+  const initialPayload: Datasource = yield getInitialDatasourcePayload(
+    actionPayload.payload.pluginId,
+    datasourceType,
+  );
 
-  const initialPayload = {
-    id: TEMP_DATASOURCE_ID,
-    name: DATASOURCE_NAME_DEFAULT_PREFIX + sequence,
-    type: datasourceType,
-    pluginId: actionPayload.payload.pluginId,
-    new: false,
-    datasourceStorages: {
-      [defaultEnvId]: {
-        datasourceId: TEMP_DATASOURCE_ID,
-        environmentId: defaultEnvId,
-        isValid: false,
-        datasourceConfiguration: {
-          properties: [],
-        },
-        toastMessage: ToastMessageType.EMPTY_TOAST_MESSAGE,
-      },
-    },
-  };
   const payload = merge(initialPayload, actionPayload.payload);
 
   payload.datasourceStorages[defaultEnvId] = merge(
@@ -1128,7 +1120,60 @@ function* createTempDatasourceFromFormSaga(
   );
 }
 
-function* createDatasourceFromFormSaga(
+/**
+ * Verifies whether a datasource for the specified plugin exists. If it does not, creates one.
+ * Then, creates an action for the datasource based on passed action configuration.
+ * @returns Action - return the created Action
+ * @param pluginPackageName - determine whether a datasource exists by its pluginPackageName.
+ * @param actionConfig - configuration for action creation
+ * @param datasourceName - name with which the datasource will be created
+ */
+export function* createOrUpdateDataSourceWithAction(
+  pluginPackageName: PluginPackageName,
+  actionConfig: Action,
+  datasourceName?: string,
+) {
+  const plugin: Plugin = yield select(
+    getPluginByPackageName,
+    pluginPackageName,
+  );
+  const datasources: Datasource[] = yield select(
+    getDatasourceByPluginId,
+    plugin.id,
+  );
+  const pageId: string = yield select(getCurrentPageId);
+  const datasourcePayload: Datasource = yield getInitialDatasourcePayload(
+    plugin.id,
+    plugin.type,
+    datasourceName,
+  );
+
+  if (datasources.length === 0) {
+    yield createDatasourceFromFormSaga({
+      payload: datasourcePayload,
+      type: ReduxActionTypes.CREATE_DATASOURCE_FROM_FORM_INIT,
+    });
+  }
+
+  const actionPayload: Datasource = yield getInitialActionPayload(
+    pageId,
+    plugin.id,
+    actionConfig,
+  );
+
+  yield createActionRequestSaga({
+    payload: actionPayload,
+    type: ReduxActionTypes.CREATE_ACTION_REQUEST,
+  });
+
+  yield put(setIdeEditorViewMode(EditorViewMode.SplitScreen));
+
+  const actions: ActionDataState = yield select(getActions);
+
+  return actions[actions.length - 1];
+}
+
+export function* createDatasourceFromFormSaga(
   actionPayload: ReduxActionWithCallbacks<Datasource, unknown, unknown>,
 ) {
   try {
diff --git a/app/client/src/sagas/EvalWorkerActionSagas.ts b/app/client/src/sagas/EvalWorkerActionSagas.ts
index c786d005550d..4485b67a36bd 100644
--- a/app/client/src/sagas/EvalWorkerActionSagas.ts
+++ b/app/client/src/sagas/EvalWorkerActionSagas.ts
@@ -23,6 +23,7 @@ import { sortJSExecutionDataByCollectionId } from "workers/Evaluation/JSObject/u
 import type { LintTreeSagaRequestData } from "plugins/Linting/types";
 import { evalErrorHandler } from "./EvalErrorHandler";
 import { getUnevaluatedDataTree } from "selectors/dataTreeSelectors";
+import { endSpan, startRootSpan } from "UITelemetry/generateTraces";
 
 export interface UpdateDataTreeMessageData {
   workerResponse: EvalTreeResponseData;
@@ -166,9 +167,13 @@ export function* handleEvalWorkerMessage(message: TMessage<any>) {
     }
     case MAIN_THREAD_ACTION.UPDATE_DATATREE: {
       const { workerResponse } = data as UpdateDataTreeMessageData;
+      const rootSpan = startRootSpan("DataTreeFactory.create");
+
       const unEvalAndConfigTree: ReturnType<typeof getUnevaluatedDataTree> =
         yield select(getUnevaluatedDataTree);
 
+      endSpan(rootSpan);
+
       yield call(updateDataTreeHandler, {
         evalTreeResponse: workerResponse as EvalTreeResponseData,
         unevalTree: unEvalAndConfigTree.unEvalTree || {},
diff --git a/app/client/src/sagas/EvaluationsSaga.test.ts b/app/client/src/sagas/EvaluationsSaga.test.ts
index 57fa288ba8f0..2cad962369ad 100644
--- a/app/client/src/sagas/EvaluationsSaga.test.ts
+++ b/app/client/src/sagas/EvaluationsSaga.test.ts
@@ -20,6 +20,13 @@ import {
 } from "ee/constants/ReduxActionConstants";
 import { fetchPluginFormConfigsSuccess } from "actions/pluginActions";
 import { createJSCollectionSuccess } from "actions/jsActionActions";
+import { getInstanceId } from "ee/selectors/tenantSelectors";
+import {
+  getApplicationLastDeployedAt,
+  getCurrentApplicationId,
+  getCurrentPageId,
+} from "selectors/editorSelectors";
+
 jest.mock("loglevel");
 
 describe("evaluateTreeSaga", () => {
@@ -40,8 +47,22 @@ describe("evaluateTreeSaga", () => {
         [select(getSelectedAppTheme), {}],
         [select(getAppMode), false],
         [select(getWidgetsMeta), {}],
+        [select(getInstanceId), "instanceId"],
+        [select(getCurrentApplicationId), "applicationId"],
+        [select(getCurrentPageId), "pageId"],
+        [
+          select(getApplicationLastDeployedAt),
+          new Date("11 September 2024").toISOString(),
+        ],
       ])
       .call(evalWorker.request, EVAL_WORKER_ACTIONS.EVAL_TREE, {
+        cacheProps: {
+          instanceId: "instanceId",
+          appId: "applicationId",
+          pageId: "pageId",
+          appMode: false,
+          timestamp: new Date("11 September 2024").toISOString(),
+        },
         unevalTree: unEvalAndConfigTree,
         widgetTypeConfigMap: undefined,
         widgets: {},
@@ -71,8 +92,22 @@ describe("evaluateTreeSaga", () => {
         [select(getSelectedAppTheme), {}],
         [select(getAppMode), false],
         [select(getWidgetsMeta), {}],
+        [select(getInstanceId), "instanceId"],
+        [select(getCurrentApplicationId), "applicationId"],
+        [select(getCurrentPageId), "pageId"],
+        [
+          select(getApplicationLastDeployedAt),
+          new Date("11 September 2024").toISOString(),
+        ],
       ])
       .call(evalWorker.request, EVAL_WORKER_ACTIONS.EVAL_TREE, {
+        cacheProps: {
+          instanceId: "instanceId",
+          appId: "applicationId",
+          pageId: "pageId",
+          appMode: false,
+          timestamp: new Date("11 September 2024").toISOString(),
+        },
         unevalTree: unEvalAndConfigTree,
         widgetTypeConfigMap: undefined,
         widgets: {},
@@ -111,8 +146,22 @@ describe("evaluateTreeSaga", () => {
         [select(getSelectedAppTheme), {}],
         [select(getAppMode), false],
         [select(getWidgetsMeta), {}],
+        [select(getInstanceId), "instanceId"],
+        [select(getCurrentApplicationId), "applicationId"],
+        [select(getCurrentPageId), "pageId"],
+        [
+          select(getApplicationLastDeployedAt),
+          new Date("11 September 2024").toISOString(),
+        ],
       ])
       .call(evalWorker.request, EVAL_WORKER_ACTIONS.EVAL_TREE, {
+        cacheProps: {
+          instanceId: "instanceId",
+          appId: "applicationId",
+          pageId: "pageId",
+          appMode: false,
+          timestamp: new Date("11 September 2024").toISOString(),
+        },
         unevalTree: unEvalAndConfigTree,
         widgetTypeConfigMap: undefined,
         widgets: {},
diff --git a/app/client/src/sagas/EvaluationsSaga.ts b/app/client/src/sagas/EvaluationsSaga.ts
index 5915b7b29a1d..c7b0115ae0eb 100644
--- a/app/client/src/sagas/EvaluationsSaga.ts
+++ b/app/client/src/sagas/EvaluationsSaga.ts
@@ -111,6 +111,12 @@ import { evalErrorHandler } from "./EvalErrorHandler";
 import AnalyticsUtil from "ee/utils/AnalyticsUtil";
 import { endSpan, startRootSpan } from "UITelemetry/generateTraces";
 import { transformTriggerEvalErrors } from "ee/sagas/helpers";
+import {
+  getApplicationLastDeployedAt,
+  getCurrentApplicationId,
+  getCurrentPageId,
+} from "selectors/editorSelectors";
+import { getInstanceId } from "ee/selectors/tenantSelectors";
 
 const APPSMITH_CONFIGS = getAppsmithConfigs();
 
@@ -261,7 +267,10 @@ export function* evaluateTreeSaga(
     yield select(getSelectedAppTheme);
 
   log.debug({ unevalTree, configTree: unEvalAndConfigTree.configTree });
-
+  const instanceId: string = yield select(getInstanceId);
+  const applicationId: string = yield select(getCurrentApplicationId);
+  const pageId: string = yield select(getCurrentPageId);
+  const lastDeployedAt: string = yield select(getApplicationLastDeployedAt);
   const appMode: ReturnType<typeof getAppMode> = yield select(getAppMode);
   const widgetsMeta: ReturnType<typeof getWidgetsMeta> =
     yield select(getWidgetsMeta);
@@ -269,6 +278,13 @@ export function* evaluateTreeSaga(
   const shouldRespondWithLogs = log.getLevel() === log.levels.DEBUG;
 
   const evalTreeRequestData: EvalTreeRequestData = {
+    cacheProps: {
+      appMode,
+      appId: applicationId,
+      pageId,
+      timestamp: lastDeployedAt,
+      instanceId,
+    },
     unevalTree: unEvalAndConfigTree,
     widgetTypeConfigMap,
     widgets,
@@ -334,10 +350,14 @@ export function* evaluateAndExecuteDynamicTrigger(
   callbackData?: Array<any>,
   globalContext?: Record<string, unknown>,
 ) {
+  const rootSpan = startRootSpan("DataTreeFactory.create");
+
   const unEvalTree: ReturnType<typeof getUnevaluatedDataTree> = yield select(
     getUnevaluatedDataTree,
   );
 
+  endSpan(rootSpan);
+
   log.debug({ execute: dynamicTrigger });
   const response: { errors: EvaluationError[]; result: unknown } = yield call(
     evalWorker.request,
@@ -481,8 +501,12 @@ export function* executeJSFunction(
 export // TODO: Fix this the next time the file is edited
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function* validateProperty(property: string, value: any, props: WidgetProps) {
+  const rootSpan = startRootSpan("DataTreeFactory.create");
+
   const unEvalAndConfigTree: ReturnType<typeof getUnevaluatedDataTree> =
     yield select(getUnevaluatedDataTree);
+
+  endSpan(rootSpan);
   const configTree = unEvalAndConfigTree.configTree;
   const entityConfig = configTree[props.widgetName] as WidgetEntityConfig;
   const validation = entityConfig?.validationPaths[property];
@@ -645,9 +669,14 @@ function* evalAndLintingHandler(
     return;
   }
 
+  const rootSpan = startRootSpan("DataTreeFactory.create");
+
   // Generate all the data needed for both eval and linting
   const unEvalAndConfigTree: ReturnType<typeof getUnevaluatedDataTree> =
     yield select(getUnevaluatedDataTree);
+
+  endSpan(rootSpan);
+
   const postEvalActions = getPostEvalActions(action);
   const fn: (...args: unknown[]) => CallEffect<unknown> | ForkEffect<unknown> =
     isBlockingCall ? call : fork;
diff --git a/app/client/src/sagas/InitSagas.ts b/app/client/src/sagas/InitSagas.ts
index 497222db194d..05f603038588 100644
--- a/app/client/src/sagas/InitSagas.ts
+++ b/app/client/src/sagas/InitSagas.ts
@@ -219,7 +219,6 @@ export function* getInitResponses({
 }: {
   applicationId?: string;
   basePageId?: string;
-  branch?: string;
   mode?: APP_MODE;
   shouldInitialiseUserDetails?: boolean;
   // TODO: Fix this the next time the file is edited
@@ -241,11 +240,14 @@ export function* getInitResponses({
       shouldInitialiseUserDetails,
     );
 
+    const rootSpan = startRootSpan("fetch-consolidated-api");
     const initConsolidatedApiResponse: ApiResponse<InitConsolidatedApi> =
       yield mode === APP_MODE.EDIT
         ? ConsolidatedPageLoadApi.getConsolidatedPageLoadDataEdit(params)
         : ConsolidatedPageLoadApi.getConsolidatedPageLoadDataView(params);
 
+    endSpan(rootSpan);
+
     const isValidResponse: boolean = yield validateResponse(
       initConsolidatedApiResponse,
     );
diff --git a/app/client/src/sagas/JSPaneSagas.ts b/app/client/src/sagas/JSPaneSagas.ts
index c36ba5073adb..5d7fcec2b86c 100644
--- a/app/client/src/sagas/JSPaneSagas.ts
+++ b/app/client/src/sagas/JSPaneSagas.ts
@@ -86,7 +86,7 @@ import { UserCancelledActionExecutionError } from "sagas/ActionExecution/errorUt
 import type { EventLocation } from "ee/utils/analyticsUtilTypes";
 import AnalyticsUtil from "ee/utils/AnalyticsUtil";
 import { checkAndLogErrorsIfCyclicDependency } from "./helper";
-import { DEBUGGER_TAB_KEYS } from "components/editorComponents/Debugger/helpers";
+import { DEBUGGER_TAB_KEYS } from "components/editorComponents/Debugger/constants";
 import {
   getJSActionPathNameToDisplay,
   isBrowserExecutionAllowed,
diff --git a/app/client/src/sagas/QueryPaneSagas.ts b/app/client/src/sagas/QueryPaneSagas.ts
index 6195973f9fd3..39bea13dfc13 100644
--- a/app/client/src/sagas/QueryPaneSagas.ts
+++ b/app/client/src/sagas/QueryPaneSagas.ts
@@ -77,7 +77,7 @@ import type { FeatureFlags } from "ee/entities/FeatureFlag";
 import { selectFeatureFlags } from "ee/selectors/featureFlagsSelectors";
 import { isGACEnabled } from "ee/utils/planHelpers";
 import { getHasManageActionPermission } from "ee/utils/BusinessFeatures/permissionPageHelpers";
-import type { ChangeQueryPayload } from "actions/queryPaneActions";
+import type { ChangeQueryPayload } from "PluginActionEditor/store";
 import {
   getApplicationByIdFromWorkspaces,
   getCurrentApplicationIdForCreateNewApp,
diff --git a/app/client/src/sagas/ReplaySaga.ts b/app/client/src/sagas/ReplaySaga.ts
index 8d49191a5a34..942c4f880d9f 100644
--- a/app/client/src/sagas/ReplaySaga.ts
+++ b/app/client/src/sagas/ReplaySaga.ts
@@ -55,7 +55,7 @@ import {
   isQueryAction,
   isSaaSAction,
 } from "entities/Action";
-import { API_EDITOR_TABS } from "constants/ApiEditorConstants/CommonApiConstants";
+import { API_EDITOR_TABS } from "PluginActionEditor/constants/CommonApiConstants";
 import { EDITOR_TABS } from "constants/QueryEditorConstants";
 import _, { isEmpty } from "lodash";
 import type { ReplayEditorUpdate } from "entities/Replay/ReplayEntity/ReplayEditor";
diff --git a/app/client/src/sagas/WidgetBlueprintSagas.ts b/app/client/src/sagas/WidgetBlueprintSagas.ts
index 10d36ba13746..6e2cd0c6db51 100644
--- a/app/client/src/sagas/WidgetBlueprintSagas.ts
+++ b/app/client/src/sagas/WidgetBlueprintSagas.ts
@@ -1,4 +1,8 @@
-import type { WidgetBlueprint } from "WidgetProvider/constants";
+import type { ActionData } from "ee/reducers/entityReducers/actionsReducer";
+import {
+  BlueprintOperationActionTypes,
+  type WidgetBlueprint,
+} from "WidgetProvider/constants";
 import type { FlattenedWidgetProps } from "reducers/entityReducers/canvasWidgetsReducer";
 import type { WidgetProps } from "widgets/BaseWidget";
 import { generateReactKey } from "utils/generators";
@@ -13,6 +17,8 @@ import * as log from "loglevel";
 import { toast } from "@appsmith/ads";
 import type { LayoutSystemTypes } from "layoutSystems/types";
 import { getLayoutSystemType } from "selectors/layoutSystemSelectors";
+import type { Action, PluginPackageName } from "../entities/Action";
+import { createOrUpdateDataSourceWithAction } from "./DatasourcesSagas";
 
 function buildView(view: WidgetBlueprint["view"], widgetId: string) {
   const children = [];
@@ -60,12 +66,15 @@ export interface UpdatePropertyArgs {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   propertyValue: any;
 }
-export type BlueprintOperationAddActionFn = () => void;
+export type BlueprintOperationAddActionFn = (
+  widget: WidgetProps & { children?: WidgetProps[] },
+) => Generator;
 export type BlueprintOperationModifyPropsFn = (
   widget: WidgetProps & { children?: WidgetProps[] },
   widgets: { [widgetId: string]: FlattenedWidgetProps },
   parent?: WidgetProps,
   layoutSystemType?: LayoutSystemTypes,
+  addActionResult?: ActionData,
 ) => UpdatePropertyArgs[] | undefined;
 
 export interface ChildOperationFnResponse {
@@ -97,10 +106,20 @@ export type BlueprintOperationFunction =
   | BlueprintBeforeOperationsFn;
 
 export type BlueprintOperationType = keyof typeof BlueprintOperationTypes;
+export type BlueprintOperationActionType =
+  keyof typeof BlueprintOperationActionTypes;
+
+export interface BlueprintOperationActionPayload {
+  pluginPackageName: PluginPackageName;
+  actionConfig: Action;
+  datasourceName?: string;
+}
 
 export interface BlueprintOperation {
   type: BlueprintOperationType;
   fn: BlueprintOperationFunction;
+  actionType?: BlueprintOperationActionType;
+  payload?: BlueprintOperationActionPayload;
 }
 
 export function* executeWidgetBlueprintOperations(
@@ -109,13 +128,19 @@ export function* executeWidgetBlueprintOperations(
   widgetId: string,
 ) {
   const layoutSystemType: LayoutSystemTypes = yield select(getLayoutSystemType);
+  let addActionResult: ActionData = {} as ActionData;
 
-  operations.forEach((operation: BlueprintOperation) => {
+  for (const operation of operations) {
     const widget: WidgetProps & { children?: string[] | WidgetProps[] } = {
       ...widgets[widgetId],
     };
 
     switch (operation.type) {
+      case BlueprintOperationTypes.ADD_ACTION:
+        addActionResult =
+          yield executeWidgetBlueprintAddActionOperations(operation);
+
+        break;
       case BlueprintOperationTypes.MODIFY_PROPS:
         if (widget.children && widget.children.length > 0) {
           widget.children = (widget.children as string[]).map(
@@ -130,6 +155,7 @@ export function* executeWidgetBlueprintOperations(
           widgets,
           get(widgets, widget.parentId || "", undefined),
           layoutSystemType,
+          addActionResult,
         );
 
         updatePropertyPayloads &&
@@ -139,13 +165,44 @@ export function* executeWidgetBlueprintOperations(
           });
         break;
     }
-  });
+  }
 
   const result: { [widgetId: string]: FlattenedWidgetProps } = yield widgets;
 
   return result;
 }
 
+/**
+ * this saga executes the blueprint add action operation
+ * @param operation
+ */
+function* executeWidgetBlueprintAddActionOperations(
+  operation: BlueprintOperation,
+) {
+  switch (operation.actionType) {
+    case BlueprintOperationActionTypes.CREATE_OR_UPDATE_DATASOURCE_WITH_ACTION:
+      if (
+        !operation.payload?.pluginPackageName ||
+        !operation.payload?.actionConfig
+      )
+        return;
+
+      const { actionConfig, datasourceName, pluginPackageName } =
+        operation.payload;
+
+      // TODO Add the event to the watcher to avoid importing it and the associated cyclic dependencies.
+      // https://github.com/appsmithorg/appsmith-ee/pull/5368#discussion_r1804419760
+      const createdAction: ActionData =
+        yield createOrUpdateDataSourceWithAction(
+          pluginPackageName,
+          actionConfig,
+          datasourceName,
+        );
+
+      return createdAction;
+  }
+}
+
 /**
  * this saga executes the blueprint child operation
  *
diff --git a/app/client/src/sagas/helper.ts b/app/client/src/sagas/helper.ts
index c720022a3f5a..bdb6cfc7406e 100644
--- a/app/client/src/sagas/helper.ts
+++ b/app/client/src/sagas/helper.ts
@@ -1,9 +1,14 @@
 import { createMessage } from "ee/constants/messages";
 import type { LayoutOnLoadActionErrors } from "constants/AppsmithActionConstants/ActionConstants";
+import type {
+  ActionData,
+  ActionDataState,
+} from "ee/reducers/entityReducers/actionsReducer";
 import type {
   FormEvalOutput,
   ConditionalOutput,
 } from "reducers/evaluationReducers/formEvaluationReducer";
+import { select } from "redux-saga/effects";
 import AppsmithConsole from "utils/AppsmithConsole";
 import LOG_TYPE from "entities/AppsmithConsole/logtype";
 import type { Log } from "entities/AppsmithConsole";
@@ -22,6 +27,18 @@ import { isPlainObject, isString } from "lodash";
 import { DATA_BIND_REGEX_GLOBAL } from "constants/BindingsConstants";
 import { apiFailureResponseInterceptor } from "api/interceptors";
 import { klonaLiteWithTelemetry } from "utils/helpers";
+import { getDefaultEnvId } from "ee/api/ApiUtils";
+import {
+  getActions,
+  getDatasourceByPluginId,
+  getDatasources,
+} from "ee/selectors/entitiesSelector";
+import {
+  DATASOURCE_NAME_DEFAULT_PREFIX,
+  TEMP_DATASOURCE_ID,
+} from "../constants/Datasource";
+import { type Datasource, ToastMessageType } from "../entities/Datasource";
+import { getNextEntityName } from "utils/AppsmithUtils";
 
 // function to extract all objects that have dynamic values
 export const extractFetchDynamicValueFormConfigs = (
@@ -249,3 +266,63 @@ export function* getFromServerWhenNoPrefetchedResult(
 
   return yield apiEffect();
 }
+
+export function* getInitialDatasourcePayload(
+  pluginId: string,
+  pluginType?: string,
+  defaultDatasourceName: string = DATASOURCE_NAME_DEFAULT_PREFIX,
+) {
+  const dsList: Datasource[] = yield select(getDatasources);
+  const datasourceName = getNextEntityName(
+    defaultDatasourceName,
+    dsList.map((el: Datasource) => el.name),
+  );
+  const defaultEnvId = getDefaultEnvId();
+
+  return {
+    id: TEMP_DATASOURCE_ID,
+    name: datasourceName,
+    type: pluginType,
+    pluginId: pluginId,
+    new: false,
+    datasourceStorages: {
+      [defaultEnvId]: {
+        datasourceId: TEMP_DATASOURCE_ID,
+        environmentId: defaultEnvId,
+        isValid: false,
+        datasourceConfiguration: {
+          url: "",
+          properties: [],
+        },
+        toastMessage: ToastMessageType.EMPTY_TOAST_MESSAGE,
+      },
+    },
+  };
+}
+
+export function* getInitialActionPayload(
+  pageId: string,
+  pluginId: string,
+  actionConfig: Action,
+) {
+  const updatedAiDatasources: Datasource[] = yield select(
+    getDatasourceByPluginId,
+    pluginId,
+  );
+
+  const actions: ActionDataState = yield select(getActions);
+  const actionName = getNextEntityName(
+    actionConfig.name,
+    actions.map((el: ActionData) => el.config.name),
+  );
+
+  return {
+    pageId,
+    pluginId: updatedAiDatasources[0].pluginId,
+    datasource: {
+      id: updatedAiDatasources[0].id,
+    },
+    name: actionName,
+    actionConfiguration: actionConfig.actionConfiguration,
+  };
+}
diff --git a/app/client/src/selectors/apiPaneSelectors.ts b/app/client/src/selectors/apiPaneSelectors.ts
deleted file mode 100644
index 92d53733783a..000000000000
--- a/app/client/src/selectors/apiPaneSelectors.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import type { AppState } from "ee/reducers";
-import { createSelector } from "reselect";
-import { combinedPreviewModeSelector } from "./editorSelectors";
-
-type GetFormData = (
-  state: AppState,
-  apiId: string,
-) => { label: string; value: string };
-
-export const getDisplayFormat: GetFormData = (state, apiId) => {
-  const displayFormat = state.ui.apiPane.extraformData[apiId];
-
-  return displayFormat;
-};
-
-export const getApiPaneConfigSelectedTabIndex = (state: AppState) =>
-  state.ui.apiPane.selectedConfigTabIndex;
-
-export const getIsRunning = (state: AppState, apiId: string) =>
-  state.ui.apiPane.isRunning[apiId];
-
-export const getApiPaneDebuggerState = (state: AppState) =>
-  state.ui.apiPane.debugger;
-
-export const showApiPaneDebugger = createSelector(
-  (state) => state.ui.apiPane.debugger.open,
-  combinedPreviewModeSelector,
-  (isOpen, isPreview) => isOpen && !isPreview,
-);
diff --git a/app/client/src/selectors/dataTreeSelectors.ts b/app/client/src/selectors/dataTreeSelectors.ts
index 467af24c1a02..1babbe0563bd 100644
--- a/app/client/src/selectors/dataTreeSelectors.ts
+++ b/app/client/src/selectors/dataTreeSelectors.ts
@@ -11,17 +11,23 @@ import {
   getCurrentModuleActions,
   getCurrentModuleJSCollections,
 } from "ee/selectors/entitiesSelector";
-import type { WidgetEntity } from "ee/entities/DataTree/types";
-import type { DataTree } from "entities/DataTree/dataTreeTypes";
-import { DataTreeFactory } from "entities/DataTree/dataTreeFactory";
+import type { AppsmithEntity, WidgetEntity } from "ee/entities/DataTree/types";
+import type {
+  ConfigTree,
+  DataTree,
+  UnEvalTree,
+} from "entities/DataTree/dataTreeTypes";
+import {
+  DataTreeFactory,
+  ENTITY_TYPE,
+} from "entities/DataTree/dataTreeFactory";
 import {
   getIsMobileBreakPoint,
   getMetaWidgets,
-  getWidgetsForEval,
+  getWidgets,
   getWidgetsMeta,
 } from "sagas/selectors";
 import "url-search-params-polyfill";
-import { getPageList } from "./appViewSelectors";
 import type { AppState } from "ee/reducers";
 import { getSelectedAppThemeProperties } from "./appThemingSelectors";
 import type { LoadingEntitiesState } from "reducers/evaluationReducers/loadingEntitiesReducer";
@@ -55,25 +61,20 @@ const getLayoutSystemPayload = createSelector(
   },
 );
 
-const getCurrentActionEntities = createSelector(
+const getCurrentActionsEntities = createSelector(
   getCurrentActions,
   getCurrentModuleActions,
   getCurrentWorkflowActions,
+  (actions, moduleActions, workflowActions) => {
+    return [...actions, ...moduleActions, ...workflowActions];
+  },
+);
+const getCurrentJSActionsEntities = createSelector(
   getCurrentJSCollections,
   getCurrentModuleJSCollections,
   getCurrentWorkflowJSActions,
-  (
-    actions,
-    moduleActions,
-    workflowActions,
-    jsActions,
-    moduleJSActions,
-    workflowJsActions,
-  ) => {
-    return {
-      actions: [...actions, ...moduleActions, ...workflowActions],
-      jsActions: [...jsActions, ...moduleJSActions, ...workflowJsActions],
-    };
+  (jsActions, moduleJSActions, workflowJsActions) => {
+    return [...jsActions, ...moduleJSActions, ...workflowJsActions];
   },
 );
 
@@ -90,49 +91,76 @@ const getModulesData = createSelector(
   },
 );
 
-export const getUnevaluatedDataTree = createSelector(
-  getCurrentActionEntities,
-  getWidgetsForEval,
-  getWidgetsMeta,
-  getPageList,
-  getAppData,
+const getActionsFromUnevaluatedDataTree = createSelector(
+  getCurrentActionsEntities,
   getPluginEditorConfigs,
   getPluginDependencyConfig,
-  getSelectedAppThemeProperties,
-  getMetaWidgets,
-  getLayoutSystemPayload,
-  getLoadingEntities,
+  (actions, editorConfigs, pluginDependencyConfig) =>
+    DataTreeFactory.actions(actions, editorConfigs, pluginDependencyConfig),
+);
+
+const getJSActionsFromUnevaluatedDataTree = createSelector(
+  getCurrentJSActionsEntities,
+  (jsActions) => DataTreeFactory.jsActions(jsActions),
+);
+
+const getWidgetsFromUnevaluatedDataTree = createSelector(
   getModulesData,
-  (
-    currentActionEntities,
-    widgets,
-    widgetsMeta,
-    pageListPayload,
-    appData,
-    editorConfigs,
-    pluginDependencyConfig,
-    selectedAppThemeProperty,
-    metaWidgets,
-    layoutSystemPayload,
-    loadingEntities,
-    modulesData,
-  ) => {
-    const pageList = pageListPayload || [];
-
-    return DataTreeFactory.create({
-      ...currentActionEntities,
+  getWidgets,
+  getWidgetsMeta,
+  getLoadingEntities,
+  getLayoutSystemPayload,
+  (moduleData, widgets, widgetsMeta, loadingEntities, layoutSystemPayload) =>
+    DataTreeFactory.widgets(
+      moduleData.moduleInputs,
+      moduleData.moduleInstances,
+      moduleData.moduleInstanceEntities,
       widgets,
       widgetsMeta,
-      pageList,
-      appData,
-      editorConfigs,
-      pluginDependencyConfig,
-      theme: selectedAppThemeProperty,
-      metaWidgets,
       loadingEntities,
-      ...layoutSystemPayload,
-      ...modulesData,
-    });
+      layoutSystemPayload.layoutSystemType,
+      layoutSystemPayload.isMobile,
+    ),
+);
+const getMetaWidgetsFromUnevaluatedDataTree = createSelector(
+  getMetaWidgets,
+  getWidgetsMeta,
+  getLoadingEntities,
+  (metaWidgets, widgetsMeta, loadingEntities) =>
+    DataTreeFactory.metaWidgets(metaWidgets, widgetsMeta, loadingEntities),
+);
+
+export const getUnevaluatedDataTree = createSelector(
+  getActionsFromUnevaluatedDataTree,
+  getJSActionsFromUnevaluatedDataTree,
+  getWidgetsFromUnevaluatedDataTree,
+  getMetaWidgetsFromUnevaluatedDataTree,
+  getAppData,
+  getSelectedAppThemeProperties,
+  (actions, jsActions, widgets, metaWidgets, appData, theme) => {
+    let dataTree: UnEvalTree = {
+      ...actions.dataTree,
+      ...jsActions.dataTree,
+      ...widgets.dataTree,
+    };
+    let configTree: ConfigTree = {
+      ...actions.configTree,
+      ...jsActions.configTree,
+      ...widgets.configTree,
+    };
+
+    dataTree.appsmith = {
+      ...appData,
+      // combine both persistent and transient state with the transient state
+      // taking precedence in case the key is the same
+      store: appData.store,
+      theme,
+    } as AppsmithEntity;
+    (dataTree.appsmith as AppsmithEntity).ENTITY_TYPE = ENTITY_TYPE.APPSMITH;
+    dataTree = { ...dataTree, ...metaWidgets.dataTree };
+    configTree = { ...configTree, ...metaWidgets.configTree };
+
+    return { unEvalTree: dataTree, configTree };
   },
 );
 
diff --git a/app/client/src/selectors/editorSelectors.tsx b/app/client/src/selectors/editorSelectors.tsx
index 355a1197c3df..ee3560dd5034 100644
--- a/app/client/src/selectors/editorSelectors.tsx
+++ b/app/client/src/selectors/editorSelectors.tsx
@@ -27,8 +27,8 @@ import {
 } from "selectors/dataTreeSelectors";
 import type { MainCanvasReduxState } from "reducers/uiReducers/mainCanvasReducer";
 
+import { getActionEditorSavingMap } from "PluginActionEditor/store";
 import {
-  getApiPaneSavingMap,
   getCanvasWidgets,
   getJSCollections,
 } from "ee/selectors/entitiesSelector";
@@ -48,6 +48,7 @@ import { protectedModeSelector } from "./gitSyncSelectors";
 import { getIsAnvilLayout } from "layoutSystems/anvil/integrations/selectors";
 import { getCurrentApplication } from "ee/selectors/applicationSelectors";
 import type { Page } from "entities/Page";
+import { objectKeys } from "@appsmith/utils";
 
 const getIsDraggingOrResizing = (state: AppState) =>
   state.ui.widgetDragResize.isResizing || state.ui.widgetDragResize.isDragging;
@@ -76,7 +77,7 @@ export const getLoadingError = (state: AppState) =>
 
 export const getIsPageSaving = createSelector(
   [
-    getApiPaneSavingMap,
+    getActionEditorSavingMap,
     (state: AppState) => state.ui.jsPane.isSaving,
     (state: AppState) => state.ui.appTheming.isSaving,
     (state: AppState) => state.ui.applications.isSavingNavigationSetting,
@@ -84,23 +85,23 @@ export const getIsPageSaving = createSelector(
     (state: AppState) => state.ui.editor.loadingStates.saving,
   ],
   (
-    savingApis,
+    savingActions,
     savingJSObjects,
     isSavingAppTheme,
     isSavingNavigationSetting,
     isEditorSavingEntity,
     isEditorSaving,
   ) => {
-    const areApisSaving = Object.keys(savingApis).some(
-      (apiId) => savingApis[apiId],
+    const areActionsSaving = objectKeys(savingActions).some(
+      (actionId) => savingActions[actionId],
     );
-    const areJsObjectsSaving = Object.keys(savingJSObjects).some(
+    const areJsObjectsSaving = objectKeys(savingJSObjects).some(
       (collectionId) => savingJSObjects[collectionId],
     );
 
     return (
       isEditorSavingEntity ||
-      areApisSaving ||
+      areActionsSaving ||
       areJsObjectsSaving ||
       isSavingAppTheme ||
       isEditorSaving ||
diff --git a/app/client/src/selectors/gitSyncSelectors.tsx b/app/client/src/selectors/gitSyncSelectors.tsx
index a21eb3d1055b..bf3b009667bf 100644
--- a/app/client/src/selectors/gitSyncSelectors.tsx
+++ b/app/client/src/selectors/gitSyncSelectors.tsx
@@ -6,6 +6,7 @@ import {
   getCurrentApplication,
 } from "ee/selectors/applicationSelectors";
 import type { Branch } from "entities/GitSync";
+import { selectFeatureFlags } from "ee/selectors/featureFlagsSelectors";
 
 export const getGitSyncState = (state: AppState): GitSyncReducerState =>
   state.ui.gitSync;
@@ -280,3 +281,8 @@ export const isGitSettingsModalOpenSelector = (state: AppState) =>
 
 export const activeGitSettingsModalTabSelector = (state: AppState) =>
   state.ui.gitSync.activeGitSettingsModalTab;
+
+export const isGitPersistBranchEnabledSelector = createSelector(
+  selectFeatureFlags,
+  (featureFlags) => featureFlags.release_git_persist_branch_enabled ?? false,
+);
diff --git a/app/client/src/selectors/ideSelectors.tsx b/app/client/src/selectors/ideSelectors.tsx
index f7637668fdb0..6abbd7255a54 100644
--- a/app/client/src/selectors/ideSelectors.tsx
+++ b/app/client/src/selectors/ideSelectors.tsx
@@ -61,3 +61,13 @@ export const getShowCreateNewModal = (state: AppState) =>
 
 export const getIdeCanvasSideBySideHoverState = (state: AppState) =>
   state.ui.ide.ideCanvasSideBySideHover;
+
+export const getListViewActiveState = (state: AppState) =>
+  state.ui.ide.isListViewActive;
+
+export const getRenameEntity = (state: AppState) => state.ui.ide.renameEntity;
+
+export const getIsRenaming = (id: string) =>
+  createSelector(getRenameEntity, (entityId) => {
+    return entityId === id;
+  });
diff --git a/app/client/src/selectors/queryPaneSelectors.ts b/app/client/src/selectors/queryPaneSelectors.ts
deleted file mode 100644
index b87485f2be7c..000000000000
--- a/app/client/src/selectors/queryPaneSelectors.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import type { AppState } from "ee/reducers";
-import { getCurrentPageId } from "./editorSelectors";
-import type { FocusEntityInfo } from "../navigation/FocusEntity";
-import { identifyEntityFromPath } from "../navigation/FocusEntity";
-import { getQueryEntityItemUrl } from "ee/pages/Editor/IDE/EditorPane/Query/utils";
-import { selectQuerySegmentEditorTabs } from "ee/selectors/appIDESelectors";
-
-export const getQueryPaneConfigSelectedTabIndex = (state: AppState) =>
-  state.ui.queryPane.selectedConfigTabIndex;
-
-export const getQueryPaneDebuggerState = (state: AppState) =>
-  state.ui.queryPane.debugger;
-
-export const getQueryRunErrorMessage = (state: AppState, id: string) => {
-  const { runErrorMessage } = state.ui.queryPane;
-
-  return runErrorMessage[id];
-};
-
-export const getQueryIsRunning = (state: AppState, id: string): boolean => {
-  const { isRunning } = state.ui.queryPane;
-
-  return !!isRunning[id];
-};
-
-export const getLastQueryTab = (
-  state: AppState,
-): FocusEntityInfo | undefined => {
-  const tabs = selectQuerySegmentEditorTabs(state);
-  const pageId = getCurrentPageId(state);
-
-  if (tabs.length) {
-    const url = getQueryEntityItemUrl(tabs[tabs.length - 1], pageId);
-    const urlWithoutQueryParams = url.split("?")[0];
-
-    return identifyEntityFromPath(urlWithoutQueryParams);
-  }
-};
diff --git a/app/client/src/selectors/ui.tsx b/app/client/src/selectors/ui.tsx
index 50a98ca5d7d4..3c51de62199c 100644
--- a/app/client/src/selectors/ui.tsx
+++ b/app/client/src/selectors/ui.tsx
@@ -22,6 +22,10 @@ export const getDefaultSelectedWidgetIds = (state: AppState) => {
 export const getIsSavingForApiName = (state: AppState, id: string) =>
   state.ui.apiName.isSaving[id];
 
+/** Select saving status for all API names */
+export const getApiNameSavingStatuses = (state: AppState) =>
+  state.ui.apiName.isSaving;
+
 /**
  * Selector to use id and provide the status of error in an API.
  */
@@ -34,6 +38,10 @@ export const getErrorForApiName = (state: AppState, id: string) =>
 export const getIsSavingForJSObjectName = (state: AppState, id: string) =>
   state.ui.jsObjectName.isSaving[id];
 
+/** Select saving status for all JS object names */
+export const getJsObjectNameSavingStatuses = (state: AppState) =>
+  state.ui.jsObjectName.isSaving;
+
 /**
  * Selector to use id and provide the status of error in a JS Object.
  */
diff --git a/app/client/src/utils/ApiPaneUtils.test.ts b/app/client/src/utils/ApiPaneUtils.test.ts
index a6cb65882243..99c9ab11bbbe 100644
--- a/app/client/src/utils/ApiPaneUtils.test.ts
+++ b/app/client/src/utils/ApiPaneUtils.test.ts
@@ -1,4 +1,4 @@
-import { POST_BODY_FORMAT_OPTIONS } from "constants/ApiEditorConstants/CommonApiConstants";
+import { POST_BODY_FORMAT_OPTIONS } from "PluginActionEditor/constants/CommonApiConstants";
 import {
   getContentTypeHeaderValue,
   getIndextoUpdate,
diff --git a/app/client/src/utils/ApiPaneUtils.tsx b/app/client/src/utils/ApiPaneUtils.tsx
index f4c3bdfaf05d..7239ccfeade9 100644
--- a/app/client/src/utils/ApiPaneUtils.tsx
+++ b/app/client/src/utils/ApiPaneUtils.tsx
@@ -1,4 +1,4 @@
-import { CONTENT_TYPE_HEADER_KEY } from "constants/ApiEditorConstants/CommonApiConstants";
+import { CONTENT_TYPE_HEADER_KEY } from "../PluginActionEditor/constants/CommonApiConstants";
 import {
   getDynamicStringSegments,
   isDynamicValue,
diff --git a/app/client/src/utils/AppsmithUtils.tsx b/app/client/src/utils/AppsmithUtils.tsx
index 0fad6ec8df0a..227b2c3ebba3 100644
--- a/app/client/src/utils/AppsmithUtils.tsx
+++ b/app/client/src/utils/AppsmithUtils.tsx
@@ -13,8 +13,10 @@ import type { JSCollectionData } from "ee/reducers/entityReducers/jsActionsReduc
 import AnalyticsUtil from "ee/utils/AnalyticsUtil";
 import type { CreateNewActionKeyInterface } from "ee/entities/Engine/actionHelpers";
 import { CreateNewActionKey } from "ee/entities/Engine/actionHelpers";
+import { ANONYMOUS_USERNAME } from "../constants/userConstants";
+import type { User } from "constants/userConstants";
 
-export const initializeAnalyticsAndTrackers = async () => {
+export const initializeAnalyticsAndTrackers = async (currentUser: User) => {
   const appsmithConfigs = getAppsmithConfigs();
 
   try {
@@ -96,12 +98,19 @@ export const initializeAnalyticsAndTrackers = async () => {
     if (appsmithConfigs.segment.enabled && !(window as any).analytics) {
       if (appsmithConfigs.segment.apiKey) {
         // This value is only enabled for Appsmith's cloud hosted version. It is not set in self-hosted environments
-        return AnalyticsUtil.initializeSegment(appsmithConfigs.segment.apiKey);
+        await AnalyticsUtil.initializeSegment(appsmithConfigs.segment.apiKey);
       } else if (appsmithConfigs.segment.ceKey) {
         // This value is set in self-hosted environments. But if the analytics are disabled, it's never used.
-        return AnalyticsUtil.initializeSegment(appsmithConfigs.segment.ceKey);
+        await AnalyticsUtil.initializeSegment(appsmithConfigs.segment.ceKey);
       }
     }
+
+    if (
+      !currentUser.isAnonymous &&
+      currentUser.username !== ANONYMOUS_USERNAME
+    ) {
+      await AnalyticsUtil.identifyUser(currentUser);
+    }
   } catch (e) {
     Sentry.captureException(e);
     log.error(e);
diff --git a/app/client/src/utils/DatasourceSagaUtils.tsx b/app/client/src/utils/DatasourceSagaUtils.tsx
deleted file mode 100644
index c5cd4943b42d..000000000000
--- a/app/client/src/utils/DatasourceSagaUtils.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import { DATASOURCE_NAME_DEFAULT_PREFIX } from "constants/Datasource";
-import type { Datasource } from "entities/Datasource";
-
-/**
- *
- * @param datasoures Array of datasource objects
- * @returns next sequence number for untitled datasources
- */
-export function getUntitledDatasourceSequence(
-  dsList: Array<Datasource>,
-): number {
-  let maxSeq = Number.MIN_VALUE;
-
-  dsList
-    .filter((ele) => ele.name.includes(DATASOURCE_NAME_DEFAULT_PREFIX))
-    .forEach((ele) => {
-      const seq = parseInt(ele.name.split(" ")[2]);
-
-      if (!isNaN(seq) && maxSeq < seq) {
-        maxSeq = seq;
-      }
-    });
-
-  return maxSeq === Number.MIN_VALUE ? 1 : maxSeq + 1;
-}
diff --git a/app/client/src/utils/PropertyControlFactory.tsx b/app/client/src/utils/PropertyControlFactory.tsx
index bb231492508a..54cc4e2fca04 100644
--- a/app/client/src/utils/PropertyControlFactory.tsx
+++ b/app/client/src/utils/PropertyControlFactory.tsx
@@ -9,6 +9,19 @@ import type {
 import type BaseControl from "components/propertyControls/BaseControl";
 import { isArray } from "lodash";
 import type { AdditionalDynamicDataTree } from "./autocomplete/customTreeTypeDefCreator";
+
+/**
+ * PropertyPaneControlFactory
+ *
+ * This classes manages all the available controls for the property pane.
+ * It maintains a map of control types to their respective builders.
+ * The control builders are responsible for creating the actual controls.
+ *
+ * Key functionalities:
+ * 1. Register control builders, methods, and computed value functions
+ * 2. Create controls based on control data and preferences
+ * 3. Retrieve available control types
+ */
 class PropertyControlFactory {
   static controlMap: Map<ControlType, ControlBuilder<ControlProps>> = new Map();
   static controlMethods: Map<ControlType, ControlMethods> = new Map();
diff --git a/app/client/src/utils/WidgetPropsUtils.tsx b/app/client/src/utils/WidgetPropsUtils.tsx
index ec411e1b7080..d7caf868e385 100644
--- a/app/client/src/utils/WidgetPropsUtils.tsx
+++ b/app/client/src/utils/WidgetPropsUtils.tsx
@@ -44,13 +44,13 @@ const defaultDSL = defaultTemplate;
  * @param fetchPageResponse The response from the fetchPage API Call
  * @returns The updated DSL and the layoutId
  */
-export const extractCurrentDSL = ({
+export const extractCurrentDSL = async ({
   dslTransformer,
   response,
 }: {
   dslTransformer?: (dsl: DSLWidget) => DSLWidget;
   response?: FetchPageResponse;
-}): { dsl: DSLWidget; layoutId: string | undefined } => {
+}): Promise<{ dsl: DSLWidget; layoutId: string | undefined }> => {
   // If fetch page response doesn't exist
   // It means we are creating a new page
   const newPage = !response;
@@ -62,10 +62,10 @@ export const extractCurrentDSL = ({
   let dsl = currentDSL as DSLWidget;
 
   // Run all the migrations on this DSL
-  dsl = migrateDSL(
+  dsl = (await migrateDSL(
     currentDSL as ContainerWidgetProps<WidgetProps>,
     newPage,
-  ) as DSLWidget;
+  )) as DSLWidget;
 
   // If this DSL is meant to be transformed
   // then the dslTransformer would have been passed by the caller
diff --git a/app/client/src/utils/formControl/FormControlRegistry.tsx b/app/client/src/utils/formControl/FormControlRegistry.tsx
index 90fe16236302..3d174d27ad4e 100644
--- a/app/client/src/utils/formControl/FormControlRegistry.tsx
+++ b/app/client/src/utils/formControl/FormControlRegistry.tsx
@@ -35,6 +35,10 @@ import FormTemplateControl from "components/formControls/FormTemplateControl";
 import type { FormTemplateControlProps } from "components/formControls/FormTemplateControl";
 import MultiFilePickerControl from "components/formControls/MultiFilePickerControl";
 import type { MultipleFilePickerControlProps } from "components/formControls/MultiFilePickerControl";
+import type { RadioButtonControlProps } from "components/formControls/RadioButtonControl";
+import RadioButtonControl from "components/formControls/RadioButtonControl";
+import type { CarbonButtonProps } from "ee/components/formControls/CarbonButton";
+import { CarbonButton } from "ee/components/formControls/CarbonButton";
 
 /**
  * NOTE: If you are adding a component that uses FormControl
@@ -183,6 +187,16 @@ class FormControlRegistry {
         },
       },
     );
+    FormControlFactory.registerControlBuilder(formControlTypes.RADIO_BUTTON, {
+      buildPropertyControl(controlProps: RadioButtonControlProps): JSX.Element {
+        return <RadioButtonControl {...controlProps} />;
+      },
+    });
+    FormControlFactory.registerControlBuilder(formControlTypes.CARBON_BUTTON, {
+      buildPropertyControl(controlProps: CarbonButtonProps): JSX.Element {
+        return <CarbonButton {...controlProps} />;
+      },
+    });
   }
 }
 
diff --git a/app/client/src/utils/formControl/formControlTypes.ts b/app/client/src/utils/formControl/formControlTypes.ts
index 053f0d6f8556..ff068339385b 100644
--- a/app/client/src/utils/formControl/formControlTypes.ts
+++ b/app/client/src/utils/formControl/formControlTypes.ts
@@ -18,4 +18,6 @@ export default {
   PROJECTION: "PROJECTION",
   FORM_TEMPLATE: "FORM_TEMPLATE",
   MULTIPLE_FILE_PICKER: "MULTIPLE_FILE_PICKER",
+  RADIO_BUTTON: "RADIO_BUTTON",
+  CARBON_BUTTON: "CARBON_BUTTON",
 };
diff --git a/app/client/src/utils/helpers.tsx b/app/client/src/utils/helpers.tsx
index 520581f313c0..698a7d122817 100644
--- a/app/client/src/utils/helpers.tsx
+++ b/app/client/src/utils/helpers.tsx
@@ -10,7 +10,7 @@ import {
   DEDICATED_WORKER_GLOBAL_SCOPE_IDENTIFIERS,
   JAVASCRIPT_KEYWORDS,
 } from "constants/WidgetValidation";
-import { get, isNil, has, uniq } from "lodash";
+import { get, has, isNil, uniq } from "lodash";
 import type { Workspace } from "ee/constants/workspaceConstants";
 import { hasCreateNewAppPermission } from "ee/utils/permissionHelpers";
 import moment from "moment";
@@ -57,21 +57,6 @@ export const snapToGrid = (
   return [snappedX, snappedY];
 };
 
-export const formatBytes = (bytes: string | number) => {
-  if (!bytes) return;
-
-  const value = typeof bytes === "string" ? parseInt(bytes) : bytes;
-  const sizes = ["Bytes", "KB", "MB", "GB", "TB"];
-
-  if (value === 0) return "0 bytes";
-
-  const i = parseInt(String(Math.floor(Math.log(value) / Math.log(1024))));
-
-  if (i === 0) return bytes + " " + sizes[i];
-
-  return (value / Math.pow(1024, i)).toFixed(1) + " " + sizes[i];
-};
-
 export const getAbsolutePixels = (size?: string | null) => {
   if (!size) return 0;
 
diff --git a/app/client/src/utils/hooks/useHoverToFocusWidget.ts b/app/client/src/utils/hooks/useHoverToFocusWidget.ts
index d159dd8b9573..10e5f764f06e 100644
--- a/app/client/src/utils/hooks/useHoverToFocusWidget.ts
+++ b/app/client/src/utils/hooks/useHoverToFocusWidget.ts
@@ -5,7 +5,7 @@ import { getAnvilSpaceDistributionStatus } from "layoutSystems/anvil/integration
 import { combinedPreviewModeSelector } from "selectors/editorSelectors";
 import type { AppState } from "ee/reducers";
 import type React from "react";
-import { useCurrentAppState } from "pages/Editor/IDE/hooks";
+import { useCurrentAppState } from "pages/Editor/IDE/hooks/useCurrentAppState";
 import { EditorState } from "ee/entities/IDE/constants";
 
 export const useHoverToFocusWidget = (
diff --git a/app/client/src/utils/replayHelpers.tsx b/app/client/src/utils/replayHelpers.tsx
index 121235ec1435..8b871586af6b 100644
--- a/app/client/src/utils/replayHelpers.tsx
+++ b/app/client/src/utils/replayHelpers.tsx
@@ -16,8 +16,7 @@ import {
   ACTION_CONFIGURATION_CHANGED,
 } from "ee/constants/messages";
 import { toast } from "@appsmith/ads";
-import { setApiPaneConfigSelectedTabIndex } from "../actions/apiPaneActions";
-import { API_EDITOR_TABS } from "../constants/ApiEditorConstants/CommonApiConstants";
+import { setPluginActionEditorSelectedTab } from "PluginActionEditor/store";
 import store from "../store";
 
 /**
@@ -173,11 +172,7 @@ export function switchTab(replayId: string): boolean {
 
   if (element.getAttribute("data-state") == "active") return false;
 
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-  // @ts-ignore
-  const index = Object.values(API_EDITOR_TABS).indexOf(replayId);
-
-  store.dispatch(setApiPaneConfigSelectedTabIndex(index));
+  store.dispatch(setPluginActionEditorSelectedTab(replayId));
 
   return true;
 }
diff --git a/app/client/src/utils/storage.ts b/app/client/src/utils/storage.ts
index 1282eded365d..dff7c051aaf3 100644
--- a/app/client/src/utils/storage.ts
+++ b/app/client/src/utils/storage.ts
@@ -43,6 +43,7 @@ export const STORAGE_KEYS: {
   CODE_WIDGET_NAVIGATION_USED: "CODE_WIDGET_NAVIGATION_USED",
   OVERRIDDEN_FEATURE_FLAGS: "OVERRIDDEN_FEATURE_FLAGS",
   ACTION_TEST_PAYLOAD: "ACTION_TEST_PAYLOAD",
+  LATEST_GIT_BRANCH: "LATEST_GIT_BRANCH",
 };
 
 const store = localforage.createInstance({
@@ -1087,3 +1088,52 @@ export const storeActionTestPayload = async (payload: {
     return false;
   }
 };
+
+export const setLatestGitBranchInLocal = async (
+  userEmail: string,
+  baseApplicationId: string,
+  branch: string,
+) => {
+  try {
+    const storedBranches: Record<
+      string,
+      Record<string, string>
+    > = (await store.getItem(STORAGE_KEYS.LATEST_GIT_BRANCH)) ?? {};
+    const userBranches = storedBranches?.[userEmail] ?? {};
+    const newBranches = {
+      ...(storedBranches ?? {}),
+      [userEmail]: {
+        ...userBranches,
+        [baseApplicationId]: branch,
+      },
+    };
+
+    await store.setItem(STORAGE_KEYS.LATEST_GIT_BRANCH, newBranches);
+
+    return true;
+  } catch (error) {
+    log.error("An error occurred while setting LATEST_GIT_BRANCH");
+    log.error(error);
+
+    return false;
+  }
+};
+
+export const getLatestGitBranchFromLocal = async (
+  userEmail: string,
+  baseApplicationId: string,
+) => {
+  try {
+    const storedBranches: Record<string, Record<string, string>> | null =
+      await store.getItem(STORAGE_KEYS.LATEST_GIT_BRANCH);
+    const userBranches = storedBranches?.[userEmail] ?? {};
+    const branch = userBranches?.[baseApplicationId] ?? null;
+
+    return branch;
+  } catch (error) {
+    log.error("An error occurred while fetching LATEST_GIT_BRANCH");
+    log.error(error);
+
+    return null;
+  }
+};
diff --git a/app/client/src/widgets/BaseInputWidget/component/index.tsx b/app/client/src/widgets/BaseInputWidget/component/index.tsx
index cbb7b21599a1..0ee121ca3f9f 100644
--- a/app/client/src/widgets/BaseInputWidget/component/index.tsx
+++ b/app/client/src/widgets/BaseInputWidget/component/index.tsx
@@ -60,6 +60,7 @@ const InputComponentWrapper = styled((props) => (
       "boxShadow",
       "accentColor",
       "isDynamicHeightEnabled",
+      "isMultiLine",
     ])}
   />
 ))<{
diff --git a/app/client/src/widgets/BaseInputWidget/widget/index.tsx b/app/client/src/widgets/BaseInputWidget/widget/index.tsx
index d3d8daf183a1..9052b0c6b033 100644
--- a/app/client/src/widgets/BaseInputWidget/widget/index.tsx
+++ b/app/client/src/widgets/BaseInputWidget/widget/index.tsx
@@ -520,7 +520,6 @@ class BaseInputWidget<
   static getMetaPropertiesMap(): Record<string, any> {
     return {
       text: undefined,
-      isFocused: false,
       isDirty: false,
     };
   }
diff --git a/app/client/src/widgets/BaseWidget.tsx b/app/client/src/widgets/BaseWidget.tsx
index 8c53804ee798..312fadd18387 100644
--- a/app/client/src/widgets/BaseWidget.tsx
+++ b/app/client/src/widgets/BaseWidget.tsx
@@ -18,7 +18,7 @@ import type {
 import { RenderModes } from "constants/WidgetConstants";
 import { ENTITY_TYPE } from "ee/entities/AppsmithConsole/utils";
 import type { SetterConfig, Stylesheet } from "entities/AppTheming";
-import type { Context, ReactNode, RefObject } from "react";
+import type { Context, ReactNode, RefObject, SVGProps } from "react";
 import { Component } from "react";
 import type {
   ModifyMetaWidgetPayload,
@@ -587,8 +587,8 @@ export interface WidgetCardProps {
   isBeta?: boolean;
   tags?: WidgetTags[];
   isSearchWildcard?: boolean;
-  IconCmp?: () => JSX.Element;
-  ThumbnailCmp?: () => JSX.Element;
+  IconCmp?: (props: SVGProps<SVGSVGElement>) => JSX.Element;
+  ThumbnailCmp?: (props: SVGProps<SVGSVGElement>) => JSX.Element;
 }
 
 export const WidgetOperations = {
diff --git a/app/client/src/widgets/ButtonWidget/component/index.tsx b/app/client/src/widgets/ButtonWidget/component/index.tsx
index 27f2377727f0..6d1a1eed5607 100644
--- a/app/client/src/widgets/ButtonWidget/component/index.tsx
+++ b/app/client/src/widgets/ButtonWidget/component/index.tsx
@@ -154,6 +154,11 @@ export const StyledButton = styled((props) => (
       "boxShadowColor",
       "buttonColor",
       "buttonVariant",
+      "primaryColor",
+      "navColorStyle",
+      "variant",
+      "insideSidebar",
+      "isMinimal",
     ])}
   />
 ))<ThemeProp & ButtonStyleProps>`
diff --git a/app/client/src/widgets/ChartWidget/widget/ChartsRendered.test.tsx b/app/client/src/widgets/ChartWidget/widget/ChartsRendered.test.tsx
new file mode 100644
index 000000000000..b569208e7f47
--- /dev/null
+++ b/app/client/src/widgets/ChartWidget/widget/ChartsRendered.test.tsx
@@ -0,0 +1,125 @@
+import { RenderModes } from "constants/WidgetConstants";
+import ChartWidget, { type ChartWidgetProps } from ".";
+import { LabelOrientation, type ChartData } from "../constants";
+import { EmptyChartData } from "../component/EmptyChartData";
+import type { WidgetError } from "widgets/BaseWidget";
+
+describe("ChartWidget getWidgetView", () => {
+  let chartWidget: ChartWidget;
+
+  const seriesData1: ChartData = {
+    seriesName: "series1",
+    data: [{ x: "x1", y: 1 }],
+    color: "series1color",
+  };
+  const seriesData2: ChartData = {
+    seriesName: "series2",
+    data: [{ x: "x1", y: 2 }],
+    color: "series2color",
+  };
+  const defaultProps: ChartWidgetProps = {
+    allowScroll: true,
+    showDataPointLabel: true,
+    chartData: {
+      seriesID1: seriesData1,
+      seriesID2: seriesData2,
+    },
+    chartName: "chart name",
+    type: "CHART_WIDGET",
+    chartType: "AREA_CHART",
+    customEChartConfig: {},
+    customFusionChartConfig: { type: "type", dataSource: undefined },
+    hasOnDataPointClick: true,
+    isVisible: true,
+    isLoading: false,
+    setAdaptiveYMin: false,
+    labelOrientation: LabelOrientation.AUTO,
+    onDataPointClick: "",
+    widgetId: "widgetID",
+    xAxisName: "xaxisname",
+    yAxisName: "yaxisname",
+    borderRadius: "1",
+    boxShadow: "1",
+    primaryColor: "primarycolor",
+    fontFamily: "fontfamily",
+    dimensions: { componentWidth: 11, componentHeight: 11 },
+    parentColumnSpace: 1,
+    parentRowSpace: 1,
+    topRow: 0,
+    bottomRow: 0,
+    leftColumn: 0,
+    rightColumn: 0,
+    widgetName: "widgetName",
+    version: 1,
+    renderMode: RenderModes.CANVAS,
+  };
+  const errors: WidgetError[] = [
+    {
+      name: "error",
+      type: "configuration",
+      message: "We have a error",
+    },
+  ];
+
+  describe("loading state", () => {
+    it("isLoading: true", () => {
+      chartWidget = new ChartWidget({ ...defaultProps, isLoading: true });
+
+      const view = chartWidget.getWidgetView();
+
+      expect(view.props.children.props.isLoading).toBe(true);
+    });
+
+    it("isLoading: true + errors", () => {
+      chartWidget = new ChartWidget({
+        ...defaultProps,
+        isLoading: true,
+        errors,
+      });
+
+      const view = chartWidget.getWidgetView();
+
+      expect(view.props.children.props.isLoading).toBe(true);
+    });
+    it("isLoading: true + emptyChartData", () => {
+      chartWidget = new ChartWidget({
+        ...defaultProps,
+        isLoading: true,
+        chartData: {},
+      });
+
+      const view = chartWidget.getWidgetView();
+
+      expect(view.props.children.props.isLoading).toBe(true);
+    });
+  });
+
+  it("renders error state", () => {
+    chartWidget = new ChartWidget({
+      ...defaultProps,
+      errors,
+    });
+
+    const view = chartWidget.getWidgetView();
+
+    expect(view.props.error.message).toBe("We have a error");
+  });
+
+  it("renders empty chart data state", () => {
+    chartWidget = new ChartWidget({ ...defaultProps, chartData: {} });
+
+    const view = chartWidget.getWidgetView();
+
+    expect(view.type).toEqual(EmptyChartData);
+  });
+
+  it("renders chart with data", () => {
+    chartWidget = new ChartWidget(defaultProps);
+    const view = chartWidget.getWidgetView();
+
+    expect(view.props.children.props.chartData).toEqual({
+      seriesID1: seriesData1,
+      seriesID2: seriesData2,
+    });
+  });
+});
diff --git a/app/client/src/widgets/ChartWidget/widget/index.test.ts b/app/client/src/widgets/ChartWidget/widget/index.test.ts
index 083e92f32d5f..040cc61a89e5 100644
--- a/app/client/src/widgets/ChartWidget/widget/index.test.ts
+++ b/app/client/src/widgets/ChartWidget/widget/index.test.ts
@@ -72,6 +72,15 @@ describe("emptyChartData", () => {
       expect(emptyChartData(props)).toEqual(true);
     });
 
+    it("returns true if each series is null or undefined", () => {
+      const props = JSON.parse(JSON.stringify(basicEChartProps));
+
+      props.chartData.seriesID1 = { data: undefined };
+      props.chartData.seriesID2 = { data: null };
+
+      expect(emptyChartData(props)).toEqual(true);
+    });
+
     it("returns true if no series is present", () => {
       const props = JSON.parse(JSON.stringify(basicEChartProps));
 
diff --git a/app/client/src/widgets/ChartWidget/widget/index.tsx b/app/client/src/widgets/ChartWidget/widget/index.tsx
index db04a5f907dc..65498ad61110 100644
--- a/app/client/src/widgets/ChartWidget/widget/index.tsx
+++ b/app/client/src/widgets/ChartWidget/widget/index.tsx
@@ -51,7 +51,10 @@ export const emptyChartData = (props: ChartWidgetProps) => {
     const builder = new EChartsDatasetBuilder(props.chartType, props.chartData);
 
     for (const seriesID in builder.filteredChartData) {
-      if (Object.keys(props.chartData[seriesID].data).length > 0) {
+      if (
+        Array.isArray(props.chartData[seriesID].data) &&
+        props.chartData[seriesID].data.length > 0
+      ) {
         return false;
       }
     }
@@ -226,42 +229,50 @@ class ChartWidget extends BaseWidget<ChartWidgetProps, WidgetState> {
   getWidgetView() {
     const errors = syntaxErrorsFromProps(this.props);
 
-    if (errors.length == 0) {
-      if (emptyChartData(this.props)) {
-        return <EmptyChartData />;
-      } else {
-        return (
-          <Suspense fallback={<Skeleton />}>
-            <ChartComponent
-              allowScroll={this.props.allowScroll}
-              borderRadius={this.props.borderRadius}
-              boxShadow={this.props.boxShadow}
-              chartData={this.props.chartData}
-              chartName={this.props.chartName}
-              chartType={this.props.chartType}
-              customEChartConfig={this.props.customEChartConfig}
-              customFusionChartConfig={this.props.customFusionChartConfig}
-              dimensions={this.props}
-              fontFamily={ChartWidget.fontFamily}
-              hasOnDataPointClick={Boolean(this.props.onDataPointClick)}
-              isLoading={this.props.isLoading}
-              isVisible={this.props.isVisible}
-              key={this.props.widgetId}
-              labelOrientation={this.props.labelOrientation}
-              onDataPointClick={this.onDataPointClick}
-              primaryColor={this.props.accentColor ?? Colors.ROYAL_BLUE_2}
-              setAdaptiveYMin={this.props.setAdaptiveYMin}
-              showDataPointLabel={this.props.showDataPointLabel}
-              widgetId={this.props.widgetId}
-              xAxisName={this.props.xAxisName}
-              yAxisName={this.props.yAxisName}
-            />
-          </Suspense>
-        );
-      }
-    } else {
+    if (this.props.isLoading) {
+      return this.renderChartWithData();
+    }
+
+    if (errors.length > 0) {
       return <ChartErrorComponent error={errors[0]} />;
     }
+
+    if (emptyChartData(this.props)) {
+      return <EmptyChartData />;
+    }
+
+    return this.renderChartWithData();
+  }
+
+  renderChartWithData() {
+    return (
+      <Suspense fallback={<Skeleton />}>
+        <ChartComponent
+          allowScroll={this.props.allowScroll}
+          borderRadius={this.props.borderRadius}
+          boxShadow={this.props.boxShadow}
+          chartData={this.props.chartData}
+          chartName={this.props.chartName}
+          chartType={this.props.chartType}
+          customEChartConfig={this.props.customEChartConfig}
+          customFusionChartConfig={this.props.customFusionChartConfig}
+          dimensions={this.props}
+          fontFamily={ChartWidget.fontFamily}
+          hasOnDataPointClick={Boolean(this.props.onDataPointClick)}
+          isLoading={this.props.isLoading}
+          isVisible={this.props.isVisible}
+          key={this.props.widgetId}
+          labelOrientation={this.props.labelOrientation}
+          onDataPointClick={this.onDataPointClick}
+          primaryColor={this.props.accentColor ?? Colors.ROYAL_BLUE_2}
+          setAdaptiveYMin={this.props.setAdaptiveYMin}
+          showDataPointLabel={this.props.showDataPointLabel}
+          widgetId={this.props.widgetId}
+          xAxisName={this.props.xAxisName}
+          yAxisName={this.props.yAxisName}
+        />
+      </Suspense>
+    );
   }
 }
 
diff --git a/app/client/src/widgets/ContainerWidget/widget/index.test.tsx b/app/client/src/widgets/ContainerWidget/widget/index.test.tsx
index faf96507c61c..3aff3f57fe5d 100644
--- a/app/client/src/widgets/ContainerWidget/widget/index.test.tsx
+++ b/app/client/src/widgets/ContainerWidget/widget/index.test.tsx
@@ -13,7 +13,7 @@ import {
 import { sagasToRunForTests } from "test/sagas";
 import { MockApplication } from "test/testCommon";
 import { UpdateAppViewer, UpdatedEditor } from "test/testMockedWidgets";
-import { render } from "test/testUtils";
+import { render, waitFor } from "test/testUtils";
 import { generateReactKey } from "widgets/WidgetUtils";
 
 const pageId = "0123456789abcdef00000000";
@@ -110,6 +110,8 @@ describe("ContainerWidget tests", () => {
       </MemoryRouter>,
       { initialState: appState, sagasToRun: sagasToRunForTests },
     );
-    expect(spyUseCanvasDragging).toHaveBeenCalled();
+    await waitFor(() => {
+      expect(spyUseCanvasDragging).toHaveBeenCalled();
+    });
   });
 });
diff --git a/app/client/src/widgets/ContainerWidget/widget/index.tsx b/app/client/src/widgets/ContainerWidget/widget/index.tsx
index 4494b2bfa74d..39652fd7d433 100644
--- a/app/client/src/widgets/ContainerWidget/widget/index.tsx
+++ b/app/client/src/widgets/ContainerWidget/widget/index.tsx
@@ -385,7 +385,11 @@ export class ContainerWidget extends BaseWidget<
       this.props.positioning !== Positioning.Vertical;
 
     return (
-      <ContainerComponent {...props} noScroll={isAutoHeightEnabled}>
+      <ContainerComponent
+        key={props.widgetId}
+        {...props}
+        noScroll={isAutoHeightEnabled}
+      >
         <WidgetsMultiSelectBox
           {...this.getSnapSpaces()}
           noContainerOffset={!!props.noContainerOffset}
diff --git a/app/client/src/widgets/DatePickerWidget2/widget/derived.js b/app/client/src/widgets/DatePickerWidget2/widget/derived.js
index cda0937f7e31..e3ace7250e46 100644
--- a/app/client/src/widgets/DatePickerWidget2/widget/derived.js
+++ b/app/client/src/widgets/DatePickerWidget2/widget/derived.js
@@ -1,31 +1,50 @@
 /* eslint-disable @typescript-eslint/no-unused-vars*/
 export default {
   isValidDate: (props, moment, _) => {
-    const minDate = new Date(props.minDate);
-    const maxDate = new Date(props.maxDate);
-    const selectedDate =
-      props.selectedDate !== ""
-        ? moment(new Date(props.selectedDate))
-        : props.selectedDate;
-    let dateValid = true;
-
-    if (!!props.minDate && !!props.maxDate) {
-      dateValid = !!selectedDate
-        ? selectedDate.isBetween(minDate, maxDate)
-        : !props.isRequired;
-    } else if (!!props.minDate) {
-      dateValid = !!selectedDate
-        ? selectedDate.isAfter(minDate)
-        : !props.isRequired;
-    } else if (!!props.maxDate) {
-      dateValid = !!selectedDate
-        ? selectedDate.isBefore(maxDate)
-        : !props.isRequired;
-    } else {
-      dateValid = props.isRequired ? !!selectedDate : true;
+    if (!props.selectedDate && !props.isRequired) {
+      return true;
     }
 
-    return dateValid;
+    const minDate = props.minDate ? new Date(props.minDate) : null;
+    const maxDate = props.maxDate ? new Date(props.maxDate) : null;
+    const selectedDate = props.selectedDate
+      ? moment(new Date(props.selectedDate))
+      : props.selectedDate;
+
+    if (!selectedDate) {
+      return !props.isRequired;
+    }
+
+    let granularity,
+      inclusivity = "[]";
+
+    switch (props.timePrecision) {
+      case "None":
+        granularity = "day";
+        break;
+      case "second":
+      case "minute":
+      case "millisecond":
+        granularity = props.timePrecision;
+        break;
+      default:
+        granularity = undefined;
+        inclusivity = undefined;
+    }
+
+    if (minDate && maxDate) {
+      return selectedDate.isBetween(minDate, maxDate, granularity, inclusivity);
+    }
+
+    if (minDate) {
+      return selectedDate.isSameOrAfter(minDate, granularity);
+    }
+
+    if (maxDate) {
+      return selectedDate.isSameOrBefore(maxDate, granularity);
+    }
+
+    return true;
   },
   //
 };
diff --git a/app/client/src/widgets/DatePickerWidget2/widget/derived.test.js b/app/client/src/widgets/DatePickerWidget2/widget/derived.test.js
index 820d4f2e10e4..f52aaf962c60 100644
--- a/app/client/src/widgets/DatePickerWidget2/widget/derived.test.js
+++ b/app/client/src/widgets/DatePickerWidget2/widget/derived.test.js
@@ -86,4 +86,124 @@ describe("Validates Derived Properties", () => {
 
     expect(result).toStrictEqual(false);
   });
+  describe("timePrecision", () => {
+    it("should fail when selectedDate minute is outside bounds", () => {
+      const { isValidDate } = derivedProperty;
+      const input = {
+        isRequired: true,
+        maxDate: "2021-12-01T05:49:00.000Z",
+        minDate: "2021-12-01T05:48:00.000Z",
+        selectedDate: "2021-12-01T05:50:00.000Z",
+        timePrecision: "minute",
+      };
+
+      let result = isValidDate(input, moment, _);
+
+      expect(result).toStrictEqual(false);
+    });
+
+    it("timePrecision: minute -> date is valid even if selectedDate is over by seconds", () => {
+      const { isValidDate } = derivedProperty;
+      const input = {
+        isRequired: true,
+        maxDate: "2121-12-31T18:29:00.000Z",
+        minDate: "2021-12-01T05:49:28.753Z",
+        selectedDate: "2021-12-01T05:49:24.753Z",
+        timePrecision: "minute",
+      };
+
+      let result = isValidDate(input, moment, _);
+
+      expect(result).toStrictEqual(true);
+    });
+
+    it("timePrecision: second -> date is valid even if selectedDate is over by milliseconds", () => {
+      const { isValidDate } = derivedProperty;
+      const input = {
+        isRequired: true,
+        maxDate: "2121-12-31T18:29:00.000Z",
+        minDate: "2021-12-01T05:49:24.753Z",
+        selectedDate: "2021-12-01T05:49:24.751Z",
+        timePrecision: "second",
+      };
+
+      let result = isValidDate(input, moment, _);
+
+      expect(result).toStrictEqual(true);
+    });
+
+    it("timePrecision: millisecond", () => {
+      const { isValidDate } = derivedProperty;
+      const input = {
+        isRequired: true,
+        maxDate: "2121-12-31T18:29:00.000Z",
+        minDate: "2021-12-01T05:49:24.752Z",
+        selectedDate: "2021-12-01T05:49:24.753Z",
+        timePrecision: "millisecond",
+      };
+
+      let result = isValidDate(input, moment, _);
+
+      expect(result).toStrictEqual(true);
+    });
+
+    describe("timePrecision: None", () => {
+      it("date is same as minDate", () => {
+        const { isValidDate } = derivedProperty;
+        const input = {
+          isRequired: true,
+          maxDate: "2121-12-31T18:29:00.000Z",
+          minDate: "2021-12-01T00:00:00.000Z",
+          selectedDate: "2021-12-01T00:00:00.000Z",
+          timePrecision: "None",
+        };
+
+        let result = isValidDate(input, moment, _);
+
+        expect(result).toStrictEqual(true);
+      });
+      it("date is same as maxDate", () => {
+        const { isValidDate } = derivedProperty;
+        const input = {
+          isRequired: true,
+          maxDate: "2021-12-01T00:00:00.000Z",
+          minDate: "1991-12-31T18:29:00.000Z",
+          selectedDate: "2021-12-01T00:00:00.000Z",
+          timePrecision: "None",
+        };
+
+        let result = isValidDate(input, moment, _);
+
+        expect(result).toStrictEqual(true);
+      });
+      it("date is between minDate and maxDate", () => {
+        const { isValidDate } = derivedProperty;
+        const input = {
+          isRequired: true,
+          maxDate: "2121-12-31T18:29:00.000Z",
+          minDate: "1920-12-31T18:30:00.000Z",
+          selectedDate: "2021-12-01T05:49:24.753Z",
+          timePrecision: "None",
+        };
+
+        let result = isValidDate(input, moment, _);
+
+        expect(result).toStrictEqual(true);
+      });
+      it("date is out of bounds", () => {
+        const { isValidDate } = derivedProperty;
+        const input = {
+          isRequired: true,
+          maxDate: "2021-12-31T18:29:00.000Z",
+          minDate: "1920-12-31T18:30:00.000Z",
+          selectedDate: "2022-12-01T05:49:24.753Z",
+          timePrecision: "None",
+        };
+
+        let result = isValidDate(input, moment, _);
+
+        expect(result).toStrictEqual(false);
+      });
+    });
+  });
 });
diff --git a/app/client/src/widgets/IconButtonWidget/component/index.tsx b/app/client/src/widgets/IconButtonWidget/component/index.tsx
index 47c4e344b3da..eca02fc5bcfa 100644
--- a/app/client/src/widgets/IconButtonWidget/component/index.tsx
+++ b/app/client/src/widgets/IconButtonWidget/component/index.tsx
@@ -116,6 +116,11 @@ export const StyledButton = styled((props) => (
       "dimension",
       "hasOnClickAction",
       "compactMode",
+      "buttonColor",
+      "primaryColor",
+      "navColorStyle",
+      "isMinimal",
+      "insideSidebar",
     ])}
   />
 ))<ThemeProp & ButtonStyleProps>`
diff --git a/app/client/src/widgets/InputWidgetV2/widget/index.tsx b/app/client/src/widgets/InputWidgetV2/widget/index.tsx
index 2339b1db288a..0a041ec8d388 100644
--- a/app/client/src/widgets/InputWidgetV2/widget/index.tsx
+++ b/app/client/src/widgets/InputWidgetV2/widget/index.tsx
@@ -1,10 +1,14 @@
-import React from "react";
-import type { WidgetProps, WidgetState } from "widgets/BaseWidget";
-import type { InputComponentProps } from "../component";
-import InputComponent from "../component";
+import type {
+  AnvilConfig,
+  AutocompletionDefinitions,
+} from "WidgetProvider/constants";
+import { ICON_NAMES } from "WidgetProvider/constants";
+import type { DerivedPropertiesMap } from "WidgetProvider/factory";
+import { LabelPosition } from "components/constants";
 import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
 import type { ValidationResponse } from "constants/WidgetValidation";
 import { ValidationTypes } from "constants/WidgetValidation";
+import { FILL_WIDGET_MIN_WIDTH } from "constants/minWidthConstants";
 import {
   createMessage,
   FIELD_REQUIRED_ERROR,
@@ -13,44 +17,40 @@ import {
   INPUT_DEFAULT_TEXT_MIN_NUM_ERROR,
   INPUT_TEXT_MAX_CHAR_ERROR,
 } from "ee/constants/messages";
-import type { DerivedPropertiesMap } from "WidgetProvider/factory";
-import { ICON_NAMES } from "WidgetProvider/constants";
-import { AutocompleteDataType } from "utils/autocomplete/AutocompleteDataType";
-import BaseInputWidget from "widgets/BaseInputWidget";
+import type { SetterConfig, Stylesheet } from "entities/AppTheming";
 import { isNil, isNumber, merge, toString } from "lodash";
-import derivedProperties from "./parsedDerivedProperties";
-import type { BaseInputWidgetProps } from "widgets/BaseInputWidget/widget";
+import React from "react";
+import { DynamicHeight } from "utils/WidgetFeatures";
+import { AutocompleteDataType } from "utils/autocomplete/AutocompleteDataType";
 import { mergeWidgetConfig } from "utils/helpers";
+import BaseInputWidget from "widgets/BaseInputWidget";
 import {
   InputTypes,
   NumberInputStepButtonPosition,
 } from "widgets/BaseInputWidget/constants";
-import type { SetterConfig, Stylesheet } from "entities/AppTheming";
-import { getParsedText, isInputTypeEmailOrPassword } from "./Utilities";
+import { checkInputTypeTextByProps } from "widgets/BaseInputWidget/utils";
+import type { BaseInputWidgetProps } from "widgets/BaseInputWidget/widget";
+import type { WidgetProps, WidgetState } from "widgets/BaseWidget";
 import {
-  isAutoHeightEnabledForWidget,
   DefaultAutocompleteDefinitions,
+  isAutoHeightEnabledForWidget,
   isCompactMode,
 } from "widgets/WidgetUtils";
-import { checkInputTypeTextByProps } from "widgets/BaseInputWidget/utils";
-import type {
-  AnvilConfig,
-  AutocompletionDefinitions,
-} from "WidgetProvider/constants";
-import { LabelPosition } from "components/constants";
-import { FILL_WIDGET_MIN_WIDTH } from "constants/minWidthConstants";
-import { DynamicHeight } from "utils/WidgetFeatures";
+import type { InputComponentProps } from "../component";
+import InputComponent from "../component";
+import { getParsedText, isInputTypeEmailOrPassword } from "./Utilities";
+import derivedProperties from "./parsedDerivedProperties";
 
 import IconSVG from "../icon.svg";
 import ThumbnailSVG from "../thumbnail.svg";
 
 import type {
-  SnipingModeProperty,
   PropertyUpdates,
+  SnipingModeProperty,
 } from "WidgetProvider/constants";
 import { WIDGET_TAGS } from "constants/WidgetConstants";
-import { ResponsiveBehavior } from "layoutSystems/common/utils/constants";
 import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
+import { ResponsiveBehavior } from "layoutSystems/common/utils/constants";
 
 export function defaultValueValidation(
   // TODO: Fix this the next time the file is edited
@@ -300,6 +300,13 @@ function InputTypeUpdateHook(
 }
 
 class InputWidget extends BaseInputWidget<InputWidgetProps, WidgetState> {
+  constructor(props: InputWidgetProps) {
+    super(props);
+    this.state = {
+      isFocused: false,
+    };
+  }
+
   static type = "INPUT_WIDGET_V2";
 
   static getConfig() {
@@ -641,7 +648,9 @@ class InputWidget extends BaseInputWidget<InputWidgetProps, WidgetState> {
   // TODO: Fix this the next time the file is edited
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   static getMetaPropertiesMap(): Record<string, any> {
-    return merge(super.getMetaPropertiesMap(), {
+    const baseMetaProperties = BaseInputWidget.getMetaPropertiesMap();
+
+    return merge(baseMetaProperties, {
       inputText: "",
       text: "",
     });
@@ -663,8 +672,10 @@ class InputWidget extends BaseInputWidget<InputWidgetProps, WidgetState> {
   }
 
   handleFocusChange = (focusState: boolean) => {
+    this.setState({ isFocused: focusState });
+
     if (focusState) {
-      this.props.updateWidgetMetaProperty("isFocused", focusState, {
+      this.executeAction({
         triggerPropertyName: "onFocus",
         dynamicString: this.props.onFocus,
         event: {
@@ -674,7 +685,7 @@ class InputWidget extends BaseInputWidget<InputWidgetProps, WidgetState> {
     }
 
     if (!focusState) {
-      this.props.updateWidgetMetaProperty("isFocused", focusState, {
+      this.executeAction({
         triggerPropertyName: "onBlur",
         dynamicString: this.props.onBlur,
         event: {
@@ -898,7 +909,7 @@ class InputWidget extends BaseInputWidget<InputWidgetProps, WidgetState> {
         onValueChange={this.onValueChange}
         placeholder={this.props.placeholderText}
         rtl={this.props.rtl}
-        showError={!!this.props.isFocused}
+        showError={!!this.state.isFocused}
         spellCheck={!!this.props.isSpellCheck}
         stepSize={1}
         tooltip={this.props.tooltip}
diff --git a/app/client/src/widgets/JSONFormWidget/component/Form.test.tsx b/app/client/src/widgets/JSONFormWidget/component/Form.test.tsx
new file mode 100644
index 000000000000..40ece445aa06
--- /dev/null
+++ b/app/client/src/widgets/JSONFormWidget/component/Form.test.tsx
@@ -0,0 +1,198 @@
+import "@testing-library/jest-dom";
+import { fireEvent, render, screen } from "@testing-library/react";
+import { klona } from "klona";
+import React from "react";
+import { useForm } from "react-hook-form";
+import { ROOT_SCHEMA_KEY, type SchemaItem } from "../constants";
+import Form from "./Form";
+import useFixedFooter from "./useFixedFooter";
+
+jest.mock("react-hook-form", () => ({
+  __esModule: true,
+  useForm: jest.fn(),
+  FormProvider: jest.fn(({ children }) => <div>{children}</div>),
+}));
+
+jest.mock("./useFixedFooter", () => ({
+  __esModule: true,
+  default: jest.fn(),
+}));
+
+jest.mock("widgets/ButtonWidget/component", () => ({
+  __esModule: true,
+  BaseButton: jest.fn(({ children, ...props }) => (
+    <button {...props}>{children}</button>
+  )),
+}));
+
+function mockUseForm(withErrors = false) {
+  (useForm as jest.Mock).mockReturnValue({
+    formState: {
+      errors: withErrors
+        ? {
+            fieldName: {
+              type: "required",
+              message: "This field is required",
+            },
+          }
+        : null,
+    },
+    reset: jest.fn(),
+    trigger: jest.fn(),
+    watch: jest.fn(() => ({
+      subscribe: jest.fn(),
+      unsubscribe: jest.fn(),
+    })),
+  });
+}
+
+const TEST_IDS = {
+  SUBMIT_BTN: "t--jsonform-submit-btn",
+  RESET_BTN: "t--jsonform-reset-btn",
+};
+
+const defaultProps = {
+  backgroundColor: "#fff",
+  disabledWhenInvalid: false,
+  fixedFooter: false,
+  getFormData: jest.fn(),
+  hideFooter: false,
+  isSubmitting: false,
+  isWidgetMounting: false,
+  onFormValidityUpdate: jest.fn(),
+  onSubmit: jest.fn(),
+  onreset: jest.fn(),
+  registerResetObserver: jest.fn(),
+  resetButtonLabel: "Reset",
+  resetButtonStyles: {},
+  scrollContents: false,
+  showReset: true,
+  stretchBodyVertically: false,
+  submitButtonLabel: "Submit",
+  submitButtonStyles: {},
+  title: "Test Form",
+  unregisterResetObserver: jest.fn(),
+  updateFormData: jest.fn(),
+  children: <input />,
+};
+
+describe("Form Component", () => {
+  beforeEach(() => {
+    const mockBodyRef = React.createRef<HTMLFormElement>();
+    const mockFooterRef = React.createRef<HTMLDivElement>();
+
+    (useFixedFooter as jest.Mock).mockReturnValue({
+      bodyRef: mockBodyRef,
+      footerRef: mockFooterRef,
+    });
+  });
+
+  describe("happy render path", () => {
+    beforeEach(() => mockUseForm());
+    it("renders the form title", () => {
+      render(<Form {...defaultProps}>Form Content</Form>);
+      expect(screen.getByText("Test Form")).toBeInTheDocument();
+    });
+
+    it("renders children inside the form body", () => {
+      render(<Form {...defaultProps}>Form Content</Form>);
+      expect(screen.getByText("Form Content")).toBeInTheDocument();
+    });
+
+    it("renders the submit button with correct label", () => {
+      const { getByTestId } = render(
+        <Form {...defaultProps}>Form Content</Form>,
+      );
+      const submitBtn = getByTestId(TEST_IDS.SUBMIT_BTN);
+
+      expect(submitBtn).toBeInTheDocument();
+      expect(submitBtn).toHaveAttribute("text", defaultProps.submitButtonLabel);
+
+      fireEvent.click(submitBtn);
+      expect(defaultProps.onSubmit).toHaveBeenCalled();
+    });
+
+    it("renders the reset button with correct label when showReset is true", () => {
+      const { getByTestId } = render(
+        <Form {...defaultProps}>Form Content</Form>,
+      );
+      const resetBtn = getByTestId(TEST_IDS.RESET_BTN);
+
+      expect(resetBtn).toBeInTheDocument();
+      expect(resetBtn).toHaveAttribute("text", defaultProps.resetButtonLabel);
+      expect(defaultProps.registerResetObserver).toHaveBeenCalled();
+    });
+
+    // Form updates data correctly when input values change
+    it("should update data when input values change", () => {
+      const mockUpdateFormData = jest.fn();
+      const mockGetFormData = jest.fn().mockReturnValue({});
+      const mockRegisterResetObserver = jest.fn();
+      const mockUnregisterResetObserver = jest.fn();
+      const mockOnSubmit = jest.fn();
+      const mockOnFormValidityUpdate = jest.fn();
+      const mockSchema = { [ROOT_SCHEMA_KEY]: {} as SchemaItem };
+      const props = klona({
+        ...defaultProps,
+        updateFormData: mockUpdateFormData,
+        getFormData: mockGetFormData,
+        registerResetObserver: mockRegisterResetObserver,
+        unregisterResetObserver: mockUnregisterResetObserver,
+        onSubmit: mockOnSubmit,
+        onFormValidityUpdate: mockOnFormValidityUpdate,
+        schema: mockSchema,
+      });
+      const { getByTestId } = render(<Form {...props} />);
+
+      fireEvent.click(getByTestId(TEST_IDS.SUBMIT_BTN));
+      expect(mockUpdateFormData).toHaveBeenCalled();
+    });
+  });
+
+  describe("unhappy render path", () => {
+    it("does not render the reset button when showReset is false", () => {
+      mockUseForm();
+      const { queryByTestId } = render(
+        <Form {...defaultProps} showReset={false}>
+          Form Content
+        </Form>,
+      );
+
+      expect(queryByTestId(TEST_IDS.RESET_BTN)).not.toBeInTheDocument();
+    });
+
+    it("disables the submit button when disabledWhenInvalid is true and form is invalid", () => {
+      mockUseForm(true);
+      const { getByTestId } = render(
+        <Form {...defaultProps} disabledWhenInvalid>
+          Form Content
+        </Form>,
+      );
+
+      expect(getByTestId(TEST_IDS.SUBMIT_BTN)).toBeDisabled();
+    });
+
+    it("triggers a check, necessitating a re-render, when the children in form are updated", () => {
+      mockUseForm(true);
+      const propsToUpdate = klona({
+        ...defaultProps,
+        disabledWhenInvalid: true,
+      });
+      const { getByTestId } = render(
+        <Form {...propsToUpdate}>Form Content</Form>,
+      );
+
+      expect(getByTestId(TEST_IDS.SUBMIT_BTN)).toBeDisabled();
+    });
+
+    it("should handle empty schema gracefully without errors", () => {
+      mockUseForm();
+      const mockUpdateFormData = jest.fn();
+      const props = klona({ ...defaultProps, schema: undefined });
+      const { container } = render(<Form {...props} />);
+
+      expect(container).toBeInTheDocument();
+      expect(mockUpdateFormData).not.toHaveBeenCalled();
+    });
+  });
+});
diff --git a/app/client/src/widgets/JSONFormWidget/component/Form.tsx b/app/client/src/widgets/JSONFormWidget/component/Form.tsx
index 5bd9b57cd022..353a0f528d77 100644
--- a/app/client/src/widgets/JSONFormWidget/component/Form.tsx
+++ b/app/client/src/widgets/JSONFormWidget/component/Form.tsx
@@ -299,6 +299,7 @@ function Form<TValues = any>(
                 <Button
                   {...resetButtonStyles}
                   className="t--jsonform-reset-btn"
+                  data-testid="t--jsonform-reset-btn"
                   onClick={(e) => onReset(schema, e)}
                   text={resetButtonLabel}
                   type="reset"
@@ -308,6 +309,7 @@ function Form<TValues = any>(
             <Button
               {...submitButtonStyles}
               className="t--jsonform-submit-btn"
+              data-testid="t--jsonform-submit-btn"
               disabled={disabledWhenInvalid && isFormInValid}
               loading={isSubmitting}
               onClick={onSubmit}
diff --git a/app/client/src/widgets/JSONFormWidget/fields/BaseInputField.tsx b/app/client/src/widgets/JSONFormWidget/fields/BaseInputField.tsx
index 2e6782142f1d..da2dc7e1c929 100644
--- a/app/client/src/widgets/JSONFormWidget/fields/BaseInputField.tsx
+++ b/app/client/src/widgets/JSONFormWidget/fields/BaseInputField.tsx
@@ -37,6 +37,7 @@ import {
 import type { InputHTMLType } from "widgets/BaseInputWidget/component";
 import BaseInputComponent from "widgets/BaseInputWidget/component";
 import { BASE_LABEL_TEXT_SIZE } from "../component/FieldLabel";
+import useUnmountFieldValidation from "./useUnmountFieldValidation";
 
 export type BaseInputComponentProps = FieldComponentBaseProps &
   FieldEventProps & {
@@ -240,6 +241,7 @@ function BaseInputField<TSchemaItem extends SchemaItem>({
     fieldType: schemaItem.fieldType,
     isValid: isValueValid,
   });
+  useUnmountFieldValidation({ fieldName: name });
 
   const { inputRef } = useEvents<HTMLInputElement | HTMLTextAreaElement>({
     fieldBlurHandler: onBlur,
diff --git a/app/client/src/widgets/JSONFormWidget/fields/CheckboxField.tsx b/app/client/src/widgets/JSONFormWidget/fields/CheckboxField.tsx
index 0dd0564744b7..81b14d8f7716 100644
--- a/app/client/src/widgets/JSONFormWidget/fields/CheckboxField.tsx
+++ b/app/client/src/widgets/JSONFormWidget/fields/CheckboxField.tsx
@@ -18,6 +18,7 @@ import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
 import { Colors } from "constants/Colors";
 import { BASE_LABEL_TEXT_SIZE } from "../component/FieldLabel";
 import { LabelPosition } from "components/constants";
+import useUnmountFieldValidation from "./useUnmountFieldValidation";
 
 type CheckboxComponentProps = FieldComponentBaseProps &
   FieldEventProps & {
@@ -82,6 +83,7 @@ function CheckboxField({
     fieldType: schemaItem.fieldType,
     isValid: isValueValid,
   });
+  useUnmountFieldValidation({ fieldName: name });
 
   const onCheckChange = useCallback(
     (isChecked: boolean) => {
diff --git a/app/client/src/widgets/JSONFormWidget/fields/DateField.tsx b/app/client/src/widgets/JSONFormWidget/fields/DateField.tsx
index ff39fba394cc..7009e09c9873 100644
--- a/app/client/src/widgets/JSONFormWidget/fields/DateField.tsx
+++ b/app/client/src/widgets/JSONFormWidget/fields/DateField.tsx
@@ -20,6 +20,7 @@ import { ISO_DATE_FORMAT } from "constants/WidgetValidation";
 import { TimePrecision } from "widgets/DatePickerWidget2/constants";
 import { Colors } from "constants/Colors";
 import { BASE_LABEL_TEXT_SIZE } from "../component/FieldLabel";
+import useUnmountFieldValidation from "./useUnmountFieldValidation";
 
 type DateComponentProps = FieldComponentBaseProps &
   FieldEventProps & {
@@ -133,6 +134,7 @@ function DateField({
     fieldName: name,
     fieldType,
   });
+  useUnmountFieldValidation({ fieldName: name });
 
   const onDateSelected = useCallback(
     (selectedValue: string) => {
diff --git a/app/client/src/widgets/JSONFormWidget/fields/FieldRenderer.tsx b/app/client/src/widgets/JSONFormWidget/fields/FieldRenderer.tsx
index a2c17e3cda77..80bdd0f52998 100644
--- a/app/client/src/widgets/JSONFormWidget/fields/FieldRenderer.tsx
+++ b/app/client/src/widgets/JSONFormWidget/fields/FieldRenderer.tsx
@@ -5,6 +5,7 @@ import { useFormContext } from "react-hook-form";
 import FormContext from "../FormContext";
 import type { SchemaItem } from "../constants";
 import { FIELD_MAP } from "../constants";
+import useUnmountFieldValidation from "./useUnmountFieldValidation";
 
 interface FieldRendererProps {
   fieldName: ControllerRenderProps["name"];
@@ -30,6 +31,7 @@ function FieldRenderer({
 
   const FieldComponent = FIELD_MAP[fieldType];
 
+  useUnmountFieldValidation({ fieldName });
   useEffect(() => {
     /**
      * When a component is hidden, the field is removed from the form and the component unmounts.
diff --git a/app/client/src/widgets/JSONFormWidget/fields/MultiSelectField.tsx b/app/client/src/widgets/JSONFormWidget/fields/MultiSelectField.tsx
index ff9f0710f247..154b81685633 100644
--- a/app/client/src/widgets/JSONFormWidget/fields/MultiSelectField.tsx
+++ b/app/client/src/widgets/JSONFormWidget/fields/MultiSelectField.tsx
@@ -22,6 +22,7 @@ import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
 import { isPrimitive, validateOptions } from "../helper";
 import { Colors } from "constants/Colors";
 import { BASE_LABEL_TEXT_SIZE } from "../component/FieldLabel";
+import useUnmountFieldValidation from "./useUnmountFieldValidation";
 
 type MultiSelectComponentProps = FieldComponentBaseProps &
   FieldEventProps & {
@@ -129,6 +130,7 @@ function MultiSelectField({
     fieldName: name,
     fieldType,
   });
+  useUnmountFieldValidation({ fieldName: name });
 
   const [updateFilterText] = useUpdateInternalMetaState({
     propertyName: `${name}.filterText`,
diff --git a/app/client/src/widgets/JSONFormWidget/fields/RadioGroupField.tsx b/app/client/src/widgets/JSONFormWidget/fields/RadioGroupField.tsx
index 02460b5db86e..d5a1837dd306 100644
--- a/app/client/src/widgets/JSONFormWidget/fields/RadioGroupField.tsx
+++ b/app/client/src/widgets/JSONFormWidget/fields/RadioGroupField.tsx
@@ -16,6 +16,7 @@ import { ActionUpdateDependency } from "../constants";
 import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
 import { Colors } from "constants/Colors";
 import { BASE_LABEL_TEXT_SIZE } from "../component/FieldLabel";
+import useUnmountFieldValidation from "./useUnmountFieldValidation";
 
 type RadioGroupComponentProps = FieldComponentBaseProps & {
   options: RadioOption[];
@@ -66,6 +67,7 @@ function RadioGroupField({
     fieldName: name,
     fieldType: schemaItem.fieldType,
   });
+  useUnmountFieldValidation({ fieldName: name });
 
   const onSelectionChange = useCallback(
     (selectedValue: string) => {
diff --git a/app/client/src/widgets/JSONFormWidget/fields/SelectField.test.tsx b/app/client/src/widgets/JSONFormWidget/fields/SelectField.test.tsx
index 7f87b5030de3..6d49c89022e3 100644
--- a/app/client/src/widgets/JSONFormWidget/fields/SelectField.test.tsx
+++ b/app/client/src/widgets/JSONFormWidget/fields/SelectField.test.tsx
@@ -1,5 +1,11 @@
+import { act, render } from "@testing-library/react";
+import { RenderModes } from "constants/WidgetConstants";
+import React from "react";
+import { FormProvider, useForm } from "react-hook-form";
+import { DataType, FieldType, type Schema } from "../constants";
+import FormContext from "../FormContext";
 import type { SelectFieldProps } from "./SelectField";
-import { isValid } from "./SelectField";
+import SelectField, { isValid } from "./SelectField";
 
 describe(".isValid", () => {
   it("returns true when isRequired is false", () => {
@@ -70,3 +76,219 @@ describe(".isValid", () => {
     });
   });
 });
+
+describe("ResizeObserver", () => {
+  const MockFormWrapper = ({ children }: { children: React.ReactNode }) => {
+    const methods = useForm();
+
+    return (
+      <FormProvider {...methods}>
+        <FormContext.Provider
+          value={{
+            executeAction: jest.fn(),
+            renderMode: RenderModes.CANVAS,
+            setMetaInternalFieldState: jest.fn(),
+            updateWidgetMetaProperty: jest.fn(),
+            updateWidgetProperty: jest.fn(),
+            updateFormData: jest.fn(),
+          }}
+        >
+          {children}
+        </FormContext.Provider>
+      </FormProvider>
+    );
+  };
+  const defaultProps: SelectFieldProps = {
+    name: "testSelect",
+    fieldClassName: "test-select",
+    propertyPath: "testSelect",
+    schemaItem: {
+      fieldType: FieldType.SELECT,
+      isRequired: false,
+      isVisible: true,
+      isDisabled: false,
+      accessor: "testSelect",
+      identifier: "testSelect",
+      originalIdentifier: "testSelect",
+      position: 0,
+      label: "Test Select",
+      options: [
+        { label: "Option 1", value: "1" },
+        { label: "Option 2", value: "2" },
+      ],
+      children: {} as Schema, // Assuming an empty Schema object or placeholder
+      dataType: DataType.STRING,
+      isCustomField: false,
+      sourceData: null, // Assuming sourceData as null or other default
+      isFilterable: false,
+      filterText: "",
+      serverSideFiltering: false,
+    },
+  };
+  let resizeObserver: ResizeObserverMock;
+
+  beforeAll(() => {
+    (
+      global as unknown as { ResizeObserver: typeof ResizeObserverMock }
+    ).ResizeObserver = ResizeObserverMock;
+  });
+
+  afterAll(() => {
+    delete (global as unknown as { ResizeObserver?: typeof ResizeObserverMock })
+      .ResizeObserver;
+  });
+
+  beforeEach(() => {
+    // Capture the ResizeObserver instance
+    resizeObserver = null!;
+    (
+      global as unknown as { ResizeObserver: typeof ResizeObserverMock }
+    ).ResizeObserver = class extends ResizeObserverMock {
+      constructor(callback: ResizeObserverCallback) {
+        super(callback);
+        resizeObserver = this as ResizeObserverMock;
+      }
+    };
+  });
+
+  it("should setup ResizeObserver on mount", () => {
+    const mockObserver = jest.fn();
+
+    window.ResizeObserver = jest.fn().mockImplementation(() => ({
+      observe: mockObserver,
+      disconnect: jest.fn(),
+      unobserve: jest.fn(),
+    }));
+    render(
+      <MockFormWrapper>
+        <SelectField {...defaultProps} />
+      </MockFormWrapper>,
+    );
+
+    expect(mockObserver).toHaveBeenCalled();
+  });
+
+  it("should cleanup ResizeObserver on unmount", () => {
+    const { unmount } = render(
+      <MockFormWrapper>
+        <SelectField {...defaultProps} />
+      </MockFormWrapper>,
+    );
+
+    const disconnectSpy = jest.spyOn(resizeObserver, "disconnect");
+
+    // Unmount component
+    unmount();
+
+    // Verify cleanup
+    expect(disconnectSpy).toHaveBeenCalled();
+  });
+
+  it("initializes with correct width", () => {
+    // Mock offsetWidth
+    const mockOffsetWidth = 200;
+
+    jest
+      .spyOn(HTMLElement.prototype, "offsetWidth", "get")
+      .mockImplementation(() => mockOffsetWidth);
+
+    const { getByTestId } = render(
+      <MockFormWrapper>
+        <SelectField {...defaultProps} />
+      </MockFormWrapper>,
+    );
+    const content = getByTestId("select-container");
+
+    expect(content.offsetWidth).toBe(mockOffsetWidth);
+  });
+
+  it("updates width when select component is resized", async () => {
+    const widths = [200, 300, 400, 250];
+
+    jest
+      .spyOn(HTMLElement.prototype, "offsetWidth", "get")
+      .mockImplementation(() => widths[0]);
+
+    const { getByTestId } = render(
+      <MockFormWrapper>
+        <SelectField {...defaultProps} />
+      </MockFormWrapper>,
+    );
+    let triggerElement = getByTestId("select-container");
+
+    widths.forEach((width, index) => {
+      let newWidth = widths[index + 1];
+
+      if (index === widths.length - 1) {
+        newWidth = widths[0];
+      }
+
+      // Verify initial width
+      expect(triggerElement.offsetWidth).toBe(width);
+
+      // Update mock width
+      jest
+        .spyOn(HTMLElement.prototype, "offsetWidth", "get")
+        .mockImplementation(() => newWidth);
+
+      // Trigger resize
+      act(() => {
+        resizeObserver.triggerResize(triggerElement, newWidth);
+      });
+
+      // Verify updated width
+      triggerElement = getByTestId("select-container");
+
+      expect(triggerElement.offsetWidth).toBe(newWidth);
+    });
+  });
+});
+
+type ResizeObserverCallback = (entries: ResizeObserverEntry[]) => void;
+
+class ResizeObserverMock implements ResizeObserver {
+  private callback: ResizeObserverCallback;
+  private elements: Set<Element>;
+
+  constructor(callback: ResizeObserverCallback) {
+    this.callback = callback;
+    this.elements = new Set();
+  }
+
+  observe(element: Element): void {
+    this.elements.add(element);
+  }
+
+  unobserve(element: Element): void {
+    this.elements.delete(element);
+  }
+
+  disconnect(): void {
+    this.elements.clear();
+  }
+
+  // Utility method to trigger resize
+  triggerResize(element: Element, width: number): void {
+    if (this.elements.has(element)) {
+      this.callback([
+        {
+          target: element,
+          contentRect: {
+            width,
+            bottom: 0,
+            height: 0,
+            left: 0,
+            right: 0,
+            top: 0,
+            x: 0,
+            y: 0,
+            toJSON: jest.fn(),
+          },
+          borderBoxSize: [{ inlineSize: width, blockSize: 0 }],
+          contentBoxSize: [{ inlineSize: width, blockSize: 0 }],
+          devicePixelContentBoxSize: [{ inlineSize: width, blockSize: 0 }],
+        } as ResizeObserverEntry,
+      ]);
+    }
+  }
+}
diff --git a/app/client/src/widgets/JSONFormWidget/fields/SelectField.tsx b/app/client/src/widgets/JSONFormWidget/fields/SelectField.tsx
index 742386b60095..d2ac95ea5c90 100644
--- a/app/client/src/widgets/JSONFormWidget/fields/SelectField.tsx
+++ b/app/client/src/widgets/JSONFormWidget/fields/SelectField.tsx
@@ -1,4 +1,11 @@
-import React, { useCallback, useContext, useMemo, useRef } from "react";
+import React, {
+  useCallback,
+  useContext,
+  useMemo,
+  useRef,
+  useEffect,
+  useState,
+} from "react";
 import styled from "styled-components";
 import { useController } from "react-hook-form";
 
@@ -18,6 +25,7 @@ import { isPrimitive } from "../helper";
 import { isNil } from "lodash";
 import { Colors } from "constants/Colors";
 import { BASE_LABEL_TEXT_SIZE } from "../component/FieldLabel";
+import useUnmountFieldValidation from "./useUnmountFieldValidation";
 
 interface MetaProps {
   filterText?: string;
@@ -100,12 +108,37 @@ function SelectField({
     schemaItem.defaultValue,
     passedDefaultValue as DefaultValue,
   );
+  const [dropDownWidth, setDropDownWidth] = useState(10);
 
   useRegisterFieldValidity({
     isValid: isValueValid,
     fieldName: name,
     fieldType: schemaItem.fieldType,
   });
+  useUnmountFieldValidation({ fieldName: name });
+  useEffect(() => {
+    const updateWidth = () => {
+      if (wrapperRef.current) {
+        setDropDownWidth(wrapperRef.current.offsetWidth);
+      }
+    };
+
+    // Initial width
+    updateWidth();
+
+    // Create ResizeObserver instance
+    const resizeObserver = new ResizeObserver(updateWidth);
+
+    // Start observing the trigger element
+    if (wrapperRef.current) {
+      resizeObserver.observe(wrapperRef.current);
+    }
+
+    // Cleanup
+    return () => {
+      resizeObserver.disconnect();
+    };
+  }, [wrapperRef]);
 
   const [updateFilterText] = useUpdateInternalMetaState({
     propertyName: `${name}.filterText`,
@@ -156,7 +189,6 @@ function SelectField({
     [onChange, schemaItem.onOptionChange, executeAction],
   );
 
-  const dropdownWidth = wrapperRef.current?.clientWidth;
   const fieldComponent = useMemo(
     () => (
       <StyledSelectWrapper ref={wrapperRef}>
@@ -166,7 +198,7 @@ function SelectField({
           boxShadow={schemaItem.boxShadow}
           compactMode={false}
           disabled={schemaItem.isDisabled}
-          dropDownWidth={dropdownWidth || 100}
+          dropDownWidth={dropDownWidth || 100}
           hasError={isDirtyRef.current ? !isValueValid : false}
           height={10}
           isFilterable={schemaItem.isFilterable}
@@ -201,7 +233,7 @@ function SelectField({
       isValueValid,
       onOptionSelected,
       selectedIndex,
-      dropdownWidth,
+      dropDownWidth,
       fieldClassName,
     ],
   );
diff --git a/app/client/src/widgets/JSONFormWidget/fields/SwitchField.tsx b/app/client/src/widgets/JSONFormWidget/fields/SwitchField.tsx
index d15e345e3d37..a24364a9cee5 100644
--- a/app/client/src/widgets/JSONFormWidget/fields/SwitchField.tsx
+++ b/app/client/src/widgets/JSONFormWidget/fields/SwitchField.tsx
@@ -17,6 +17,7 @@ import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
 import { Colors } from "constants/Colors";
 import { BASE_LABEL_TEXT_SIZE } from "../component/FieldLabel";
 import { LabelPosition } from "components/constants";
+import useUnmountFieldValidation from "./useUnmountFieldValidation";
 
 type SwitchComponentOwnProps = FieldComponentBaseProps &
   FieldEventProps & {
@@ -70,6 +71,7 @@ function SwitchField({
     fieldType: schemaItem.fieldType,
     isValid: isValueValid,
   });
+  useUnmountFieldValidation({ fieldName: name });
 
   const onSwitchChange = useCallback(
     (value: boolean) => {
diff --git a/app/client/src/widgets/JSONFormWidget/fields/useUnmountFieldValidation.test.tsx b/app/client/src/widgets/JSONFormWidget/fields/useUnmountFieldValidation.test.tsx
new file mode 100644
index 000000000000..8a6af4f3b915
--- /dev/null
+++ b/app/client/src/widgets/JSONFormWidget/fields/useUnmountFieldValidation.test.tsx
@@ -0,0 +1,65 @@
+import { renderHook } from "@testing-library/react-hooks";
+import { useFormContext } from "react-hook-form";
+import useUnmountFieldValidation from "./useUnmountFieldValidation";
+import { startAndEndSpanForFn } from "UITelemetry/generateTraces";
+
+// Mock dependencies
+jest.mock("react-hook-form", () => ({
+  useFormContext: jest.fn(),
+}));
+
+jest.mock("UITelemetry/generateTraces", () => ({
+  startAndEndSpanForFn: jest.fn((name, options, fn) => fn()),
+}));
+
+describe("useUnmountFieldValidation", () => {
+  const mockTrigger = jest.fn();
+
+  beforeEach(() => {
+    (useFormContext as jest.Mock).mockReturnValue({
+      trigger: mockTrigger,
+    });
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it("should trigger validation on unmount", () => {
+    const fieldName = "testField";
+    const { unmount } = renderHook(() =>
+      useUnmountFieldValidation({ fieldName }),
+    );
+
+    // Verify trigger hasn't been called yet
+    expect(mockTrigger).not.toHaveBeenCalled();
+    expect(startAndEndSpanForFn).not.toHaveBeenCalled();
+
+    // Unmount the hook
+    unmount();
+
+    // Verify trigger was called with correct field name
+    expect(startAndEndSpanForFn).toHaveBeenCalledWith(
+      "JSONFormWidget.triggerFieldValidation",
+      {},
+      expect.any(Function),
+    );
+    expect(mockTrigger).toHaveBeenCalledWith(fieldName);
+  });
+
+  it("should update cleanup when fieldName changes", () => {
+    const { rerender, unmount } = renderHook(
+      ({ fieldName }) => useUnmountFieldValidation({ fieldName }),
+      {
+        initialProps: { fieldName: "field1" },
+      },
+    );
+
+    // Change the field name
+    rerender({ fieldName: "field2" });
+    unmount();
+
+    // Should trigger validation for the latest field name
+    expect(mockTrigger).toHaveBeenCalledWith("field2");
+  });
+});
diff --git a/app/client/src/widgets/JSONFormWidget/fields/useUnmountFieldValidation.ts b/app/client/src/widgets/JSONFormWidget/fields/useUnmountFieldValidation.ts
new file mode 100644
index 000000000000..13c449ca292c
--- /dev/null
+++ b/app/client/src/widgets/JSONFormWidget/fields/useUnmountFieldValidation.ts
@@ -0,0 +1,29 @@
+import { useEffect } from "react";
+import { useFormContext } from "react-hook-form";
+import type { ControllerProps } from "react-hook-form";
+import { startAndEndSpanForFn } from "UITelemetry/generateTraces";
+
+export interface UseUnmountFieldValidationProps {
+  fieldName: ControllerProps["name"];
+}
+
+/**
+ * This hook triggers validation for a field when it unmounts
+ * Useful for validating fields that become hidden/removed
+ * https://github.com/appsmithorg/appsmith/issues/28018
+ */
+function useUnmountFieldValidation({
+  fieldName,
+}: UseUnmountFieldValidationProps) {
+  const { trigger } = useFormContext();
+
+  useEffect(() => {
+    return () => {
+      startAndEndSpanForFn("JSONFormWidget.triggerFieldValidation", {}, () => {
+        trigger(fieldName);
+      });
+    };
+  }, [fieldName, trigger]);
+}
+
+export default useUnmountFieldValidation;
diff --git a/app/client/src/widgets/JSONFormWidget/schemaParser.ts b/app/client/src/widgets/JSONFormWidget/schemaParser.ts
index d21943a9de37..42c4724f9ec1 100644
--- a/app/client/src/widgets/JSONFormWidget/schemaParser.ts
+++ b/app/client/src/widgets/JSONFormWidget/schemaParser.ts
@@ -226,9 +226,7 @@ export const normalizeArrayValue = (data: any[]) => {
   return data[0];
 };
 
-// TODO: Fix this the next time the file is edited
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const fieldTypeFor = (value: any): FieldType => {
+export const fieldTypeFor = (value: unknown): FieldType => {
   const dataType = dataTypeFor(value);
   const potentialFieldType = DATA_TYPE_POTENTIAL_FIELD[dataType];
   const subDataType = subDataTypeFor(value);
diff --git a/app/client/src/widgets/JSONFormWidget/widget/propertyConfig/properties/select.test.ts b/app/client/src/widgets/JSONFormWidget/widget/propertyConfig/properties/select.test.ts
index 05a4dd0983e5..56aaa2967a93 100644
--- a/app/client/src/widgets/JSONFormWidget/widget/propertyConfig/properties/select.test.ts
+++ b/app/client/src/widgets/JSONFormWidget/widget/propertyConfig/properties/select.test.ts
@@ -4,98 +4,120 @@ import type { JSONFormWidgetProps } from "../..";
 import { defaultOptionValueValidation } from "./select";
 
 describe(".defaultOptionValueValidation", () => {
-  it("return undefined when input is undefined", () => {
-    const input = undefined;
-    const expectedOutput = {
-      isValid: true,
-      parsed: undefined,
-      messages: [{ name: "", message: "" }],
-    };
-
-    const response = defaultOptionValueValidation(
-      input,
-      {} as JSONFormWidgetProps,
-      _,
-    );
-
-    expect(response).toEqual(expectedOutput);
-  });
+  describe("handling falsey values", () => {
+    it("return undefined when input is undefined", () => {
+      const input = undefined;
+      const expectedOutput = {
+        isValid: true,
+        parsed: undefined,
+        messages: [{ name: "", message: "" }],
+      };
 
-  it("return null when input is null", () => {
-    const input = null;
-    const expectedOutput = {
-      isValid: true,
-      parsed: null,
-      messages: [{ name: "", message: "" }],
-    };
-
-    const response = defaultOptionValueValidation(
-      input,
-      {} as JSONFormWidgetProps,
-      _,
-    );
-
-    expect(response).toEqual(expectedOutput);
-  });
+      const response = defaultOptionValueValidation(
+        input,
+        {} as JSONFormWidgetProps,
+        _,
+      );
 
-  it("return empty string with empty string", () => {
-    const input = "";
-    const expectedOutput = {
-      isValid: true,
-      parsed: "",
-      messages: [{ name: "", message: "" }],
-    };
-
-    const response = defaultOptionValueValidation(
-      input,
-      {} as JSONFormWidgetProps,
-      _,
-    );
-
-    expect(response).toEqual(expectedOutput);
-  });
+      expect(response).toEqual(expectedOutput);
+    });
+
+    it("return null when input is null", () => {
+      const input = null;
+      const expectedOutput = {
+        isValid: true,
+        parsed: null,
+        messages: [{ name: "", message: "" }],
+      };
+
+      const response = defaultOptionValueValidation(
+        input,
+        {} as JSONFormWidgetProps,
+        _,
+      );
+
+      expect(response).toEqual(expectedOutput);
+    });
+
+    it("return empty string with empty string", () => {
+      const input = "";
+      const expectedOutput = {
+        isValid: true,
+        parsed: "",
+        messages: [{ name: "", message: "" }],
+      };
+
+      const response = defaultOptionValueValidation(
+        input,
+        {} as JSONFormWidgetProps,
+        _,
+      );
 
-  it("return value with string", () => {
-    const input = "green";
-    const expectedOutput = {
-      isValid: true,
-      parsed: "green",
-      messages: [{ name: "", message: "" }],
-    };
-
-    const response = defaultOptionValueValidation(
-      input,
-      {} as JSONFormWidgetProps,
-      _,
-    );
-
-    expect(response).toEqual(expectedOutput);
+      expect(response).toEqual(expectedOutput);
+    });
   });
 
-  it("return value with stringified json", () => {
-    const input = `
+  describe("handling truthy values", () => {
+    it("return value with string", () => {
+      const input = "green";
+      const expectedOutput = {
+        isValid: true,
+        parsed: "green",
+        messages: [{ name: "", message: "" }],
+      };
+
+      const response = defaultOptionValueValidation(
+        input,
+        {} as JSONFormWidgetProps,
+        _,
+      );
+
+      expect(response).toEqual(expectedOutput);
+    });
+
+    it("return value with stringified json", () => {
+      const input = `
       {
         "label": "green",
         "value": "green"
       }
     `;
 
-    const expectedOutput = {
-      isValid: true,
-      parsed: {
-        label: "green",
-        value: "green",
-      },
-      messages: [{ name: "", message: "" }],
-    };
-
-    const response = defaultOptionValueValidation(
-      input,
-      {} as JSONFormWidgetProps,
-      _,
-    );
-
-    expect(response).toEqual(expectedOutput);
+      const expectedOutput = {
+        isValid: true,
+        parsed: {
+          label: "green",
+          value: "green",
+        },
+        messages: [{ name: "", message: "" }],
+      };
+
+      const response = defaultOptionValueValidation(
+        input,
+        {} as JSONFormWidgetProps,
+        _,
+      );
+
+      expect(response).toEqual(expectedOutput);
+    });
+
+    it("Edge Case: For very long numbers passed as string, don't parse it as number", () => {
+      const input =
+        "123456789012345678901234567890123456789012345678901234567890";
+      const expectedOutput = {
+        isValid: true,
+        parsed: "123456789012345678901234567890123456789012345678901234567890",
+        messages: [{ name: "", message: "" }],
+      };
+
+      const response = defaultOptionValueValidation(
+        input,
+        {} as JSONFormWidgetProps,
+        _,
+      );
+
+      expect(response).toEqual(expectedOutput);
+    });
   });
 
   it("should return isValid false with invalid values", () => {
diff --git a/app/client/src/widgets/JSONFormWidget/widget/propertyConfig/properties/select.ts b/app/client/src/widgets/JSONFormWidget/widget/propertyConfig/properties/select.ts
index 3da96ecd95d6..d1c7285c7afb 100644
--- a/app/client/src/widgets/JSONFormWidget/widget/propertyConfig/properties/select.ts
+++ b/app/client/src/widgets/JSONFormWidget/widget/propertyConfig/properties/select.ts
@@ -7,21 +7,13 @@ import type { ValidationResponse } from "constants/WidgetValidation";
 import { ValidationTypes } from "constants/WidgetValidation";
 import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
 import { AutocompleteDataType } from "utils/autocomplete/AutocompleteDataType";
+import type { LoDashStatic } from "lodash";
 
 export function defaultOptionValueValidation(
-  inputValue: unknown,
+  value: unknown,
   props: JSONFormWidgetProps,
-  // TODO: Fix this the next time the file is edited
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  _: any,
+  _: LoDashStatic,
 ): ValidationResponse {
-  const DEFAULT_ERROR_MESSAGE = {
-    name: "TypeError",
-    message:
-      'value should match: string | { "label": "label1", "value": "value1" }',
-  };
-  let value = inputValue;
-
   const hasLabelValueProperties = (
     // TODO: Fix this the next time the file is edited
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -38,21 +30,29 @@ export function defaultOptionValueValidation(
 
   // If input value is empty string then we can fairly assume that the input
   // was cleared out and can be treated as undefined.
-  if (inputValue === undefined || inputValue === null || inputValue === "") {
+  if (value === undefined || value === null || value === "") {
     return {
       isValid: true,
-      parsed: inputValue,
+      parsed: value,
       messages: [{ name: "", message: "" }],
     };
   }
 
-  if (typeof inputValue === "string") {
+  if (typeof value === "string") {
     try {
-      value = JSON.parse(inputValue);
+      const parsedValue = JSON.parse(value);
+
+      if (_.isObject(parsedValue)) {
+        value = parsedValue;
+      }
     } catch (e) {}
   }
 
-  if (_.isString(value) || _.isFinite(value)) {
+  if (
+    _.isString(value) ||
+    _.isFinite(value) ||
+    hasLabelValueProperties(value)
+  ) {
     // When value is "", "green", 444
     return {
       isValid: true,
@@ -61,19 +61,16 @@ export function defaultOptionValueValidation(
     };
   }
 
-  if (hasLabelValueProperties(value)) {
-    // When value is {label: "green", value: "green"}
-    return {
-      isValid: true,
-      parsed: value,
-      messages: [{ name: "", message: "" }],
-    };
-  }
-
   return {
     isValid: false,
     parsed: {},
-    messages: [DEFAULT_ERROR_MESSAGE],
+    messages: [
+      {
+        name: "TypeError",
+        message:
+          'value should match: string | { "label": "label1", "value": "value1" }',
+      },
+    ],
   };
 }
 
diff --git a/app/client/src/widgets/MenuButtonWidget/widget/propertyConfig/contentConfig.ts b/app/client/src/widgets/MenuButtonWidget/widget/propertyConfig/contentConfig.ts
index b36704b62b3e..78121c0f731a 100644
--- a/app/client/src/widgets/MenuButtonWidget/widget/propertyConfig/contentConfig.ts
+++ b/app/client/src/widgets/MenuButtonWidget/widget/propertyConfig/contentConfig.ts
@@ -89,7 +89,7 @@ export default [
         controlType: "OPEN_CONFIG_PANEL",
         buttonConfig: {
           label: "Configure",
-          icon: "settings-2-line",
+          icon: "settings-v3",
         },
         label: "Configure menu items",
         isBindProperty: false,
diff --git a/app/client/src/widgets/MultiSelectWidgetV2/widget/index.tsx b/app/client/src/widgets/MultiSelectWidgetV2/widget/index.tsx
index 829ad1700e51..e604d111beaf 100644
--- a/app/client/src/widgets/MultiSelectWidgetV2/widget/index.tsx
+++ b/app/client/src/widgets/MultiSelectWidgetV2/widget/index.tsx
@@ -180,12 +180,7 @@ class MultiSelectWidget extends BaseWidget<
             onFilterUpdate: queryConfig.select.run,
           };
 
-          if (
-            !!MultiSelectWidget.getFeatureFlag(
-              FEATURE_FLAG.rollout_js_enabled_one_click_binding_enabled,
-            )
-          )
-            dynamicPropertyPathList.push({ key: "sourceData" });
+          dynamicPropertyPathList.push({ key: "sourceData" });
         }
 
         return {
diff --git a/app/client/src/widgets/SelectWidget/component/SelectWidgetComponent.test.tsx b/app/client/src/widgets/SelectWidget/component/SelectWidgetComponent.test.tsx
new file mode 100644
index 000000000000..cc67b8b73612
--- /dev/null
+++ b/app/client/src/widgets/SelectWidget/component/SelectWidgetComponent.test.tsx
@@ -0,0 +1,36 @@
+import React from "react";
+import { fireEvent, render, screen } from "@testing-library/react";
+import SelectComponent, { type SelectComponentProps } from "./index";
+
+const mockProps: SelectComponentProps = {
+  borderRadius: "",
+  compactMode: false,
+  dropDownWidth: 0,
+  height: 0,
+  isFilterable: false,
+  isLoading: false,
+  isValid: false,
+  labelText: "",
+  onFilterChange: jest.fn(),
+  onOptionSelected: jest.fn(),
+  onDropdownClose: jest.fn(),
+  onDropdownOpen: jest.fn(),
+  options: [],
+  serverSideFiltering: false,
+  width: 0,
+  widgetId: "",
+};
+
+describe("SelectComponent", () => {
+  it("should call onDropdownClose only once when select button is clicked twice", () => {
+    render(<SelectComponent {...mockProps} />);
+    const dropdownButton = screen.getByTestId("selectbutton.btn.main");
+
+    fireEvent.click(dropdownButton);
+
+    expect(mockProps.onDropdownOpen).toHaveBeenCalledTimes(1);
+    fireEvent.click(dropdownButton);
+
+    expect(mockProps.onDropdownClose).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/app/client/src/widgets/SelectWidget/component/index.tsx b/app/client/src/widgets/SelectWidget/component/index.tsx
index 862934a2e9cc..127edda7b356 100644
--- a/app/client/src/widgets/SelectWidget/component/index.tsx
+++ b/app/client/src/widgets/SelectWidget/component/index.tsx
@@ -75,7 +75,15 @@ class SelectComponent extends React.Component<
     }
   };
 
-  togglePopoverVisibility = () => {
+  togglePopoverVisibilityFromButton = () => {
+    this.togglePopoverVisibility(true);
+  };
+
+  togglePopoverVisibility = (isButtonClick = false) => {
+    // This is an edge case, this method gets called twice if user closes it by clicking on the `SelectButton`
+    // which in turn triggers handleOnDropdownClose twice, to solve we have this exception to tell if click event is from button
+    if (isButtonClick && this.state.isOpen) return;
+
     if (this.state.isOpen) {
       this.handleOnDropdownClose();
     } else {
@@ -456,7 +464,7 @@ class SelectComponent extends React.Component<
               hideCancelIcon={this.props.hideCancelIcon}
               isRequired={this.props.isRequired}
               spanRef={this.spanRef}
-              togglePopoverVisibility={this.togglePopoverVisibility}
+              togglePopoverVisibility={this.togglePopoverVisibilityFromButton}
               tooltipText={tooltipText}
               value={this.props.value?.toString()}
             />
diff --git a/app/client/src/widgets/SelectWidget/widget/index.tsx b/app/client/src/widgets/SelectWidget/widget/index.tsx
index e98e78ed2c50..8bf1cf42ef96 100644
--- a/app/client/src/widgets/SelectWidget/widget/index.tsx
+++ b/app/client/src/widgets/SelectWidget/widget/index.tsx
@@ -162,12 +162,7 @@ class SelectWidget extends BaseWidget<SelectWidgetProps, WidgetState> {
             onFilterUpdate: queryConfig.select.run,
           };
 
-          if (
-            !!SelectWidget.getFeatureFlag(
-              FEATURE_FLAG.rollout_js_enabled_one_click_binding_enabled,
-            )
-          )
-            dynamicPropertyPathList.push({ key: "sourceData" });
+          dynamicPropertyPathList.push({ key: "sourceData" });
         }
 
         return {
diff --git a/app/client/src/widgets/TableWidgetV2/component/Constants.ts b/app/client/src/widgets/TableWidgetV2/component/Constants.ts
index c4a3d0eceb5b..182eb402073a 100644
--- a/app/client/src/widgets/TableWidgetV2/component/Constants.ts
+++ b/app/client/src/widgets/TableWidgetV2/component/Constants.ts
@@ -546,7 +546,7 @@ export enum IMAGE_VERTICAL_ALIGN {
 }
 
 export interface BaseCellComponentProps {
-  compactMode: string;
+  compactMode: CompactMode;
   isHidden: boolean;
   allowCellWrapping?: boolean;
   horizontalAlignment?: CellAlignment;
diff --git a/app/client/src/widgets/TableWidgetV2/component/TableStyledWrappers.tsx b/app/client/src/widgets/TableWidgetV2/component/TableStyledWrappers.tsx
index 76cc4267ef2e..d212ac791530 100644
--- a/app/client/src/widgets/TableWidgetV2/component/TableStyledWrappers.tsx
+++ b/app/client/src/widgets/TableWidgetV2/component/TableStyledWrappers.tsx
@@ -473,6 +473,7 @@ export const MenuColumnWrapper = styled.div<{ selected: boolean }>`
 
 export const ActionWrapper = styled.div<{ disabled: boolean }>`
   margin: 0 5px 0 0;
+  max-width: 100%;
   ${(props) => (props.disabled ? "cursor: not-allowed;" : null)}
   &&&&&& {
     .bp3-button {
diff --git a/app/client/src/widgets/TableWidgetV2/component/cellComponents/AutoToolTipComponent.tsx b/app/client/src/widgets/TableWidgetV2/component/cellComponents/AutoToolTipComponent.tsx
index 7d264fdb9aaf..8b9d30e99e66 100644
--- a/app/client/src/widgets/TableWidgetV2/component/cellComponents/AutoToolTipComponent.tsx
+++ b/app/client/src/widgets/TableWidgetV2/component/cellComponents/AutoToolTipComponent.tsx
@@ -36,45 +36,71 @@ const MAX_WIDTH = 500;
 const TOOLTIP_OPEN_DELAY = 500;
 const MAX_CHARS_ALLOWED_IN_TOOLTIP = 200;
 
-function useToolTip(children: React.ReactNode, title?: string) {
+export function isButtonTextTruncated(element: HTMLElement): boolean {
+  const spanElement = element.querySelector("span");
+
+  if (!spanElement) {
+    return false;
+  }
+
+  const offsetWidth = spanElement.offsetWidth;
+  const scrollWidth = spanElement.scrollWidth;
+
+  return scrollWidth > offsetWidth;
+}
+
+function useToolTip(
+  children: React.ReactNode,
+  title?: string,
+  isButton?: boolean,
+) {
   const ref = createRef<HTMLDivElement>();
   const [requiresTooltip, setRequiresTooltip] = useState(false);
 
-  useEffect(() => {
-    let timeout: ReturnType<typeof setTimeout>;
-
-    const mouseEnterHandler = () => {
-      const element = ref.current?.querySelector("div") as HTMLDivElement;
-
-      /*
-       * Using setTimeout to simulate hoverOpenDelay of the tooltip
-       * during initial render
-       */
-      timeout = setTimeout(() => {
-        if (element && element.offsetWidth < element.scrollWidth) {
-          setRequiresTooltip(true);
-        } else {
-          setRequiresTooltip(false);
-        }
-
-        ref.current?.removeEventListener("mouseenter", mouseEnterHandler);
-        ref.current?.removeEventListener("mouseleave", mouseLeaveHandler);
-      }, TOOLTIP_OPEN_DELAY);
-    };
-
-    const mouseLeaveHandler = () => {
-      clearTimeout(timeout);
-    };
-
-    ref.current?.addEventListener("mouseenter", mouseEnterHandler);
-    ref.current?.addEventListener("mouseleave", mouseLeaveHandler);
-
-    return () => {
-      ref.current?.removeEventListener("mouseenter", mouseEnterHandler);
-      ref.current?.removeEventListener("mouseleave", mouseLeaveHandler);
-      clearTimeout(timeout);
-    };
-  }, [children]);
+  useEffect(
+    function setupMouseHandlers() {
+      let timeout: ReturnType<typeof setTimeout>;
+      const currentRef = ref.current;
+
+      if (!currentRef) return;
+
+      const mouseEnterHandler = () => {
+        timeout = setTimeout(() => {
+          const element = currentRef?.querySelector("div") as HTMLDivElement;
+
+          /*
+           * Using setTimeout to simulate hoverOpenDelay of the tooltip
+           * during initial render
+           */
+          if (element && element.offsetWidth < element.scrollWidth) {
+            setRequiresTooltip(true);
+          } else if (isButton && element && isButtonTextTruncated(element)) {
+            setRequiresTooltip(true);
+          } else {
+            setRequiresTooltip(false);
+          }
+
+          currentRef?.removeEventListener("mouseenter", mouseEnterHandler);
+          currentRef?.removeEventListener("mouseleave", mouseLeaveHandler);
+        }, TOOLTIP_OPEN_DELAY);
+      };
+
+      const mouseLeaveHandler = () => {
+        setRequiresTooltip(false);
+        clearTimeout(timeout);
+      };
+
+      currentRef?.addEventListener("mouseenter", mouseEnterHandler);
+      currentRef?.addEventListener("mouseleave", mouseLeaveHandler);
+
+      return () => {
+        currentRef?.removeEventListener("mouseenter", mouseEnterHandler);
+        currentRef?.removeEventListener("mouseleave", mouseLeaveHandler);
+        clearTimeout(timeout);
+      };
+    },
+    [children, isButton, ref],
+  );
 
   return requiresTooltip && children ? (
     <Tooltip
@@ -111,7 +137,7 @@ interface Props {
   children: React.ReactNode;
   title: string;
   tableWidth?: number;
-  columnType?: string;
+  columnType?: ColumnTypes;
   className?: string;
   compactMode?: string;
   allowCellWrapping?: boolean;
@@ -126,43 +152,34 @@ interface Props {
   isCellDisabled?: boolean;
 }
 
-function LinkWrapper(props: Props) {
-  const content = useToolTip(props.children, props.title);
-
-  return (
-    <CellWrapper
-      allowCellWrapping={props.allowCellWrapping}
-      cellBackground={props.cellBackground}
-      className="cell-wrapper"
-      compactMode={props.compactMode}
-      fontStyle={props.fontStyle}
-      horizontalAlignment={props.horizontalAlignment}
-      isCellDisabled={props.isCellDisabled}
-      isCellVisible={props.isCellVisible}
-      isHidden={props.isHidden}
-      isHyperLink
-      isTextType
-      onClick={(e: React.MouseEvent<HTMLDivElement>) => {
-        e.stopPropagation();
-        window.open(props.url, "_blank");
-      }}
-      textColor={props.textColor}
-      textSize={props.textSize}
-      verticalAlignment={props.verticalAlignment}
-    >
-      <div className="link-text">{content}</div>
-      <OpenNewTabIconWrapper className="hidden-icon">
-        <OpenNewTabIcon />
-      </OpenNewTabIconWrapper>
-    </CellWrapper>
+export function AutoToolTipComponent(props: Props) {
+  const content = useToolTip(
+    props.children,
+    props.title,
+    props.columnType === ColumnTypes.BUTTON,
   );
-}
 
-function AutoToolTipComponent(props: Props) {
-  const content = useToolTip(props.children, props.title);
+  let contentToRender;
+
+  switch (props.columnType) {
+    case ColumnTypes.BUTTON:
+      if (props.title) {
+        return content;
+      }
 
-  if (props.columnType === ColumnTypes.URL && props.title) {
-    return <LinkWrapper {...props} />;
+      break;
+    case ColumnTypes.URL:
+      contentToRender = (
+        <>
+          <div className="link-text">{content}</div>
+          <OpenNewTabIconWrapper className="hidden-icon">
+            <OpenNewTabIcon />
+          </OpenNewTabIconWrapper>
+        </>
+      );
+      break;
+    default:
+      contentToRender = content;
   }
 
   return (
@@ -178,12 +195,13 @@ function AutoToolTipComponent(props: Props) {
         isCellDisabled={props.isCellDisabled}
         isCellVisible={props.isCellVisible}
         isHidden={props.isHidden}
+        isHyperLink={props.columnType === ColumnTypes.URL}
         isTextType
         textColor={props.textColor}
         textSize={props.textSize}
         verticalAlignment={props.verticalAlignment}
       >
-        {content}
+        {contentToRender}
       </CellWrapper>
     </ColumnWrapper>
   );
diff --git a/app/client/src/widgets/TableWidgetV2/component/cellComponents/AutoTooltipComponent.test.tsx b/app/client/src/widgets/TableWidgetV2/component/cellComponents/AutoTooltipComponent.test.tsx
new file mode 100644
index 000000000000..bf46ff76952c
--- /dev/null
+++ b/app/client/src/widgets/TableWidgetV2/component/cellComponents/AutoTooltipComponent.test.tsx
@@ -0,0 +1,122 @@
+import React from "react";
+import { fireEvent, render, screen } from "@testing-library/react";
+import AutoToolTipComponent from "./AutoToolTipComponent";
+import { ColumnTypes } from "widgets/TableWidgetV2/constants";
+import "@testing-library/jest-dom";
+import { isButtonTextTruncated } from "./AutoToolTipComponent";
+
+jest.mock("react", () => {
+  const actualReact = jest.requireActual("react");
+
+  return {
+    ...actualReact,
+    useState: jest.fn((initial) => [initial, jest.fn()]),
+  };
+});
+
+test.each([
+  ["truncated text", "This is a long text that will be truncated"],
+  [
+    "truncated button text",
+    "This is a long text that will be truncated in the button",
+  ],
+])("shows tooltip for %s", (_, longText) => {
+  const { getByText } = render(
+    <AutoToolTipComponent columnType={ColumnTypes.BUTTON} title={longText}>
+      <span
+        style={{
+          width: "50px",
+          display: "inline-block",
+          overflow: "hidden",
+          textOverflow: "ellipsis",
+          whiteSpace: "nowrap",
+        }}
+      >
+        {longText}
+      </span>
+    </AutoToolTipComponent>,
+  );
+
+  fireEvent.mouseEnter(getByText(longText));
+  expect(getByText(longText)).toBeInTheDocument();
+});
+
+test("does not show tooltip for non-button types", () => {
+  const { getByText } = render(
+    <AutoToolTipComponent columnType={ColumnTypes.URL} title="Not a button">
+      <a href="#">Not a button</a>
+    </AutoToolTipComponent>,
+  );
+
+  expect(getByText("Not a button")).toBeInTheDocument();
+  expect(screen.queryByRole("dialog")).not.toBeInTheDocument();
+});
+
+test("handles empty tooltip", () => {
+  const { getByText } = render(
+    <AutoToolTipComponent columnType={ColumnTypes.BUTTON} title="Empty button">
+      <button>Empty button</button>
+    </AutoToolTipComponent>,
+  );
+
+  expect(getByText("Empty button")).toBeInTheDocument();
+  expect(screen.queryByRole("dialog")).not.toBeInTheDocument();
+});
+
+test("renders content without tooltip for normal text", () => {
+  const { getByText } = render(
+    <AutoToolTipComponent title="Normal Text">
+      <span>Normal Text</span>
+    </AutoToolTipComponent>,
+  );
+
+  expect(getByText("Normal Text")).toBeInTheDocument();
+  expect(screen.queryByRole("dialog")).not.toBeInTheDocument();
+});
+
+test("does not show tooltip for non-truncated text", () => {
+  const shortText = "Short text";
+  const { getByText } = render(
+    <AutoToolTipComponent columnType={ColumnTypes.BUTTON} title={shortText}>
+      <span>{shortText}</span>
+    </AutoToolTipComponent>,
+  );
+
+  fireEvent.mouseEnter(getByText(shortText));
+  expect(screen.queryByRole("dialog")).not.toBeInTheDocument();
+});
+
+describe("isButtonTextTruncated", () => {
+  function mockElementWidths(
+    offsetWidth: number,
+    scrollWidth: number,
+  ): HTMLElement {
+    const spanElement = document.createElement("span");
+
+    Object.defineProperty(spanElement, "offsetWidth", { value: offsetWidth });
+    Object.defineProperty(spanElement, "scrollWidth", { value: scrollWidth });
+    const container = document.createElement("div");
+
+    container.appendChild(spanElement);
+
+    return container;
+  }
+
+  test("returns true when text is truncated (scrollWidth > offsetWidth)", () => {
+    const element = mockElementWidths(100, 150);
+
+    expect(isButtonTextTruncated(element)).toBe(true);
+  });
+
+  test("returns false when text is not truncated (scrollWidth <= offsetWidth)", () => {
+    const element = mockElementWidths(150, 150);
+
+    expect(isButtonTextTruncated(element)).toBe(false);
+  });
+
+  test("returns false when no span element is found", () => {
+    const element = document.createElement("div");
+
+    expect(isButtonTextTruncated(element)).toBe(false);
+  });
+});
diff --git a/app/client/src/widgets/TableWidgetV2/component/cellComponents/BasicCell.test.tsx b/app/client/src/widgets/TableWidgetV2/component/cellComponents/BasicCell.test.tsx
new file mode 100644
index 000000000000..ee37e656b95b
--- /dev/null
+++ b/app/client/src/widgets/TableWidgetV2/component/cellComponents/BasicCell.test.tsx
@@ -0,0 +1,56 @@
+import React from "react";
+import { render, screen, fireEvent } from "@testing-library/react";
+import "@testing-library/jest-dom";
+import { BasicCell, type PropType } from "./BasicCell";
+import { ColumnTypes } from "widgets/TableWidgetV2/constants";
+import { CompactModeTypes } from "widgets/TableWidget/component/Constants";
+
+describe("BasicCell Component", () => {
+  const defaultProps: PropType = {
+    value: "Test Value",
+    onEdit: jest.fn(),
+    isCellEditable: false,
+    hasUnsavedChanges: false,
+    columnType: ColumnTypes.TEXT,
+    url: "",
+    compactMode: CompactModeTypes.DEFAULT,
+    isHidden: false,
+    isCellVisible: true,
+    accentColor: "",
+    tableWidth: 100,
+    disabledEditIcon: false,
+    disabledEditIconMessage: "",
+  };
+
+  it("renders the value", () => {
+    render(<BasicCell {...defaultProps} />);
+    expect(screen.getByText("Test Value")).toBeInTheDocument();
+  });
+
+  it("renders a link when columnType is URL", () => {
+    render(
+      <BasicCell
+        {...defaultProps}
+        columnType={ColumnTypes.URL}
+        url="http://example.com"
+      />,
+    );
+    const link = screen.getByText("Test Value");
+
+    expect(link).toBeInTheDocument();
+    expect(link).toHaveAttribute("href", "http://example.com");
+  });
+
+  it("calls onEdit when double-clicked", () => {
+    render(<BasicCell {...defaultProps} isCellEditable />);
+    fireEvent.doubleClick(screen.getByText("Test Value"));
+    expect(defaultProps.onEdit).toHaveBeenCalled();
+  });
+
+  it("forwards ref to the div element", () => {
+    const ref = React.createRef<HTMLDivElement>();
+
+    render(<BasicCell {...defaultProps} ref={ref} />);
+    expect(ref.current).toBeInstanceOf(HTMLDivElement);
+  });
+});
diff --git a/app/client/src/widgets/TableWidgetV2/component/cellComponents/BasicCell.tsx b/app/client/src/widgets/TableWidgetV2/component/cellComponents/BasicCell.tsx
index 08d9efe89018..9b2431cf8609 100644
--- a/app/client/src/widgets/TableWidgetV2/component/cellComponents/BasicCell.tsx
+++ b/app/client/src/widgets/TableWidgetV2/component/cellComponents/BasicCell.tsx
@@ -1,12 +1,13 @@
 import type { Ref } from "react";
-import React, { useCallback } from "react";
+import React, { useCallback, useMemo } from "react";
 import { Tooltip } from "@blueprintjs/core";
 import styled from "styled-components";
-import type { BaseCellComponentProps } from "../Constants";
+import type { BaseCellComponentProps, CompactMode } from "../Constants";
 import { TABLE_SIZES } from "../Constants";
 import { TooltipContentWrapper } from "../TableStyledWrappers";
 import AutoToolTipComponent from "./AutoToolTipComponent";
 import { importSvg } from "@appsmith/ads-old";
+import { ColumnTypes } from "widgets/TableWidgetV2/constants";
 
 const EditIcon = importSvg(
   async () => import("assets/icons/control/edit-variant1.svg"),
@@ -55,7 +56,7 @@ const Content = styled.div`
 const StyledEditIcon = styled.div<{
   accentColor?: string;
   backgroundColor?: string;
-  compactMode: string;
+  compactMode: CompactMode;
   disabledEditIcon: boolean;
 }>`
   position: absolute;
@@ -74,12 +75,12 @@ const StyledEditIcon = styled.div<{
   }
 `;
 
-type PropType = BaseCellComponentProps & {
+export type PropType = BaseCellComponentProps & {
   accentColor: string;
   // TODO: Fix this the next time the file is edited
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   value: any;
-  columnType: string;
+  columnType: ColumnTypes;
   tableWidth: number;
   isCellEditable?: boolean;
   isCellEditMode?: boolean;
@@ -128,6 +129,18 @@ export const BasicCell = React.forwardRef(
       },
       [onEdit, disabledEditIcon, isCellEditable],
     );
+    const contentToRender = useMemo(() => {
+      switch (columnType) {
+        case ColumnTypes.URL:
+          return (
+            <a href={url} rel="noopener noreferrer" target="_blank">
+              {value}
+            </a>
+          );
+        default:
+          return value;
+      }
+    }, [columnType, url, value]);
 
     return (
       <Wrapper
@@ -157,7 +170,7 @@ export const BasicCell = React.forwardRef(
           url={url}
           verticalAlignment={verticalAlignment}
         >
-          <Content ref={contentRef}>{value}</Content>
+          <Content ref={contentRef}>{contentToRender}</Content>
         </StyledAutoToolTipComponent>
         {isCellEditable && (
           <StyledEditIcon
diff --git a/app/client/src/widgets/TableWidgetV2/component/cellComponents/Button.tsx b/app/client/src/widgets/TableWidgetV2/component/cellComponents/Button.tsx
index 35ccc27e2216..3eca9af7bd3c 100644
--- a/app/client/src/widgets/TableWidgetV2/component/cellComponents/Button.tsx
+++ b/app/client/src/widgets/TableWidgetV2/component/cellComponents/Button.tsx
@@ -2,8 +2,12 @@ import React, { useState } from "react";
 
 import { ActionWrapper } from "../TableStyledWrappers";
 import { BaseButton } from "widgets/ButtonWidget/component";
-import type { ButtonColumnActions } from "widgets/TableWidgetV2/constants";
+import {
+  ColumnTypes,
+  type ButtonColumnActions,
+} from "widgets/TableWidgetV2/constants";
 import styled from "styled-components";
+import AutoToolTipComponent from "widgets/TableWidgetV2/component/cellComponents/AutoToolTipComponent";
 
 const StyledButton = styled(BaseButton)<{
   compactMode?: string;
@@ -37,27 +41,31 @@ export function Button(props: ButtonProps) {
     props.onCommandClick(props.action.dynamicTrigger, onComplete);
   };
 
+  const stopPropagation = (e: React.MouseEvent<HTMLDivElement>) => {
+    e.stopPropagation();
+  };
+
   return (
-    <ActionWrapper
-      disabled={!!props.isDisabled}
-      onClick={(e) => {
-        e.stopPropagation();
-      }}
-    >
-      {props.isCellVisible && props.action.isVisible ? (
-        <StyledButton
-          borderRadius={props.action.borderRadius}
-          boxShadow={props.action.boxShadow}
-          buttonColor={props.action.backgroundColor}
-          buttonVariant={props.action.variant}
-          compactMode={props.compactMode}
-          disabled={props.isDisabled}
-          iconAlign={props.action.iconAlign}
-          iconName={props.action.iconName}
-          loading={loading}
-          onClick={handleClick}
-          text={props.action.label}
-        />
+    <ActionWrapper disabled={!!props.isDisabled} onClick={stopPropagation}>
+      {props.isCellVisible && props.action.isVisible && props.action.label ? (
+        <AutoToolTipComponent
+          columnType={ColumnTypes.BUTTON}
+          title={props.action.label}
+        >
+          <StyledButton
+            borderRadius={props.action.borderRadius}
+            boxShadow={props.action.boxShadow}
+            buttonColor={props.action.backgroundColor}
+            buttonVariant={props.action.variant}
+            compactMode={props.compactMode}
+            disabled={props.isDisabled}
+            iconAlign={props.action.iconAlign}
+            iconName={props.action.iconName}
+            loading={loading}
+            onClick={handleClick}
+            text={props.action.label}
+          />
+        </AutoToolTipComponent>
       ) : null}
     </ActionWrapper>
   );
diff --git a/app/client/src/widgets/TableWidgetV2/component/cellComponents/PlainTextCell.tsx b/app/client/src/widgets/TableWidgetV2/component/cellComponents/PlainTextCell.tsx
index bfc92d8a01d2..f9dd1874fe3a 100644
--- a/app/client/src/widgets/TableWidgetV2/component/cellComponents/PlainTextCell.tsx
+++ b/app/client/src/widgets/TableWidgetV2/component/cellComponents/PlainTextCell.tsx
@@ -39,7 +39,7 @@ export type RenderDefaultPropsType = BaseCellComponentProps & {
   // TODO: Fix this the next time the file is edited
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   value: any;
-  columnType: string;
+  columnType: ColumnTypes;
   tableWidth: number;
   isCellEditable: boolean;
   isCellEditMode?: boolean;
diff --git a/app/client/src/widgets/TableWidgetV2/component/cellComponents/SelectCell.tsx b/app/client/src/widgets/TableWidgetV2/component/cellComponents/SelectCell.tsx
index 2e37cb7dd6c9..1eff4dfb08b7 100644
--- a/app/client/src/widgets/TableWidgetV2/component/cellComponents/SelectCell.tsx
+++ b/app/client/src/widgets/TableWidgetV2/component/cellComponents/SelectCell.tsx
@@ -1,7 +1,5 @@
-import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
 import React, { useCallback, useMemo } from "react";
 import styled from "styled-components";
-import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
 import SelectComponent from "widgets/SelectWidget/component";
 import type { DropdownOption } from "widgets/SelectWidget/constants";
 import type { EditableCellActions } from "widgets/TableWidgetV2/constants";
@@ -13,6 +11,7 @@ import {
 } from "../Constants";
 import { CellWrapper } from "../TableStyledWrappers";
 import { BasicCell } from "./BasicCell";
+import type { ColumnTypes } from "widgets/TableWidget/component/Constants";
 
 const StyledSelectComponent = styled(SelectComponent)<{
   accentColor: string;
@@ -63,7 +62,7 @@ type SelectProps = BaseCellComponentProps & {
   alias: string;
   accentColor: string;
   autoOpen: boolean;
-  columnType: string;
+  columnType: ColumnTypes;
   borderRadius: string;
   options?: DropdownOption[];
   onFilterChange: (
@@ -196,25 +195,17 @@ export const SelectCell = (props: SelectProps) => {
     .map((d: DropdownOption) => d.value)
     .indexOf(value);
 
-  const releaseTableSelectCellLabelValue = useFeatureFlag(
-    FEATURE_FLAG.release_table_cell_label_value_enabled,
-  );
-
   const cellLabelValue = useMemo(() => {
-    if (releaseTableSelectCellLabelValue) {
-      if (!options.length) return value;
+    if (!options.length) return value;
 
-      const selectedOption = options.find(
-        (option) => option[TableSelectColumnOptionKeys.VALUE] === value,
-      );
+    const selectedOption = options.find(
+      (option) => option[TableSelectColumnOptionKeys.VALUE] === value,
+    );
 
-      return selectedOption
-        ? selectedOption[TableSelectColumnOptionKeys.LABEL]
-        : "";
-    } else {
-      return value;
-    }
-  }, [releaseTableSelectCellLabelValue, value, options]);
+    return selectedOption
+      ? selectedOption[TableSelectColumnOptionKeys.LABEL]
+      : "";
+  }, [value, options]);
 
   if (isEditable && isCellEditable && isCellEditMode) {
     return (
diff --git a/app/client/src/widgets/TableWidgetV2/constants.ts b/app/client/src/widgets/TableWidgetV2/constants.ts
index 8fb0e8605aad..c88992218216 100644
--- a/app/client/src/widgets/TableWidgetV2/constants.ts
+++ b/app/client/src/widgets/TableWidgetV2/constants.ts
@@ -109,6 +109,8 @@ export interface TableWidgetProps
   firstEditableColumnIdByOrder: string;
   enableServerSideFiltering: boolean;
   onTableFilterUpdate: string;
+  customIsLoading: boolean;
+  customIsLoadingValue: boolean;
 }
 
 export enum TableVariantTypes {
@@ -237,3 +239,6 @@ export const DEFAULT_COLUMN_NAME = "Table Column";
 
 export const ALLOW_TABLE_WIDGET_SERVER_SIDE_FILTERING =
   FEATURE_FLAG["release_table_serverside_filtering_enabled"];
+
+export const CUSTOM_LOADING_STATE_ENABLED =
+  FEATURE_FLAG["release_table_custom_loading_state_enabled"];
diff --git a/app/client/src/widgets/TableWidgetV2/widget/TableRendered.test.ts b/app/client/src/widgets/TableWidgetV2/widget/TableRendered.test.ts
new file mode 100644
index 000000000000..fcd4e4a1dfe0
--- /dev/null
+++ b/app/client/src/widgets/TableWidgetV2/widget/TableRendered.test.ts
@@ -0,0 +1,181 @@
+import { ResponsiveBehavior } from "layoutSystems/common/utils/constants";
+import TableWidgetV2 from ".";
+import type { TableWidgetProps } from "../constants";
+
+describe("TableWidgetV2 getWidgetView", () => {
+  const tableWidgetProps: TableWidgetProps = {
+    customIsLoading: false,
+    customIsLoadingValue: false,
+    delimiter: ",",
+    filteredTableData: [],
+    isVisibleDownload: true,
+    isVisibleFilters: true,
+    isVisiblePagination: true,
+    isVisibleSearch: true,
+    pageSize: 10,
+    primaryColumns: {},
+    totalRecordsCount: 100,
+    accentColor: "#000000",
+    borderColor: "#000000",
+    borderRadius: "40px",
+    borderWidth: "1px",
+    boxShadow: "none",
+    canFreezeColumn: true,
+    columnWidthMap: {},
+    compactMode: "DEFAULT",
+    filters: [],
+    isAddRowInProgress: false,
+    isEditableCellsValid: {},
+    isLoading: false,
+    isSortable: true,
+    multiRowSelection: false,
+    pageNo: 1,
+    renderMode: "CANVAS",
+    searchText: "",
+    selectedRowIndex: -1,
+    selectedRowIndices: [],
+    serverSidePaginationEnabled: false,
+    tableData: [],
+    widgetId: "widgetId",
+    widgetName: "TableWidget",
+    componentWidth: 800,
+    componentHeight: 600,
+    onPageChange: "",
+    onSearchTextChanged: "",
+    onSort: "",
+    onRowSelected: "",
+    onAddNewRowSave: "",
+    onAddNewRowDiscard: "",
+    onBulkSave: "",
+    onBulkDiscard: "",
+    onPageSizeChange: "",
+    commitBatchMetaUpdates: jest.fn(),
+    pushBatchMetaUpdates: jest.fn(),
+    updateWidgetMetaProperty: jest.fn(),
+    updateWidgetProperty: "",
+    updateOneClickBindingOptionsVisibility: "",
+    // Added missing properties
+    primaryColumnId: "",
+    columnOrder: [],
+    derivedColumns: {},
+    dynamicPropertyPathList: [],
+    dynamicTriggerPathList: [],
+    dynamicBindingPathList: [],
+    childStylesheet: {},
+    isVisible: true,
+    version: 1,
+    parentColumnSpace: 1,
+    parentRowSpace: 1,
+    leftColumn: 0,
+    rightColumn: 0,
+    topRow: 0,
+    bottomRow: 0,
+    parentId: "",
+    responsiveBehavior: ResponsiveBehavior.Hug,
+    minWidth: 0,
+    minHeight: 0,
+    isDisabled: false,
+    animateLoading: false,
+    primaryColor: "",
+    backgroundColor: "",
+    textColor: "",
+    fontFamily: "",
+    fontSize: "",
+    fontStyle: "",
+    textAlign: "",
+    textDecoration: "",
+    textTransform: "",
+    letterSpacing: "",
+    lineHeight: "",
+    whiteSpace: "",
+    overflow: "",
+    textOverflow: "",
+    wordBreak: "",
+    wordWrap: "",
+    cursor: "",
+    zIndex: 0,
+    pristine: true,
+    label: "TableWidget",
+    defaultSearchText: "",
+    sortOrder: { column: "", order: null },
+    transientTableData: { data: { name: "name" } },
+    newRow: {},
+    firstEditableColumnIdByOrder: "",
+    enableServerSideFiltering: false,
+    onTableFilterUpdate: "",
+    type: "",
+    allowAddNewRow: false,
+    defaultNewRow: {},
+    frozenColumnIndices: { a: 1 },
+  };
+
+  describe("TableWidgetV2 loading checks", () => {
+    describe("When custom loading logic is not provided", () => {
+      it("Should not be loading with built-in property isLoading is set to false", () => {
+        const tableWidget = new TableWidgetV2(tableWidgetProps);
+        const widgetView = tableWidget.getWidgetView();
+
+        expect(widgetView.props.children.props.isLoading).toBe(false);
+      });
+      it("Should be loading with built-in property isLoading is set to true", () => {
+        const tableWidget = new TableWidgetV2({
+          ...tableWidgetProps,
+          isLoading: true,
+        });
+        const widgetView = tableWidget.getWidgetView();
+
+        expect(widgetView.props.children.props.isLoading).toBe(true);
+      });
+    });
+    describe("When custom loading logic is provided", () => {
+      describe("When isLoading is false", () => {
+        it("Should not be loading with isLoading: false,  customIsLoading: true and customIsLoadingTrue: true", () => {
+          const tableWidget = new TableWidgetV2({
+            ...tableWidgetProps,
+            customIsLoading: true,
+            customIsLoadingValue: false,
+            isLoading: false,
+          });
+          const widgetView = tableWidget.getWidgetView();
+
+          expect(widgetView.props.children.props.isLoading).toBe(false);
+        });
+        it("Should be loading with customIsLoading set to true and customIsLoadingTrue set to true", () => {
+          const tableWidget = new TableWidgetV2({
+            ...tableWidgetProps,
+            customIsLoading: true,
+            customIsLoadingValue: true,
+            isLoading: false,
+          });
+          const widgetView = tableWidget.getWidgetView();
+
+          expect(widgetView.props.children.props.isLoading).toBe(true);
+        });
+      });
+      describe("When isLoading is true", () => {
+        it("Should be loading with customIsLoading set to true and customIsLoadingTrue set to false", () => {
+          const tableWidget = new TableWidgetV2({
+            ...tableWidgetProps,
+            customIsLoading: true,
+            customIsLoadingValue: false,
+            isLoading: true,
+          });
+          const widgetView = tableWidget.getWidgetView();
+
+          expect(widgetView.props.children.props.isLoading).toBe(true);
+        });
+        it("Should be loading with customIsLoading set to true and customIsLoadingTrue set to true, even if in built loading is false", () => {
+          const tableWidget = new TableWidgetV2({
+            ...tableWidgetProps,
+            customIsLoading: true,
+            customIsLoadingValue: true,
+            isLoading: true,
+          });
+          const widgetView = tableWidget.getWidgetView();
+
+          expect(widgetView.props.children.props.isLoading).toBe(true);
+        });
+      });
+    });
+  });
+});
diff --git a/app/client/src/widgets/TableWidgetV2/widget/derived.js b/app/client/src/widgets/TableWidgetV2/widget/derived.js
index d27e7e84c593..c62e58ac6f9f 100644
--- a/app/client/src/widgets/TableWidgetV2/widget/derived.js
+++ b/app/client/src/widgets/TableWidgetV2/widget/derived.js
@@ -446,25 +446,42 @@ export default {
 
       sortedTableData = transformedTableDataForSorting.sort((a, b) => {
         if (_.isPlainObject(a) && _.isPlainObject(b)) {
+          let [processedA, processedB] = [a, b];
+
+          if (!selectColumnKeysWithSortByLabel.length) {
+            const originalA = (props.tableData ??
+              transformedTableDataForSorting)[a.__originalIndex__];
+            const originalB = (props.tableData ??
+              transformedTableDataForSorting)[b.__originalIndex__];
+
+            [processedA, processedB] = [
+              { ...a, ...originalA },
+              { ...b, ...originalB },
+            ];
+          }
+
           if (
-            isEmptyOrNil(a[sortByColumnOriginalId]) ||
-            isEmptyOrNil(b[sortByColumnOriginalId])
+            isEmptyOrNil(processedA[sortByColumnOriginalId]) ||
+            isEmptyOrNil(processedB[sortByColumnOriginalId])
           ) {
             /* push null, undefined and "" values to the bottom. */
-            return isEmptyOrNil(a[sortByColumnOriginalId]) ? 1 : -1;
+            return isEmptyOrNil(processedA[sortByColumnOriginalId]) ? 1 : -1;
           } else {
             switch (columnType) {
               case "number":
               case "currency":
                 return sortByOrder(
-                  Number(a[sortByColumnOriginalId]) >
-                    Number(b[sortByColumnOriginalId]),
+                  Number(processedA[sortByColumnOriginalId]) >
+                    Number(processedB[sortByColumnOriginalId]),
                 );
               case "date":
                 try {
                   return sortByOrder(
-                    moment(a[sortByColumnOriginalId], inputFormat).isAfter(
-                      moment(b[sortByColumnOriginalId], inputFormat),
+                    moment(
+                      processedA[sortByColumnOriginalId],
+                      inputFormat,
+                    ).isAfter(
+                      moment(processedB[sortByColumnOriginalId], inputFormat),
                     ),
                   );
                 } catch (e) {
@@ -489,8 +506,8 @@ export default {
                 }
               default:
                 return sortByOrder(
-                  a[sortByColumnOriginalId].toString().toLowerCase() >
-                    b[sortByColumnOriginalId].toString().toLowerCase(),
+                  processedA[sortByColumnOriginalId].toString().toLowerCase() >
+                    processedB[sortByColumnOriginalId].toString().toLowerCase(),
                 );
             }
           }
@@ -676,15 +693,18 @@ export default {
 
     const finalTableData = sortedTableData.filter((row) => {
       let isSearchKeyFound = true;
+      const originalRow = (props.tableData ?? sortedTableData)[
+        row.__originalIndex__
+      ];
       const columnWithDisplayText = Object.values(props.primaryColumns).filter(
         (column) => column.columnType === "url" && column.displayText,
       );
 
       /*
        * For select columns with label and values, we need to include the label value
-       * in the search
+       * in the search and filter data
        */
-      let labelValueForSelectCell = "";
+      let labelValuesForSelectCell = {};
       /*
        * Initialize an array to store keys for columns that have the 'select' column type
        * and contain selectOptions.
@@ -716,13 +736,15 @@ export default {
             primaryColumns[key].selectOptions,
           );
 
-          let selectOptions;
+          let selectOptions = {};
 
           /*
            * If selectOptions is an array, check if it contains nested arrays.
            * This is to handle situations where selectOptons is a javascript object and computes as a nested array.
            */
           if (isSelectOptionsAnArray) {
+            const selectOptionKey = primaryColumns[key].alias;
+
             if (_.some(primaryColumns[key].selectOptions, _.isArray)) {
               /* Handle the case where selectOptions contains nested arrays - selectOptions is javascript */
               selectOptions =
@@ -732,7 +754,7 @@ export default {
               });
 
               if (option) {
-                labelValueForSelectCell = option.label;
+                labelValuesForSelectCell[selectOptionKey] = option.label;
               }
             } else {
               /* Handle the case where selectOptions is a flat array - selectOptions is plain JSON */
@@ -742,7 +764,7 @@ export default {
               );
 
               if (option) {
-                labelValueForSelectCell = option.label;
+                labelValuesForSelectCell[selectOptionKey] = option.label;
               }
             }
           } else {
@@ -753,7 +775,7 @@ export default {
             );
 
             if (option) {
-              labelValueForSelectCell = option.label;
+              labelValuesForSelectCell[selectOptionKey] = option.label;
             }
           }
         });
@@ -761,7 +783,7 @@ export default {
 
       const displayedRow = {
         ...row,
-        labelValueForSelectCell,
+        ...labelValuesForSelectCell,
         ...columnWithDisplayText.reduce((acc, column) => {
           let displayText;
 
@@ -778,7 +800,10 @@ export default {
       };
 
       if (searchKey) {
-        isSearchKeyFound = Object.values(_.omit(displayedRow, hiddenColumns))
+        isSearchKeyFound = [
+          ...Object.values(_.omit(displayedRow, hiddenColumns)),
+          ...Object.values(_.omit(originalRow, hiddenColumns)),
+        ]
           .join(", ")
           .toLowerCase()
           .includes(searchKey);
@@ -809,10 +834,15 @@ export default {
             ConditionFunctions[props.filters[i].condition];
 
           if (conditionFunction) {
-            filterResult = conditionFunction(
-              displayedRow[props.filters[i].column],
-              props.filters[i].value,
-            );
+            filterResult =
+              conditionFunction(
+                originalRow[props.filters[i].column],
+                props.filters[i].value,
+              ) ||
+              conditionFunction(
+                displayedRow[props.filters[i].column],
+                props.filters[i].value,
+              );
           }
         } catch (e) {
           filterResult = false;
@@ -976,10 +1006,7 @@ export default {
   },
   //
   getPageOffset: (props, moment, _) => {
-    const pageSize =
-      props.serverSidePaginationEnabled && props.tableData
-        ? props.tableData?.length
-        : props.pageSize;
+    const pageSize = props.pageSize;
 
     if (
       Number.isFinite(props.pageNo) &&
diff --git a/app/client/src/widgets/TableWidgetV2/widget/derived.test.js b/app/client/src/widgets/TableWidgetV2/widget/derived.test.js
index e7ba48a1a39c..e12cb35ff306 100644
--- a/app/client/src/widgets/TableWidgetV2/widget/derived.test.js
+++ b/app/client/src/widgets/TableWidgetV2/widget/derived.test.js
@@ -580,6 +580,93 @@ describe("Validates getFilteredTableData Properties", () => {
     expect(result).toStrictEqual(expected);
   });
 
+  it("validates generated filtered edited table data to be sorted correctly based on column type", () => {
+    const { getFilteredTableData } = derivedProperty;
+    const input = {
+      processedTableData: [
+        { id: 123, name: "BAC", __originalIndex__: 0 },
+        { id: 1234, name: "ABC", __originalIndex__: 1 },
+        { id: 234, name: "CAB", __originalIndex__: 2 },
+      ],
+      tableData: [
+        { id: 123, name: "BAC" },
+        { id: 1234, name: "ABC" },
+        { id: 234, name: "CAB" },
+      ],
+      sortOrder: { column: "name", order: "asc" },
+      columnOrder: ["name", "id"],
+      primaryColumns: {
+        id: {
+          index: 1,
+          width: 150,
+          id: "id",
+          alias: "id",
+          originalId: "id",
+          horizontalAlignment: "LEFT",
+          verticalAlignment: "CENTER",
+          columnType: "number",
+          textColor: "#231F20",
+          textSize: "PARAGRAPH",
+          fontStyle: "REGULAR",
+          enableFilter: true,
+          enableSort: true,
+          isVisible: true,
+          isDerived: false,
+          label: "id",
+          isAscOrder: false,
+        },
+        name: {
+          index: 0,
+          width: 150,
+          id: "name",
+          alias: "name",
+          originalId: "name",
+          horizontalAlignment: "LEFT",
+          verticalAlignment: "CENTER",
+          columnType: "text",
+          textColor: "#231F20",
+          textSize: "PARAGRAPH",
+          fontStyle: "REGULAR",
+          enableFilter: true,
+          enableSort: true,
+          isVisible: true,
+          isDerived: false,
+          label: "awesome",
+          isAscOrder: undefined,
+          computedValue: ["BAC", "ABC", "AAB"],
+        },
+      },
+    };
+
+    input.orderedTableColumns = Object.values(input.primaryColumns).sort(
+      (a, b) => {
+        return input.columnOrder[a.id] < input.columnOrder[b.id];
+      },
+    );
+
+    const expected = [
+      {
+        id: 1234,
+        name: "ABC",
+        __originalIndex__: 1,
+      },
+      {
+        id: 123,
+        name: "BAC",
+        __originalIndex__: 0,
+      },
+      {
+        id: 234,
+        name: "AAB",
+        __originalIndex__: 2,
+      },
+    ];
+
+    let result = getFilteredTableData(input, moment, _);
+
+    expect(result).toStrictEqual(expected);
+  });
+
   it("validates generated filtered table data with null values to be sorted correctly", () => {
     const { getFilteredTableData } = derivedProperty;
     const input = {
@@ -1181,6 +1268,122 @@ describe("Validates getFilteredTableData Properties", () => {
     expect(result).toStrictEqual(expected);
   });
 
+  it("should filter correctly after editing a value with an applied filter", () => {
+    const { getFilteredTableData } = derivedProperty;
+    const input = {
+      tableData: [
+        { id: 1234, name: "Jim Doe" },
+        { id: 123, name: "Hamza Khafaga" },
+        { id: 234, name: "Khadija Khafaga" },
+      ],
+      processedTableData: [
+        { id: 1234, name: "Jim Doe", __originalIndex__: 0 },
+        { id: 123, name: "Hamza Anas", __originalIndex__: 1 },
+        { id: 234, name: "Khadija Khafaga", __originalIndex__: 2 },
+      ],
+      filters: [
+        {
+          condition: "contains",
+          column: "name",
+          value: "Khafaga",
+        },
+      ],
+      sortOrder: { column: "id", order: "desc" },
+      columnOrder: ["name", "id"],
+      primaryColumns: {
+        id: {
+          index: 1,
+          width: 150,
+          id: "id",
+          alias: "id",
+          originalId: "id",
+          horizontalAlignment: "LEFT",
+          verticalAlignment: "CENTER",
+          columnType: "number",
+          textColor: "#231F20",
+          textSize: "PARAGRAPH",
+          fontStyle: "REGULAR",
+          enableFilter: true,
+          enableSort: true,
+          isVisible: true,
+          isDerived: false,
+          label: "id",
+          isAscOrder: false,
+        },
+        name: {
+          index: 0,
+          width: 150,
+          id: "name",
+          alias: "name",
+          originalId: "name",
+          horizontalAlignment: "LEFT",
+          verticalAlignment: "CENTER",
+          columnType: "text",
+          textColor: "#231F20",
+          textSize: "PARAGRAPH",
+          fontStyle: "REGULAR",
+          enableFilter: true,
+          enableSort: true,
+          isVisible: true,
+          isDerived: false,
+          label: "awesome",
+          isAscOrder: undefined,
+        },
+      },
+      tableColumns: [
+        {
+          index: 0,
+          width: 150,
+          id: "name",
+          horizontalAlignment: "LEFT",
+          verticalAlignment: "CENTER",
+          columnType: "text",
+          textColor: "#231F20",
+          textSize: "PARAGRAPH",
+          fontStyle: "REGULAR",
+          enableFilter: true,
+          enableSort: true,
+          isVisible: true,
+          isDerived: false,
+          label: "awesome",
+          isAscOrder: undefined,
+        },
+        {
+          index: 1,
+          width: 150,
+          id: "id",
+          horizontalAlignment: "LEFT",
+          verticalAlignment: "CENTER",
+          columnType: "number",
+          textColor: "#231F20",
+          textSize: "PARAGRAPH",
+          fontStyle: "REGULAR",
+          enableFilter: true,
+          enableSort: true,
+          isVisible: true,
+          isDerived: false,
+          label: "id",
+          isAscOrder: false,
+        },
+      ],
+    };
+
+    input.orderedTableColumns = Object.values(input.primaryColumns).sort(
+      (a, b) => {
+        return input.columnOrder[a.id] < input.columnOrder[b.id];
+      },
+    );
+
+    const expected = [
+      { id: 234, name: "Khadija Khafaga", __originalIndex__: 2 },
+      { id: 123, name: "Hamza Anas", __originalIndex__: 1 },
+    ];
+
+    let result = getFilteredTableData(input, moment, _);
+
+    expect(result).toStrictEqual(expected);
+  });
+
   it("validates generated sanitized table data with valid property keys", () => {
     const { getProcessedTableData } = derivedProperty;
 
@@ -1333,6 +1536,116 @@ describe("Validates getFilteredTableData Properties", () => {
 
     expect(result).toStrictEqual(expected);
   });
+
+  it("filters correctly after editing a value with an applied search key", () => {
+    const { getFilteredTableData } = derivedProperty;
+    const input = {
+      tableData: [
+        { id: 1234, name: "Jim Doe" },
+        { id: 123, name: "Hamza Khafaga" },
+        { id: 234, name: "Khadija Khafaga" },
+      ],
+      processedTableData: [
+        { id: 1234, name: "Jim Doe", __originalIndex__: 0 },
+        { id: 123, name: "Hamza Anas", __originalIndex__: 1 },
+        { id: 234, name: "Khadija Khafaga", __originalIndex__: 2 },
+      ],
+      searchText: "Khafaga",
+      sortOrder: { column: "id", order: "desc" },
+      columnOrder: ["name", "id"],
+      primaryColumns: {
+        id: {
+          index: 1,
+          width: 150,
+          id: "id",
+          alias: "id",
+          originalId: "id",
+          horizontalAlignment: "LEFT",
+          verticalAlignment: "CENTER",
+          columnType: "number",
+          textColor: "#231F20",
+          textSize: "PARAGRAPH",
+          fontStyle: "REGULAR",
+          enableFilter: true,
+          enableSort: true,
+          isVisible: true,
+          isDerived: false,
+          label: "id",
+          isAscOrder: false,
+        },
+        name: {
+          index: 0,
+          width: 150,
+          id: "name",
+          alias: "name",
+          originalId: "name",
+          horizontalAlignment: "LEFT",
+          verticalAlignment: "CENTER",
+          columnType: "text",
+          textColor: "#231F20",
+          textSize: "PARAGRAPH",
+          fontStyle: "REGULAR",
+          enableFilter: true,
+          enableSort: true,
+          isVisible: true,
+          isDerived: false,
+          label: "awesome",
+          isAscOrder: undefined,
+        },
+      },
+      tableColumns: [
+        {
+          index: 0,
+          width: 150,
+          id: "name",
+          horizontalAlignment: "LEFT",
+          verticalAlignment: "CENTER",
+          columnType: "text",
+          textColor: "#231F20",
+          textSize: "PARAGRAPH",
+          fontStyle: "REGULAR",
+          enableFilter: true,
+          enableSort: true,
+          isVisible: true,
+          isDerived: false,
+          label: "awesome",
+          isAscOrder: undefined,
+        },
+        {
+          index: 1,
+          width: 150,
+          id: "id",
+          horizontalAlignment: "LEFT",
+          verticalAlignment: "CENTER",
+          columnType: "number",
+          textColor: "#231F20",
+          textSize: "PARAGRAPH",
+          fontStyle: "REGULAR",
+          enableFilter: true,
+          enableSort: true,
+          isVisible: true,
+          isDerived: false,
+          label: "id",
+          isAscOrder: false,
+        },
+      ],
+    };
+
+    input.orderedTableColumns = Object.values(input.primaryColumns).sort(
+      (a, b) => {
+        return input.columnOrder[a.id] < input.columnOrder[b.id];
+      },
+    );
+
+    const expected = [
+      { id: 234, name: "Khadija Khafaga", __originalIndex__: 2 },
+      { id: 123, name: "Hamza Anas", __originalIndex__: 1 },
+    ];
+
+    let result = getFilteredTableData(input, moment, _);
+
+    expect(result).toStrictEqual(expected);
+  });
 });
 
 describe("Validate getSelectedRow function", () => {
diff --git a/app/client/src/widgets/TableWidgetV2/widget/index.tsx b/app/client/src/widgets/TableWidgetV2/widget/index.tsx
index 046366812074..4d8e31b3e57b 100644
--- a/app/client/src/widgets/TableWidgetV2/widget/index.tsx
+++ b/app/client/src/widgets/TableWidgetV2/widget/index.tsx
@@ -138,7 +138,6 @@ import {
 } from "layoutSystems/common/utils/constants";
 import IconSVG from "../icon.svg";
 import ThumbnailSVG from "../thumbnail.svg";
-import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
 import { klonaRegularWithTelemetry } from "utils/helpers";
 
 const ReactTableComponent = lazy(async () =>
@@ -227,6 +226,8 @@ class TableWidgetV2 extends BaseWidget<TableWidgetProps, WidgetState> {
       )
         ? false
         : undefined,
+      customIsLoading: false,
+      customIsLoadingValue: "",
     };
   }
 
@@ -275,12 +276,7 @@ class TableWidgetV2 extends BaseWidget<TableWidgetProps, WidgetState> {
             isVisibleDownload: false,
           });
 
-          if (
-            !!TableWidgetV2.getFeatureFlag(
-              FEATURE_FLAG.rollout_js_enabled_one_click_binding_enabled,
-            )
-          )
-            dynamicPropertyPathList.push({ key: "tableData" });
+          dynamicPropertyPathList.push({ key: "tableData" });
         }
 
         if (queryConfig.create) {
@@ -1217,6 +1213,8 @@ class TableWidgetV2 extends BaseWidget<TableWidgetProps, WidgetState> {
 
   getWidgetView() {
     const {
+      customIsLoading,
+      customIsLoadingValue,
       delimiter,
       filteredTableData = [],
       isVisibleDownload,
@@ -1272,7 +1270,11 @@ class TableWidgetV2 extends BaseWidget<TableWidgetProps, WidgetState> {
           height={componentHeight}
           isAddRowInProgress={this.props.isAddRowInProgress}
           isEditableCellsValid={this.props.isEditableCellsValid}
-          isLoading={this.props.isLoading}
+          isLoading={
+            customIsLoading
+              ? customIsLoadingValue || this.props.isLoading
+              : this.props.isLoading
+          }
           isSortable={this.props.isSortable ?? true}
           isVisibleDownload={isVisibleDownload}
           isVisibleFilters={isVisibleFilters}
diff --git a/app/client/src/widgets/TableWidgetV2/widget/propertyConfig/PanelConfig/Basic.ts b/app/client/src/widgets/TableWidgetV2/widget/propertyConfig/PanelConfig/Basic.ts
index 837acc498f4d..ba370ac0ff61 100644
--- a/app/client/src/widgets/TableWidgetV2/widget/propertyConfig/PanelConfig/Basic.ts
+++ b/app/client/src/widgets/TableWidgetV2/widget/propertyConfig/PanelConfig/Basic.ts
@@ -181,7 +181,7 @@ export default {
       controlType: "OPEN_CONFIG_PANEL",
       buttonConfig: {
         label: "Configure",
-        icon: "settings-2-line",
+        icon: "settings-v3",
       },
       label: "Configure menu items",
       isBindProperty: false,
diff --git a/app/client/src/widgets/TableWidgetV2/widget/propertyConfig/contentConfig.ts b/app/client/src/widgets/TableWidgetV2/widget/propertyConfig/contentConfig.ts
index a3570b99228a..580daa70f83f 100644
--- a/app/client/src/widgets/TableWidgetV2/widget/propertyConfig/contentConfig.ts
+++ b/app/client/src/widgets/TableWidgetV2/widget/propertyConfig/contentConfig.ts
@@ -7,7 +7,10 @@ import { ValidationTypes } from "constants/WidgetValidation";
 import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
 import { AutocompleteDataType } from "utils/autocomplete/AutocompleteDataType";
 import type { TableWidgetProps } from "widgets/TableWidgetV2/constants";
-import { ALLOW_TABLE_WIDGET_SERVER_SIDE_FILTERING } from "../../constants";
+import {
+  ALLOW_TABLE_WIDGET_SERVER_SIDE_FILTERING,
+  CUSTOM_LOADING_STATE_ENABLED,
+} from "../../constants";
 import { InlineEditingSaveOptions } from "widgets/TableWidgetV2/constants";
 import { composePropertyUpdateHook } from "widgets/WidgetUtils";
 import {
@@ -494,13 +497,35 @@ export default [
         propertyName: "animateLoading",
         label: "Animate loading",
         controlType: "SWITCH",
-        helpText: "Controls the loading of the widget",
+        helpText: "Controls the animation loading of the widget",
         defaultValue: true,
         isJSConvertible: true,
         isBindProperty: true,
         isTriggerProperty: false,
         validation: { type: ValidationTypes.BOOLEAN },
       },
+      {
+        propertyName: "customIsLoading",
+        label: `Custom loading state`,
+        controlType: "SWITCH",
+        helpText: "Defines a custom value for the loading state",
+        defaultValue: false,
+        isBindProperty: true,
+        isTriggerProperty: false,
+        validation: { type: ValidationTypes.BOOLEAN },
+        hidden: () => !Widget.getFeatureFlag(CUSTOM_LOADING_STATE_ENABLED),
+      },
+      {
+        propertyName: "customIsLoadingValue",
+        label: "isLoading value",
+        controlType: "INPUT_TEXT",
+        defaultValue: "",
+        isBindProperty: true,
+        isTriggerProperty: false,
+        validation: { type: ValidationTypes.BOOLEAN },
+        hidden: (props: TableWidgetProps) => !props.customIsLoading,
+        dependencies: ["customIsLoading"],
+      },
       {
         propertyName: "isVisibleDownload",
         helpText: "Toggle visibility of the data download",
diff --git a/app/client/src/widgets/TabsWidget/widget/index.test.tsx b/app/client/src/widgets/TabsWidget/widget/index.test.tsx
index e6adddfc5f3a..dc87414b1cf2 100644
--- a/app/client/src/widgets/TabsWidget/widget/index.test.tsx
+++ b/app/client/src/widgets/TabsWidget/widget/index.test.tsx
@@ -49,7 +49,7 @@ describe("Tabs widget functional cases", () => {
     expect(tab2).toBeDefined();
   });
 
-  it("Should render components inside tabs by default", () => {
+  it("Should render components inside tabs by default", async () => {
     const tab1Children = buildChildren([
       { type: "SWITCH_WIDGET", label: "Tab1 Switch" },
       { type: "CHECKBOX_WIDGET", label: "Tab1 Checkbox" },
@@ -74,6 +74,10 @@ describe("Tabs widget functional cases", () => {
         <Canvas canvasWidth={dsl.rightColumn} widgetsStructure={dsl} />
       </MockPageDSL>,
     );
+
+    // wait for the dom to settle down by waitng for the canvas to be loaded
+    await component.findByTestId("t--canvas-artboard");
+
     const tab1 = component.queryByText("Tab 1");
     // TODO: Fix this the next time the file is edited
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/app/client/src/widgets/WidgetUtils.ts b/app/client/src/widgets/WidgetUtils.ts
index 8a0a7c33e2f4..5184b0c73d2a 100644
--- a/app/client/src/widgets/WidgetUtils.ts
+++ b/app/client/src/widgets/WidgetUtils.ts
@@ -166,12 +166,12 @@ export const getCustomHoverColor = (
  * Calculate Hover Color using the logic
  * https://www.notion.so/appsmith/Widget-hover-colors-165e54b304ca4e83a355e4e14d7aa3cb
  *
- * In case of transparent backgrounds (secondary or tertiary button varients)
+ * In case of transparent backgrounds (secondary or tertiary button variants)
  * 1. Find out the button color
  * 2. Calculate hover color by setting the button color to 10% transparency
  * 3. Add the calculated color to the background of the button
  *
- * In case of non transparent backgrounds (primary button varient), using the HSL color modal,
+ * In case of non transparent backgrounds (primary button variant), using the HSL color modal,
  * 1. If lightness > 35, decrease the lightness by 5 on hover
  * 2. If lightness <= 35, increase the lightness by 5 on hover
  *
diff --git a/app/client/src/widgets/index.ts b/app/client/src/widgets/index.ts
index f3d09da26f1f..c1e4cb2e52ca 100644
--- a/app/client/src/widgets/index.ts
+++ b/app/client/src/widgets/index.ts
@@ -87,6 +87,7 @@ import { WDSPasswordInputWidget } from "modules/ui-builder/ui/wds/WDSPasswordInp
 import { WDSNumberInputWidget } from "modules/ui-builder/ui/wds/WDSNumberInputWidget";
 import { WDSMultilineInputWidget } from "modules/ui-builder/ui/wds/WDSMultilineInputWidget";
 import { WDSSelectWidget } from "modules/ui-builder/ui/wds/WDSSelectWidget";
+import { EEWDSWidgets } from "ee/modules/ui-builder/ui/wds";
 
 const LegacyWidgets = [
   CanvasWidget,
@@ -156,7 +157,6 @@ const DeprecatedWidgets = [
 ];
 
 const WDSWidgets = [
-  // WDS Widgets
   WDSButtonWidget,
   WDSInputWidget,
   WDSCheckboxWidget,
@@ -191,6 +191,7 @@ const Widgets = [
   ...WDSWidgets,
   ...DeprecatedWidgets,
   ...LegacyWidgets,
+  ...EEWDSWidgets,
 ] as (typeof BaseWidget)[];
 
 export default Widgets;
diff --git a/app/client/src/workers/Evaluation/JSObject/index.ts b/app/client/src/workers/Evaluation/JSObject/index.ts
index 4c9c6b35f785..79dce10b39bb 100644
--- a/app/client/src/workers/Evaluation/JSObject/index.ts
+++ b/app/client/src/workers/Evaluation/JSObject/index.ts
@@ -114,18 +114,17 @@ export function saveResolvedFunctionsAndJSUpdates(
         JSObjectName: entityName,
         JSObjectASTParseTime,
       });
-      // TODO: Fix this the next time the file is edited
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const actions: any = [];
-      // TODO: Fix this the next time the file is edited
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const variables: any = [];
+
+      const actionsMap: Record<string, ParsedJSSubAction> = {};
+      const variablesMap: Record<string, { name: string; value: unknown }> = {};
 
       if (success) {
         if (!!parsedObject) {
           jsPropertiesState.update(entityName, parsedObject);
           parsedObject.forEach((parsedElement) => {
             if (isJSFunctionProperty(parsedElement)) {
+              if (actionsMap[parsedElement.key]) return;
+
               try {
                 ExecutionMetaData.setExecutionMetaData({
                   enableJSVarUpdateTracking: false,
@@ -164,12 +163,11 @@ export function saveResolvedFunctionsAndJSUpdates(
                     `${entityName}.${parsedElement.key}`,
                     functionString,
                   );
-                  actions.push({
+                  actionsMap[parsedElement.key] = {
                     name: parsedElement.key,
                     body: functionString,
                     arguments: params,
-                    parsedFunction: result,
-                  });
+                  };
                 }
               } catch {
                 // in case we need to handle error state
@@ -184,10 +182,10 @@ export function saveResolvedFunctionsAndJSUpdates(
                 ? parsedElement.key.slice(1, -1)
                 : parsedElement.key;
 
-              variables.push({
+              variablesMap[parsedKey] = {
                 name: parsedKey,
                 value: parsedElement.value,
-              });
+              };
               JSObjectCollection.updateUnEvalState(
                 `${entityName}.${parsedElement.key}`,
                 parsedElement.value,
@@ -196,8 +194,8 @@ export function saveResolvedFunctionsAndJSUpdates(
           });
           const parsedBody = {
             body: entity.body,
-            actions: actions,
-            variables,
+            actions: Object.values(actionsMap),
+            variables: Object.values(variablesMap),
           };
 
           set(jsUpdates, `${entityName}`, {
@@ -312,8 +310,6 @@ export function parseJSActions(
     parsedBody.actions = parsedBody.actions.map((action) => {
       return {
         ...action,
-        // parsedFunction - used only to determine if function is async
-        parsedFunction: undefined,
       } as ParsedJSSubAction;
     });
   });
diff --git a/app/client/src/workers/Evaluation/JSObject/test.ts b/app/client/src/workers/Evaluation/JSObject/test.ts
index 3a4cebe482d0..ccfb1c6c969c 100644
--- a/app/client/src/workers/Evaluation/JSObject/test.ts
+++ b/app/client/src/workers/Evaluation/JSObject/test.ts
@@ -1,5 +1,14 @@
 import type { ConfigTree, UnEvalTree } from "entities/DataTree/dataTreeTypes";
-import { getUpdatedLocalUnEvalTreeAfterJSUpdates } from ".";
+import {
+  getUpdatedLocalUnEvalTreeAfterJSUpdates,
+  saveResolvedFunctionsAndJSUpdates,
+} from ".";
+import type { JSUpdate } from "utils/JSPaneUtils";
+import type {
+  JSActionEntity,
+  JSActionEntityConfig,
+} from "ee/entities/DataTree/types";
+import DataTreeEvaluator from "workers/common/DataTreeEvaluator";
 
 describe("updateJSCollectionInUnEvalTree", function () {
   it("updates async value of jsAction", () => {
@@ -137,3 +146,119 @@ describe("updateJSCollectionInUnEvalTree", function () {
     expect(expectedResult).toStrictEqual(actualResult);
   });
 });
+
+describe("saveResolvedFunctionsAndJSUpdates", function () {
+  it("parses JSObject with duplicate actions, variables and updates jsUpdates correctly", () => {
+    const dataTreeEvalRef = new DataTreeEvaluator({});
+    const entity: JSActionEntity = {
+      actionId: "64013546b956c26882acc587",
+      body: "export default {\n\tmyVar1: [],\n\tmyVar1: [],\n\tmyVar2: {},\n\tmyFun1: () => {\n\t\t//write code here\n\t\t\n\t},\n\tmyFun2:  () => {\n\t\t//use async-await or promises\n\t\tyeso\n\t}\n,\n\tmyFun2:  () => {\n\t\t//use async-await or promises\n\t\tyeso\n\t}}",
+      ENTITY_TYPE: "JSACTION",
+      name: "JSObject1",
+      pluginType: "JS",
+    };
+    const jsUpdates: Record<string, JSUpdate> = {};
+    const unEvalDataTree: UnEvalTree = {
+      JSObject1: {
+        myVar1: "[]",
+        myVar2: "{}",
+        myFun1: new String("() => {}"),
+        myFun2: new String("async () => {\n  yeso;\n}"),
+        body: "export default {\n\tmyVar1: [],\n\tmyVar1: [],\n\tmyVar2: {},\n\tmyFun1: () => {\n\t\t//write code here\n\t\t\n\t},\n\tmyFun2:  () => {\n\t\t//use async-await or promises\n\t\tyeso\n\t}\n,\n\tmyFun2:  () => {\n\t\t//use async-await or promises\n\t\tyeso\n\t}}",
+        ENTITY_TYPE: "JSACTION",
+        meta: {
+          myFun1: {
+            arguments: [],
+            confirmBeforeExecute: false,
+          },
+          myFun2: {
+            arguments: [],
+            confirmBeforeExecute: false,
+          },
+        },
+        dependencyMap: {
+          body: ["myFun1", "myFun2"],
+        },
+        dynamicBindingPathList: [
+          {
+            key: "body",
+          },
+          {
+            key: "myVar1",
+          },
+          {
+            key: "myVar2",
+          },
+          {
+            key: "myFun1",
+          },
+          {
+            key: "myFun2",
+          },
+          {
+            key: "myFun2",
+          },
+        ],
+        bindingPaths: {
+          body: "SMART_SUBSTITUTE",
+          myVar1: "SMART_SUBSTITUTE",
+          myVar2: "SMART_SUBSTITUTE",
+          myFun1: "SMART_SUBSTITUTE",
+          myFun2: "SMART_SUBSTITUTE",
+        },
+        reactivePaths: {
+          body: "SMART_SUBSTITUTE",
+          myVar1: "SMART_SUBSTITUTE",
+          myVar2: "SMART_SUBSTITUTE",
+          myFun1: "SMART_SUBSTITUTE",
+          myFun2: "SMART_SUBSTITUTE",
+        },
+        pluginType: "JS",
+        name: "JSObject1",
+        actionId: "64013546b956c26882acc587",
+      } as JSActionEntityConfig,
+    };
+    const entityName = "JSObject1";
+
+    const result = saveResolvedFunctionsAndJSUpdates(
+      dataTreeEvalRef,
+      entity,
+      jsUpdates,
+      unEvalDataTree,
+      entityName,
+    );
+
+    const expectedJSUpdates = {
+      JSObject1: {
+        parsedBody: {
+          body: "export default {\n\tmyVar1: [],\n\tmyVar1: [],\n\tmyVar2: {},\n\tmyFun1: () => {\n\t\t//write code here\n\t\t\n\t},\n\tmyFun2:  () => {\n\t\t//use async-await or promises\n\t\tyeso\n\t}\n,\n\tmyFun2:  () => {\n\t\t//use async-await or promises\n\t\tyeso\n\t}}",
+          actions: [
+            {
+              name: "myFun1",
+              body: "() => {}",
+              arguments: [],
+            },
+            {
+              name: "myFun2",
+              body: "() => {\n  yeso;\n}",
+              arguments: [],
+            },
+          ],
+          variables: [
+            {
+              name: "myVar1",
+              value: "[]",
+            },
+            {
+              name: "myVar2",
+              value: "{}",
+            },
+          ],
+        },
+        id: "64013546b956c26882acc587",
+      },
+    };
+
+    expect(result).toStrictEqual(expectedJSUpdates);
+  });
+});
diff --git a/app/client/src/workers/Evaluation/__tests__/evaluation.test.ts b/app/client/src/workers/Evaluation/__tests__/evaluation.test.ts
index d1f6ed7a08d9..dd25e57bb1e9 100644
--- a/app/client/src/workers/Evaluation/__tests__/evaluation.test.ts
+++ b/app/client/src/workers/Evaluation/__tests__/evaluation.test.ts
@@ -18,6 +18,7 @@ import WidgetFactory from "WidgetProvider/factory";
 import { generateDataTreeWidget } from "entities/DataTree/dataTreeWidget";
 import { sortObjectWithArray } from "../../../utils/treeUtils";
 import klona from "klona";
+import { APP_MODE } from "entities/App";
 
 const klonaFullSpy = jest.fn();
 
@@ -565,8 +566,19 @@ describe("DataTreeEvaluator", () => {
 
   const evaluator = new DataTreeEvaluator(WIDGET_CONFIG_MAP);
 
-  it("Checks the number of clone operations in first tree flow", () => {
-    evaluator.setupFirstTree(unEvalTree, configTree);
+  it("Checks the number of clone operations in first tree flow", async () => {
+    await evaluator.setupFirstTree(
+      unEvalTree,
+      configTree,
+      {},
+      {
+        appId: "appId",
+        pageId: "pageId",
+        timestamp: "timestamp",
+        appMode: APP_MODE.PUBLISHED,
+        instanceId: "instanceId",
+      },
+    );
     evaluator.evalAndValidateFirstTree();
     // Hard check to not regress on the number of clone operations. Try to improve this number.
     expect(klonaFullSpy).toBeCalledTimes(41);
diff --git a/app/client/src/workers/Evaluation/evalTreeWithChanges.test.ts b/app/client/src/workers/Evaluation/evalTreeWithChanges.test.ts
index 3227e290ecce..5ee2ba8b677c 100644
--- a/app/client/src/workers/Evaluation/evalTreeWithChanges.test.ts
+++ b/app/client/src/workers/Evaluation/evalTreeWithChanges.test.ts
@@ -9,6 +9,7 @@ import type { WidgetEntity } from "plugins/Linting/lib/entity/WidgetEntity";
 import type { UpdateDataTreeMessageData } from "sagas/EvalWorkerActionSagas";
 import DataTreeEvaluator from "workers/common/DataTreeEvaluator";
 import * as evalTreeWithChanges from "./evalTreeWithChanges";
+import { APP_MODE } from "entities/App";
 export const BASE_WIDGET = {
   widgetId: "randomID",
   widgetName: "randomWidgetName",
@@ -184,9 +185,20 @@ describe("evaluateAndGenerateResponse", () => {
     return updates.filter((p: any) => !p.rhs.__evaluation__);
   };
 
-  beforeEach(() => {
+  beforeEach(async () => {
     evaluator = new DataTreeEvaluator(WIDGET_CONFIG_MAP);
-    evaluator.setupFirstTree(unEvalTree, configTree);
+    await evaluator.setupFirstTree(
+      unEvalTree,
+      configTree,
+      {},
+      {
+        appId: "appId",
+        pageId: "pageId",
+        timestamp: "timestamp",
+        appMode: APP_MODE.PUBLISHED,
+        instanceId: "instanceId",
+      },
+    );
     evaluator.evalAndValidateFirstTree();
   });
 
@@ -277,6 +289,11 @@ describe("evaluateAndGenerateResponse", () => {
         [],
         [],
       );
+
+      expect(webworkerResponse.workerResponse.dependencies).toEqual({
+        "Text1.text": ["Text2.text", "Text1"],
+        "Text2.text": ["Text2"],
+      });
       const parsedUpdates =
         getParsedUpdatesFromWebWorkerResp(webworkerResponse);
 
diff --git a/app/client/src/workers/Evaluation/evalTreeWithChanges.ts b/app/client/src/workers/Evaluation/evalTreeWithChanges.ts
index 8b75815c5ba6..bc561de0df56 100644
--- a/app/client/src/workers/Evaluation/evalTreeWithChanges.ts
+++ b/app/client/src/workers/Evaluation/evalTreeWithChanges.ts
@@ -139,6 +139,7 @@ export const evaluateAndGenerateResponse = (
   );
 
   defaultResponse.staleMetaIds = updateResponse.staleMetaIds;
+  defaultResponse.dependencies = dataTreeEvaluator.inverseDependencies;
 
   // when additional paths are required to be added as updates, we extract the updates from the data tree using these paths.
   const additionalUpdates = getNewDataTreeUpdates(
diff --git a/app/client/src/workers/Evaluation/handlers/evalTree.ts b/app/client/src/workers/Evaluation/handlers/evalTree.ts
index d8098a6e45e9..ee786065cba4 100644
--- a/app/client/src/workers/Evaluation/handlers/evalTree.ts
+++ b/app/client/src/workers/Evaluation/handlers/evalTree.ts
@@ -14,11 +14,7 @@ import {
   CrashingError,
   getSafeToRenderDataTree,
 } from "ee/workers/Evaluation/evaluationUtils";
-import type {
-  EvalTreeRequestData,
-  EvalTreeResponseData,
-  EvalWorkerSyncRequest,
-} from "../types";
+import type { EvalTreeRequestData, EvalWorkerASyncRequest } from "../types";
 import { clearAllIntervals } from "../fns/overrides/interval";
 import JSObjectCollection from "workers/Evaluation/JSObject/Collection";
 import { getJSVariableCreatedEvents } from "../JSObject/JSVariableEvents";
@@ -33,6 +29,7 @@ import { MessageType, sendMessage } from "utils/MessageUtil";
 import {
   profileFn,
   newWebWorkerSpanData,
+  profileAsyncFn,
 } from "UITelemetry/generateWebWorkerTraces";
 import type { SpanAttributes } from "UITelemetry/generateTraces";
 import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer";
@@ -49,9 +46,9 @@ export let canvasWidgetsMeta: Record<string, any>;
 export let metaWidgetsCache: MetaWidgetsReduxState;
 export let canvasWidgets: CanvasWidgetsReduxState;
 
-export function evalTree(
-  request: EvalWorkerSyncRequest<EvalTreeRequestData>,
-): EvalTreeResponseData {
+export async function evalTree(
+  request: EvalWorkerASyncRequest<EvalTreeRequestData>,
+) {
   const { data, webworkerTelemetry } = request;
 
   webworkerTelemetry["transferDataToWorkerThread"].endTime = Date.now();
@@ -76,6 +73,7 @@ export function evalTree(
     affectedJSObjects,
     allActionValidationConfig,
     appMode,
+    cacheProps,
     forceEvaluation,
     metaWidgets,
     shouldReplay,
@@ -109,16 +107,17 @@ export function evalTree(
         allActionValidationConfig,
       );
 
-      const setupFirstTreeResponse = profileFn(
+      const setupFirstTreeResponse = await profileAsyncFn(
         "setupFirstTree",
-        { description: "during initialisation" },
+        (dataTreeEvaluator as DataTreeEvaluator).setupFirstTree.bind(
+          dataTreeEvaluator,
+          unevalTree,
+          configTree,
+          webworkerTelemetry,
+          cacheProps,
+        ),
         webworkerTelemetry,
-        () =>
-          (dataTreeEvaluator as DataTreeEvaluator).setupFirstTree(
-            unevalTree,
-            configTree,
-            webworkerTelemetry,
-          ),
+        { description: "during initialisation" },
       );
 
       evalOrder = setupFirstTreeResponse.evalOrder;
@@ -128,8 +127,9 @@ export function evalTree(
         "evalAndValidateFirstTree",
         { description: "during initialisation" },
         webworkerTelemetry,
-        () =>
-          (dataTreeEvaluator as DataTreeEvaluator).evalAndValidateFirstTree(),
+        (dataTreeEvaluator as DataTreeEvaluator).evalAndValidateFirstTree.bind(
+          dataTreeEvaluator,
+        ),
       );
 
       dataTree = makeEntityConfigsAsObjProperties(dataTreeResponse.evalTree, {
@@ -160,15 +160,17 @@ export function evalTree(
         );
       }
 
-      const setupFirstTreeResponse = profileFn(
+      const setupFirstTreeResponse = await profileAsyncFn(
         "setupFirstTree",
-        { description: "non-initialisation" },
+        (dataTreeEvaluator as DataTreeEvaluator).setupFirstTree.bind(
+          dataTreeEvaluator,
+          unevalTree,
+          configTree,
+          webworkerTelemetry,
+          cacheProps,
+        ),
         webworkerTelemetry,
-        () =>
-          (dataTreeEvaluator as DataTreeEvaluator).setupFirstTree(
-            unevalTree,
-            configTree,
-          ),
+        { description: "non-initialisation" },
       );
 
       isCreateFirstTree = true;
diff --git a/app/client/src/workers/Evaluation/handlers/index.ts b/app/client/src/workers/Evaluation/handlers/index.ts
index b2dc7d81e664..1c8a79b3f1b9 100644
--- a/app/client/src/workers/Evaluation/handlers/index.ts
+++ b/app/client/src/workers/Evaluation/handlers/index.ts
@@ -31,7 +31,6 @@ const syncHandlerMap: Record<
   (req: EvalWorkerSyncRequest) => any
 > = {
   [EVAL_WORKER_ACTIONS.EVAL_ACTION_BINDINGS]: evalActionBindings,
-  [EVAL_WORKER_ACTIONS.EVAL_TREE]: evalTree,
   [EVAL_WORKER_ACTIONS.EVAL_TREE_WITH_CHANGES]: evalTreeWithChanges,
   [EVAL_WORKER_ACTIONS.UNDO]: undo,
   [EVAL_WORKER_ACTIONS.REDO]: redo,
@@ -52,6 +51,7 @@ const asyncHandlerMap: Record<
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   (req: EvalWorkerASyncRequest) => any
 > = {
+  [EVAL_WORKER_ACTIONS.EVAL_TREE]: evalTree,
   [EVAL_WORKER_ACTIONS.EVAL_TRIGGER]: evalTrigger,
   [EVAL_WORKER_ACTIONS.EVAL_EXPRESSION]: evalExpression,
   [EVAL_WORKER_ACTIONS.LOAD_LIBRARIES]: loadLibraries,
diff --git a/app/client/src/workers/Evaluation/types.ts b/app/client/src/workers/Evaluation/types.ts
index bb6cdebfd93b..5fcd231b003c 100644
--- a/app/client/src/workers/Evaluation/types.ts
+++ b/app/client/src/workers/Evaluation/types.ts
@@ -18,6 +18,7 @@ import type { APP_MODE } from "entities/App";
 import type { WebworkerSpanData } from "UITelemetry/generateWebWorkerTraces";
 import type { SpanAttributes } from "UITelemetry/generateTraces";
 import type { AffectedJSObjects } from "sagas/EvaluationsSagaUtils";
+import type { ICacheProps } from "../common/AppComputationCache/types";
 
 // TODO: Fix this the next time the file is edited
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -34,6 +35,7 @@ export type EvalWorkerASyncRequest<T = any> = WorkerRequest<
 export type EvalWorkerResponse = EvalTreeResponseData | boolean | unknown;
 
 export interface EvalTreeRequestData {
+  cacheProps: ICacheProps;
   unevalTree: unEvalAndConfigTree;
   widgetTypeConfigMap: WidgetTypeConfigMap;
   widgets: CanvasWidgetsReduxState;
diff --git a/app/client/src/workers/common/AppComputationCache/AppComputationCache.test.ts b/app/client/src/workers/common/AppComputationCache/AppComputationCache.test.ts
new file mode 100644
index 000000000000..e3a837485c9c
--- /dev/null
+++ b/app/client/src/workers/common/AppComputationCache/AppComputationCache.test.ts
@@ -0,0 +1,519 @@
+import { EComputationCacheName, type ICacheProps } from "./types";
+import { APP_MODE } from "entities/App";
+import localforage from "localforage";
+import loglevel from "loglevel";
+import { AppComputationCache } from "./index";
+
+jest.useFakeTimers();
+
+// Mock functions for the main store
+const setItemMock = jest.fn();
+const getItemMock = jest.fn();
+const keysMock = jest.fn();
+const removeItemMock = jest.fn();
+
+// Mock functions for the cache logs store
+const setItemMockLogs = jest.fn();
+const getItemMockLogs = jest.fn();
+const keysMockLogs = jest.fn();
+const removeItemMockLogs = jest.fn();
+
+// Override the localforage driver to mock the local storage
+localforage.defineDriver({
+  _driver: localforage.LOCALSTORAGE,
+  _initStorage: jest.fn(),
+
+  // These methods will be used by the instances created in AppComputationCache
+  keys: keysMock,
+  getItem: getItemMock,
+  setItem: setItemMock,
+  removeItem: removeItemMock,
+
+  iterate: jest.fn(),
+  key: jest.fn(),
+  length: jest.fn(),
+  clear: jest.fn(),
+});
+
+// Mock localforage.createInstance to return our mocks
+jest.spyOn(localforage, "createInstance").mockImplementation((options) => {
+  if (options.storeName === "cachedResults") {
+    return {
+      ...localforage,
+      setItem: setItemMock,
+      getItem: getItemMock,
+      keys: keysMock,
+      removeItem: removeItemMock,
+    };
+  } else if (options.storeName === "cacheMetadataStore") {
+    return {
+      ...localforage,
+      setItem: setItemMockLogs,
+      getItem: getItemMockLogs,
+      keys: keysMockLogs,
+      removeItem: removeItemMockLogs,
+    };
+  } else {
+    throw new Error("Unknown store");
+  }
+});
+
+describe("AppComputationCache", () => {
+  let appComputationCache: AppComputationCache;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    AppComputationCache.resetInstance();
+
+    // Now instantiate the singleton after mocks are set up
+    appComputationCache = AppComputationCache.getInstance();
+  });
+
+  describe("generateCacheKey", () => {
+    test("should generate the correct cache key", () => {
+      const cacheProps: ICacheProps = {
+        appMode: APP_MODE.PUBLISHED,
+        timestamp: new Date("11 September 2024").toISOString(),
+        appId: "appId",
+        instanceId: "instanceId",
+        pageId: "pageId",
+      };
+
+      const cacheName = EComputationCacheName.ALL_KEYS;
+
+      const cacheKey = appComputationCache.generateCacheKey({
+        cacheName,
+        cacheProps,
+      });
+
+      expect(cacheKey).toBe(
+        `${cacheProps.instanceId}>${cacheProps.appId}>${cacheProps.pageId}>${cacheProps.appMode}>${new Date(
+          cacheProps.timestamp,
+        ).getTime()}>${cacheName}`,
+      );
+    });
+  });
+
+  describe("isComputationCached", () => {
+    test("should return false for EDIT mode", () => {
+      const cacheProps: ICacheProps = {
+        appMode: APP_MODE.EDIT,
+        timestamp: new Date("11 September 2024").toISOString(),
+        appId: "appId",
+        instanceId: "instanceId",
+        pageId: "pageId",
+      };
+
+      const cacheName = EComputationCacheName.ALL_KEYS;
+
+      const result = appComputationCache.isComputationCached({
+        cacheName,
+        cacheProps,
+      });
+
+      expect(result).toBe(false);
+    });
+
+    test("should return true for PUBLISHED mode", () => {
+      const cacheProps: ICacheProps = {
+        appMode: APP_MODE.PUBLISHED,
+        timestamp: new Date("11 September 2024").toISOString(),
+        appId: "appId",
+        instanceId: "instanceId",
+        pageId: "pageId",
+      };
+
+      const cacheName = EComputationCacheName.ALL_KEYS;
+
+      const result = appComputationCache.isComputationCached({
+        cacheName,
+        cacheProps,
+      });
+
+      expect(result).toBe(true);
+    });
+
+    test("should return false if appMode is undefined", () => {
+      const cacheProps: ICacheProps = {
+        timestamp: new Date("11 September 2024").toISOString(),
+        appId: "appId",
+        instanceId: "instanceId",
+        pageId: "pageId",
+      };
+
+      const cacheName = EComputationCacheName.ALL_KEYS;
+
+      const result = appComputationCache.isComputationCached({
+        cacheName,
+        cacheProps,
+      });
+
+      expect(result).toBe(false);
+    });
+
+    test("should return false if timestamp is undefined", () => {
+      const cacheProps: ICacheProps = {
+        appMode: APP_MODE.PUBLISHED,
+        timestamp: "",
+        appId: "appId",
+        instanceId: "instanceId",
+        pageId: "pageId",
+      };
+
+      const cacheName = EComputationCacheName.ALL_KEYS;
+
+      const result = appComputationCache.isComputationCached({
+        cacheName,
+        cacheProps,
+      });
+
+      expect(result).toBe(false);
+    });
+  });
+
+  describe("getCachedComputationResult", () => {
+    test("should call getItemMock and return null if cache miss", async () => {
+      const cacheProps: ICacheProps = {
+        appMode: APP_MODE.PUBLISHED,
+        timestamp: new Date("11 September 2024").toISOString(),
+        appId: "appId",
+        instanceId: "instanceId",
+        pageId: "pageId",
+      };
+
+      const cacheName = EComputationCacheName.ALL_KEYS;
+
+      const cacheKey = appComputationCache.generateCacheKey({
+        cacheName,
+        cacheProps,
+      });
+
+      getItemMock.mockResolvedValue(null);
+      keysMock.mockResolvedValue([]);
+
+      const result = await appComputationCache.getCachedComputationResult({
+        cacheName,
+        cacheProps,
+      });
+
+      expect(getItemMock).toHaveBeenCalledWith(cacheKey);
+      expect(result).toBe(null);
+
+      jest.advanceTimersByTime(5000);
+
+      expect(keysMock).toHaveBeenCalledTimes(1);
+    });
+
+    test("should call deleteInvalidCacheEntries on cache miss after 10 seconds", async () => {
+      const cacheProps: ICacheProps = {
+        appMode: APP_MODE.PUBLISHED,
+        timestamp: new Date("11 September 2024").toISOString(),
+        appId: "appId",
+        instanceId: "instanceId",
+        pageId: "pageId",
+      };
+
+      const cacheName = EComputationCacheName.ALL_KEYS;
+
+      const cacheKey = appComputationCache.generateCacheKey({
+        cacheName,
+        cacheProps,
+      });
+
+      getItemMock.mockResolvedValue(null);
+      keysMock.mockResolvedValue([]);
+
+      const result = await appComputationCache.getCachedComputationResult({
+        cacheName,
+        cacheProps,
+      });
+
+      expect(getItemMock).toHaveBeenCalledWith(cacheKey);
+      expect(result).toBe(null);
+
+      jest.advanceTimersByTime(2500);
+      expect(keysMock).toHaveBeenCalledTimes(0);
+
+      jest.advanceTimersByTime(2500);
+      jest.runAllTimers();
+
+      expect(keysMock).toHaveBeenCalledTimes(1);
+    });
+
+    test("should call getItemMock and return cached value if cache hit", async () => {
+      const cacheProps: ICacheProps = {
+        appMode: APP_MODE.PUBLISHED,
+        timestamp: new Date("11 September 2024").toISOString(),
+        appId: "appId",
+        instanceId: "instanceId",
+        pageId: "pageId",
+      };
+
+      const cacheName = EComputationCacheName.ALL_KEYS;
+
+      const cacheKey = appComputationCache.generateCacheKey({
+        cacheName,
+        cacheProps,
+      });
+
+      getItemMock.mockResolvedValue({ value: "cachedValue" });
+
+      const result = await appComputationCache.getCachedComputationResult({
+        cacheName,
+        cacheProps,
+      });
+
+      expect(getItemMock).toHaveBeenCalledWith(cacheKey);
+      expect(result).toBe("cachedValue");
+    });
+  });
+
+  describe("cacheComputationResult", () => {
+    test("should store computation result and call trackCacheUsage when shouldCache is true", async () => {
+      const cacheProps: ICacheProps = {
+        appMode: APP_MODE.PUBLISHED,
+        timestamp: new Date("11 September 2024").toISOString(),
+        appId: "appId",
+        instanceId: "instanceId",
+        pageId: "pageId",
+      };
+
+      const cacheName = EComputationCacheName.ALL_KEYS;
+
+      const cacheKey = appComputationCache.generateCacheKey({
+        cacheName,
+        cacheProps,
+      });
+
+      const computationResult = "computedValue";
+
+      const trackCacheUsageSpy = jest.spyOn(
+        appComputationCache,
+        "trackCacheUsage",
+      );
+
+      await appComputationCache.cacheComputationResult({
+        cacheName,
+        cacheProps,
+        computationResult,
+      });
+
+      expect(setItemMock).toHaveBeenCalledWith(cacheKey, {
+        value: computationResult,
+      });
+      expect(trackCacheUsageSpy).toHaveBeenCalledWith(cacheKey);
+
+      trackCacheUsageSpy.mockRestore();
+    });
+
+    test("should not store computation result when shouldCache is false", async () => {
+      const cacheProps: ICacheProps = {
+        appMode: APP_MODE.EDIT,
+        timestamp: new Date("11 September 2024").toISOString(),
+        appId: "appId",
+        instanceId: "instanceId",
+        pageId: "pageId",
+      };
+
+      const cacheName = EComputationCacheName.ALL_KEYS;
+
+      const computationResult = "computedValue";
+
+      await appComputationCache.cacheComputationResult({
+        cacheName,
+        cacheProps,
+        computationResult,
+      });
+
+      expect(setItemMock).not.toHaveBeenCalled();
+    });
+  });
+
+  describe("fetchOrCompute", () => {
+    test("should return cached result if available", async () => {
+      const cacheProps: ICacheProps = {
+        appMode: APP_MODE.PUBLISHED,
+        timestamp: new Date("11 September 2024").toISOString(),
+        appId: "appId",
+        instanceId: "instanceId",
+        pageId: "pageId",
+      };
+
+      const cacheName = EComputationCacheName.ALL_KEYS;
+
+      const cacheKey = appComputationCache.generateCacheKey({
+        cacheName,
+        cacheProps,
+      });
+
+      getItemMock.mockResolvedValue({ value: "cachedValue" });
+
+      const computeFn = jest.fn(() => "computedValue");
+
+      const result = await appComputationCache.fetchOrCompute({
+        cacheName,
+        cacheProps,
+        computeFn,
+      });
+
+      expect(getItemMock).toHaveBeenCalledWith(cacheKey);
+      expect(computeFn).not.toHaveBeenCalled();
+      expect(result).toBe("cachedValue");
+    });
+
+    test("should compute, cache, and return result if not in cache", async () => {
+      getItemMock.mockResolvedValue(null);
+
+      const cacheProps: ICacheProps = {
+        appMode: APP_MODE.PUBLISHED,
+        timestamp: new Date("11 September 2024").toISOString(),
+        appId: "appId",
+        instanceId: "instanceId",
+        pageId: "pageId",
+      };
+
+      const cacheName = EComputationCacheName.ALL_KEYS;
+
+      const cacheKey = appComputationCache.generateCacheKey({
+        cacheName,
+        cacheProps,
+      });
+
+      const computationResult = "computedValue";
+
+      const computeFn = jest.fn(() => computationResult);
+
+      const cacheComputationResultSpy = jest.spyOn(
+        appComputationCache,
+        "cacheComputationResult",
+      );
+
+      const result = await appComputationCache.fetchOrCompute({
+        cacheName,
+        cacheProps,
+        computeFn,
+      });
+
+      expect(getItemMock).toHaveBeenCalledWith(cacheKey);
+      expect(computeFn).toHaveBeenCalled();
+      expect(cacheComputationResultSpy).toHaveBeenCalledWith({
+        cacheName,
+        cacheProps,
+        computationResult,
+      });
+      expect(result).toBe(computationResult);
+
+      cacheComputationResultSpy.mockRestore();
+    });
+
+    test("should handle cache errors and compute result", async () => {
+      getItemMock.mockRejectedValue(new Error("Cache access error"));
+
+      const defaultLogLevel = loglevel.getLevel();
+
+      loglevel.setLevel("SILENT");
+
+      const cacheProps: ICacheProps = {
+        appMode: APP_MODE.PUBLISHED,
+        timestamp: new Date("11 September 2024").toISOString(),
+        appId: "appId",
+        instanceId: "instanceId",
+        pageId: "pageId",
+      };
+
+      const cacheName = EComputationCacheName.ALL_KEYS;
+
+      const computationResult = "computedValue";
+
+      const computeFn = jest.fn(() => computationResult);
+
+      const cacheComputationResultSpy = jest.spyOn(
+        appComputationCache,
+        "cacheComputationResult",
+      );
+
+      const result = await appComputationCache.fetchOrCompute({
+        cacheName,
+        cacheProps,
+        computeFn,
+      });
+
+      expect(getItemMock).toHaveBeenCalled();
+      expect(computeFn).toHaveBeenCalled();
+      expect(cacheComputationResultSpy).toHaveBeenCalledWith({
+        cacheName,
+        cacheProps,
+        computationResult,
+      });
+      expect(result).toBe(computationResult);
+
+      cacheComputationResultSpy.mockRestore();
+      loglevel.setLevel(defaultLogLevel);
+    });
+  });
+
+  describe("deleteInvalidCacheEntries", () => {
+    test("should delete old cache entries", async () => {
+      const cacheProps: ICacheProps = {
+        appMode: APP_MODE.PUBLISHED,
+        timestamp: new Date("11 September 2024").toISOString(),
+        appId: "appId",
+        instanceId: "instanceId",
+        pageId: "pageId",
+      };
+
+      const currentTimestamp = new Date(cacheProps.timestamp).getTime();
+
+      const currentCacheKey = [
+        cacheProps.instanceId,
+        cacheProps.appId,
+        cacheProps.pageId,
+        cacheProps.appMode,
+        currentTimestamp,
+        EComputationCacheName.ALL_KEYS,
+      ].join(">");
+
+      const oldTimestamp = new Date("10 September 2024").getTime();
+
+      const oldCacheKey = [
+        cacheProps.instanceId,
+        cacheProps.appId,
+        cacheProps.pageId,
+        cacheProps.appMode,
+        oldTimestamp,
+        EComputationCacheName.ALL_KEYS,
+      ].join(">");
+
+      keysMock.mockResolvedValue([currentCacheKey, oldCacheKey]);
+
+      await appComputationCache.deleteInvalidCacheEntries(cacheProps);
+
+      expect(keysMock).toHaveBeenCalled();
+
+      expect(removeItemMock).toHaveBeenCalledWith(oldCacheKey);
+      expect(removeItemMock).not.toHaveBeenCalledWith(currentCacheKey);
+    });
+  });
+
+  describe("trackCacheUsage", () => {
+    test("should update cache log", async () => {
+      const cacheKey = "someCacheKey";
+
+      const existingCacheLog = {
+        lastAccessedAt: Date.now() - 1000,
+        createdAt: Date.now() - 2000,
+      };
+
+      getItemMockLogs.mockResolvedValue(existingCacheLog);
+
+      await appComputationCache.trackCacheUsage(cacheKey);
+
+      expect(getItemMockLogs).toHaveBeenCalledWith(cacheKey);
+
+      expect(setItemMockLogs).toHaveBeenCalledWith(cacheKey, {
+        lastAccessedAt: expect.any(Number),
+        createdAt: existingCacheLog.createdAt,
+      });
+    });
+  });
+});
diff --git a/app/client/src/workers/common/AppComputationCache/index.ts b/app/client/src/workers/common/AppComputationCache/index.ts
new file mode 100644
index 000000000000..a7e70ad36512
--- /dev/null
+++ b/app/client/src/workers/common/AppComputationCache/index.ts
@@ -0,0 +1,305 @@
+import { APP_MODE } from "entities/App";
+import localforage from "localforage";
+import isNull from "lodash/isNull";
+import loglevel from "loglevel";
+import { EComputationCacheName, type ICacheProps } from "./types";
+import debounce from "lodash/debounce";
+
+interface ICachedData<T> {
+  value: T;
+}
+
+interface ICacheLog {
+  lastAccessedAt: number;
+  createdAt: number | null;
+}
+
+export class AppComputationCache {
+  // Singleton instance
+  private static instance: AppComputationCache | null = null;
+  private static CACHE_KEY_DELIMITER = ">";
+
+  // The cache store for computation results
+  private readonly store: LocalForage;
+
+  // The cache store for cache event logs
+  private readonly cacheLogsStore: LocalForage;
+
+  // The app mode configuration for each cache type. This determines which app modes
+  // the cache should be enabled for
+  private readonly appModeConfig = {
+    [EComputationCacheName.DEPENDENCY_MAP]: [APP_MODE.PUBLISHED],
+    [EComputationCacheName.ALL_KEYS]: [APP_MODE.PUBLISHED],
+  };
+
+  constructor() {
+    this.store = localforage.createInstance({
+      name: "AppComputationCache",
+      storeName: "cachedResults",
+    });
+
+    this.cacheLogsStore = localforage.createInstance({
+      name: "AppComputationCache",
+      storeName: "cacheMetadataStore",
+    });
+  }
+
+  static getInstance(): AppComputationCache {
+    if (!AppComputationCache.instance) {
+      AppComputationCache.instance = new AppComputationCache();
+    }
+
+    return AppComputationCache.instance;
+  }
+
+  debouncedDeleteInvalidCacheEntries = debounce(
+    this.deleteInvalidCacheEntries,
+    5000,
+  );
+
+  /**
+   * Check if the computation result should be cached based on the app mode configuration
+   * @returns - A boolean indicating whether the cache should be enabled for the given app mode
+   */
+  isComputationCached({
+    cacheName,
+    cacheProps,
+  }: {
+    cacheName: EComputationCacheName;
+    cacheProps: ICacheProps;
+  }) {
+    const { appMode, timestamp } = cacheProps;
+
+    if (!appMode || !timestamp) {
+      return false;
+    }
+
+    return this.appModeConfig[cacheName].includes(appMode);
+  }
+
+  /**
+   * Checks if the value should be cached based on the app mode configuration and
+   * caches the computation result if it should be cached. It also tracks the cache usage
+   * @returns - A promise that resolves when the computation result is cached
+   */
+  async cacheComputationResult<T>({
+    cacheName,
+    cacheProps,
+    computationResult,
+  }: {
+    cacheProps: ICacheProps;
+    cacheName: EComputationCacheName;
+    computationResult: T;
+  }) {
+    const shouldCache = this.isComputationCached({
+      cacheName,
+      cacheProps,
+    });
+
+    if (!shouldCache) {
+      return;
+    }
+
+    const cacheKey = this.generateCacheKey({ cacheProps, cacheName });
+
+    try {
+      await this.store.setItem<ICachedData<T>>(cacheKey, {
+        value: computationResult,
+      });
+
+      await this.trackCacheUsage(cacheKey);
+    } catch (error) {
+      loglevel.debug("Error caching computation result:", error);
+    }
+  }
+
+  /**
+   * Gets the cached computation result if it exists and is valid
+   * @returns - A promise that resolves with the cached computation result or null if it does not exist
+   */
+  async getCachedComputationResult<T>({
+    cacheName,
+    cacheProps,
+  }: {
+    cacheProps: ICacheProps;
+    cacheName: EComputationCacheName;
+  }): Promise<T | null> {
+    const shouldCache = this.isComputationCached({
+      cacheName,
+      cacheProps,
+    });
+
+    if (!shouldCache) {
+      return null;
+    }
+
+    const cacheKey = this.generateCacheKey({
+      cacheProps,
+      cacheName,
+    });
+
+    try {
+      const cached = await this.store.getItem<ICachedData<T>>(cacheKey);
+
+      if (isNull(cached)) {
+        // Cache miss
+        // Delete invalid cache entries when thread is idle
+        setTimeout(async () => {
+          await this.debouncedDeleteInvalidCacheEntries(cacheProps);
+        }, 0);
+
+        return null;
+      }
+
+      await this.trackCacheUsage(cacheKey);
+
+      return cached.value;
+    } catch (error) {
+      loglevel.error("Error getting cache result:", error);
+
+      return null;
+    }
+  }
+
+  /**
+   * Generates a cache key from the index parts
+   * @returns - The generated cache key
+   */
+  generateCacheKey({
+    cacheName,
+    cacheProps,
+  }: {
+    cacheProps: ICacheProps;
+    cacheName: EComputationCacheName;
+  }) {
+    const { appId, appMode, instanceId, pageId, timestamp } = cacheProps;
+
+    const timeStampEpoch = new Date(timestamp).getTime();
+    const cacheKeyParts = [
+      instanceId,
+      appId,
+      pageId,
+      appMode,
+      timeStampEpoch,
+      cacheName,
+    ];
+
+    return cacheKeyParts.join(AppComputationCache.CACHE_KEY_DELIMITER);
+  }
+
+  /**
+   * Fetches the computation result from the cache or computes it if it does not exist
+   * @returns - A promise that resolves with the computation result
+   * @throws - Logs an error if the computation result cannot be fetched or computed and returns the computed fallback result
+   */
+  async fetchOrCompute<T>({
+    cacheName,
+    cacheProps,
+    computeFn,
+  }: {
+    cacheProps: ICacheProps;
+    computeFn: () => Promise<T> | T;
+    cacheName: EComputationCacheName;
+  }) {
+    const shouldCache = this.isComputationCached({
+      cacheName,
+      cacheProps,
+    });
+
+    if (!shouldCache) {
+      return computeFn();
+    }
+
+    try {
+      const cachedResult = await this.getCachedComputationResult<T>({
+        cacheProps,
+        cacheName,
+      });
+
+      if (cachedResult) {
+        return cachedResult;
+      }
+
+      const computationResult = await computeFn();
+
+      await this.cacheComputationResult({
+        cacheProps,
+        computationResult,
+        cacheName,
+      });
+
+      return computationResult;
+    } catch (error) {
+      loglevel.error("Error getting cache result:", error);
+      const fallbackResult = await computeFn();
+
+      return fallbackResult;
+    }
+  }
+
+  /**
+   * Tracks the cache usage by updating the last accessed timestamp of the cache
+   * @param name - The name of the cache
+   * @returns - A promise that resolves when the cache usage is tracked
+   * @throws - Logs an error if the cache usage cannot be tracked
+   */
+  async trackCacheUsage(name: string) {
+    try {
+      const currentLog = await this.cacheLogsStore.getItem<ICacheLog>(name);
+
+      await this.cacheLogsStore.setItem(name, {
+        lastAccessedAt: Date.now(),
+        createdAt: currentLog?.createdAt || Date.now(),
+      });
+    } catch (error) {
+      loglevel.error("Error tracking cache usage:", error);
+    }
+  }
+
+  /**
+   * Delete invalid cache entries
+   * @returns - A promise that resolves when the invalid cache entries are deleted
+   */
+
+  async deleteInvalidCacheEntries(cacheProps: ICacheProps) {
+    try {
+      // Get previous entry keys
+      const cacheKeys = await this.store.keys();
+
+      // Get invalid cache keys
+      const invalidCacheKeys = cacheKeys.filter((key) => {
+        const keyParts = key.split(AppComputationCache.CACHE_KEY_DELIMITER);
+        const cacheKeyTimestamp = parseInt(keyParts[4], 10);
+
+        return (
+          keyParts[0] === cacheProps.instanceId &&
+          keyParts[1] === cacheProps.appId &&
+          keyParts[3] === cacheProps.appMode &&
+          cacheKeyTimestamp !== new Date(cacheProps.timestamp).getTime()
+        );
+      });
+
+      // Delete invalid cache entries
+      await Promise.all(
+        invalidCacheKeys.map(async (key) => this.store.removeItem(key)),
+      );
+
+      // Delete invalid cache logs
+      await Promise.all(
+        invalidCacheKeys.map(async (key) =>
+          this.cacheLogsStore.removeItem(key),
+        ),
+      );
+    } catch (error) {
+      loglevel.error("Error deleting invalid cache entries:", error);
+    }
+  }
+
+  static resetInstance() {
+    AppComputationCache.instance = null;
+  }
+}
+
+export const appComputationCache = AppComputationCache.getInstance();
+
+export default appComputationCache;
diff --git a/app/client/src/workers/common/AppComputationCache/types.ts b/app/client/src/workers/common/AppComputationCache/types.ts
new file mode 100644
index 000000000000..5ae66f61039b
--- /dev/null
+++ b/app/client/src/workers/common/AppComputationCache/types.ts
@@ -0,0 +1,14 @@
+import type { APP_MODE } from "entities/App";
+
+export enum EComputationCacheName {
+  DEPENDENCY_MAP = "DEPENDENCY_MAP",
+  ALL_KEYS = "ALL_KEYS",
+}
+
+export interface ICacheProps {
+  appId: string;
+  pageId: string;
+  appMode?: APP_MODE;
+  timestamp: string;
+  instanceId: string;
+}
diff --git a/app/client/src/workers/common/DataTreeEvaluator/index.ts b/app/client/src/workers/common/DataTreeEvaluator/index.ts
index c9b4c3031277..d874741e483b 100644
--- a/app/client/src/workers/common/DataTreeEvaluator/index.ts
+++ b/app/client/src/workers/common/DataTreeEvaluator/index.ts
@@ -136,12 +136,18 @@ import DataStore from "workers/Evaluation/dataStore";
 import { updateTreeWithData } from "workers/Evaluation/dataStore/utils";
 import microDiff from "microdiff";
 import {
+  profileAsyncFn,
   profileFn,
   type WebworkerSpanData,
 } from "UITelemetry/generateWebWorkerTraces";
 import type { SpanAttributes } from "UITelemetry/generateTraces";
 import type { AffectedJSObjects } from "sagas/EvaluationsSagaUtils";
 import generateOverrideContext from "ee/workers/Evaluation/generateOverrideContext";
+import appComputationCache from "../AppComputationCache";
+import {
+  EComputationCacheName,
+  type ICacheProps,
+} from "../AppComputationCache/types";
 
 type SortedDependencies = Array<string>;
 export interface EvalProps {
@@ -235,16 +241,14 @@ export default class DataTreeEvaluator {
    * Method to create all data required for linting and
    * evaluation of the first tree
    */
-  setupFirstTree(
+  async setupFirstTree(
     // TODO: Fix this the next time the file is edited
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     unEvalTree: any,
     configTree: ConfigTree,
     webworkerTelemetry: Record<string, WebworkerSpanData | SpanAttributes> = {},
-  ): {
-    jsUpdates: Record<string, JSUpdate>;
-    evalOrder: string[];
-  } {
+    cacheProps: ICacheProps,
+  ) {
     this.setConfigTree(configTree);
 
     const totalFirstTreeSetupStartTime = performance.now();
@@ -287,19 +291,29 @@ export default class DataTreeEvaluator {
     );
     const allKeysGenerationStartTime = performance.now();
 
-    this.allKeys = getAllPaths(unEvalTreeWithStrigifiedJSFunctions);
+    this.allKeys = await appComputationCache.fetchOrCompute({
+      cacheProps,
+      cacheName: EComputationCacheName.ALL_KEYS,
+      computeFn: () => getAllPaths(unEvalTreeWithStrigifiedJSFunctions),
+    });
+
     const allKeysGenerationEndTime = performance.now();
 
     const createDependencyMapStartTime = performance.now();
 
-    const { dependencies, inverseDependencies } = profileFn(
+    const { dependencies, inverseDependencies } = await profileAsyncFn(
       "createDependencyMap",
-      undefined,
+      async () =>
+        createDependencyMap(
+          this,
+          localUnEvalTree,
+          configTree,
+          cacheProps,
+          webworkerTelemetry,
+        ),
       webworkerTelemetry,
-      () => {
-        return createDependencyMap(this, localUnEvalTree, configTree);
-      },
     );
+
     const createDependencyMapEndTime = performance.now();
 
     this.dependencies = dependencies;
diff --git a/app/client/src/workers/common/DataTreeEvaluator/test.ts b/app/client/src/workers/common/DataTreeEvaluator/test.ts
index f71e77021ea2..8c77aeaea266 100644
--- a/app/client/src/workers/common/DataTreeEvaluator/test.ts
+++ b/app/client/src/workers/common/DataTreeEvaluator/test.ts
@@ -26,6 +26,7 @@ import {
 } from "constants/AppsmithActionConstants/ActionConstants";
 import generateOverrideContext from "ee/workers/Evaluation/generateOverrideContext";
 import { klona } from "klona";
+import { APP_MODE } from "entities/App";
 
 const widgetConfigMap: Record<
   string,
@@ -278,10 +279,18 @@ describe("DataTreeEvaluator", () => {
   });
 
   describe("test updateDependencyMap", () => {
-    beforeEach(() => {
-      dataTreeEvaluator.setupFirstTree(
+    beforeEach(async () => {
+      await dataTreeEvaluator.setupFirstTree(
         unEvalTree as unknown as DataTree,
         configTree as unknown as ConfigTree,
+        {},
+        {
+          appId: "appId",
+          pageId: "pageId",
+          timestamp: "timestamp",
+          appMode: APP_MODE.PUBLISHED,
+          instanceId: "instanceId",
+        },
       );
       dataTreeEvaluator.evalAndValidateFirstTree();
     });
@@ -373,10 +382,18 @@ describe("DataTreeEvaluator", () => {
   describe("array accessor dependency handling", () => {
     const dataTreeEvaluator = new DataTreeEvaluator(widgetConfigMap);
 
-    beforeEach(() => {
-      dataTreeEvaluator.setupFirstTree(
+    beforeEach(async () => {
+      await dataTreeEvaluator.setupFirstTree(
         nestedArrayAccessorCyclicDependency.initUnEvalTree,
         nestedArrayAccessorCyclicDependencyConfig.initConfigTree,
+        {},
+        {
+          appId: "appId",
+          pageId: "pageId",
+          timestamp: new Date().toISOString(),
+          appMode: APP_MODE.PUBLISHED,
+          instanceId: "instanceId",
+        },
       );
       dataTreeEvaluator.evalAndValidateFirstTree();
     });
diff --git a/app/client/src/workers/common/DependencyMap/index.ts b/app/client/src/workers/common/DependencyMap/index.ts
index 07de9cec8f10..420284ce29bb 100644
--- a/app/client/src/workers/common/DependencyMap/index.ts
+++ b/app/client/src/workers/common/DependencyMap/index.ts
@@ -29,46 +29,91 @@ import {
 } from "ee/workers/Evaluation/Actions";
 import { isWidgetActionOrJsObject } from "ee/entities/DataTree/utils";
 import { getValidEntityType } from "workers/common/DataTreeEvaluator/utils";
+import appComputationCache from "../AppComputationCache";
+import {
+  EComputationCacheName,
+  type ICacheProps,
+} from "../AppComputationCache/types";
 import type DependencyMap from "entities/DependencyMap";
+import {
+  profileFn,
+  type WebworkerSpanData,
+} from "UITelemetry/generateWebWorkerTraces";
+import type { SpanAttributes } from "UITelemetry/generateTraces";
 
-export function createDependencyMap(
+export async function createDependencyMap(
   dataTreeEvalRef: DataTreeEvaluator,
   unEvalTree: DataTree,
   configTree: ConfigTree,
+  cacheProps: ICacheProps,
+  webworkerSpans: Record<string, WebworkerSpanData | SpanAttributes> = {},
 ) {
   const { allKeys, dependencyMap } = dataTreeEvalRef;
+
   const allAppsmithInternalFunctions = convertArrayToObject(
     AppsmithFunctionsWithFields,
   );
   const setterFunctions = getAllSetterFunctions(unEvalTree, configTree);
 
-  dependencyMap.addNodes(
-    { ...allKeys, ...allAppsmithInternalFunctions, ...setterFunctions },
-    false,
-  );
-
-  Object.keys(configTree).forEach((entityName) => {
-    const entity = unEvalTree[entityName];
-    const entityConfig = configTree[entityName];
-    const entityDependencies = getEntityDependencies(
-      entity as DataTreeEntityObject,
-      entityConfig,
-      allKeys,
+  profileFn("createDependencyMap.addNodes", {}, webworkerSpans, async () => {
+    dependencyMap.addNodes(
+      { ...allKeys, ...allAppsmithInternalFunctions, ...setterFunctions },
+      false,
     );
+  });
+
+  const dependencyMapCache =
+    await appComputationCache.getCachedComputationResult<
+      Record<string, string[]>
+    >({
+      cacheProps,
+      cacheName: EComputationCacheName.DEPENDENCY_MAP,
+    });
 
-    for (const path of Object.keys(entityDependencies)) {
-      const pathDependencies = entityDependencies[path];
-      const { errors, references } = extractInfoFromBindings(
-        pathDependencies,
+  if (dependencyMapCache) {
+    profileFn("createDependencyMap.addDependency", {}, webworkerSpans, () => {
+      Object.entries(dependencyMapCache).forEach(([path, references]) => {
+        dependencyMap.addDependency(path, references);
+      });
+    });
+  } else {
+    let shouldCache = true;
+
+    Object.keys(configTree).forEach((entityName) => {
+      const entity = unEvalTree[entityName];
+      const entityConfig = configTree[entityName];
+      const entityDependencies = getEntityDependencies(
+        entity as DataTreeEntityObject,
+        entityConfig,
         allKeys,
       );
 
-      dependencyMap.addDependency(path, references);
-      dataTreeEvalRef.errors.push(...errors);
-    }
-  });
+      for (const path of Object.keys(entityDependencies)) {
+        const pathDependencies = entityDependencies[path];
+        const { errors, references } = extractInfoFromBindings(
+          pathDependencies,
+          allKeys,
+        );
+
+        dependencyMap.addDependency(path, references);
+        dataTreeEvalRef.errors.push(...errors);
 
-  DependencyMapUtils.makeParentsDependOnChildren(dependencyMap);
+        if (errors.length) {
+          shouldCache = false;
+        }
+      }
+    });
+
+    DependencyMapUtils.makeParentsDependOnChildren(dependencyMap);
+
+    if (shouldCache) {
+      await appComputationCache.cacheComputationResult({
+        cacheProps,
+        cacheName: EComputationCacheName.DEPENDENCY_MAP,
+        computationResult: dependencyMap.dependencies,
+      });
+    }
+  }
 
   return {
     dependencies: dependencyMap.dependencies,
diff --git a/app/client/test/__mocks__/reactMarkdown.tsx b/app/client/test/__mocks__/reactMarkdown.tsx
new file mode 100644
index 000000000000..65a0c9176006
--- /dev/null
+++ b/app/client/test/__mocks__/reactMarkdown.tsx
@@ -0,0 +1,8 @@
+import React from "react";
+
+jest.mock("react-markdown", () => (props: { children: unknown }) => {
+  return <>{props.children}</>;
+});
+
+jest.mock("remark-gfm", () => () => {
+})
\ No newline at end of file
diff --git a/app/client/test/factories/MockPluginsState.ts b/app/client/test/factories/MockPluginsState.ts
index cc3a9d9c9f95..dbebc0ad9fd2 100644
--- a/app/client/test/factories/MockPluginsState.ts
+++ b/app/client/test/factories/MockPluginsState.ts
@@ -6933,8 +6933,9 @@ export default {
             },
           },
           {
-            label: "Use Prepared Statement",
-            info: "Prepared statements prevent SQL injections on your queries but do not support dynamic bindings outside values in your SQL",
+            label: "Use prepared statements",
+            tooltipText:
+              "Prepared statements prevent SQL injections on your queries but do not support dynamic bindings outside values in your SQL",
             configProperty:
               "actionConfiguration.pluginSpecifiedTemplates[0].value",
             controlType: "SWITCH",
@@ -6951,23 +6952,22 @@ export default {
         id: 1,
         children: [
           {
-            label: "Run API on page load",
+            label: "Run the API on page load",
             configProperty: "executeOnLoad",
             controlType: "SWITCH",
-            subtitle: "Will refresh data each time the page is loaded",
           },
           {
-            label: "Request confirmation before running API",
+            label: "Request confirmation before running this API",
             configProperty: "confirmBeforeExecute",
             controlType: "SWITCH",
-            subtitle:
+            tooltipText:
               "Ask confirmation from the user each time before refreshing data",
           },
           {
             label: "Encode query params",
             configProperty: "actionConfiguration.encodeParamsToggle",
             controlType: "SWITCH",
-            subtitle:
+            tooltipText:
               "Encode query params for all APIs. Also encode form body when Content-Type header is set to x-www-form-encoded",
           },
           {
@@ -6975,7 +6975,7 @@ export default {
             configProperty:
               "actionConfiguration.pluginSpecifiedTemplates[0].value",
             controlType: "SWITCH",
-            subtitle:
+            tooltipText:
               "Turning on this property fixes the JSON substitution of bindings in API body by adding/removing quotes intelligently and reduces developer errors",
             initialValue: true,
           },
@@ -6984,8 +6984,6 @@ export default {
             configProperty: "actionConfiguration.httpVersion",
             name: "actionConfiguration.httpVersion",
             controlType: "DROP_DOWN",
-            subtitle:
-              "Select the protocol that best suits your security and performance requirements.",
             initialValue: "HTTP/1.1",
             options: [
               {
@@ -7020,23 +7018,22 @@ export default {
         id: 1,
         children: [
           {
-            label: "Run API on page load",
+            label: "Run the API on page load",
             configProperty: "executeOnLoad",
             controlType: "SWITCH",
-            subtitle: "Will refresh data each time the page is loaded",
           },
           {
-            label: "Request confirmation before running API",
+            label: "Request confirmation before running this API",
             configProperty: "confirmBeforeExecute",
             controlType: "SWITCH",
-            subtitle:
+            tooltipText:
               "Ask confirmation from the user each time before refreshing data",
           },
           {
             label: "Encode query params",
             configProperty: "actionConfiguration.encodeParamsToggle",
             controlType: "SWITCH",
-            subtitle:
+            tooltipText:
               "Encode query params for all APIs. Also encode form body when Content-Type header is set to x-www-form-encoded",
           },
           {
@@ -7044,7 +7041,7 @@ export default {
             configProperty:
               "actionConfiguration.pluginSpecifiedTemplates[0].value",
             controlType: "SWITCH",
-            subtitle:
+            tooltipText:
               "Turning on this property fixes the JSON substitution of bindings in API body by adding/removing quotes intelligently and reduces developer errors",
             initialValue: true,
           },
@@ -7053,8 +7050,6 @@ export default {
             configProperty: "actionConfiguration.httpVersion",
             name: "actionConfiguration.httpVersion",
             controlType: "DROP_DOWN",
-            subtitle:
-              "Select the protocol that best suits your security and performance requirements.",
             initialValue: "HTTP/1.1",
             options: [
               {
@@ -7089,16 +7084,15 @@ export default {
         id: 1,
         children: [
           {
-            label: "Run query on page load",
+            label: "Run the query on page load",
             configProperty: "executeOnLoad",
             controlType: "SWITCH",
-            subtitle: "Will refresh data each time the page is loaded",
           },
           {
-            label: "Request confirmation before running query",
+            label: "Request confirmation before running this query",
             configProperty: "confirmBeforeExecute",
             controlType: "SWITCH",
-            subtitle:
+            tooltipText:
               "Ask confirmation from the user each time before refreshing data",
           },
           {
@@ -7119,21 +7113,20 @@ export default {
         id: 1,
         children: [
           {
-            label: "Run query on page load",
+            label: "Run the query on page load",
             configProperty: "executeOnLoad",
             controlType: "SWITCH",
-            subtitle: "Will refresh data each time the page is loaded",
           },
           {
-            label: "Request confirmation before running query",
+            label: "Request confirmation before running this query",
             configProperty: "confirmBeforeExecute",
             controlType: "SWITCH",
-            subtitle:
+            tooltipText:
               "Ask confirmation from the user each time before refreshing data",
           },
           {
-            label: "Use Prepared Statement",
-            subtitle:
+            label: "Use prepared statements",
+            tooltipText:
               "Prepared statements prevent SQL injections on your queries but do not support dynamic bindings outside values in your SQL",
             configProperty:
               "actionConfiguration.pluginSpecifiedTemplates[0].value",
diff --git a/app/client/test/factories/WidgetFactoryUtils.ts b/app/client/test/factories/WidgetFactoryUtils.ts
index 262b37bb042b..b5d8bdf3c1be 100644
--- a/app/client/test/factories/WidgetFactoryUtils.ts
+++ b/app/client/test/factories/WidgetFactoryUtils.ts
@@ -4,12 +4,12 @@ import type { DSLWidget } from "WidgetProvider/constants";
 import defaultTemplate from "templates/default";
 import { WidgetTypeFactories } from "./Widgets/WidgetTypeFactories";
 const defaultMainContainer: DSLWidget = {
-  ...(defaultTemplate as any),
+  ...(defaultTemplate as unknown as DSLWidget),
   canExtend: true,
   renderMode: "PAGE",
   version: 1,
   isLoading: false,
-};
+} as DSLWidget;
 
 export const mainContainerFactory = makeFactory({ ...defaultMainContainer });
 export const widgetCanvasFactory = makeFactory(mainContainerFactory.build());
@@ -18,18 +18,22 @@ const buildChild = (child: Partial<WidgetProps>): WidgetProps => {
     ...child,
   });
 };
+
 export const buildChildren = (children: Partial<WidgetProps>[]) => {
   try {
     return children.map((child) => {
       return buildChild(child);
     });
   } catch (error) {
+    // eslint-disable-next-line no-console
     console.error("Check if child widget data provided");
   }
 };
 
 export const buildDslWithChildren = (childData: Partial<WidgetProps>[]) => {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const children: any = buildChildren(childData);
+
   return widgetCanvasFactory.build({
     children,
   });
diff --git a/app/client/test/testCommon.ts b/app/client/test/testCommon.ts
index a1494d6fe9f1..ab3fcb9d1282 100644
--- a/app/client/test/testCommon.ts
+++ b/app/client/test/testCommon.ts
@@ -12,13 +12,16 @@ import type { WidgetEntity } from "ee/entities/DataTree/types";
 import urlBuilder from "ee/entities/URLRedirect/URLAssembly";
 import type { FlattenedWidgetProps } from "reducers/entityReducers/canvasWidgetsStructureReducer";
 import type { Page } from "entities/Page";
+import { useEffect, useState } from "react";
+import type { FetchPageResponse } from "api/PageApi";
 
 const pageId = "0123456789abcdef00000000";
 
-export const useMockDsl = (dsl: any, mode?: APP_MODE) => {
+export const useMockDsl = (dsl: unknown, mode?: APP_MODE) => {
   const dispatch = useDispatch();
-  dispatch(setAppMode(mode || APP_MODE.EDIT));
-  const mockResp: any = {
+  const [hasLoaded, setHasLoaded] = useState(false);
+
+  const mockResp = {
     data: {
       id: pageId,
       pageId: pageId,
@@ -42,52 +45,81 @@ export const useMockDsl = (dsl: any, mode?: APP_MODE) => {
         "delete:pages",
       ],
     },
-  };
-  const canvasWidgetsPayload = getCanvasWidgetsPayload(mockResp);
-  dispatch({
-    type: ReduxActionTypes.FETCH_PAGE_DSLS_SUCCESS,
-    payload: [
-      {
-        pageId: mockResp.data.id,
-        dsl: extractCurrentDSL({ response: mockResp }).dsl,
-      },
-    ],
-  });
-  const pages: Page[] = [
-    {
-      pageName: mockResp.data.name,
-      pageId: mockResp.data.id,
-      basePageId: mockResp.data.id,
-      isDefault: mockResp.data.isDefault,
-      isHidden: !!mockResp.data.isHidden,
-      slug: mockResp.data.slug,
-      userPermissions: [
-        "read:pages",
-        "manage:pages",
-        "create:pageActions",
-        "delete:pages",
-      ],
-    },
-  ];
-  dispatch({
-    type: ReduxActionTypes.FETCH_PAGE_LIST_SUCCESS,
-    payload: {
-      pages,
-      applicationId: mockResp.data.applicationId,
-    },
-  });
-  dispatch({
-    type: "UPDATE_LAYOUT",
-    payload: { widgets: canvasWidgetsPayload.widgets },
-  });
+  } as unknown as FetchPageResponse;
 
-  dispatch(updateCurrentPage(mockResp.data.id));
+  useEffect(function loadScripts() {
+    const loadMigrationScripts = async () => {
+      const canvasWidgetsPayloadD = await getCanvasWidgetsPayload(mockResp);
+      const currentDSL = await extractCurrentDSL({
+        response: mockResp,
+      });
+
+      const currentDsl = currentDSL.dsl;
+      const canvasWidgetsPayload = canvasWidgetsPayloadD.widgets;
+
+      dispatch(setAppMode(mode || APP_MODE.EDIT));
+
+      dispatch({
+        type: ReduxActionTypes.FETCH_PAGE_DSLS_SUCCESS,
+        payload: [
+          {
+            pageId: mockResp.data.id,
+            dsl: currentDsl,
+          },
+        ],
+      });
+      const pages = [
+        {
+          pageName: mockResp.data.name,
+          pageId: mockResp.data.id,
+          basePageId: mockResp.data.id,
+          isDefault: mockResp.data.isDefault,
+          isHidden: !!mockResp.data.isHidden,
+          slug: mockResp.data.slug,
+          userPermissions: [
+            "read:pages",
+            "manage:pages",
+            "create:pageActions",
+            "delete:pages",
+          ],
+        },
+      ] as unknown as Page[];
+
+      dispatch({
+        type: ReduxActionTypes.FETCH_PAGE_LIST_SUCCESS,
+        payload: {
+          pages,
+          applicationId: mockResp.data.applicationId,
+        },
+      });
+      dispatch({
+        type: "UPDATE_LAYOUT",
+        payload: { widgets: canvasWidgetsPayload },
+      });
+
+      dispatch(updateCurrentPage(mockResp.data.id));
+      setHasLoaded(true);
+    };
+
+    loadMigrationScripts();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  return hasLoaded;
 };
 
-export function MockPageDSL({ children, dsl }: any) {
+export function MockPageDSL({
+  children,
+  dsl,
+}: {
+  children: JSX.Element;
+  dsl?: unknown;
+}) {
   editorInitializer();
-  useMockDsl(dsl);
-  return children;
+
+  const hasLoaded = useMockDsl(dsl);
+
+  return hasLoaded ? children : null;
 }
 
 const getChildWidgets = (
@@ -123,7 +155,7 @@ export const mockCreateCanvasWidget = (
   canvasWidget: FlattenedWidgetProps,
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   evaluatedWidget: WidgetEntity,
-): any => {
+) => {
   return { ...canvasWidget };
 };
 
@@ -141,17 +173,21 @@ export const syntheticTestMouseEvent = (
   optionsToAdd = {},
 ) => {
   const options = Object.entries(optionsToAdd);
+
   options.forEach(([key, value]) => {
     Object.defineProperty(event, key, { get: () => value });
   });
+
   return event;
 };
 
-export function MockApplication({ children }: any) {
+export function MockApplication({ children }: { children: JSX.Element }) {
   editorInitializer();
   const dispatch = useDispatch();
+
   dispatch(initEditorAction({ basePageId: pageId, mode: APP_MODE.EDIT }));
-  const mockResp: any = {
+
+  const mockResp = {
     workspaceId: "workspace_id",
     pages: [
       {
@@ -176,6 +212,7 @@ export function MockApplication({ children }: any) {
     slug: "app-name",
     applicationVersion: 2,
   };
+
   urlBuilder.updateURLParams(
     {
       baseApplicationId: mockResp.baseId,
@@ -212,6 +249,7 @@ export function MockApplication({ children }: any) {
       ],
     },
   });
+
   return children;
 }
 
@@ -225,7 +263,8 @@ export function dispatchTestKeyboardEventWithCode(
   meta = false,
 ) {
   const event = document.createEvent("KeyboardEvent");
-  (event as any).initKeyboardEvent(
+
+  event.initKeyboardEvent(
     eventType,
     true,
     true,
diff --git a/app/client/test/testMockedWidgets.tsx b/app/client/test/testMockedWidgets.tsx
index d4cd005133f9..70795c0a7295 100644
--- a/app/client/test/testMockedWidgets.tsx
+++ b/app/client/test/testMockedWidgets.tsx
@@ -9,14 +9,17 @@ import { useMockDsl } from "./testCommon";
 
 export function MockCanvas() {
   const canvasWidgetsStructure = useSelector(getCanvasWidgetsStructure);
+
   return <Canvas canvasWidth={0} widgetsStructure={canvasWidgetsStructure} />;
 }
 
-export function UpdateAppViewer({ dsl }: any) {
-  useMockDsl(dsl, APP_MODE.PUBLISHED);
-  return <AppViewerPageContainer />;
+export function UpdateAppViewer({ dsl }: { dsl: unknown }) {
+  const hasLoaded = useMockDsl(dsl, APP_MODE.PUBLISHED);
+
+  return hasLoaded ? <AppViewerPageContainer /> : null;
 }
-export function UpdatedEditor({ dsl }: any) {
-  useMockDsl(dsl, APP_MODE.EDIT);
-  return <IDE />;
+export function UpdatedEditor({ dsl }: { dsl: unknown }) {
+  const hasLoaded = useMockDsl(dsl, APP_MODE.EDIT);
+
+  return hasLoaded ? <IDE /> : null;
 }
diff --git a/app/client/yarn.lock b/app/client/yarn.lock
index d236a94e1afe..5ac9ff782ea4 100644
--- a/app/client/yarn.lock
+++ b/app/client/yarn.lock
@@ -250,10 +250,16 @@ __metadata:
     "@react-types/shared": ^3.23.1
     "@tabler/icons-react": ^3.10.0
     "@types/fs-extra": ^11.0.4
+    "@types/react-syntax-highlighter": ^15.5.13
+    "@types/react-transition-group": ^4.4.11
     clsx: ^2.0.0
     eslint-plugin-storybook: ^0.6.10
     lodash: "*"
     react-aria-components: ^1.2.1
+    react-markdown: ^9.0.1
+    react-syntax-highlighter: ^15.5.0
+    react-transition-group: ^4.4.5
+    remark-gfm: ^4.0.0
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
   languageName: unknown
@@ -1259,17 +1265,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-string-parser@npm:^7.24.8":
-  version: 7.24.8
-  resolution: "@babel/helper-string-parser@npm:7.24.8"
-  checksum: 39b03c5119216883878655b149148dc4d2e284791e969b19467a9411fccaa33f7a713add98f4db5ed519535f70ad273cdadfd2eb54d47ebbdeac5083351328ce
+"@babel/helper-string-parser@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/helper-string-parser@npm:7.25.9"
+  checksum: 6435ee0849e101681c1849868278b5aee82686ba2c1e27280e5e8aca6233af6810d39f8e4e693d2f2a44a3728a6ccfd66f72d71826a94105b86b731697cdfa99
   languageName: node
   linkType: hard
 
-"@babel/helper-validator-identifier@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-validator-identifier@npm:7.24.7"
-  checksum: 6799ab117cefc0ecd35cd0b40ead320c621a298ecac88686a14cffceaac89d80cdb3c178f969861bf5fa5e4f766648f9161ea0752ecfe080d8e89e3147270257
+"@babel/helper-validator-identifier@npm:^7.24.7, @babel/helper-validator-identifier@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/helper-validator-identifier@npm:7.25.9"
+  checksum: 5b85918cb1a92a7f3f508ea02699e8d2422fe17ea8e82acd445006c0ef7520fbf48e3dbcdaf7b0a1d571fc3a2715a29719e5226636cb6042e15fe6ed2a590944
   languageName: node
   linkType: hard
 
@@ -1314,14 +1320,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.23.0, @babel/parser@npm:^7.23.9, @babel/parser@npm:^7.25.0, @babel/parser@npm:^7.25.3":
-  version: 7.25.3
-  resolution: "@babel/parser@npm:7.25.3"
+"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.23.0, @babel/parser@npm:^7.23.9, @babel/parser@npm:^7.24.4, @babel/parser@npm:^7.25.0, @babel/parser@npm:^7.25.3":
+  version: 7.26.1
+  resolution: "@babel/parser@npm:7.26.1"
   dependencies:
-    "@babel/types": ^7.25.2
+    "@babel/types": ^7.26.0
   bin:
     parser: ./bin/babel-parser.js
-  checksum: b55aba64214fa1d66ccd0d29f476d2e55a48586920d280f88c546f81cbbececc0e01c9d05a78d6bf206e8438b9c426caa344942c1a581eecc4d365beaab8a20e
+  checksum: 354320d1a0a7102b2f25620ceea1bbc809f5225432a73e8a8874009d2f82ed29e2b035fe68fb6d18bb7eafed78df1ec0fa12e8d8226b295d7a020f9b852de653
   languageName: node
   linkType: hard
 
@@ -1452,7 +1458,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-private-methods@npm:^7.16.0":
+"@babel/plugin-proposal-private-methods@npm:^7.16.0, @babel/plugin-proposal-private-methods@npm:^7.18.6":
   version: 7.18.6
   resolution: "@babel/plugin-proposal-private-methods@npm:7.18.6"
   dependencies:
@@ -2624,12 +2630,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.1, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.11.1, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.16.0, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.18.0, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.20.0, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2":
-  version: 7.24.8
-  resolution: "@babel/runtime@npm:7.24.8"
+"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.1, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.11.1, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.16.0, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.18.0, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.20.0, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
+  version: 7.26.0
+  resolution: "@babel/runtime@npm:7.26.0"
   dependencies:
     regenerator-runtime: ^0.14.0
-  checksum: 6b1e4230580f67a807ad054720812bbefbb024cc2adc1159d050acbb764c4c81c7ac5f7a042c48f578987c5edc2453c71039268df059058e9501fa6023d764b0
+  checksum: c8e2c0504ab271b3467a261a8f119bf2603eb857a0d71e37791f4e3fae00f681365073cc79f141ddaa90c6077c60ba56448004ad5429d07ac73532be9f7cf28a
   languageName: node
   linkType: hard
 
@@ -2666,14 +2672,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.6, @babel/types@npm:^7.18.9, @babel/types@npm:^7.20.7, @babel/types@npm:^7.21.3, @babel/types@npm:^7.22.5, @babel/types@npm:^7.24.0, @babel/types@npm:^7.24.7, @babel/types@npm:^7.24.8, @babel/types@npm:^7.25.0, @babel/types@npm:^7.25.2, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4":
-  version: 7.25.2
-  resolution: "@babel/types@npm:7.25.2"
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.6, @babel/types@npm:^7.18.9, @babel/types@npm:^7.20.7, @babel/types@npm:^7.21.3, @babel/types@npm:^7.22.5, @babel/types@npm:^7.24.0, @babel/types@npm:^7.24.7, @babel/types@npm:^7.24.8, @babel/types@npm:^7.25.0, @babel/types@npm:^7.25.2, @babel/types@npm:^7.26.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4":
+  version: 7.26.0
+  resolution: "@babel/types@npm:7.26.0"
   dependencies:
-    "@babel/helper-string-parser": ^7.24.8
-    "@babel/helper-validator-identifier": ^7.24.7
-    to-fast-properties: ^2.0.0
-  checksum: f73f66ba903c6f7e38f519a33d53a67d49c07e208e59ea65250362691dc546c6da7ab90ec66ee79651ef697329872f6f97eb19a6dfcacc026fd05e76a563c5d2
+    "@babel/helper-string-parser": ^7.25.9
+    "@babel/helper-validator-identifier": ^7.25.9
+  checksum: a3dd37dabac693018872da96edb8c1843a605c1bfacde6c3f504fba79b972426a6f24df70aa646356c0c1b19bdd2c722c623c684a996c002381071680602280d
   languageName: node
   linkType: hard
 
@@ -4766,6 +4771,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@opentelemetry/api-logs@npm:0.53.0":
+  version: 0.53.0
+  resolution: "@opentelemetry/api-logs@npm:0.53.0"
+  dependencies:
+    "@opentelemetry/api": ^1.0.0
+  checksum: 3383ff75f94a77402370a655f8edf049f9864ad60140f70821a1b775ce43bdb9ca6fade533a1faf46dbca19f3189bcbf1f8805062f5a68bfe2a00281b1712d1f
+  languageName: node
+  linkType: hard
+
 "@opentelemetry/api@npm:^1.0.0, @opentelemetry/api@npm:^1.9.0":
   version: 1.9.0
   resolution: "@opentelemetry/api@npm:1.9.0"
@@ -4773,6 +4787,31 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@opentelemetry/auto-instrumentations-web@npm:^0.41.0":
+  version: 0.41.0
+  resolution: "@opentelemetry/auto-instrumentations-web@npm:0.41.0"
+  dependencies:
+    "@opentelemetry/instrumentation": ^0.53.0
+    "@opentelemetry/instrumentation-document-load": ^0.40.0
+    "@opentelemetry/instrumentation-fetch": ^0.53.0
+    "@opentelemetry/instrumentation-user-interaction": ^0.40.0
+    "@opentelemetry/instrumentation-xml-http-request": ^0.53.0
+  peerDependencies:
+    "@opentelemetry/api": ^1.3.0
+    zone.js: ^0.11.4 || ^0.13.0 || ^0.14.0
+  checksum: 9e73bc3654bfe325154a2e26d713033a3a6c1e4341a5f3803af75b5c945d1844e2f83b129b42c69b660ca9caf5f16b666c12143ac51744c8d12ea550d29935d5
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/context-async-hooks@npm:1.26.0":
+  version: 1.26.0
+  resolution: "@opentelemetry/context-async-hooks@npm:1.26.0"
+  peerDependencies:
+    "@opentelemetry/api": ">=1.0.0 <1.10.0"
+  checksum: f0fe5bfa3aeed99fbe7d6f6157e3bcc2e4450850a62ef60e551812f3e5aa72cb81e38de8c4e1b6934c93e18579a503664597f78e7e7d9904e271f59c939a3e02
+  languageName: node
+  linkType: hard
+
 "@opentelemetry/context-zone-peer-dep@npm:1.25.1":
   version: 1.25.1
   resolution: "@opentelemetry/context-zone-peer-dep@npm:1.25.1"
@@ -4804,7 +4843,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@opentelemetry/core@npm:^1.26.0":
+"@opentelemetry/core@npm:1.26.0":
   version: 1.26.0
   resolution: "@opentelemetry/core@npm:1.26.0"
   dependencies:
@@ -4815,6 +4854,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@opentelemetry/core@npm:1.27.0, @opentelemetry/core@npm:^1.26.0, @opentelemetry/core@npm:^1.8.0":
+  version: 1.27.0
+  resolution: "@opentelemetry/core@npm:1.27.0"
+  dependencies:
+    "@opentelemetry/semantic-conventions": 1.27.0
+  peerDependencies:
+    "@opentelemetry/api": ">=1.0.0 <1.10.0"
+  checksum: 33ff551f89f0bb95830c9f9464c43b11adf88882ec1d3a03a5b9afcc89d2aafab33c36cb5047f18667d7929d6ab40ed0121649c42d0105f1cb33ffdca48f8b13
+  languageName: node
+  linkType: hard
+
 "@opentelemetry/exporter-metrics-otlp-http@npm:0.52.1":
   version: 0.52.1
   resolution: "@opentelemetry/exporter-metrics-otlp-http@npm:0.52.1"
@@ -4845,6 +4895,77 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@opentelemetry/instrumentation-document-load@npm:^0.40.0":
+  version: 0.40.0
+  resolution: "@opentelemetry/instrumentation-document-load@npm:0.40.0"
+  dependencies:
+    "@opentelemetry/core": ^1.8.0
+    "@opentelemetry/instrumentation": ^0.53.0
+    "@opentelemetry/sdk-trace-base": ^1.0.0
+    "@opentelemetry/sdk-trace-web": ^1.15.0
+    "@opentelemetry/semantic-conventions": ^1.27.0
+  peerDependencies:
+    "@opentelemetry/api": ^1.3.0
+  checksum: 5a06eeb5b68623c655fa728cc2bb036cdd0270488abfa1fca5e733891f3ce5b22067b014c4f3317e957be3c89acab5c70f199eb82c409dd01605960908c34048
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/instrumentation-fetch@npm:^0.53.0":
+  version: 0.53.0
+  resolution: "@opentelemetry/instrumentation-fetch@npm:0.53.0"
+  dependencies:
+    "@opentelemetry/core": 1.26.0
+    "@opentelemetry/instrumentation": 0.53.0
+    "@opentelemetry/sdk-trace-web": 1.26.0
+    "@opentelemetry/semantic-conventions": 1.27.0
+  peerDependencies:
+    "@opentelemetry/api": ^1.0.0
+  checksum: 2c92c9ccccfa424adb3773424df42d64156b67bdbcc1a21fbe5f620370d68bbd64701279897a0807e0b259b4e7a9fdcfdc21fa064343793c592bd0d08c5483cf
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/instrumentation-http@npm:^0.53.0":
+  version: 0.53.0
+  resolution: "@opentelemetry/instrumentation-http@npm:0.53.0"
+  dependencies:
+    "@opentelemetry/core": 1.26.0
+    "@opentelemetry/instrumentation": 0.53.0
+    "@opentelemetry/semantic-conventions": 1.27.0
+    semver: ^7.5.2
+  peerDependencies:
+    "@opentelemetry/api": ^1.3.0
+  checksum: 4ee569f7fc8c7ce50fabaff016d33577f36e63272b0634ac45806d70bffdf38fcf09db3cd9dd27c3150f6c4547fec673c356c419a6ed2399ff2849b9487a6e89
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/instrumentation-user-interaction@npm:^0.40.0":
+  version: 0.40.0
+  resolution: "@opentelemetry/instrumentation-user-interaction@npm:0.40.0"
+  dependencies:
+    "@opentelemetry/core": ^1.8.0
+    "@opentelemetry/instrumentation": ^0.53.0
+    "@opentelemetry/sdk-trace-web": ^1.8.0
+  peerDependencies:
+    "@opentelemetry/api": ^1.3.0
+    zone.js: ^0.11.4 || ^0.13.0 || ^0.14.0
+  checksum: 24ae06b6a6ab2df39dc1074e7edf8ddaa2009e0376bf5e2bcb5d355bdf96bb4aeb09dc861a110150702a251d30e9984ee2a0bd7ba57e820e0859977f5807f369
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/instrumentation-xml-http-request@npm:^0.53.0":
+  version: 0.53.0
+  resolution: "@opentelemetry/instrumentation-xml-http-request@npm:0.53.0"
+  dependencies:
+    "@opentelemetry/core": 1.26.0
+    "@opentelemetry/instrumentation": 0.53.0
+    "@opentelemetry/sdk-trace-web": 1.26.0
+    "@opentelemetry/semantic-conventions": 1.27.0
+  peerDependencies:
+    "@opentelemetry/api": ^1.0.0
+  checksum: 61dd00e30fbf4de611a7d1fa63aa8b004a0624c566d043dc9970dcaaef8eeb1f67e39a224bffd0d05c437e0d08371ee569f1d273429c05eb155e8c854e3fa818
+  languageName: node
+  linkType: hard
+
 "@opentelemetry/instrumentation@npm:0.52.1":
   version: 0.52.1
   resolution: "@opentelemetry/instrumentation@npm:0.52.1"
@@ -4861,6 +4982,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@opentelemetry/instrumentation@npm:0.53.0, @opentelemetry/instrumentation@npm:^0.53.0":
+  version: 0.53.0
+  resolution: "@opentelemetry/instrumentation@npm:0.53.0"
+  dependencies:
+    "@opentelemetry/api-logs": 0.53.0
+    "@types/shimmer": ^1.2.0
+    import-in-the-middle: ^1.8.1
+    require-in-the-middle: ^7.1.1
+    semver: ^7.5.2
+    shimmer: ^1.2.1
+  peerDependencies:
+    "@opentelemetry/api": ^1.3.0
+  checksum: a386fe066eab71129a6edbc883ab407b1022850e8acc4750029a12e8730588a8b81442d0b008aaddb46f7614af40d19d331e7348790ca2d08ba8eed6d23ffdae
+  languageName: node
+  linkType: hard
+
 "@opentelemetry/otlp-exporter-base@npm:0.52.1":
   version: 0.52.1
   resolution: "@opentelemetry/otlp-exporter-base@npm:0.52.1"
@@ -4890,6 +5027,28 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@opentelemetry/propagator-b3@npm:1.26.0":
+  version: 1.26.0
+  resolution: "@opentelemetry/propagator-b3@npm:1.26.0"
+  dependencies:
+    "@opentelemetry/core": 1.26.0
+  peerDependencies:
+    "@opentelemetry/api": ">=1.0.0 <1.10.0"
+  checksum: c2e99a8ed2814cf5b8e6e2a79411f2f6d668b7d5fc8351e5302ea4149601a96ec655422cf59470c66d8a408850f8a6b5156bf7deac7afb07d3f7a935c51fff04
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/propagator-jaeger@npm:1.26.0":
+  version: 1.26.0
+  resolution: "@opentelemetry/propagator-jaeger@npm:1.26.0"
+  dependencies:
+    "@opentelemetry/core": 1.26.0
+  peerDependencies:
+    "@opentelemetry/api": ">=1.0.0 <1.10.0"
+  checksum: a0ac3888c86f1b4671c7ca520396b89b4c47fa9e9d976bd014472d2b7786e7c5bdf4823a6e2a900fed5ea5dfe23eda0bdf6740e77c1352f2c0f82b13a71c03df
+  languageName: node
+  linkType: hard
+
 "@opentelemetry/resources@npm:1.25.1":
   version: 1.25.1
   resolution: "@opentelemetry/resources@npm:1.25.1"
@@ -4902,6 +5061,30 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@opentelemetry/resources@npm:1.26.0":
+  version: 1.26.0
+  resolution: "@opentelemetry/resources@npm:1.26.0"
+  dependencies:
+    "@opentelemetry/core": 1.26.0
+    "@opentelemetry/semantic-conventions": 1.27.0
+  peerDependencies:
+    "@opentelemetry/api": ">=1.0.0 <1.10.0"
+  checksum: f70b0fdf4fb00c950bc30084818c92a5339f1be5d709bd681ab14453e877d6bb9f700324b8e65a0eabfeea618d01ed071abf9088e00fa0bf7f3305b1abad22cb
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/resources@npm:1.27.0":
+  version: 1.27.0
+  resolution: "@opentelemetry/resources@npm:1.27.0"
+  dependencies:
+    "@opentelemetry/core": 1.27.0
+    "@opentelemetry/semantic-conventions": 1.27.0
+  peerDependencies:
+    "@opentelemetry/api": ">=1.0.0 <1.10.0"
+  checksum: 43d298afea7daf7524e6b98c1441bcce9fa73b76aecf17e36cabb1a4cfaae6818acf9759d3e42706b1fd91243644076d2291e78c3ed81641d3b351fcff6cb9a9
+  languageName: node
+  linkType: hard
+
 "@opentelemetry/sdk-logs@npm:0.52.1":
   version: 0.52.1
   resolution: "@opentelemetry/sdk-logs@npm:0.52.1"
@@ -4941,6 +5124,48 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@opentelemetry/sdk-trace-base@npm:1.26.0":
+  version: 1.26.0
+  resolution: "@opentelemetry/sdk-trace-base@npm:1.26.0"
+  dependencies:
+    "@opentelemetry/core": 1.26.0
+    "@opentelemetry/resources": 1.26.0
+    "@opentelemetry/semantic-conventions": 1.27.0
+  peerDependencies:
+    "@opentelemetry/api": ">=1.0.0 <1.10.0"
+  checksum: a4f4ddf644fd0d79b2bd49e4377143688d2aa657643a470d8bed6696f26817598fb4e9f16ba2d8c237292af56f06eec56594a7b4cc417d4ea7e490a45a22113b
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/sdk-trace-base@npm:1.27.0, @opentelemetry/sdk-trace-base@npm:^1.0.0":
+  version: 1.27.0
+  resolution: "@opentelemetry/sdk-trace-base@npm:1.27.0"
+  dependencies:
+    "@opentelemetry/core": 1.27.0
+    "@opentelemetry/resources": 1.27.0
+    "@opentelemetry/semantic-conventions": 1.27.0
+  peerDependencies:
+    "@opentelemetry/api": ">=1.0.0 <1.10.0"
+  checksum: d28c36724aeaf4884f7957e2ab138d9a0ca715a68b2ad23e2935ff0e39cd438c57fd0c8cc85fd5e280464857ede1ae8f9c8e40a37088a1e34d2e625e77276fee
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/sdk-trace-node@npm:^1.26.0":
+  version: 1.26.0
+  resolution: "@opentelemetry/sdk-trace-node@npm:1.26.0"
+  dependencies:
+    "@opentelemetry/context-async-hooks": 1.26.0
+    "@opentelemetry/core": 1.26.0
+    "@opentelemetry/propagator-b3": 1.26.0
+    "@opentelemetry/propagator-jaeger": 1.26.0
+    "@opentelemetry/sdk-trace-base": 1.26.0
+    semver: ^7.5.2
+  peerDependencies:
+    "@opentelemetry/api": ">=1.0.0 <1.10.0"
+  checksum: 1d63bed8fc36496698919ccd25be3b7b0e0d0bf9478f413a26bdbfe0bf0d4166bf58bbbee2415fb2fe42d3008b5c32ec7e4e42f2cb6d18b665b349eb025c15eb
+  languageName: node
+  linkType: hard
+
 "@opentelemetry/sdk-trace-web@npm:1.25.1":
   version: 1.25.1
   resolution: "@opentelemetry/sdk-trace-web@npm:1.25.1"
@@ -4954,6 +5179,32 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@opentelemetry/sdk-trace-web@npm:1.26.0":
+  version: 1.26.0
+  resolution: "@opentelemetry/sdk-trace-web@npm:1.26.0"
+  dependencies:
+    "@opentelemetry/core": 1.26.0
+    "@opentelemetry/sdk-trace-base": 1.26.0
+    "@opentelemetry/semantic-conventions": 1.27.0
+  peerDependencies:
+    "@opentelemetry/api": ">=1.0.0 <1.10.0"
+  checksum: d8e0ae8f9088723fc250874290923dc81933b279958f04beb79ca7e312bf66a79b823d92dd06be4e707d6919030c2998f8a18167a47ee7281e573b3ef3cc9e10
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/sdk-trace-web@npm:^1.15.0, @opentelemetry/sdk-trace-web@npm:^1.8.0":
+  version: 1.27.0
+  resolution: "@opentelemetry/sdk-trace-web@npm:1.27.0"
+  dependencies:
+    "@opentelemetry/core": 1.27.0
+    "@opentelemetry/sdk-trace-base": 1.27.0
+    "@opentelemetry/semantic-conventions": 1.27.0
+  peerDependencies:
+    "@opentelemetry/api": ">=1.0.0 <1.10.0"
+  checksum: 7c5c354fc9400adef70e6f169edd61a11ebcd36ca15993b366e8f6cfb296f248786be41d327ca971ad4f24b6623a5b8af2fb88fd760af6419c6313a7288ed6f9
+  languageName: node
+  linkType: hard
+
 "@opentelemetry/semantic-conventions@npm:1.25.1":
   version: 1.25.1
   resolution: "@opentelemetry/semantic-conventions@npm:1.25.1"
@@ -4961,7 +5212,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@opentelemetry/semantic-conventions@npm:1.27.0":
+"@opentelemetry/semantic-conventions@npm:1.27.0, @opentelemetry/semantic-conventions@npm:^1.27.0":
   version: 1.27.0
   resolution: "@opentelemetry/semantic-conventions@npm:1.27.0"
   checksum: 26d85f8d13c8c64024f7a84528cff41d56afc9829e7ff8a654576404f8b2c1a9c264adcc6fa5a9551bacdd938a4a464041fa9493e0a722e5605f2c2ae6752398
@@ -8109,12 +8360,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rrweb/types@npm:^2.0.0-alpha.11":
-  version: 2.0.0-alpha.12
-  resolution: "@rrweb/types@npm:2.0.0-alpha.12"
+"@rrweb/types@npm:^2.0.0-alpha.11, @rrweb/types@npm:^2.0.0-alpha.13":
+  version: 2.0.0-alpha.17
+  resolution: "@rrweb/types@npm:2.0.0-alpha.17"
   dependencies:
-    rrweb-snapshot: ^2.0.0-alpha.12
-  checksum: 9764d04dde006e65b0dfef32265a6365cdf1095e5a05fc129ba23f24143e3b967afc450ea401220f23bbd87cd24a6c45866d525096849fdb81831122adee1e91
+    rrweb-snapshot: ^2.0.0-alpha.17
+  checksum: 03237d9cc3b5f2a6a05000ae356e6fe6d0866fa06efe66341d9226c098fda778d46ba702efe755ee1664ce2f07c494b0e689e11693707ec2672d193314800e08
   languageName: node
   linkType: hard
 
@@ -10189,6 +10440,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/debug@npm:^4.0.0":
+  version: 4.1.12
+  resolution: "@types/debug@npm:4.1.12"
+  dependencies:
+    "@types/ms": "*"
+  checksum: 47876a852de8240bfdaf7481357af2b88cb660d30c72e73789abf00c499d6bc7cd5e52f41c915d1b9cd8ec9fef5b05688d7b7aef17f7f272c2d04679508d1053
+  languageName: node
+  linkType: hard
+
 "@types/deep-diff@npm:^1.0.0":
   version: 1.0.0
   resolution: "@types/deep-diff@npm:1.0.0"
@@ -10275,6 +10535,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/estree-jsx@npm:^1.0.0":
+  version: 1.0.5
+  resolution: "@types/estree-jsx@npm:1.0.5"
+  dependencies:
+    "@types/estree": "*"
+  checksum: a028ab0cd7b2950168a05c6a86026eb3a36a54a4adfae57f13911d7b49dffe573d9c2b28421b2d029b49b3d02fcd686611be2622dc3dad6d9791166c083f6008
+  languageName: node
+  linkType: hard
+
 "@types/estree@npm:*, @types/estree@npm:1.0.5, @types/estree@npm:^1.0.0":
   version: 1.0.5
   resolution: "@types/estree@npm:1.0.5"
@@ -10376,6 +10645,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/hast@npm:^2.0.0":
+  version: 2.3.10
+  resolution: "@types/hast@npm:2.3.10"
+  dependencies:
+    "@types/unist": ^2
+  checksum: 41531b7fbf590b02452996fc63272479c20a07269e370bd6514982cbcd1819b4b84d3ea620f2410d1b9541a23d08ce2eeb0a592145d05e00e249c3d56700d460
+  languageName: node
+  linkType: hard
+
 "@types/hast@npm:^3.0.0":
   version: 3.0.4
   resolution: "@types/hast@npm:3.0.4"
@@ -10565,6 +10843,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/mdast@npm:^4.0.0":
+  version: 4.0.4
+  resolution: "@types/mdast@npm:4.0.4"
+  dependencies:
+    "@types/unist": "*"
+  checksum: 20c4e9574cc409db662a35cba52b068b91eb696b3049e94321219d47d34c8ccc99a142be5c76c80a538b612457b03586bc2f6b727a3e9e7530f4c8568f6282ee
+  languageName: node
+  linkType: hard
+
 "@types/mdx@npm:^2.0.0":
   version: 2.0.5
   resolution: "@types/mdx@npm:2.0.5"
@@ -10586,6 +10873,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/mixpanel-browser@npm:^2.50.1":
+  version: 2.50.1
+  resolution: "@types/mixpanel-browser@npm:2.50.1"
+  checksum: bdc42048c3c44ee36a106ed0ebe4a4027d13a52cb4ef624339ca6dc13f3e9a08c7d747f32f97cbfc3fb23d1c73185be1210d0dd6793a868e9cc067a8cff15225
+  languageName: node
+  linkType: hard
+
 "@types/moment-timezone@npm:^0.5.10":
   version: 0.5.30
   resolution: "@types/moment-timezone@npm:0.5.30"
@@ -10595,6 +10889,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/ms@npm:*":
+  version: 0.7.34
+  resolution: "@types/ms@npm:0.7.34"
+  checksum: f38d36e7b6edecd9badc9cf50474159e9da5fa6965a75186cceaf883278611b9df6669dc3a3cc122b7938d317b68a9e3d573d316fcb35d1be47ec9e468c6bd8a
+  languageName: node
+  linkType: hard
+
 "@types/nanoid@npm:^2.0.0":
   version: 2.1.0
   resolution: "@types/nanoid@npm:2.1.0"
@@ -10604,7 +10905,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node-fetch@npm:^2.6.11":
+"@types/node-fetch@npm:^2.6.11, @types/node-fetch@npm:^2.6.4":
   version: 2.6.11
   resolution: "@types/node-fetch@npm:2.6.11"
   dependencies:
@@ -10639,12 +10940,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:^18.0.0":
-  version: 18.19.15
-  resolution: "@types/node@npm:18.19.15"
+"@types/node@npm:^18.0.0, @types/node@npm:^18.11.18":
+  version: 18.19.54
+  resolution: "@types/node@npm:18.19.54"
   dependencies:
     undici-types: ~5.26.4
-  checksum: 8ebad6b0a010ff01a841c2d99a464993ee22348aff476e95276c17a9a72f336f4a395940c59c4f21e10ef50ed79a7811a60d562099a87c476d241e8b37e3cdd5
+  checksum: d85bacc7430c2913bcd2cf293f312bc1f9108819707ac25b58404185c3b8f9ca9e3e93c396672f457c18e65f5ba86cc8363803f830207c6b7dd14fd74e1455b0
   languageName: node
   linkType: hard
 
@@ -10830,6 +11131,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/react-syntax-highlighter@npm:^15.5.13":
+  version: 15.5.13
+  resolution: "@types/react-syntax-highlighter@npm:15.5.13"
+  dependencies:
+    "@types/react": "*"
+  checksum: 55f751c140eb6641b16a5644af3b6fc25223957141085758ae6898948e70eaca33d8276e86e75d5d60939aff63af1d20278aba0d3a25483266f9deee1eb468e3
+  languageName: node
+  linkType: hard
+
 "@types/react-table@npm:*, @types/react-table@npm:^7.0.13":
   version: 7.7.14
   resolution: "@types/react-table@npm:7.7.14"
@@ -10857,6 +11167,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/react-transition-group@npm:^4.4.11":
+  version: 4.4.11
+  resolution: "@types/react-transition-group@npm:4.4.11"
+  dependencies:
+    "@types/react": "*"
+  checksum: a6e3b2e4363cb019e256ae4f19dadf9d7eb199da1a5e4109bbbf6a132821884044d332e9c74b520b1e5321a7f545502443fd1ce0b18649c8b510fa4220b0e5c2
+  languageName: node
+  linkType: hard
+
 "@types/react-window@npm:^1.8.2":
   version: 1.8.2
   resolution: "@types/react-window@npm:1.8.2"
@@ -10968,10 +11287,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/shimmer@npm:^1.0.2":
-  version: 1.0.4
-  resolution: "@types/shimmer@npm:1.0.4"
-  checksum: f1e7f8b773c34ea21b69686cb100117bd94cc0d1f043e3fc50683453b9936d1295c4f48e1872766556234a9ec48ea37fc7e6b5e56212f66ec65d5b2b5d73092b
+"@types/shimmer@npm:^1.0.2, @types/shimmer@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "@types/shimmer@npm:1.2.0"
+  checksum: f081a31d826ce7bfe8cc7ba8129d2b1dffae44fd580eba4fcf741237646c4c2494ae6de2cada4b7713d138f35f4bc512dbf01311d813dee82020f97d7d8c491c
   languageName: node
   linkType: hard
 
@@ -11087,6 +11406,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/unist@npm:^2, @types/unist@npm:^2.0.0":
+  version: 2.0.11
+  resolution: "@types/unist@npm:2.0.11"
+  checksum: 6d436e832bc35c6dde9f056ac515ebf2b3384a1d7f63679d12358766f9b313368077402e9c1126a14d827f10370a5485e628bf61aa91117cf4fc882423191a4e
+  languageName: node
+  linkType: hard
+
 "@types/uuid@npm:^9.0.5":
   version: 9.0.8
   resolution: "@types/uuid@npm:9.0.8"
@@ -12099,6 +12425,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"abort-controller@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "abort-controller@npm:3.0.0"
+  dependencies:
+    event-target-shim: ^5.0.0
+  checksum: 170bdba9b47b7e65906a28c8ce4f38a7a369d78e2271706f020849c1bfe0ee2067d4261df8bbb66eb84f79208fd5b710df759d64191db58cfba7ce8ef9c54b75
+  languageName: node
+  linkType: hard
+
 "abortcontroller-polyfill@npm:^1.4.0":
   version: 1.7.1
   resolution: "abortcontroller-polyfill@npm:1.7.1"
@@ -12486,6 +12821,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "appsmith-icons@workspace:packages/icons"
   dependencies:
+    "@svgr/core": ^8.1.0
+    "@svgr/plugin-jsx": ^8.1.0
     fast-glob: ^3.3.2
     figmagic: ^4.5.13
     fs-extra: ^11.2.0
@@ -12499,6 +12836,9 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "appsmith-rts@workspace:packages/rts"
   dependencies:
+    "@opentelemetry/instrumentation-http": ^0.53.0
+    "@opentelemetry/sdk-trace-node": ^1.26.0
+    "@opentelemetry/semantic-conventions": ^1.27.0
     "@shared/ast": "workspace:^"
     "@types/express": ^4.17.14
     "@types/jest": ^29.2.3
@@ -12548,6 +12888,7 @@ __metadata:
     "@newrelic/browser-agent": ^1.255.0
     "@octokit/rest": ^20.0.1
     "@opentelemetry/api": ^1.9.0
+    "@opentelemetry/auto-instrumentations-web": ^0.41.0
     "@opentelemetry/context-zone": 1.25.1
     "@opentelemetry/core": ^1.26.0
     "@opentelemetry/exporter-metrics-otlp-http": 0.52.1
@@ -12557,7 +12898,7 @@ __metadata:
     "@opentelemetry/sdk-metrics": 1.25.1
     "@opentelemetry/sdk-trace-base": 1.25.1
     "@opentelemetry/sdk-trace-web": 1.25.1
-    "@opentelemetry/semantic-conventions": 1.25.1
+    "@opentelemetry/semantic-conventions": ^1.27.0
     "@peculiar/webcrypto": ^1.4.3
     "@react-spring/web": ^9.7.4
     "@react-types/shared": ^3.23.0
@@ -12584,6 +12925,7 @@ __metadata:
     "@types/jest": ^27.4.1
     "@types/jshint": ^2.12.0
     "@types/lodash": ^4.14.120
+    "@types/mixpanel-browser": ^2.50.1
     "@types/moment-timezone": ^0.5.10
     "@types/nanoid": ^2.0.0
     "@types/node": ^10.12.18
@@ -12663,7 +13005,7 @@ __metadata:
     cypress-wait-until: ^1.7.2
     cypress-xpath: ^1.6.0
     d3-geo: ^3.1.0
-    date-fns: 2.30.0
+    date-fns: ^4.1.0
     dayjs: ^1.10.6
     deep-diff: ^1.0.2
     diff: ^5.0.0
@@ -12677,6 +13019,7 @@ __metadata:
     eslint-plugin-jest: ^27.4.2
     eslint-plugin-prettier: ^5.0.0
     eslint-plugin-react: ^7.33.2
+    eslint-plugin-react-compiler: beta
     eslint-plugin-react-hooks: ^4.6.0
     eslint-plugin-react-perf: ^3.3.2
     eslint-plugin-sort-destructure-keys: ^1.5.0
@@ -12717,12 +13060,14 @@ __metadata:
     memoize-one: ^6.0.0
     micro-memoize: ^4.0.10
     microdiff: ^1.4.0
+    mixpanel-browser: ^2.55.1
     moment: 2.29.4
     moment-timezone: ^0.5.35
     msw: ^0.28.0
     nanoid: ^2.0.4
     node-forge: ^1.3.0
     object-hash: ^3.0.0
+    openai: ^4.64.0
     path-to-regexp: ^6.3.0
     pg: ^8.11.3
     plop: ^3.1.1
@@ -12799,7 +13144,7 @@ __metadata:
     tailwindcss: ^3.3.3
     tern: ^0.21.0
     tinycolor2: ^1.4.2
-    tinymce: ^7.3.0
+    tinymce: 6.8.3
     toposort: ^2.0.2
     ts-jest: 29.1.0
     ts-jest-mock-import-meta: ^0.12.0
@@ -12808,6 +13153,7 @@ __metadata:
     typescript: ^5.5.4
     unescape-js: ^1.1.4
     url-search-params-polyfill: ^8.0.0
+    usehooks-ts: ^3.1.0
     uuid: ^9.0.0
     validate-color: ^2.2.4
     web-vitals: 3.5.2
@@ -13603,6 +13949,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"bail@npm:^2.0.0":
+  version: 2.0.2
+  resolution: "bail@npm:2.0.2"
+  checksum: aab4e8ccdc8d762bf3fdfce8e706601695620c0c2eda256dd85088dc0be3cfd7ff126f6e99c2bee1f24f5d418414aacf09d7f9702f16d6963df2fa488cda8824
+  languageName: node
+  linkType: hard
+
 "balanced-match@npm:^1.0.0":
   version: 1.0.2
   resolution: "balanced-match@npm:1.0.2"
@@ -14377,6 +14730,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ccount@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "ccount@npm:2.0.1"
+  checksum: 48193dada54c9e260e0acf57fc16171a225305548f9ad20d5471e0f7a8c026aedd8747091dccb0d900cde7df4e4ddbd235df0d8de4a64c71b12f0d3303eeafd4
+  languageName: node
+  linkType: hard
+
 "chalk@npm:5.3.0, chalk@npm:^5.0.0, chalk@npm:^5.0.1, chalk@npm:^5.2.0":
   version: 5.3.0
   resolution: "chalk@npm:5.3.0"
@@ -14449,6 +14809,55 @@ __metadata:
   languageName: node
   linkType: hard
 
+"character-entities-html4@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "character-entities-html4@npm:2.1.0"
+  checksum: 7034aa7c7fa90309667f6dd50499c8a760c3d3a6fb159adb4e0bada0107d194551cdbad0714302f62d06ce4ed68565c8c2e15fdef2e8f8764eb63fa92b34b11d
+  languageName: node
+  linkType: hard
+
+"character-entities-legacy@npm:^1.0.0":
+  version: 1.1.4
+  resolution: "character-entities-legacy@npm:1.1.4"
+  checksum: fe03a82c154414da3a0c8ab3188e4237ec68006cbcd681cf23c7cfb9502a0e76cd30ab69a2e50857ca10d984d57de3b307680fff5328ccd427f400e559c3a811
+  languageName: node
+  linkType: hard
+
+"character-entities-legacy@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "character-entities-legacy@npm:3.0.0"
+  checksum: 7582af055cb488b626d364b7d7a4e46b06abd526fb63c0e4eb35bcb9c9799cc4f76b39f34fdccef2d1174ac95e53e9ab355aae83227c1a2505877893fce77731
+  languageName: node
+  linkType: hard
+
+"character-entities@npm:^1.0.0":
+  version: 1.2.4
+  resolution: "character-entities@npm:1.2.4"
+  checksum: e1545716571ead57beac008433c1ff69517cd8ca5b336889321c5b8ff4a99c29b65589a701e9c086cda8a5e346a67295e2684f6c7ea96819fe85cbf49bf8686d
+  languageName: node
+  linkType: hard
+
+"character-entities@npm:^2.0.0":
+  version: 2.0.2
+  resolution: "character-entities@npm:2.0.2"
+  checksum: cf1643814023697f725e47328fcec17923b8f1799102a8a79c1514e894815651794a2bffd84bb1b3a4b124b050154e4529ed6e81f7c8068a734aecf07a6d3def
+  languageName: node
+  linkType: hard
+
+"character-reference-invalid@npm:^1.0.0":
+  version: 1.1.4
+  resolution: "character-reference-invalid@npm:1.1.4"
+  checksum: 20274574c70e05e2f81135f3b93285536bc8ff70f37f0809b0d17791a832838f1e49938382899ed4cb444e5bbd4314ca1415231344ba29f4222ce2ccf24fea0b
+  languageName: node
+  linkType: hard
+
+"character-reference-invalid@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "character-reference-invalid@npm:2.0.1"
+  checksum: 98d3b1a52ae510b7329e6ee7f6210df14f1e318c5415975d4c9e7ee0ef4c07875d47c6e74230c64551f12f556b4a8ccc24d9f3691a2aa197019e72a95e9297ee
+  languageName: node
+  linkType: hard
+
 "chardet@npm:^0.7.0":
   version: 0.7.0
   resolution: "chardet@npm:0.7.0"
@@ -14912,6 +15321,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"comma-separated-tokens@npm:^1.0.0":
+  version: 1.0.8
+  resolution: "comma-separated-tokens@npm:1.0.8"
+  checksum: 0adcb07174fa4d08cf0f5c8e3aec40a36b5ff0c2c720e5e23f50fe02e6789d1d00a67036c80e0c1e1539f41d3e7f0101b074039dd833b4e4a59031b659d6ca0d
+  languageName: node
+  linkType: hard
+
+"comma-separated-tokens@npm:^2.0.0":
+  version: 2.0.3
+  resolution: "comma-separated-tokens@npm:2.0.3"
+  checksum: e3bf9e0332a5c45f49b90e79bcdb4a7a85f28d6a6f0876a94f1bb9b2bfbdbbb9292aac50e1e742d8c0db1e62a0229a106f57917e2d067fca951d81737651700d
+  languageName: node
+  linkType: hard
+
 "commander@npm:11.0.0":
   version: 11.0.0
   resolution: "commander@npm:11.0.0"
@@ -16052,7 +16475,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"date-fns@npm:2.30.0, date-fns@npm:^2.0.1, date-fns@npm:^2.24.0, date-fns@npm:^2.29.3":
+"date-fns@npm:^2.0.1, date-fns@npm:^2.24.0, date-fns@npm:^2.29.3":
   version: 2.30.0
   resolution: "date-fns@npm:2.30.0"
   dependencies:
@@ -16061,6 +16484,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"date-fns@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "date-fns@npm:4.1.0"
+  checksum: fb681b242cccabed45494468f64282a7d375ea970e0adbcc5dcc92dcb7aba49b2081c2c9739d41bf71ce89ed68dd73bebfe06ca35129490704775d091895710b
+  languageName: node
+  linkType: hard
+
 "date-now@npm:^0.1.4":
   version: 0.1.4
   resolution: "date-now@npm:0.1.4"
@@ -16091,15 +16521,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:4, debug@npm:4.3.5, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.0, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4, debug@npm:~4.3.1, debug@npm:~4.3.2":
-  version: 4.3.5
-  resolution: "debug@npm:4.3.5"
+"debug@npm:4, debug@npm:^4.0.0, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.0, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4, debug@npm:~4.3.1, debug@npm:~4.3.2":
+  version: 4.3.7
+  resolution: "debug@npm:4.3.7"
   dependencies:
-    ms: 2.1.2
+    ms: ^2.1.3
   peerDependenciesMeta:
     supports-color:
       optional: true
-  checksum: 7c002b51e256257f936dda09eb37167df952758c57badf6bf44bdc40b89a4bcb8e5a0a2e4c7b53f97c69e2970dd5272d33a757378a12c8f8e64ea7bf99e8e86e
+  checksum: 822d74e209cd910ef0802d261b150314bbcf36c582ccdbb3e70f0894823c17e49a50d3e66d96b633524263975ca16b6a833f3e3b7e030c157169a5fabac63160
   languageName: node
   linkType: hard
 
@@ -16115,6 +16545,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"debug@npm:4.3.5":
+  version: 4.3.5
+  resolution: "debug@npm:4.3.5"
+  dependencies:
+    ms: 2.1.2
+  peerDependenciesMeta:
+    supports-color:
+      optional: true
+  checksum: 7c002b51e256257f936dda09eb37167df952758c57badf6bf44bdc40b89a4bcb8e5a0a2e4c7b53f97c69e2970dd5272d33a757378a12c8f8e64ea7bf99e8e86e
+  languageName: node
+  linkType: hard
+
 "debug@npm:^3.1.0, debug@npm:^3.2.7":
   version: 3.2.7
   resolution: "debug@npm:3.2.7"
@@ -16138,6 +16580,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"decode-named-character-reference@npm:^1.0.0":
+  version: 1.0.2
+  resolution: "decode-named-character-reference@npm:1.0.2"
+  dependencies:
+    character-entities: ^2.0.0
+  checksum: f4c71d3b93105f20076052f9cb1523a22a9c796b8296cd35eef1ca54239c78d182c136a848b83ff8da2071e3ae2b1d300bf29d00650a6d6e675438cc31b11d78
+  languageName: node
+  linkType: hard
+
 "decode-uri-component@npm:^0.2.0":
   version: 0.2.2
   resolution: "decode-uri-component@npm:0.2.2"
@@ -16389,7 +16840,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dequal@npm:^2.0.2":
+"dequal@npm:^2.0.0, dequal@npm:^2.0.2":
   version: 2.0.3
   resolution: "dequal@npm:2.0.3"
   checksum: 8679b850e1a3d0ebbc46ee780d5df7b478c23f335887464023a631d1b9af051ad4a6595a44220f9ff8ff95a8ddccf019b5ad778a976fd7bbf77383d36f412f90
@@ -16481,6 +16932,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"devlop@npm:^1.0.0, devlop@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "devlop@npm:1.1.0"
+  dependencies:
+    dequal: ^2.0.0
+  checksum: d2ff650bac0bb6ef08c48f3ba98640bb5fec5cce81e9957eb620408d1bab1204d382a45b785c6b3314dc867bb0684936b84c6867820da6db97cbb5d3c15dd185
+  languageName: node
+  linkType: hard
+
 "dezalgo@npm:^1.0.4":
   version: 1.0.4
   resolution: "dezalgo@npm:1.0.4"
@@ -16666,6 +17126,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"dom-helpers@npm:^5.0.1":
+  version: 5.2.1
+  resolution: "dom-helpers@npm:5.2.1"
+  dependencies:
+    "@babel/runtime": ^7.8.7
+    csstype: ^3.0.2
+  checksum: 863ba9e086f7093df3376b43e74ce4422571d404fc9828bf2c56140963d5edf0e56160f9b2f3bb61b282c07f8fc8134f023c98fd684bddcb12daf7b0f14d951c
+  languageName: node
+  linkType: hard
+
 "dom-serializer@npm:0":
   version: 0.2.2
   resolution: "dom-serializer@npm:0.2.2"
@@ -16949,8 +17419,8 @@ __metadata:
   linkType: hard
 
 "elliptic@npm:^6.5.3, elliptic@npm:^6.5.4":
-  version: 6.5.7
-  resolution: "elliptic@npm:6.5.7"
+  version: 6.6.0
+  resolution: "elliptic@npm:6.6.0"
   dependencies:
     bn.js: ^4.11.9
     brorand: ^1.1.0
@@ -16959,7 +17429,7 @@ __metadata:
     inherits: ^2.0.4
     minimalistic-assert: ^1.0.1
     minimalistic-crypto-utils: ^1.0.1
-  checksum: af0ffddffdbc2fea4eeec74388cd73e62ed5a0eac6711568fb28071566319785df529c968b0bf1250ba4bc628e074b2d64c54a633e034aa6f0c6b152ceb49ab8
+  checksum: e912349b883e694bfe65005214237a470c9a098a6ba36fd24396d0ab07feb399920c0738aeed1aed6cf5dca9c64fd479e212faed3a75c9d81453671ef0de5157
   languageName: node
   linkType: hard
 
@@ -17498,6 +17968,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"escape-string-regexp@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "escape-string-regexp@npm:5.0.0"
+  checksum: 20daabe197f3cb198ec28546deebcf24b3dbb1a5a269184381b3116d12f0532e06007f4bc8da25669d6a7f8efb68db0758df4cd981f57bc5b57f521a3e12c59e
+  languageName: node
+  linkType: hard
+
 "escodegen@npm:^2.0.0, escodegen@npm:^2.1.0":
   version: 2.1.0
   resolution: "escodegen@npm:2.1.0"
@@ -17715,6 +18192,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eslint-plugin-react-compiler@npm:beta":
+  version: 19.0.0-beta-6fc168f-20241025
+  resolution: "eslint-plugin-react-compiler@npm:19.0.0-beta-6fc168f-20241025"
+  dependencies:
+    "@babel/core": ^7.24.4
+    "@babel/parser": ^7.24.4
+    "@babel/plugin-proposal-private-methods": ^7.18.6
+    hermes-parser: ^0.20.1
+    zod: ^3.22.4
+    zod-validation-error: ^3.0.3
+  peerDependencies:
+    eslint: ">=7"
+  checksum: 9595934e48b75ea964bde98b479abd5b8554d33fcefade0cf419d2707602b1f64652b9dd4854d4bc71e21a1b186143293a4aed1ac144d8e1460396f4d9274934
+  languageName: node
+  linkType: hard
+
 "eslint-plugin-react-hooks@npm:^4.3.0, eslint-plugin-react-hooks@npm:^4.6.0":
   version: 4.6.0
   resolution: "eslint-plugin-react-hooks@npm:4.6.0"
@@ -17967,6 +18460,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"estree-util-is-identifier-name@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "estree-util-is-identifier-name@npm:3.0.0"
+  checksum: ea3909f0188ea164af0aadeca87c087e3e5da78d76da5ae9c7954ff1340ea3e4679c4653bbf4299ffb70caa9b322218cc1128db2541f3d2976eb9704f9857787
+  languageName: node
+  linkType: hard
+
 "estree-walker@npm:^1.0.1":
   version: 1.0.1
   resolution: "estree-walker@npm:1.0.1"
@@ -17995,6 +18495,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"event-target-shim@npm:^5.0.0":
+  version: 5.0.1
+  resolution: "event-target-shim@npm:5.0.1"
+  checksum: 1ffe3bb22a6d51bdeb6bf6f7cf97d2ff4a74b017ad12284cc9e6a279e727dc30a5de6bb613e5596ff4dc3e517841339ad09a7eec44266eccb1aa201a30448166
+  languageName: node
+  linkType: hard
+
 "eventemitter2@npm:6.4.7":
   version: 6.4.7
   resolution: "eventemitter2@npm:6.4.7"
@@ -18221,7 +18728,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"extend@npm:^3.0.2, extend@npm:~3.0.2":
+"extend@npm:^3.0.0, extend@npm:^3.0.2, extend@npm:~3.0.2":
   version: 3.0.2
   resolution: "extend@npm:3.0.2"
   checksum: a50a8309ca65ea5d426382ff09f33586527882cf532931cb08ca786ea3146c0553310bda688710ff61d7668eba9f96b923fe1420cdf56a2c3eaf30fcab87b515
@@ -18371,6 +18878,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fault@npm:^1.0.0":
+  version: 1.0.4
+  resolution: "fault@npm:1.0.4"
+  dependencies:
+    format: ^0.2.0
+  checksum: 5ac610d8b09424e0f2fa8cf913064372f2ee7140a203a79957f73ed557c0e79b1a3d096064d7f40bde8132a69204c1fe25ec23634c05c6da2da2039cff26c4e7
+  languageName: node
+  linkType: hard
+
 "faye-websocket@npm:^0.11.3":
   version: 0.11.4
   resolution: "faye-websocket@npm:0.11.4"
@@ -18853,6 +19369,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"form-data-encoder@npm:1.7.2":
+  version: 1.7.2
+  resolution: "form-data-encoder@npm:1.7.2"
+  checksum: aeebd87a1cb009e13cbb5e4e4008e6202ed5f6551eb6d9582ba8a062005178907b90f4887899d3c993de879159b6c0c940af8196725b428b4248cec5af3acf5f
+  languageName: node
+  linkType: hard
+
 "form-data@npm:^3.0.0":
   version: 3.0.1
   resolution: "form-data@npm:3.0.1"
@@ -18886,6 +19409,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"format@npm:^0.2.0":
+  version: 0.2.2
+  resolution: "format@npm:0.2.2"
+  checksum: 646a60e1336250d802509cf24fb801e43bd4a70a07510c816fa133aa42cdbc9c21e66e9cc0801bb183c5b031c9d68be62e7fbb6877756e52357850f92aa28799
+  languageName: node
+  linkType: hard
+
+"formdata-node@npm:^4.3.2":
+  version: 4.4.1
+  resolution: "formdata-node@npm:4.4.1"
+  dependencies:
+    node-domexception: 1.0.0
+    web-streams-polyfill: 4.0.0-beta.3
+  checksum: d91d4f667cfed74827fc281594102c0dabddd03c9f8b426fc97123eedbf73f5060ee43205d89284d6854e2fc5827e030cd352ef68b93beda8decc2d72128c576
+  languageName: node
+  linkType: hard
+
 "formidable@npm:^2.1.2":
   version: 2.1.2
   resolution: "formidable@npm:2.1.2"
@@ -19752,6 +20292,36 @@ __metadata:
   languageName: node
   linkType: hard
 
+"hast-util-parse-selector@npm:^2.0.0":
+  version: 2.2.5
+  resolution: "hast-util-parse-selector@npm:2.2.5"
+  checksum: 22ee4afbd11754562144cb3c4f3ec52524dafba4d90ee52512902d17cf11066d83b38f7bdf6ca571bbc2541f07ba30db0d234657b6ecb8ca4631587466459605
+  languageName: node
+  linkType: hard
+
+"hast-util-to-jsx-runtime@npm:^2.0.0":
+  version: 2.3.0
+  resolution: "hast-util-to-jsx-runtime@npm:2.3.0"
+  dependencies:
+    "@types/estree": ^1.0.0
+    "@types/hast": ^3.0.0
+    "@types/unist": ^3.0.0
+    comma-separated-tokens: ^2.0.0
+    devlop: ^1.0.0
+    estree-util-is-identifier-name: ^3.0.0
+    hast-util-whitespace: ^3.0.0
+    mdast-util-mdx-expression: ^2.0.0
+    mdast-util-mdx-jsx: ^3.0.0
+    mdast-util-mdxjs-esm: ^2.0.0
+    property-information: ^6.0.0
+    space-separated-tokens: ^2.0.0
+    style-to-object: ^1.0.0
+    unist-util-position: ^5.0.0
+    vfile-message: ^4.0.0
+  checksum: 599a97c6ec61c1430776813d7fb42e6f96032bf4a04dfcbb8eceef3bc8d1845ecf242387a4426b9d3f52320dbbfa26450643b81124b3d6a0b9bbb0fff4d0ba83
+  languageName: node
+  linkType: hard
+
 "hast-util-to-string@npm:^3.0.0":
   version: 3.0.0
   resolution: "hast-util-to-string@npm:3.0.0"
@@ -19761,6 +20331,28 @@ __metadata:
   languageName: node
   linkType: hard
 
+"hast-util-whitespace@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "hast-util-whitespace@npm:3.0.0"
+  dependencies:
+    "@types/hast": ^3.0.0
+  checksum: 41d93ccce218ba935dc3c12acdf586193c35069489c8c8f50c2aa824c00dec94a3c78b03d1db40fa75381942a189161922e4b7bca700b3a2cc779634c351a1e4
+  languageName: node
+  linkType: hard
+
+"hastscript@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "hastscript@npm:6.0.0"
+  dependencies:
+    "@types/hast": ^2.0.0
+    comma-separated-tokens: ^1.0.0
+    hast-util-parse-selector: ^2.0.0
+    property-information: ^5.0.0
+    space-separated-tokens: ^1.0.0
+  checksum: 5e50b85af0d2cb7c17979cb1ddca75d6b96b53019dd999b39e7833192c9004201c3cee6445065620ea05d0087d9ae147a4844e582d64868be5bc6b0232dfe52d
+  languageName: node
+  linkType: hard
+
 "he@npm:^1.2.0":
   version: 1.2.0
   resolution: "he@npm:1.2.0"
@@ -19787,6 +20379,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"hermes-estree@npm:0.20.1":
+  version: 0.20.1
+  resolution: "hermes-estree@npm:0.20.1"
+  checksum: 226378c62e29a79f8e0935cc8bdefd987195c069b835a9ed1cae08109cd228f6e97a2e580d5de057e4437dc988c972b9fe7227a1d9353dc2abbe142dbd5260c6
+  languageName: node
+  linkType: hard
+
+"hermes-parser@npm:^0.20.1":
+  version: 0.20.1
+  resolution: "hermes-parser@npm:0.20.1"
+  dependencies:
+    hermes-estree: 0.20.1
+  checksum: 2a0c17b5f8fbb0a377f42d480f577b5cc64eafe4d5ebc0a9cbce23b79a02042693134bef1b71163f771d67cd10a450138c8d24b9a431c487fa9ed57cba67e85c
+  languageName: node
+  linkType: hard
+
 "hexoid@npm:^1.0.0":
   version: 1.0.0
   resolution: "hexoid@npm:1.0.0"
@@ -19794,6 +20402,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"highlight.js@npm:^10.4.1, highlight.js@npm:~10.7.0":
+  version: 10.7.3
+  resolution: "highlight.js@npm:10.7.3"
+  checksum: defeafcd546b535d710d8efb8e650af9e3b369ef53e28c3dc7893eacfe263200bba4c5fcf43524ae66d5c0c296b1af0870523ceae3e3104d24b7abf6374a4fea
+  languageName: node
+  linkType: hard
+
 "history@npm:^4.10.1, history@npm:^4.9.0":
   version: 4.10.1
   resolution: "history@npm:4.10.1"
@@ -19917,6 +20532,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"html-url-attributes@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "html-url-attributes@npm:3.0.1"
+  checksum: 1ecbf9cae0c438d2802386710177b7bbf7e30cc61327e9f125eb32fca7302cd1e3ab45c441859cb1e7646109be322fc1163592ad4dfde9b14d09416d101a6573
+  languageName: node
+  linkType: hard
+
 "html-webpack-plugin@npm:^5.5.0":
   version: 5.5.0
   resolution: "html-webpack-plugin@npm:5.5.0"
@@ -20355,6 +20977,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"inline-style-parser@npm:0.2.4":
+  version: 0.2.4
+  resolution: "inline-style-parser@npm:0.2.4"
+  checksum: 5df20a21dd8d67104faaae29774bb50dc9690c75bc5c45dac107559670a5530104ead72c4cf54f390026e617e7014c65b3d68fb0bb573a37c4d1f94e9c36e1ca
+  languageName: node
+  linkType: hard
+
 "inquirer@npm:^7.3.3":
   version: 7.3.3
   resolution: "inquirer@npm:7.3.3"
@@ -20524,6 +21153,40 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-alphabetical@npm:^1.0.0":
+  version: 1.0.4
+  resolution: "is-alphabetical@npm:1.0.4"
+  checksum: 6508cce44fd348f06705d377b260974f4ce68c74000e7da4045f0d919e568226dc3ce9685c5a2af272195384df6930f748ce9213fc9f399b5d31b362c66312cb
+  languageName: node
+  linkType: hard
+
+"is-alphabetical@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "is-alphabetical@npm:2.0.1"
+  checksum: 56207db8d9de0850f0cd30f4966bf731eb82cedfe496cbc2e97e7c3bacaf66fc54a972d2d08c0d93bb679cb84976a05d24c5ad63de56fabbfc60aadae312edaa
+  languageName: node
+  linkType: hard
+
+"is-alphanumerical@npm:^1.0.0":
+  version: 1.0.4
+  resolution: "is-alphanumerical@npm:1.0.4"
+  dependencies:
+    is-alphabetical: ^1.0.0
+    is-decimal: ^1.0.0
+  checksum: e2e491acc16fcf5b363f7c726f666a9538dba0a043665740feb45bba1652457a73441e7c5179c6768a638ed396db3437e9905f403644ec7c468fb41f4813d03f
+  languageName: node
+  linkType: hard
+
+"is-alphanumerical@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "is-alphanumerical@npm:2.0.1"
+  dependencies:
+    is-alphabetical: ^2.0.0
+    is-decimal: ^2.0.0
+  checksum: 87acc068008d4c9c4e9f5bd5e251041d42e7a50995c77b1499cf6ed248f971aadeddb11f239cabf09f7975ee58cac7a48ffc170b7890076d8d227b24a68663c9
+  languageName: node
+  linkType: hard
+
 "is-arguments@npm:^1.0.4, is-arguments@npm:^1.1.1":
   version: 1.1.1
   resolution: "is-arguments@npm:1.1.1"
@@ -20632,6 +21295,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-decimal@npm:^1.0.0":
+  version: 1.0.4
+  resolution: "is-decimal@npm:1.0.4"
+  checksum: ed483a387517856dc395c68403a10201fddcc1b63dc56513fbe2fe86ab38766120090ecdbfed89223d84ca8b1cd28b0641b93cb6597b6e8f4c097a7c24e3fb96
+  languageName: node
+  linkType: hard
+
+"is-decimal@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "is-decimal@npm:2.0.1"
+  checksum: 97132de7acdce77caa7b797632970a2ecd649a88e715db0e4dbc00ab0708b5e7574ba5903962c860cd4894a14fd12b100c0c4ac8aed445cf6f55c6cf747a4158
+  languageName: node
+  linkType: hard
+
 "is-docker@npm:^2.0.0, is-docker@npm:^2.1.1":
   version: 2.2.1
   resolution: "is-docker@npm:2.2.1"
@@ -20721,6 +21398,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-hexadecimal@npm:^1.0.0":
+  version: 1.0.4
+  resolution: "is-hexadecimal@npm:1.0.4"
+  checksum: a452e047587b6069332d83130f54d30da4faf2f2ebaa2ce6d073c27b5703d030d58ed9e0b729c8e4e5b52c6f1dab26781bb77b7bc6c7805f14f320e328ff8cd5
+  languageName: node
+  linkType: hard
+
+"is-hexadecimal@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "is-hexadecimal@npm:2.0.1"
+  checksum: 66a2ea85994c622858f063f23eda506db29d92b52580709eb6f4c19550552d4dcf3fb81952e52f7cf972097237959e00adc7bb8c9400cd12886e15bf06145321
+  languageName: node
+  linkType: hard
+
 "is-inside-container@npm:^1.0.0":
   version: 1.0.0
   resolution: "is-inside-container@npm:1.0.0"
@@ -20835,6 +21526,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-plain-obj@npm:^4.0.0":
+  version: 4.1.0
+  resolution: "is-plain-obj@npm:4.1.0"
+  checksum: 6dc45da70d04a81f35c9310971e78a6a3c7a63547ef782e3a07ee3674695081b6ca4e977fbb8efc48dae3375e0b34558d2bcd722aec9bddfa2d7db5b041be8ce
+  languageName: node
+  linkType: hard
+
 "is-plain-object@npm:5.0.0, is-plain-object@npm:^5.0.0":
   version: 5.0.0
   resolution: "is-plain-object@npm:5.0.0"
@@ -23236,6 +23934,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"longest-streak@npm:^3.0.0":
+  version: 3.1.0
+  resolution: "longest-streak@npm:3.1.0"
+  checksum: d7f952ed004cbdb5c8bcfc4f7f5c3d65449e6c5a9e9be4505a656e3df5a57ee125f284286b4bf8ecea0c21a7b3bf2b8f9001ad506c319b9815ad6a63a47d0fd0
+  languageName: node
+  linkType: hard
+
 "loose-envify@npm:^1.0.0, loose-envify@npm:^1.1.0, loose-envify@npm:^1.2.0, loose-envify@npm:^1.3.1, loose-envify@npm:^1.4.0":
   version: 1.4.0
   resolution: "loose-envify@npm:1.4.0"
@@ -23274,6 +23979,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lowlight@npm:^1.17.0":
+  version: 1.20.0
+  resolution: "lowlight@npm:1.20.0"
+  dependencies:
+    fault: ^1.0.0
+    highlight.js: ~10.7.0
+  checksum: 14a1815d6bae202ddee313fc60f06d46e5235c02fa483a77950b401d85b4c1e12290145ccd17a716b07f9328bd5864aa2d402b6a819ff3be7c833d9748ff8ba7
+  languageName: node
+  linkType: hard
+
 "lru-cache@npm:^11.0.0":
   version: 11.0.1
   resolution: "lru-cache@npm:11.0.1"
@@ -23434,6 +24149,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"markdown-table@npm:^3.0.0":
+  version: 3.0.3
+  resolution: "markdown-table@npm:3.0.3"
+  checksum: 8fcd3d9018311120fbb97115987f8b1665a603f3134c93fbecc5d1463380c8036f789e2a62c19432058829e594fff8db9ff81c88f83690b2f8ed6c074f8d9e10
+  languageName: node
+  linkType: hard
+
 "markdown-to-jsx@npm:^7.4.5":
   version: 7.4.7
   resolution: "markdown-to-jsx@npm:7.4.7"
@@ -23470,6 +24192,215 @@ __metadata:
   languageName: node
   linkType: hard
 
+"mdast-util-find-and-replace@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "mdast-util-find-and-replace@npm:3.0.1"
+  dependencies:
+    "@types/mdast": ^4.0.0
+    escape-string-regexp: ^5.0.0
+    unist-util-is: ^6.0.0
+    unist-util-visit-parents: ^6.0.0
+  checksum: 05d5c4ff02e31db2f8a685a13bcb6c3f44e040bd9dfa54c19a232af8de5268334c8755d79cb456ed4cced1300c4fb83e88444c7ae8ee9ff16869a580f29d08cd
+  languageName: node
+  linkType: hard
+
+"mdast-util-from-markdown@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "mdast-util-from-markdown@npm:2.0.1"
+  dependencies:
+    "@types/mdast": ^4.0.0
+    "@types/unist": ^3.0.0
+    decode-named-character-reference: ^1.0.0
+    devlop: ^1.0.0
+    mdast-util-to-string: ^4.0.0
+    micromark: ^4.0.0
+    micromark-util-decode-numeric-character-reference: ^2.0.0
+    micromark-util-decode-string: ^2.0.0
+    micromark-util-normalize-identifier: ^2.0.0
+    micromark-util-symbol: ^2.0.0
+    micromark-util-types: ^2.0.0
+    unist-util-stringify-position: ^4.0.0
+  checksum: 2e50be71272a1503558c599cd5766cf2743935a021f82e32bc2ae5da44f6c7dcabb9da3a6eee76ede0ec8ad2b122d1192f4fe89890aac90c76463f049f8a835d
+  languageName: node
+  linkType: hard
+
+"mdast-util-gfm-autolink-literal@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "mdast-util-gfm-autolink-literal@npm:2.0.1"
+  dependencies:
+    "@types/mdast": ^4.0.0
+    ccount: ^2.0.0
+    devlop: ^1.0.0
+    mdast-util-find-and-replace: ^3.0.0
+    micromark-util-character: ^2.0.0
+  checksum: 5630b12e072d7004cb132231c94f667fb5813486779cb0dfb0a196d7ae0e048897a43b0b37e080017adda618ddfcbea1d7bf23c0fa31c87bfc683e0898ea1cfe
+  languageName: node
+  linkType: hard
+
+"mdast-util-gfm-footnote@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "mdast-util-gfm-footnote@npm:2.0.0"
+  dependencies:
+    "@types/mdast": ^4.0.0
+    devlop: ^1.1.0
+    mdast-util-from-markdown: ^2.0.0
+    mdast-util-to-markdown: ^2.0.0
+    micromark-util-normalize-identifier: ^2.0.0
+  checksum: 45d26b40e7a093712e023105791129d76e164e2168d5268e113298a22de30c018162683fb7893cdc04ab246dac0087eed708b2a136d1d18ed2b32b3e0cae4a79
+  languageName: node
+  linkType: hard
+
+"mdast-util-gfm-strikethrough@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "mdast-util-gfm-strikethrough@npm:2.0.0"
+  dependencies:
+    "@types/mdast": ^4.0.0
+    mdast-util-from-markdown: ^2.0.0
+    mdast-util-to-markdown: ^2.0.0
+  checksum: fe9b1d0eba9b791ff9001c008744eafe3dd7a81b085f2bf521595ce4a8e8b1b44764ad9361761ad4533af3e5d913d8ad053abec38172031d9ee32a8ebd1c7dbd
+  languageName: node
+  linkType: hard
+
+"mdast-util-gfm-table@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "mdast-util-gfm-table@npm:2.0.0"
+  dependencies:
+    "@types/mdast": ^4.0.0
+    devlop: ^1.0.0
+    markdown-table: ^3.0.0
+    mdast-util-from-markdown: ^2.0.0
+    mdast-util-to-markdown: ^2.0.0
+  checksum: 063a627fd0993548fd63ca0c24c437baf91ba7d51d0a38820bd459bc20bf3d13d7365ef8d28dca99176dd5eb26058f7dde51190479c186dfe6af2e11202957c9
+  languageName: node
+  linkType: hard
+
+"mdast-util-gfm-task-list-item@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "mdast-util-gfm-task-list-item@npm:2.0.0"
+  dependencies:
+    "@types/mdast": ^4.0.0
+    devlop: ^1.0.0
+    mdast-util-from-markdown: ^2.0.0
+    mdast-util-to-markdown: ^2.0.0
+  checksum: 37db90c59b15330fc54d790404abf5ef9f2f83e8961c53666fe7de4aab8dd5e6b3c296b6be19797456711a89a27840291d8871ff0438e9b4e15c89d170efe072
+  languageName: node
+  linkType: hard
+
+"mdast-util-gfm@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "mdast-util-gfm@npm:3.0.0"
+  dependencies:
+    mdast-util-from-markdown: ^2.0.0
+    mdast-util-gfm-autolink-literal: ^2.0.0
+    mdast-util-gfm-footnote: ^2.0.0
+    mdast-util-gfm-strikethrough: ^2.0.0
+    mdast-util-gfm-table: ^2.0.0
+    mdast-util-gfm-task-list-item: ^2.0.0
+    mdast-util-to-markdown: ^2.0.0
+  checksum: 62039d2f682ae3821ea1c999454863d31faf94d67eb9b746589c7e136076d7fb35fabc67e02f025c7c26fd7919331a0ee1aabfae24f565d9a6a9ebab3371c626
+  languageName: node
+  linkType: hard
+
+"mdast-util-mdx-expression@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "mdast-util-mdx-expression@npm:2.0.1"
+  dependencies:
+    "@types/estree-jsx": ^1.0.0
+    "@types/hast": ^3.0.0
+    "@types/mdast": ^4.0.0
+    devlop: ^1.0.0
+    mdast-util-from-markdown: ^2.0.0
+    mdast-util-to-markdown: ^2.0.0
+  checksum: 6af56b06bde3ab971129db9855dcf0d31806c70b3b052d7a90a5499a366b57ffd0c2efca67d281c448c557298ba7e3e61bd07133733b735440840dd339b28e19
+  languageName: node
+  linkType: hard
+
+"mdast-util-mdx-jsx@npm:^3.0.0":
+  version: 3.1.3
+  resolution: "mdast-util-mdx-jsx@npm:3.1.3"
+  dependencies:
+    "@types/estree-jsx": ^1.0.0
+    "@types/hast": ^3.0.0
+    "@types/mdast": ^4.0.0
+    "@types/unist": ^3.0.0
+    ccount: ^2.0.0
+    devlop: ^1.1.0
+    mdast-util-from-markdown: ^2.0.0
+    mdast-util-to-markdown: ^2.0.0
+    parse-entities: ^4.0.0
+    stringify-entities: ^4.0.0
+    unist-util-stringify-position: ^4.0.0
+    vfile-message: ^4.0.0
+  checksum: 638644420090163fc08d01150e10550a21e914b85dd3a37178d3b949173c5aee2d7fee536f864ac25800e0cebde8357a5808427ffb7e9975a669e4382ae479ab
+  languageName: node
+  linkType: hard
+
+"mdast-util-mdxjs-esm@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "mdast-util-mdxjs-esm@npm:2.0.1"
+  dependencies:
+    "@types/estree-jsx": ^1.0.0
+    "@types/hast": ^3.0.0
+    "@types/mdast": ^4.0.0
+    devlop: ^1.0.0
+    mdast-util-from-markdown: ^2.0.0
+    mdast-util-to-markdown: ^2.0.0
+  checksum: 1f9dad04d31d59005332e9157ea9510dc1d03092aadbc607a10475c7eec1c158b475aa0601a3a4f74e13097ca735deb8c2d9d37928ddef25d3029fd7c9e14dc3
+  languageName: node
+  linkType: hard
+
+"mdast-util-phrasing@npm:^4.0.0":
+  version: 4.1.0
+  resolution: "mdast-util-phrasing@npm:4.1.0"
+  dependencies:
+    "@types/mdast": ^4.0.0
+    unist-util-is: ^6.0.0
+  checksum: 3a97533e8ad104a422f8bebb34b3dde4f17167b8ed3a721cf9263c7416bd3447d2364e6d012a594aada40cac9e949db28a060bb71a982231693609034ed5324e
+  languageName: node
+  linkType: hard
+
+"mdast-util-to-hast@npm:^13.0.0":
+  version: 13.2.0
+  resolution: "mdast-util-to-hast@npm:13.2.0"
+  dependencies:
+    "@types/hast": ^3.0.0
+    "@types/mdast": ^4.0.0
+    "@ungap/structured-clone": ^1.0.0
+    devlop: ^1.0.0
+    micromark-util-sanitize-uri: ^2.0.0
+    trim-lines: ^3.0.0
+    unist-util-position: ^5.0.0
+    unist-util-visit: ^5.0.0
+    vfile: ^6.0.0
+  checksum: 7e5231ff3d4e35e1421908437577fd5098141f64918ff5cc8a0f7a8a76c5407f7a3ee88d75f7a1f7afb763989c9f357475fa0ba8296c00aaff1e940098fe86a6
+  languageName: node
+  linkType: hard
+
+"mdast-util-to-markdown@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "mdast-util-to-markdown@npm:2.1.0"
+  dependencies:
+    "@types/mdast": ^4.0.0
+    "@types/unist": ^3.0.0
+    longest-streak: ^3.0.0
+    mdast-util-phrasing: ^4.0.0
+    mdast-util-to-string: ^4.0.0
+    micromark-util-decode-string: ^2.0.0
+    unist-util-visit: ^5.0.0
+    zwitch: ^2.0.0
+  checksum: 3a2cf3957e23b34e2e092e6e76ae72ee0b8745955bd811baba6814cf3a3d916c3fd52264b4b58f3bb3d512a428f84a1e998b6fc7e28434e388a9ae8fb6a9c173
+  languageName: node
+  linkType: hard
+
+"mdast-util-to-string@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "mdast-util-to-string@npm:4.0.0"
+  dependencies:
+    "@types/mdast": ^4.0.0
+  checksum: 35489fb5710d58cbc2d6c8b6547df161a3f81e0f28f320dfb3548a9393555daf07c310c0c497708e67ed4dfea4a06e5655799e7d631ca91420c288b4525d6c29
+  languageName: node
+  linkType: hard
+
 "mdn-data@npm:2.0.14":
   version: 2.0.14
   resolution: "mdn-data@npm:2.0.14"
@@ -23589,6 +24520,335 @@ __metadata:
   languageName: node
   linkType: hard
 
+"micromark-core-commonmark@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "micromark-core-commonmark@npm:2.0.1"
+  dependencies:
+    decode-named-character-reference: ^1.0.0
+    devlop: ^1.0.0
+    micromark-factory-destination: ^2.0.0
+    micromark-factory-label: ^2.0.0
+    micromark-factory-space: ^2.0.0
+    micromark-factory-title: ^2.0.0
+    micromark-factory-whitespace: ^2.0.0
+    micromark-util-character: ^2.0.0
+    micromark-util-chunked: ^2.0.0
+    micromark-util-classify-character: ^2.0.0
+    micromark-util-html-tag-name: ^2.0.0
+    micromark-util-normalize-identifier: ^2.0.0
+    micromark-util-resolve-all: ^2.0.0
+    micromark-util-subtokenize: ^2.0.0
+    micromark-util-symbol: ^2.0.0
+    micromark-util-types: ^2.0.0
+  checksum: 6a9891cc883a531e090dc8dab6669945f3df9448e84216a8f2a91f9258281e6abea5ae3940fde2bd77a57dc3e0d67f2add6762aed63a378f37b09eaf7e7426c4
+  languageName: node
+  linkType: hard
+
+"micromark-extension-gfm-autolink-literal@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "micromark-extension-gfm-autolink-literal@npm:2.1.0"
+  dependencies:
+    micromark-util-character: ^2.0.0
+    micromark-util-sanitize-uri: ^2.0.0
+    micromark-util-symbol: ^2.0.0
+    micromark-util-types: ^2.0.0
+  checksum: e00a570c70c837b9cbbe94b2c23b787f44e781cd19b72f1828e3453abca2a9fb600fa539cdc75229fa3919db384491063645086e02249481e6ff3ec2c18f767c
+  languageName: node
+  linkType: hard
+
+"micromark-extension-gfm-footnote@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "micromark-extension-gfm-footnote@npm:2.1.0"
+  dependencies:
+    devlop: ^1.0.0
+    micromark-core-commonmark: ^2.0.0
+    micromark-factory-space: ^2.0.0
+    micromark-util-character: ^2.0.0
+    micromark-util-normalize-identifier: ^2.0.0
+    micromark-util-sanitize-uri: ^2.0.0
+    micromark-util-symbol: ^2.0.0
+    micromark-util-types: ^2.0.0
+  checksum: ac6fb039e98395d37b71ebff7c7a249aef52678b5cf554c89c4f716111d4be62ef99a5d715a5bd5d68fa549778c977d85cb671d1d8506dc8a3a1b46e867ae52f
+  languageName: node
+  linkType: hard
+
+"micromark-extension-gfm-strikethrough@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "micromark-extension-gfm-strikethrough@npm:2.1.0"
+  dependencies:
+    devlop: ^1.0.0
+    micromark-util-chunked: ^2.0.0
+    micromark-util-classify-character: ^2.0.0
+    micromark-util-resolve-all: ^2.0.0
+    micromark-util-symbol: ^2.0.0
+    micromark-util-types: ^2.0.0
+  checksum: cdb7a38dd6eefb6ceb6792a44a6796b10f951e8e3e45b8579f599f43e7ae26ccd048c0aa7e441b3c29dd0c54656944fe6eb0098de2bc4b5106fbc0a42e9e016c
+  languageName: node
+  linkType: hard
+
+"micromark-extension-gfm-table@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "micromark-extension-gfm-table@npm:2.1.0"
+  dependencies:
+    devlop: ^1.0.0
+    micromark-factory-space: ^2.0.0
+    micromark-util-character: ^2.0.0
+    micromark-util-symbol: ^2.0.0
+    micromark-util-types: ^2.0.0
+  checksum: 249d695f5f8bd222a0d8a774ec78ea2a2d624cb50a4d008092a54aa87dad1f9d540e151d29696cf849eb1cee380113c4df722aebb3b425a214832a2de5dea1d7
+  languageName: node
+  linkType: hard
+
+"micromark-extension-gfm-tagfilter@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-extension-gfm-tagfilter@npm:2.0.0"
+  dependencies:
+    micromark-util-types: ^2.0.0
+  checksum: cf21552f4a63592bfd6c96ae5d64a5f22bda4e77814e3f0501bfe80e7a49378ad140f827007f36044666f176b3a0d5fea7c2e8e7973ce4b4579b77789f01ae95
+  languageName: node
+  linkType: hard
+
+"micromark-extension-gfm-task-list-item@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "micromark-extension-gfm-task-list-item@npm:2.1.0"
+  dependencies:
+    devlop: ^1.0.0
+    micromark-factory-space: ^2.0.0
+    micromark-util-character: ^2.0.0
+    micromark-util-symbol: ^2.0.0
+    micromark-util-types: ^2.0.0
+  checksum: b1ad86a4e9d68d9ad536d94fb25a5182acbc85cc79318f4a6316034342f6a71d67983cc13f12911d0290fd09b2bda43cdabe8781a2d9cca2ebe0d421e8b2b8a4
+  languageName: node
+  linkType: hard
+
+"micromark-extension-gfm@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "micromark-extension-gfm@npm:3.0.0"
+  dependencies:
+    micromark-extension-gfm-autolink-literal: ^2.0.0
+    micromark-extension-gfm-footnote: ^2.0.0
+    micromark-extension-gfm-strikethrough: ^2.0.0
+    micromark-extension-gfm-table: ^2.0.0
+    micromark-extension-gfm-tagfilter: ^2.0.0
+    micromark-extension-gfm-task-list-item: ^2.0.0
+    micromark-util-combine-extensions: ^2.0.0
+    micromark-util-types: ^2.0.0
+  checksum: 2060fa62666a09532d6b3a272d413bc1b25bbb262f921d7402795ac021e1362c8913727e33d7528d5b4ccaf26922ec51208c43f795a702964817bc986de886c9
+  languageName: node
+  linkType: hard
+
+"micromark-factory-destination@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-factory-destination@npm:2.0.0"
+  dependencies:
+    micromark-util-character: ^2.0.0
+    micromark-util-symbol: ^2.0.0
+    micromark-util-types: ^2.0.0
+  checksum: d36e65ed1c072ff4148b016783148ba7c68a078991154625723e24bda3945160268fb91079fb28618e1613c2b6e70390a8ddc544c45410288aa27b413593071a
+  languageName: node
+  linkType: hard
+
+"micromark-factory-label@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-factory-label@npm:2.0.0"
+  dependencies:
+    devlop: ^1.0.0
+    micromark-util-character: ^2.0.0
+    micromark-util-symbol: ^2.0.0
+    micromark-util-types: ^2.0.0
+  checksum: c021dbd0ed367610d35f2bae21209bc804d1a6d1286ffce458fd6a717f4d7fe581a7cba7d5c2d7a63757c44eb927c80d6a571d6ea7969fae1b48ab6461d109c4
+  languageName: node
+  linkType: hard
+
+"micromark-factory-space@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-factory-space@npm:2.0.0"
+  dependencies:
+    micromark-util-character: ^2.0.0
+    micromark-util-types: ^2.0.0
+  checksum: 4ffdcdc2f759887bbb356500cb460b3915ecddcb5d85c3618d7df68ad05d13ed02b1153ee1845677b7d8126df8f388288b84fcf0d943bd9c92bcc71cd7222e37
+  languageName: node
+  linkType: hard
+
+"micromark-factory-title@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-factory-title@npm:2.0.0"
+  dependencies:
+    micromark-factory-space: ^2.0.0
+    micromark-util-character: ^2.0.0
+    micromark-util-symbol: ^2.0.0
+    micromark-util-types: ^2.0.0
+  checksum: 39e1ac23af3554e6e652e56065579bc7faf21ade7b8704b29c175871b4152b7109b790bb3cae0f7e088381139c6bac9553b8400772c3d322e4fa635f813a3578
+  languageName: node
+  linkType: hard
+
+"micromark-factory-whitespace@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-factory-whitespace@npm:2.0.0"
+  dependencies:
+    micromark-factory-space: ^2.0.0
+    micromark-util-character: ^2.0.0
+    micromark-util-symbol: ^2.0.0
+    micromark-util-types: ^2.0.0
+  checksum: 9587c2546d1a58b4d5472b42adf05463f6212d0449455285662d63cd8eaed89c6b159ac82713fcee5f9dd88628c24307d9533cccd8971a2f3f4d48702f8f850a
+  languageName: node
+  linkType: hard
+
+"micromark-util-character@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "micromark-util-character@npm:2.1.0"
+  dependencies:
+    micromark-util-symbol: ^2.0.0
+    micromark-util-types: ^2.0.0
+  checksum: 36ee910f84077cf16626fa618cfe46ac25956b3242e3166b8e8e98c5a8c524af7e5bf3d70822264b1fd2d297a36104a7eb7e3462c19c28353eaca7b0d8717594
+  languageName: node
+  linkType: hard
+
+"micromark-util-chunked@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-util-chunked@npm:2.0.0"
+  dependencies:
+    micromark-util-symbol: ^2.0.0
+  checksum: 324f95cccdae061332a8241936eaba6ef0782a1e355bac5c607ad2564fd3744929be7dc81651315a2921535747a33243e6a5606bcb64b7a56d49b6d74ea1a3d4
+  languageName: node
+  linkType: hard
+
+"micromark-util-classify-character@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-util-classify-character@npm:2.0.0"
+  dependencies:
+    micromark-util-character: ^2.0.0
+    micromark-util-symbol: ^2.0.0
+    micromark-util-types: ^2.0.0
+  checksum: 086e52904deffebb793fb1c08c94aabb8901f76958142dfc3a6282890ebaa983b285e69bd602b9d507f1b758ed38e75a994d2ad9fbbefa7de2584f67a16af405
+  languageName: node
+  linkType: hard
+
+"micromark-util-combine-extensions@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-util-combine-extensions@npm:2.0.0"
+  dependencies:
+    micromark-util-chunked: ^2.0.0
+    micromark-util-types: ^2.0.0
+  checksum: 107c47700343f365b4ed81551e18bc3458b573c500e56ac052b2490bd548adc475216e41d2271633a8867fac66fc22ba3e0a2d74a31ed79b9870ca947eb4e3ba
+  languageName: node
+  linkType: hard
+
+"micromark-util-decode-numeric-character-reference@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "micromark-util-decode-numeric-character-reference@npm:2.0.1"
+  dependencies:
+    micromark-util-symbol: ^2.0.0
+  checksum: 9512507722efd2033a9f08715eeef787fbfe27e23edf55db21423d46d82ab46f76c89b4f960be3f5e50a2d388d89658afc0647989cf256d051e9ea01277a1adb
+  languageName: node
+  linkType: hard
+
+"micromark-util-decode-string@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-util-decode-string@npm:2.0.0"
+  dependencies:
+    decode-named-character-reference: ^1.0.0
+    micromark-util-character: ^2.0.0
+    micromark-util-decode-numeric-character-reference: ^2.0.0
+    micromark-util-symbol: ^2.0.0
+  checksum: a75daf32a4a6b549e9f19b4d833ebfeb09a32a9a1f9ce50f35dec6b6a3e4f9f121f49024ba7f9c91c55ebe792f7c7a332fc9604795181b6a612637df0df5b959
+  languageName: node
+  linkType: hard
+
+"micromark-util-encode@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-util-encode@npm:2.0.0"
+  checksum: 853a3f33fce72aaf4ffa60b7f2b6fcfca40b270b3466e1b96561b02185d2bd8c01dd7948bc31a24ac014f4cc854e545ca9a8e9cf7ea46262f9d24c9e88551c66
+  languageName: node
+  linkType: hard
+
+"micromark-util-html-tag-name@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-util-html-tag-name@npm:2.0.0"
+  checksum: d786d4486f93eb0ac5b628779809ca97c5dc60f3c9fc03eb565809831db181cf8cb7f05f9ac76852f3eb35461af0f89fa407b46f3a03f4f97a96754d8dc540d8
+  languageName: node
+  linkType: hard
+
+"micromark-util-normalize-identifier@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-util-normalize-identifier@npm:2.0.0"
+  dependencies:
+    micromark-util-symbol: ^2.0.0
+  checksum: b36da2d3fd102053dadd953ce5c558328df12a63a8ac0e5aad13d4dda8e43b6a5d4a661baafe0a1cd8a260bead4b4a8e6e0e74193dd651e8484225bd4f4e68aa
+  languageName: node
+  linkType: hard
+
+"micromark-util-resolve-all@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-util-resolve-all@npm:2.0.0"
+  dependencies:
+    micromark-util-types: ^2.0.0
+  checksum: 31fe703b85572cb3f598ebe32750e59516925c7ff1f66cfe6afaebe0771a395a9eaa770787f2523d3c46082ea80e6c14f83643303740b3d650af7c96ebd30ccc
+  languageName: node
+  linkType: hard
+
+"micromark-util-sanitize-uri@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-util-sanitize-uri@npm:2.0.0"
+  dependencies:
+    micromark-util-character: ^2.0.0
+    micromark-util-encode: ^2.0.0
+    micromark-util-symbol: ^2.0.0
+  checksum: ea4c28bbffcf2430e9aff2d18554296789a8b0a1f54ac24020d1dde76624a7f93e8f2a83e88cd5a846b6d2c4287b71b1142d1b89fa7f1b0363a9b33711a141fe
+  languageName: node
+  linkType: hard
+
+"micromark-util-subtokenize@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "micromark-util-subtokenize@npm:2.0.1"
+  dependencies:
+    devlop: ^1.0.0
+    micromark-util-chunked: ^2.0.0
+    micromark-util-symbol: ^2.0.0
+    micromark-util-types: ^2.0.0
+  checksum: 5d338883ad8889c63f9b262b9cae0c02a42088201981d820ae7af7aa6d38fab6585b89fd4cf2206a46a7c4002e41ee6c70e1a3e0ceb3ad8b7adcffaf166b1511
+  languageName: node
+  linkType: hard
+
+"micromark-util-symbol@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-util-symbol@npm:2.0.0"
+  checksum: fa4a05bff575d9fbf0ad96a1013003e3bb6087ed6b34b609a141b6c0d2137b57df594aca409a95f4c5fda199f227b56a7d8b1f82cea0768df161d8a3a3660764
+  languageName: node
+  linkType: hard
+
+"micromark-util-types@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-util-types@npm:2.0.0"
+  checksum: 819fef3ab5770c37893d2a60381fb2694396c8d22803b6e103c830c3a1bc1490363c2b0470bb2acaaddad776dfbc2fc1fcfde39cb63c4f54d95121611672e3d0
+  languageName: node
+  linkType: hard
+
+"micromark@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "micromark@npm:4.0.0"
+  dependencies:
+    "@types/debug": ^4.0.0
+    debug: ^4.0.0
+    decode-named-character-reference: ^1.0.0
+    devlop: ^1.0.0
+    micromark-core-commonmark: ^2.0.0
+    micromark-factory-space: ^2.0.0
+    micromark-util-character: ^2.0.0
+    micromark-util-chunked: ^2.0.0
+    micromark-util-combine-extensions: ^2.0.0
+    micromark-util-decode-numeric-character-reference: ^2.0.0
+    micromark-util-encode: ^2.0.0
+    micromark-util-normalize-identifier: ^2.0.0
+    micromark-util-resolve-all: ^2.0.0
+    micromark-util-sanitize-uri: ^2.0.0
+    micromark-util-subtokenize: ^2.0.0
+    micromark-util-symbol: ^2.0.0
+    micromark-util-types: ^2.0.0
+  checksum: b84ab5ab1a0b28c063c52e9c2c9d7d44b954507235c10c9492d66e0b38f7de24bf298f914a1fbdf109f2a57a88cf0412de217c84cfac5fd60e3e42a74dbac085
+  languageName: node
+  linkType: hard
+
 "micromatch@npm:4.0.5, micromatch@npm:^4.0.2, micromatch@npm:^4.0.4, micromatch@npm:^4.0.5":
   version: 4.0.5
   resolution: "micromatch@npm:4.0.5"
@@ -23829,6 +25089,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"mixpanel-browser@npm:^2.55.1":
+  version: 2.55.1
+  resolution: "mixpanel-browser@npm:2.55.1"
+  dependencies:
+    rrweb: 2.0.0-alpha.13
+  checksum: 10bc4d9267113c6357ef25f63e1708b1dc38f3ce6c89d97b53d85052bbeed53889b2ac4599aed0ea752814cc34342dd7d5dbe2aaca05c181f469742e8661cfb6
+  languageName: node
+  linkType: hard
+
 "mkdirp-classic@npm:^0.5.2":
   version: 0.5.3
   resolution: "mkdirp-classic@npm:0.5.3"
@@ -23996,7 +25265,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ms@npm:2.1.3, ms@npm:^2.0.0, ms@npm:^2.1.1":
+"ms@npm:2.1.3, ms@npm:^2.0.0, ms@npm:^2.1.1, ms@npm:^2.1.3":
   version: 2.1.3
   resolution: "ms@npm:2.1.3"
   checksum: aa92de608021b242401676e35cfa5aa42dd70cbdc082b916da7fb925c542173e36bce97ea3e804923fe92c0ad991434e4a38327e15a1b5b5f945d66df615ae6d
@@ -24155,6 +25424,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"node-domexception@npm:1.0.0":
+  version: 1.0.0
+  resolution: "node-domexception@npm:1.0.0"
+  checksum: ee1d37dd2a4eb26a8a92cd6b64dfc29caec72bff5e1ed9aba80c294f57a31ba4895a60fd48347cf17dd6e766da0ae87d75657dfd1f384ebfa60462c2283f5c7f
+  languageName: node
+  linkType: hard
+
 "node-fetch-native@npm:^1.0.2":
   version: 1.2.0
   resolution: "node-fetch-native@npm:1.2.0"
@@ -24649,6 +25925,28 @@ __metadata:
   languageName: node
   linkType: hard
 
+"openai@npm:^4.64.0":
+  version: 4.67.0
+  resolution: "openai@npm:4.67.0"
+  dependencies:
+    "@types/node": ^18.11.18
+    "@types/node-fetch": ^2.6.4
+    abort-controller: ^3.0.0
+    agentkeepalive: ^4.2.1
+    form-data-encoder: 1.7.2
+    formdata-node: ^4.3.2
+    node-fetch: ^2.6.7
+  peerDependencies:
+    zod: ^3.23.8
+  peerDependenciesMeta:
+    zod:
+      optional: true
+  bin:
+    openai: bin/cli
+  checksum: 9e214f27630d1cb0ae9bf129a81133e6cf4683e7af8e8aa852cf473d9a1a84c6f551722b0557c7c18c8b92ee0112f1781227b89e9b7f16be9de1b64fcba4c55e
+  languageName: node
+  linkType: hard
+
 "opener@npm:^1.5.1, opener@npm:^1.5.2":
   version: 1.5.2
   resolution: "opener@npm:1.5.2"
@@ -24921,6 +26219,36 @@ __metadata:
   languageName: node
   linkType: hard
 
+"parse-entities@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "parse-entities@npm:2.0.0"
+  dependencies:
+    character-entities: ^1.0.0
+    character-entities-legacy: ^1.0.0
+    character-reference-invalid: ^1.0.0
+    is-alphanumerical: ^1.0.0
+    is-decimal: ^1.0.0
+    is-hexadecimal: ^1.0.0
+  checksum: 7addfd3e7d747521afac33c8121a5f23043c6973809756920d37e806639b4898385d386fcf4b3c8e2ecf1bc28aac5ae97df0b112d5042034efbe80f44081ebce
+  languageName: node
+  linkType: hard
+
+"parse-entities@npm:^4.0.0":
+  version: 4.0.1
+  resolution: "parse-entities@npm:4.0.1"
+  dependencies:
+    "@types/unist": ^2.0.0
+    character-entities: ^2.0.0
+    character-entities-legacy: ^3.0.0
+    character-reference-invalid: ^2.0.0
+    decode-named-character-reference: ^1.0.0
+    is-alphanumerical: ^2.0.0
+    is-decimal: ^2.0.0
+    is-hexadecimal: ^2.0.0
+  checksum: 32a6ff5b9acb9d2c4d71537308521fd265e685b9215691df73feedd9edfe041bb6da9f89bd0c35c4a2bc7d58e3e76e399bb6078c2fd7d2a343ff1dd46edbf1bd
+  languageName: node
+  linkType: hard
+
 "parse-filepath@npm:^1.0.2":
   version: 1.0.2
   resolution: "parse-filepath@npm:1.0.2"
@@ -26434,7 +27762,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prismjs@npm:^1.27.0":
+"prismjs@npm:^1.27.0, prismjs@npm:~1.27.0":
   version: 1.27.0
   resolution: "prismjs@npm:1.27.0"
   checksum: 85c7f4a3e999073502cc9e1882af01e3709706369ec254b60bff1149eda701f40d02512acab956012dc7e61cfd61743a3a34c1bd0737e8dbacd79141e5698bbc
@@ -26546,6 +27874,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"property-information@npm:^5.0.0":
+  version: 5.6.0
+  resolution: "property-information@npm:5.6.0"
+  dependencies:
+    xtend: ^4.0.0
+  checksum: fcf87c6542e59a8bbe31ca0b3255a4a63ac1059b01b04469680288998bcfa97f341ca989566adbb63975f4d85339030b82320c324a511532d390910d1c583893
+  languageName: node
+  linkType: hard
+
+"property-information@npm:^6.0.0":
+  version: 6.5.0
+  resolution: "property-information@npm:6.5.0"
+  checksum: 6e55664e2f64083b715011e5bafaa1e694faf36986c235b0907e95d09259cc37c38382e3cc94a4c3f56366e05336443db12c8a0f0968a8c0a1b1416eebfc8f53
+  languageName: node
+  linkType: hard
+
 "protobufjs@npm:^7.3.0":
   version: 7.3.2
   resolution: "protobufjs@npm:7.3.2"
@@ -27508,6 +28852,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-markdown@npm:^9.0.1":
+  version: 9.0.1
+  resolution: "react-markdown@npm:9.0.1"
+  dependencies:
+    "@types/hast": ^3.0.0
+    devlop: ^1.0.0
+    hast-util-to-jsx-runtime: ^2.0.0
+    html-url-attributes: ^3.0.0
+    mdast-util-to-hast: ^13.0.0
+    remark-parse: ^11.0.0
+    remark-rehype: ^11.0.0
+    unified: ^11.0.0
+    unist-util-visit: ^5.0.0
+    vfile: ^6.0.0
+  peerDependencies:
+    "@types/react": ">=18"
+    react: ">=18"
+  checksum: ca1daa650d48b84a5a9771683cdb3f3d2d418247ce0faf73ede3207c65f2a21cdebb9df37afda67f6fc8f0f0a7b9ce00eb239781954a4d6c7ad88ea4df068add
+  languageName: node
+  linkType: hard
+
 "react-media-recorder@npm:^1.6.1":
   version: 1.6.1
   resolution: "react-media-recorder@npm:1.6.1"
@@ -27887,6 +29252,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-syntax-highlighter@npm:^15.5.0":
+  version: 15.5.0
+  resolution: "react-syntax-highlighter@npm:15.5.0"
+  dependencies:
+    "@babel/runtime": ^7.3.1
+    highlight.js: ^10.4.1
+    lowlight: ^1.17.0
+    prismjs: ^1.27.0
+    refractor: ^3.6.0
+  peerDependencies:
+    react: ">= 0.14.0"
+  checksum: c082b48f30f8ba8d0c55ed1d761910630860077c7ff5793c4c912adcb5760df06436ed0ad62be0de28113aac9ad2af55eccd995f8eee98df53382e4ced2072fb
+  languageName: node
+  linkType: hard
+
 "react-table-sticky@npm:^1.1.3":
   version: 1.1.3
   resolution: "react-table-sticky@npm:1.1.3"
@@ -27979,6 +29359,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-transition-group@npm:^4.4.5":
+  version: 4.4.5
+  resolution: "react-transition-group@npm:4.4.5"
+  dependencies:
+    "@babel/runtime": ^7.5.5
+    dom-helpers: ^5.0.1
+    loose-envify: ^1.4.0
+    prop-types: ^15.6.2
+  peerDependencies:
+    react: ">=16.6.0"
+    react-dom: ">=16.6.0"
+  checksum: 75602840106aa9c6545149d6d7ae1502fb7b7abadcce70a6954c4b64a438ff1cd16fc77a0a1e5197cdd72da398f39eb929ea06f9005c45b132ed34e056ebdeb1
+  languageName: node
+  linkType: hard
+
 "react-use-gesture@npm:^7.0.4":
   version: 7.0.16
   resolution: "react-use-gesture@npm:7.0.16"
@@ -28270,6 +29665,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"refractor@npm:^3.6.0":
+  version: 3.6.0
+  resolution: "refractor@npm:3.6.0"
+  dependencies:
+    hastscript: ^6.0.0
+    parse-entities: ^2.0.0
+    prismjs: ~1.27.0
+  checksum: 39b01c4168c77c5c8486f9bf8907bbb05f257f15026057ba5728535815a2d90eed620468a4bfbb2b8ceefbb3ce3931a1be8b17152dbdbc8b0eef92450ff750a2
+  languageName: node
+  linkType: hard
+
 "regenerate-unicode-properties@npm:^10.1.0":
   version: 10.1.0
   resolution: "regenerate-unicode-properties@npm:10.1.0"
@@ -28395,6 +29801,56 @@ __metadata:
   languageName: node
   linkType: hard
 
+"remark-gfm@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "remark-gfm@npm:4.0.0"
+  dependencies:
+    "@types/mdast": ^4.0.0
+    mdast-util-gfm: ^3.0.0
+    micromark-extension-gfm: ^3.0.0
+    remark-parse: ^11.0.0
+    remark-stringify: ^11.0.0
+    unified: ^11.0.0
+  checksum: 84bea84e388061fbbb697b4b666089f5c328aa04d19dc544c229b607446bc10902e46b67b9594415a1017bbbd7c811c1f0c30d36682c6d1a6718b66a1558261b
+  languageName: node
+  linkType: hard
+
+"remark-parse@npm:^11.0.0":
+  version: 11.0.0
+  resolution: "remark-parse@npm:11.0.0"
+  dependencies:
+    "@types/mdast": ^4.0.0
+    mdast-util-from-markdown: ^2.0.0
+    micromark-util-types: ^2.0.0
+    unified: ^11.0.0
+  checksum: d83d245290fa84bb04fb3e78111f09c74f7417e7c012a64dd8dc04fccc3699036d828fbd8eeec8944f774b6c30cc1d925c98f8c46495ebcee7c595496342ab7f
+  languageName: node
+  linkType: hard
+
+"remark-rehype@npm:^11.0.0":
+  version: 11.1.1
+  resolution: "remark-rehype@npm:11.1.1"
+  dependencies:
+    "@types/hast": ^3.0.0
+    "@types/mdast": ^4.0.0
+    mdast-util-to-hast: ^13.0.0
+    unified: ^11.0.0
+    vfile: ^6.0.0
+  checksum: e199dff098ae6a560e13dd1778dec9c61440f979cc931c4ca4dcde0d58e51c0723243a901c1842379b189083cf4d74f224f57833738095ffa9535179d7cf3f01
+  languageName: node
+  linkType: hard
+
+"remark-stringify@npm:^11.0.0":
+  version: 11.0.0
+  resolution: "remark-stringify@npm:11.0.0"
+  dependencies:
+    "@types/mdast": ^4.0.0
+    mdast-util-to-markdown: ^2.0.0
+    unified: ^11.0.0
+  checksum: 59e07460eb629d6c3b3c0f438b0b236e7e6858fd5ab770303078f5a556ec00354d9c7fb9ef6d5f745a4617ac7da1ab618b170fbb4dac120e183fecd9cc86bce6
+  languageName: node
+  linkType: hard
+
 "remixicon-react@npm:^1.0.0":
   version: 1.0.0
   resolution: "remixicon-react@npm:1.0.0"
@@ -28863,19 +30319,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rrdom@npm:^2.0.0-alpha.11":
-  version: 2.0.0-alpha.12
-  resolution: "rrdom@npm:2.0.0-alpha.12"
+"rrdom@npm:^2.0.0-alpha.11, rrdom@npm:^2.0.0-alpha.13":
+  version: 2.0.0-alpha.17
+  resolution: "rrdom@npm:2.0.0-alpha.17"
   dependencies:
-    rrweb-snapshot: ^2.0.0-alpha.12
-  checksum: 64647547f099eaf0f77d207a83498b321c3bf76e6aa12c17dd1543e1019145bd7e564dd1c16439d3f9029e472e4d1d25c1d6717e4b37af1d8c0d42c8452c96f2
+    rrweb-snapshot: ^2.0.0-alpha.17
+  checksum: a73d6e1386bb8fae02cc563ee38949e71fe031db6c55fe56fe2031f16235a107dbeb6ea30dc15e6f4fffd829908a6fe1b09e153903eda254e7c27bc11d52f278
   languageName: node
   linkType: hard
 
-"rrweb-snapshot@npm:^2.0.0-alpha.11, rrweb-snapshot@npm:^2.0.0-alpha.12":
-  version: 2.0.0-alpha.12
-  resolution: "rrweb-snapshot@npm:2.0.0-alpha.12"
-  checksum: de8a7f8208ac9834d6cef1cea41d91782f6199ea101dde1eb9016e7253d79531444fe63466dfd42249b278ba0022c610e3806c2846df3a1cbe4328c5e88ce3a4
+"rrweb-snapshot@npm:^2.0.0-alpha.11, rrweb-snapshot@npm:^2.0.0-alpha.13, rrweb-snapshot@npm:^2.0.0-alpha.17":
+  version: 2.0.0-alpha.17
+  resolution: "rrweb-snapshot@npm:2.0.0-alpha.17"
+  dependencies:
+    postcss: ^8.4.38
+  checksum: 076d25fa91b56f7f863bf36cb0b772efb0ad74b92e2f5318ac7beb22ab41e750c2f85120bd31769d2eca638f96f62f8bf7b4b262741cd56e74403335f77f815f
   languageName: node
   linkType: hard
 
@@ -28895,6 +30353,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rrweb@npm:2.0.0-alpha.13":
+  version: 2.0.0-alpha.13
+  resolution: "rrweb@npm:2.0.0-alpha.13"
+  dependencies:
+    "@rrweb/types": ^2.0.0-alpha.13
+    "@types/css-font-loading-module": 0.0.7
+    "@xstate/fsm": ^1.4.0
+    base64-arraybuffer: ^1.0.1
+    fflate: ^0.4.4
+    mitt: ^3.0.0
+    rrdom: ^2.0.0-alpha.13
+    rrweb-snapshot: ^2.0.0-alpha.13
+  checksum: e20e88c5fe897a54648a0f96ad3bcb285ac82a7b716944bf38ffecd6b88601d23846d4a8ad7471a4cfcb3ce37d77ed7d093e48d15936d33e8282c5e84125f797
+  languageName: node
+  linkType: hard
+
 "run-applescript@npm:^5.0.0":
   version: 5.0.0
   resolution: "run-applescript@npm:5.0.0"
@@ -29747,6 +31221,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"space-separated-tokens@npm:^1.0.0":
+  version: 1.1.5
+  resolution: "space-separated-tokens@npm:1.1.5"
+  checksum: 8ef68f1cfa8ccad316b7f8d0df0919d0f1f6d32101e8faeee34ea3a923ce8509c1ad562f57388585ee4951e92d27afa211ed0a077d3d5995b5ba9180331be708
+  languageName: node
+  linkType: hard
+
 "space-separated-tokens@npm:^2.0.0":
   version: 2.0.2
   resolution: "space-separated-tokens@npm:2.0.2"
@@ -30225,6 +31706,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"stringify-entities@npm:^4.0.0":
+  version: 4.0.4
+  resolution: "stringify-entities@npm:4.0.4"
+  dependencies:
+    character-entities-html4: ^2.0.0
+    character-entities-legacy: ^3.0.0
+  checksum: ac1344ef211eacf6cf0a0a8feaf96f9c36083835b406560d2c6ff5a87406a41b13f2f0b4c570a3b391f465121c4fd6822b863ffb197e8c0601a64097862cc5b5
+  languageName: node
+  linkType: hard
+
 "stringify-object@npm:^3.3.0":
   version: 3.3.0
   resolution: "stringify-object@npm:3.3.0"
@@ -30364,6 +31855,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"style-to-object@npm:^1.0.0":
+  version: 1.0.8
+  resolution: "style-to-object@npm:1.0.8"
+  dependencies:
+    inline-style-parser: 0.2.4
+  checksum: 80ca4773fc728d7919edc552eb46bab11aa8cdd0b426528ee8b817ba6872ea7b9d38fbb97b6443fd2d4895a4c4b02ec32765387466a302d0b4d1b91deab1e1a0
+  languageName: node
+  linkType: hard
+
 "styled-components@npm:^5.3.6":
   version: 5.3.6
   resolution: "styled-components@npm:5.3.6"
@@ -30938,7 +32438,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tinymce@npm:^7.0.0 || ^6.0.0 || ^5.5.1, tinymce@npm:^7.3.0":
+"tinymce@npm:6.8.3":
+  version: 6.8.3
+  resolution: "tinymce@npm:6.8.3"
+  checksum: 2ce922ceb60636778afb21a493e99d561e73f82c5fb331a4f666d973129ca27277bc1b6332d6932ab8fe0a379b1f201285f143a2d72646a813fda88a0dec5312
+  languageName: node
+  linkType: hard
+
+"tinymce@npm:^7.0.0 || ^6.0.0 || ^5.5.1":
   version: 7.3.0
   resolution: "tinymce@npm:7.3.0"
   checksum: 8c2205e8f316ae86c713ba09d8072921050011fbb6a28060c02c53d79d34d470995f286b478966e42c767d5905fd9d89a808338d63ac63a0ea0f96a017b020e2
@@ -30993,13 +32500,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"to-fast-properties@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "to-fast-properties@npm:2.0.0"
-  checksum: be2de62fe58ead94e3e592680052683b1ec986c72d589e7b21e5697f8744cdbf48c266fa72f6c15932894c10187b5f54573a3bcf7da0bfd964d5caf23d436168
-  languageName: node
-  linkType: hard
-
 "to-no-case@npm:^1.0.0":
   version: 1.0.2
   resolution: "to-no-case@npm:1.0.2"
@@ -31092,6 +32592,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"trim-lines@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "trim-lines@npm:3.0.1"
+  checksum: e241da104682a0e0d807222cc1496b92e716af4db7a002f4aeff33ae6a0024fef93165d49eab11aa07c71e1347c42d46563f91dfaa4d3fb945aa535cdead53ed
+  languageName: node
+  linkType: hard
+
+"trough@npm:^2.0.0":
+  version: 2.2.0
+  resolution: "trough@npm:2.2.0"
+  checksum: 6097df63169aca1f9b08c263b1b501a9b878387f46e161dde93f6d0bba7febba93c95f876a293c5ea370f6cb03bcb687b2488c8955c3cfb66c2c0161ea8c00f6
+  languageName: node
+  linkType: hard
+
 "tryer@npm:^1.0.1":
   version: 1.0.1
   resolution: "tryer@npm:1.0.1"
@@ -31679,6 +33193,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"unified@npm:^11.0.0":
+  version: 11.0.5
+  resolution: "unified@npm:11.0.5"
+  dependencies:
+    "@types/unist": ^3.0.0
+    bail: ^2.0.0
+    devlop: ^1.0.0
+    extend: ^3.0.0
+    is-plain-obj: ^4.0.0
+    trough: ^2.0.0
+    vfile: ^6.0.0
+  checksum: b3bf7fd6f568cc261e074dae21188483b0f2a8ab858d62e6e85b75b96cc655f59532906ae3c64d56a9b257408722d71f1d4135292b3d7ee02907c8b592fb3cf0
+  languageName: node
+  linkType: hard
+
 "unique-filename@npm:^2.0.0":
   version: 2.0.1
   resolution: "unique-filename@npm:2.0.1"
@@ -31724,6 +33253,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"unist-util-position@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "unist-util-position@npm:5.0.0"
+  dependencies:
+    "@types/unist": ^3.0.0
+  checksum: f89b27989b19f07878de9579cd8db2aa0194c8360db69e2c99bd2124a480d79c08f04b73a64daf01a8fb3af7cba65ff4b45a0b978ca243226084ad5f5d441dde
+  languageName: node
+  linkType: hard
+
+"unist-util-stringify-position@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "unist-util-stringify-position@npm:4.0.0"
+  dependencies:
+    "@types/unist": ^3.0.0
+  checksum: e2e7aee4b92ddb64d314b4ac89eef7a46e4c829cbd3ee4aee516d100772b490eb6b4974f653ba0717a0071ca6ea0770bf22b0a2ea62c65fcba1d071285e96324
+  languageName: node
+  linkType: hard
+
 "unist-util-visit-parents@npm:^6.0.0":
   version: 6.0.1
   resolution: "unist-util-visit-parents@npm:6.0.1"
@@ -31942,6 +33489,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"usehooks-ts@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "usehooks-ts@npm:3.1.0"
+  dependencies:
+    lodash.debounce: ^4.0.8
+  peerDependencies:
+    react: ^16.8.0  || ^17 || ^18
+  checksum: 4f850c0c5ab408afa52fa2ea2c93c488cd7065c82679eb1fb62cba12ca4c57ff62d52375acc6738823421fe6579ce3adcea1e2dc345ce4f549c593d2e51455b3
+  languageName: node
+  linkType: hard
+
 "util-deprecate@npm:^1.0.1, util-deprecate@npm:^1.0.2, util-deprecate@npm:~1.0.1":
   version: 1.0.2
   resolution: "util-deprecate@npm:1.0.2"
@@ -32109,6 +33667,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"vfile-message@npm:^4.0.0":
+  version: 4.0.2
+  resolution: "vfile-message@npm:4.0.2"
+  dependencies:
+    "@types/unist": ^3.0.0
+    unist-util-stringify-position: ^4.0.0
+  checksum: 964e7e119f4c0e0270fc269119c41c96da20afa01acb7c9809a88365c8e0c64aa692fafbd952669382b978002ecd7ad31ef4446d85e8a22cdb62f6df20186c2d
+  languageName: node
+  linkType: hard
+
+"vfile@npm:^6.0.0":
+  version: 6.0.3
+  resolution: "vfile@npm:6.0.3"
+  dependencies:
+    "@types/unist": ^3.0.0
+    vfile-message: ^4.0.0
+  checksum: 152b6729be1af70df723efb65c1a1170fd483d41086557da3651eea69a1dd1f0c22ea4344834d56d30734b9185bcab63e22edc81d3f0e9bed8aa4660d61080af
+  languageName: node
+  linkType: hard
+
 "vite-plugin-svgr@npm:^4.2.0":
   version: 4.2.0
   resolution: "vite-plugin-svgr@npm:4.2.0"
@@ -32292,6 +33870,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"web-streams-polyfill@npm:4.0.0-beta.3":
+  version: 4.0.0-beta.3
+  resolution: "web-streams-polyfill@npm:4.0.0-beta.3"
+  checksum: dfec1fbf52b9140e4183a941e380487b6c3d5d3838dd1259be81506c1c9f2abfcf5aeb670aeeecfd9dff4271a6d8fef931b193c7bedfb42542a3b05ff36c0d16
+  languageName: node
+  linkType: hard
+
 "web-vitals@npm:3.5.2, web-vitals@npm:^3.1.0":
   version: 3.5.2
   resolution: "web-vitals@npm:3.5.2"
@@ -33378,3 +34963,10 @@ __metadata:
   checksum: ae89584fbe4256217e500a74183fd5870a2bed7e7b3234cd78fcbc0a1a82da8449596b2019105927069531b567ecf94425fb171abd6cedcbf517e52fdf438722
   languageName: node
   linkType: hard
+
+"zwitch@npm:^2.0.0":
+  version: 2.0.4
+  resolution: "zwitch@npm:2.0.4"
+  checksum: f22ec5fc2d5f02c423c93d35cdfa83573a3a3bd98c66b927c368ea4d0e7252a500df2a90a6b45522be536a96a73404393c958e945fdba95e6832c200791702b6
+  languageName: node
+  linkType: hard
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 23891664b741..d919338cef95 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
@@ -47,6 +47,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Pattern;
 
 import static com.appsmith.external.git.constants.GitConstants.ACTION_COLLECTION_LIST;
@@ -243,7 +244,7 @@ protected Set<String> updateEntitiesInRepo(ApplicationGitReference applicationGi
 
         Set<String> validPages = new HashSet<>();
         for (Map.Entry<String, Object> pageResource : pageEntries) {
-            Map<String, String> validWidgetToParentMap = new HashMap<>();
+            Map<String, String> validWidgetToParentMap = new ConcurrentHashMap<>();
             final String pageName = pageResource.getKey();
             Path pageSpecificDirectory = pageDirectory.resolve(pageName);
             boolean isResourceUpdated =
@@ -255,7 +256,8 @@ protected Set<String> updateEntitiesInRepo(ApplicationGitReference applicationGi
                         pageSpecificDirectory.resolve(pageName + CommonConstants.JSON_EXTENSION));
                 Map<String, JSONObject> result = DSLTransformerHelper.flatten(
                         new JSONObject(applicationGitReference.getPageDsl().get(pageName)));
-                result.forEach((key, jsonObject) -> {
+                result.keySet().parallelStream().forEach(key -> {
+                    JSONObject jsonObject = result.get(key);
                     String widgetName = key.substring(key.lastIndexOf(CommonConstants.DELIMITER_POINT) + 1);
 
                     String childPath = DSLTransformerHelper.getPathToWidgetFile(key, jsonObject, widgetName);
@@ -291,8 +293,8 @@ protected Set<String> updateEntitiesInRepo(ApplicationGitReference applicationGi
             Path jsLibDirectory = baseRepo.resolve(JS_LIB_DIRECTORY);
             Set<Map.Entry<String, Object>> jsLibEntries =
                     applicationGitReference.getJsLibraries().entrySet();
-            Set<String> validJsLibs = new HashSet<>();
-            jsLibEntries.forEach(jsLibEntry -> {
+            Set<String> validJsLibs = ConcurrentHashMap.newKeySet();
+            jsLibEntries.parallelStream().forEach(jsLibEntry -> {
                 String uidString = jsLibEntry.getKey();
                 boolean isResourceUpdated = modifiedResources.isResourceUpdated(CUSTOM_JS_LIB_LIST, uidString);
 
@@ -308,18 +310,17 @@ protected Set<String> updateEntitiesInRepo(ApplicationGitReference applicationGi
         }
 
         // Create HashMap for valid actions and actionCollections
-        HashMap<String, Set<String>> validActionsMap = new HashMap<>();
-        HashMap<String, Set<String>> validActionCollectionsMap = new HashMap<>();
+        ConcurrentHashMap<String, Set<String>> validActionsMap = new ConcurrentHashMap<>();
+        ConcurrentHashMap<String, Set<String>> validActionCollectionsMap = new ConcurrentHashMap<>();
         validPages.forEach(validPage -> {
-            validActionsMap.put(validPage, new HashSet<>());
-            validActionCollectionsMap.put(validPage, new HashSet<>());
+            validActionsMap.put(validPage, ConcurrentHashMap.newKeySet());
+            validActionCollectionsMap.put(validPage, ConcurrentHashMap.newKeySet());
         });
 
         // Save actions
-        for (Map.Entry<String, Object> resource :
-                applicationGitReference.getActions().entrySet()) {
-            // queryName_pageName => nomenclature for the keys
-            // TODO queryName => for app level queries, this is not implemented yet
+        // queryName_pageName => nomenclature for the keys
+        // TODO queryName => for app level queries, this is not implemented yet
+        applicationGitReference.getActions().entrySet().parallelStream().forEach(resource -> {
             String[] names = resource.getKey().split(NAME_SEPARATOR);
             if (names.length > 1 && StringUtils.hasLength(names[1])) {
                 // For actions, we are referring to validNames to maintain unique file names as just name
@@ -349,7 +350,7 @@ protected Set<String> updateEntitiesInRepo(ApplicationGitReference applicationGi
                             .resolve(queryName + CommonConstants.JSON_EXTENSION));
                 }
             }
-        }
+        });
 
         validActionsMap.forEach((pageName, validActionNames) -> {
             Path pageSpecificDirectory = pageDirectory.resolve(pageName);
@@ -358,35 +359,38 @@ protected Set<String> updateEntitiesInRepo(ApplicationGitReference applicationGi
         });
 
         // Save JSObjects
-        for (Map.Entry<String, Object> resource :
-                applicationGitReference.getActionCollections().entrySet()) {
-            // JSObjectName_pageName => nomenclature for the keys
-            // TODO JSObjectName => for app level JSObjects, this is not implemented yet
-            String[] names = resource.getKey().split(NAME_SEPARATOR);
-            if (names.length > 1 && StringUtils.hasLength(names[1])) {
-                final String actionCollectionName = names[0];
-                final String pageName = names[1];
-                Path pageSpecificDirectory = pageDirectory.resolve(pageName);
-                Path actionCollectionSpecificDirectory = pageSpecificDirectory.resolve(ACTION_COLLECTION_DIRECTORY);
-
-                if (!validActionCollectionsMap.containsKey(pageName)) {
-                    validActionCollectionsMap.put(pageName, new HashSet<>());
-                }
-                validActionCollectionsMap.get(pageName).add(actionCollectionName);
-                boolean isResourceUpdated = modifiedResources != null
-                        && modifiedResources.isResourceUpdated(ACTION_COLLECTION_LIST, resource.getKey());
-                if (Boolean.TRUE.equals(isResourceUpdated)) {
-                    saveActionCollection(
-                            resource.getValue(),
-                            applicationGitReference.getActionCollectionBody().get(resource.getKey()),
-                            actionCollectionName,
-                            actionCollectionSpecificDirectory.resolve(actionCollectionName));
-                    // Delete the resource from the old file structure v2
-                    fileOperations.deleteFile(actionCollectionSpecificDirectory.resolve(
-                            actionCollectionName + CommonConstants.JSON_EXTENSION));
-                }
-            }
-        }
+        // JSObjectName_pageName => nomenclature for the keys
+        // TODO JSObjectName => for app level JSObjects, this is not implemented yet
+        applicationGitReference.getActionCollections().entrySet().parallelStream()
+                .forEach(resource -> {
+                    String[] names = resource.getKey().split(NAME_SEPARATOR);
+                    if (names.length > 1 && StringUtils.hasLength(names[1])) {
+                        final String actionCollectionName = names[0];
+                        final String pageName = names[1];
+                        Path pageSpecificDirectory = pageDirectory.resolve(pageName);
+                        Path actionCollectionSpecificDirectory =
+                                pageSpecificDirectory.resolve(ACTION_COLLECTION_DIRECTORY);
+
+                        if (!validActionCollectionsMap.containsKey(pageName)) {
+                            validActionCollectionsMap.put(pageName, new HashSet<>());
+                        }
+                        validActionCollectionsMap.get(pageName).add(actionCollectionName);
+                        boolean isResourceUpdated = modifiedResources != null
+                                && modifiedResources.isResourceUpdated(ACTION_COLLECTION_LIST, resource.getKey());
+                        if (Boolean.TRUE.equals(isResourceUpdated)) {
+                            saveActionCollection(
+                                    resource.getValue(),
+                                    applicationGitReference
+                                            .getActionCollectionBody()
+                                            .get(resource.getKey()),
+                                    actionCollectionName,
+                                    actionCollectionSpecificDirectory.resolve(actionCollectionName));
+                            // Delete the resource from the old file structure v2
+                            fileOperations.deleteFile(actionCollectionSpecificDirectory.resolve(
+                                    actionCollectionName + CommonConstants.JSON_EXTENSION));
+                        }
+                    }
+                });
 
         // Verify if the old files are deleted
         validActionCollectionsMap.forEach((pageName, validActionCollectionNames) -> {
diff --git a/app/server/appsmith-interfaces/pom.xml b/app/server/appsmith-interfaces/pom.xml
index 83d43f4e569f..05c39edbc10e 100644
--- a/app/server/appsmith-interfaces/pom.xml
+++ b/app/server/appsmith-interfaces/pom.xml
@@ -65,8 +65,7 @@
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-mongodb</artifactId>
-            <version>4.0.0</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -127,7 +126,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.7</version>
+            <version>2.17.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/MDCConstants.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/MDCConstants.java
index 2f78969b21d3..375c429c0bac 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/MDCConstants.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/MDCConstants.java
@@ -7,5 +7,6 @@ public class MDCConstants {
     public static final String THREAD = "thread";
     public static final String OBSERVATION = "micrometer.observation";
     public static final String TRACE_ID = "traceId";
+    public static final String TRACE_PARENT = "traceparent";
     public static final String SPAN_ID = "spanId";
 }
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/BaseSpan.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/BaseSpan.java
index b654c4847947..d6612827ce58 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/BaseSpan.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/BaseSpan.java
@@ -9,4 +9,8 @@ public class BaseSpan {
     public static final String GIT_SPAN_PREFIX = "git.";
 
     public static final String APPLICATION_SPAN_PREFIX = "application.";
+
+    public static final String AUTHENTICATE = "authenticate";
+
+    public static final String AUTHORIZE = "authorize";
 }
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/OnLoadSpan.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/OnLoadSpan.java
new file mode 100644
index 000000000000..a77fbef0797f
--- /dev/null
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/OnLoadSpan.java
@@ -0,0 +1,5 @@
+package com.appsmith.external.constants.spans;
+
+import com.appsmith.external.constants.spans.ce.OnLoadSpanCE;
+
+public class OnLoadSpan extends OnLoadSpanCE {}
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/ActionSpanCE.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/ActionSpanCE.java
index 1cbec44a3a75..567a2296b76d 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/ActionSpanCE.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/ActionSpanCE.java
@@ -37,4 +37,11 @@ public class ActionSpanCE {
     public static final String CREATE_ACTION = APPSMITH_SPAN_PREFIX + "create.action";
     public static final String UPDATE_ACTION = APPSMITH_SPAN_PREFIX + "update.action";
     public static final String DELETE_ACTION = APPSMITH_SPAN_PREFIX + "delete.action";
+    public static final String FILL_SELF_REFERENCING_PATHS_ACTION =
+            APPSMITH_SPAN_PREFIX + "action.fillSelfReferencingPaths";
+
+    public static final String VALIDATE_AND_GENERATE_ACTION_DOMAIN_BASED_ON_CONTEXT =
+            APPSMITH_SPAN_PREFIX + ACTIONS + "validateAndGenerateActionDomainBasedOnContext";
+    public static final String VALIDATE_AND_SAVE_ACTION_TO_REPOSITORY =
+            APPSMITH_SPAN_PREFIX + ACTIONS + "validateAndSaveActionToRepository";
 }
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/ApplicationSpanCE.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/ApplicationSpanCE.java
index 57a8982e0e30..dec0ed2aaadf 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/ApplicationSpanCE.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/ApplicationSpanCE.java
@@ -7,4 +7,5 @@ public class ApplicationSpanCE {
     public static final String APPLICATION_FETCH_FROM_DB = CONSOLIDATED_API_PREFIX + "app_db";
     public static final String APPLICATION_ID_FETCH_REDIS_SPAN = APPLICATION_ID_SPAN + ".read_redis";
     public static final String APPLICATION_ID_UPDATE_REDIS_SPAN = APPLICATION_ID_SPAN + ".update_redis";
+    public static final String APPLICATION_SAVE_LAST_EDIT_INFO_SPAN = APPLICATION_ID_SPAN + ".save_last_edit_info";
 }
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/DatasourceSpanCE.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/DatasourceSpanCE.java
index edb8b50fe7e0..d7e447bec50d 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/DatasourceSpanCE.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/DatasourceSpanCE.java
@@ -3,7 +3,12 @@
 import static com.appsmith.external.constants.spans.BaseSpan.APPSMITH_SPAN_PREFIX;
 
 public class DatasourceSpanCE {
+    public static final String DATASOURCES = "datasources.";
     public static final String FETCH_ALL_DATASOURCES_WITH_STORAGES =
             APPSMITH_SPAN_PREFIX + "get_all_datasource_storage";
     public static final String FETCH_ALL_PLUGINS_IN_WORKSPACE = APPSMITH_SPAN_PREFIX + "get_all_plugins_in_workspace";
+
+    // datasource service spans
+    public static final String DATASOURCE_SERVICE = "datasourceService";
+    public static final String FIND_DATASOURCE_BY_ID = APPSMITH_SPAN_PREFIX + DATASOURCE_SERVICE + ".findById";
 }
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/LayoutSpanCE.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/LayoutSpanCE.java
index 98c972bd1285..f8fb95a6a2d0 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/LayoutSpanCE.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/LayoutSpanCE.java
@@ -15,4 +15,16 @@ public class LayoutSpanCE {
             APPSMITH_SPAN_PREFIX + "onLoadExecutablesUtil.updateExecutablesExecuteOnLoad";
     public static final String FIND_AND_UPDATE_LAYOUT =
             APPSMITH_SPAN_PREFIX + "onLoadExecutablesUtil.findAndUpdateLayout";
+    public static final String UNESCAPE_MONGO_SPECIAL_CHARS = APPSMITH_SPAN_PREFIX + "unescapeMongoSpecialCharacters";
+    public static final String EXTRACT_ALL_WIDGET_NAMES_AND_DYNAMIC_BINDINGS_FROM_DSL =
+            APPSMITH_SPAN_PREFIX + "extractAllWidgetNamesAndDynamicBindingsFromDSL";
+    public static final String EXTRACT_AND_SET_EXECUTABLE_BINDINGS_IN_GRAPH_EDGES =
+            APPSMITH_SPAN_PREFIX + "extractAndSetExecutableBindingsInGraphEdges";
+    public static final String RECURSIVELY_ADD_EXECUTABLES_AND_THEIR_DEPENDENTS_TO_GRAPH_FROM_BINDINGS =
+            APPSMITH_SPAN_PREFIX + "recursivelyAddExecutablesAndTheirDependentsToGraphFromBindings";
+    public static final String ADD_WIDGET_RELATIONSHIP_TO_GRAPH = APPSMITH_SPAN_PREFIX + "addWidgetRelationshipToGraph";
+    public static final String COMPUTE_ON_PAGE_LOAD_EXECUTABLES_SCHEDULING_ORDER =
+            APPSMITH_SPAN_PREFIX + "computeOnPageLoadExecutablesSchedulingOrder";
+    public static final String FILTER_AND_TRANSFORM_SCHEDULING_ORDER_TO_DTO =
+            APPSMITH_SPAN_PREFIX + "filterAndTransformSchedulingOrderToDTO";
 }
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/OnLoadSpanCE.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/OnLoadSpanCE.java
new file mode 100644
index 000000000000..138aa40f93f2
--- /dev/null
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/OnLoadSpanCE.java
@@ -0,0 +1,20 @@
+package com.appsmith.external.constants.spans.ce;
+
+import static com.appsmith.external.constants.spans.BaseSpan.APPSMITH_SPAN_PREFIX;
+
+public class OnLoadSpanCE {
+
+    public static final String GET_ALL_EXECUTABLES_BY_CREATOR_ID =
+            APPSMITH_SPAN_PREFIX + "getAllExecutablesByCreatorIdFlux";
+    public static final String EXECUTABLE_NAME_TO_EXECUTABLE_MAP =
+            APPSMITH_SPAN_PREFIX + "executableNameToExecutableMap";
+    public static final String EXECUTABLE_IN_CREATOR_CONTEXT = APPSMITH_SPAN_PREFIX + "executablesInCreatorContext";
+    public static final String ADD_DIRECTLY_REFERENCED_EXECUTABLES_TO_GRAPH =
+            APPSMITH_SPAN_PREFIX + "addDirectlyReferencedExecutablesToGraph";
+    public static final String UPDATE_EXECUTABLE_SELF_REFERENCING_PATHS =
+            APPSMITH_SPAN_PREFIX + "updateExecutableSelfReferencingPaths";
+    public static final String ADD_EXPLICIT_USER_SET_ON_LOAD_EXECUTABLES_TO_GRAPH =
+            APPSMITH_SPAN_PREFIX + "addExplicitUserSetOnLoadExecutablesToGraph";
+    public static final String GET_UNPUBLISHED_ON_LOAD_EXECUTABLES_EXPLICIT_SET_BY_USER_IN_CREATOR_CONTEXT =
+            APPSMITH_SPAN_PREFIX + "getUnpublishedOnLoadExecutablesExplicitSetByUserInCreatorContext";
+}
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/PageSpanCE.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/PageSpanCE.java
index 8f3e8f78ed16..5934b6b6ae75 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/PageSpanCE.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/PageSpanCE.java
@@ -14,5 +14,9 @@ public class PageSpanCE {
     public static final String PREPARE_APPLICATION_PAGES_DTO_FROM_PAGES = PAGES + "generate_app_pages_dto";
     public static final String MIGRATE_DSL = PAGES + "migrate_dsl";
 
-    public static final String GET_PAGE_BY_ID = APPSMITH_SPAN_PREFIX + "get.page.unpublished";
+    public static final String GET_PAGE_BY_ID = APPSMITH_SPAN_PREFIX + PAGES + "newPageService.findById";
+    public static final String GET_PAGE_BY_ID_AND_LAYOUTS_ID = APPSMITH_SPAN_PREFIX + PAGES + "getPageByIdAndLayoutsId";
+
+    // page level method added here
+    public static final String IS_NAME_ALLOWED = APPSMITH_SPAN_PREFIX + PAGES + "refactoringService.isNameAllowed";
 }
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/plugins/BasePlugin.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/plugins/BasePlugin.java
index 17ca7b8cae6e..047f5fd57543 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/plugins/BasePlugin.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/plugins/BasePlugin.java
@@ -7,7 +7,8 @@
 
 public abstract class BasePlugin extends Plugin {
 
-    protected static final ObjectMapper objectMapper = SerializationUtils.getObjectMapperWithSourceInLocationEnabled();
+    protected static final ObjectMapper objectMapper =
+            SerializationUtils.getObjectMapperWithSourceInLocationAndMaxStringLengthEnabled();
 
     public BasePlugin(PluginWrapper wrapper) {
         super(wrapper);
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/services/ce/FilterDataServiceCE.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/services/ce/FilterDataServiceCE.java
index b0ec7e012984..d0eb203f0430 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/services/ce/FilterDataServiceCE.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/services/ce/FilterDataServiceCE.java
@@ -764,7 +764,7 @@ private PreparedStatement setValueInStatement(
                     AppsmithPluginError.PLUGIN_IN_MEMORY_FILTERING_ERROR,
                     "Error while interacting with value " + value + " : " + e.getMessage());
         } catch (IllegalArgumentException e) {
-            // The data type recognized does not match the data type of the value being set via Prepared Statement
+            // The data type recognized does not match the data type of the value being set via prepared statement
             // Add proper handling here.
             throw new AppsmithPluginException(
                     AppsmithPluginError.PLUGIN_IN_MEMORY_FILTERING_ERROR,
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/util/SerializationUtils.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/util/SerializationUtils.java
index b123faedb6ab..e2b06f06bec7 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/util/SerializationUtils.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/util/SerializationUtils.java
@@ -6,6 +6,7 @@
 import com.appsmith.external.views.Views;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.PrettyPrinter;
+import com.fasterxml.jackson.core.StreamReadConstraints;
 import com.fasterxml.jackson.core.StreamReadFeature;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.MapperFeature;
@@ -73,4 +74,18 @@ public static GsonBuilderCustomizer typeAdapterRegistration() {
     public static ObjectMapper getObjectMapperWithSourceInLocationEnabled() {
         return new ObjectMapper().enable(StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION.mappedFeature());
     }
+
+    public static ObjectMapper getObjectMapperWithSourceInLocationAndMaxStringLengthEnabled() {
+        ObjectMapper objectMapper =
+                new ObjectMapper().enable(StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION.mappedFeature());
+        // Multipart data would be parsed using object mapper, these files may be large in the size.
+        // Hence, the length should not be truncated, therefore allowing maximum length.
+        objectMapper
+                .getFactory()
+                .setStreamReadConstraints(StreamReadConstraints.builder()
+                        .maxStringLength(Integer.MAX_VALUE)
+                        .build());
+
+        return objectMapper;
+    }
 }
diff --git a/app/server/appsmith-plugins/amazons3Plugin/src/main/resources/setting.json b/app/server/appsmith-plugins/amazons3Plugin/src/main/resources/setting.json
index a42c02296456..cb5ad8bfc24f 100644
--- a/app/server/appsmith-plugins/amazons3Plugin/src/main/resources/setting.json
+++ b/app/server/appsmith-plugins/amazons3Plugin/src/main/resources/setting.json
@@ -5,20 +5,19 @@
       "id": 1,
       "children": [
         {
-          "label": "Run query on page load",
+          "label": "Run the query on page load",
           "configProperty": "executeOnLoad",
-          "controlType": "SWITCH",
-          "subtitle": "Will refresh data each time the page is loaded"
+          "controlType": "SWITCH"
         },
         {
-          "label": "Request confirmation before running query",
+          "label": "Request confirmation before running this query",
           "configProperty": "confirmBeforeExecute",
           "controlType": "SWITCH",
-          "subtitle": "Ask confirmation from the user each time before refreshing data"
+          "tooltipText": "Ask confirmation from the user each time before refreshing data"
         },
         {
           "label": "Smart JSON substitution",
-          "subtitle": "Turning on this property fixes the JSON substitution of bindings in the Content field by adding/removing quotes intelligently and reduces developer errors",
+          "tooltipText": "Turning on this property fixes the JSON substitution of bindings in the Content field by adding/removing quotes intelligently and reduces developer errors",
           "configProperty": "actionConfiguration.formData.smartSubstitution.data",
           "controlType": "SWITCH",
           "initialValue": true
diff --git a/app/server/appsmith-plugins/anthropicPlugin/pom.xml b/app/server/appsmith-plugins/anthropicPlugin/pom.xml
index 5a863b84f775..58b09491e771 100644
--- a/app/server/appsmith-plugins/anthropicPlugin/pom.xml
+++ b/app/server/appsmith-plugins/anthropicPlugin/pom.xml
@@ -89,7 +89,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-webflux</artifactId>
-            <version>${spring-boot.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/app/server/appsmith-plugins/anthropicPlugin/src/main/resources/setting.json b/app/server/appsmith-plugins/anthropicPlugin/src/main/resources/setting.json
index dd959a1b4b72..f24806929a67 100644
--- a/app/server/appsmith-plugins/anthropicPlugin/src/main/resources/setting.json
+++ b/app/server/appsmith-plugins/anthropicPlugin/src/main/resources/setting.json
@@ -5,16 +5,15 @@
       "id": 1,
       "children": [
         {
-          "label": "Run query on page load",
+          "label": "Run the query on page load",
           "configProperty": "executeOnLoad",
-          "controlType": "SWITCH",
-          "subtitle": "Will refresh data each time the page is loaded"
+          "controlType": "SWITCH"
         },
         {
-          "label": "Request confirmation before running query",
+          "label": "Request confirmation before running this query",
           "configProperty": "confirmBeforeExecute",
           "controlType": "SWITCH",
-          "subtitle": "Ask confirmation from the user each time before refreshing data"
+          "tooltipText": "Ask confirmation from the user each time before refreshing data"
         },
         {
           "label": "Query timeout (in milliseconds)",
diff --git a/app/server/appsmith-plugins/appsmithAiPlugin/pom.xml b/app/server/appsmith-plugins/appsmithAiPlugin/pom.xml
index aac406577ba0..b32c6ef5a7ac 100644
--- a/app/server/appsmith-plugins/appsmithAiPlugin/pom.xml
+++ b/app/server/appsmith-plugins/appsmithAiPlugin/pom.xml
@@ -82,7 +82,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-webflux</artifactId>
-            <version>${spring-boot.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/setting.json b/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/setting.json
index dd959a1b4b72..f24806929a67 100644
--- a/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/setting.json
+++ b/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/setting.json
@@ -5,16 +5,15 @@
       "id": 1,
       "children": [
         {
-          "label": "Run query on page load",
+          "label": "Run the query on page load",
           "configProperty": "executeOnLoad",
-          "controlType": "SWITCH",
-          "subtitle": "Will refresh data each time the page is loaded"
+          "controlType": "SWITCH"
         },
         {
-          "label": "Request confirmation before running query",
+          "label": "Request confirmation before running this query",
           "configProperty": "confirmBeforeExecute",
           "controlType": "SWITCH",
-          "subtitle": "Ask confirmation from the user each time before refreshing data"
+          "tooltipText": "Ask confirmation from the user each time before refreshing data"
         },
         {
           "label": "Query timeout (in milliseconds)",
diff --git a/app/server/appsmith-plugins/arangoDBPlugin/src/main/resources/editor.json b/app/server/appsmith-plugins/arangoDBPlugin/src/main/resources/editor.json
index 7db65795ba72..88e836ba0ba7 100644
--- a/app/server/appsmith-plugins/arangoDBPlugin/src/main/resources/editor.json
+++ b/app/server/appsmith-plugins/arangoDBPlugin/src/main/resources/editor.json
@@ -3,6 +3,7 @@
     {
       "controlType": "SECTION_V2",
       "identifier": "SECTION-ONE",
+      "isFullWidth": true,
       "children": [
         {
           "controlType": "SINGLE_COLUMN_ZONE",
diff --git a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/setting.json b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/setting.json
index 0cad17a20c02..10edd6468460 100644
--- a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/setting.json
+++ b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/setting.json
@@ -5,20 +5,19 @@
       "id": 1,
       "children": [
         {
-          "label": "Run query on page load",
+          "label": "Run the query on page load",
           "configProperty": "executeOnLoad",
-          "controlType": "SWITCH",
-          "subtitle": "Will refresh data each time the page is loaded"
+          "controlType": "SWITCH"
         },
         {
-          "label": "Request confirmation before running query",
+          "label": "Request confirmation before running this query",
           "configProperty": "confirmBeforeExecute",
           "controlType": "SWITCH",
-          "subtitle": "Ask confirmation from the user each time before refreshing data"
+          "tooltipText": "Ask confirmation from the user each time before refreshing data"
         },
         {
           "label": "Smart JSON substitution",
-          "subtitle": "Turning on this property fixes the JSON substitution of bindings in the Body field by adding/removing quotes intelligently and reduces developer errors",
+          "tooltipText": "Turning on this property fixes the JSON substitution of bindings in the Body field by adding/removing quotes intelligently and reduces developer errors",
           "configProperty": "actionConfiguration.formData.smartSubstitution",
           "controlType": "SWITCH",
           "initialValue": true
diff --git a/app/server/appsmith-plugins/googleAiPlugin/pom.xml b/app/server/appsmith-plugins/googleAiPlugin/pom.xml
index 9c8ba07e5c97..e0465720eca6 100644
--- a/app/server/appsmith-plugins/googleAiPlugin/pom.xml
+++ b/app/server/appsmith-plugins/googleAiPlugin/pom.xml
@@ -89,7 +89,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-webflux</artifactId>
-            <version>${spring-boot.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/app/server/appsmith-plugins/googleAiPlugin/src/main/resources/setting.json b/app/server/appsmith-plugins/googleAiPlugin/src/main/resources/setting.json
index dd959a1b4b72..f24806929a67 100644
--- a/app/server/appsmith-plugins/googleAiPlugin/src/main/resources/setting.json
+++ b/app/server/appsmith-plugins/googleAiPlugin/src/main/resources/setting.json
@@ -5,16 +5,15 @@
       "id": 1,
       "children": [
         {
-          "label": "Run query on page load",
+          "label": "Run the query on page load",
           "configProperty": "executeOnLoad",
-          "controlType": "SWITCH",
-          "subtitle": "Will refresh data each time the page is loaded"
+          "controlType": "SWITCH"
         },
         {
-          "label": "Request confirmation before running query",
+          "label": "Request confirmation before running this query",
           "configProperty": "confirmBeforeExecute",
           "controlType": "SWITCH",
-          "subtitle": "Ask confirmation from the user each time before refreshing data"
+          "tooltipText": "Ask confirmation from the user each time before refreshing data"
         },
         {
           "label": "Query timeout (in milliseconds)",
diff --git a/app/server/appsmith-plugins/googleSheetsPlugin/pom.xml b/app/server/appsmith-plugins/googleSheetsPlugin/pom.xml
index c427e9f9409b..18e43347b6d7 100644
--- a/app/server/appsmith-plugins/googleSheetsPlugin/pom.xml
+++ b/app/server/appsmith-plugins/googleSheetsPlugin/pom.xml
@@ -107,7 +107,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-webflux</artifactId>
-            <version>${spring-boot.version}</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/constants/ErrorMessages.java b/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/constants/ErrorMessages.java
index 466b205d2e07..53937354c813 100644
--- a/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/constants/ErrorMessages.java
+++ b/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/constants/ErrorMessages.java
@@ -39,6 +39,9 @@ public class ErrorMessages extends BasePluginErrorMessages {
 
     public static final String MISSING_ROW_INDEX_ERROR_MSG = "Missing required field 'Row index'";
 
+    public static final String MISSING_SPREADSHEET_URL_SELECTED_SHEETS_ERROR_MSG =
+            "Missing required field 'Spreadsheet Url'. Please check if your datasource is authorized to use this spreadsheet.";
+
     public static final String UNABLE_TO_CREATE_URI_ERROR_MSG = "Unable to create URI";
 
     public static final String MISSING_VALID_RESPONSE_ERROR_MSG = "Missing a valid response object.";
diff --git a/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/plugins/GoogleSheetsPlugin.java b/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/plugins/GoogleSheetsPlugin.java
index e99f97a9fe55..f336d54b8fc2 100644
--- a/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/plugins/GoogleSheetsPlugin.java
+++ b/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/plugins/GoogleSheetsPlugin.java
@@ -51,7 +51,7 @@
 import static com.appsmith.external.helpers.PluginUtils.getDataValueSafelyFromFormData;
 import static com.appsmith.external.helpers.PluginUtils.setDataValueSafelyInFormData;
 import static com.appsmith.external.helpers.PluginUtils.validConfigurationPresentInFormData;
-import static com.external.utils.SheetsUtil.getUserAuthorizedSheetIds;
+import static com.external.utils.SheetsUtil.validateAndGetUserAuthorizedSheetIds;
 import static java.lang.Boolean.TRUE;
 
 @Slf4j
@@ -175,7 +175,8 @@ public Mono<ActionExecutionResult> executeCommon(
 
             // This will get list of authorised sheet ids from datasource config, and transform execution response to
             // contain only authorised files
-            final Set<String> userAuthorizedSheetIds = getUserAuthorizedSheetIds(datasourceConfiguration);
+            final Set<String> userAuthorizedSheetIds =
+                    validateAndGetUserAuthorizedSheetIds(datasourceConfiguration, methodConfig);
 
             // Triggering the actual REST API call
             return executionMethod
@@ -338,7 +339,8 @@ public Mono<TriggerResultDTO> trigger(
 
             // This will get list of authorised sheet ids from datasource config, and transform trigger response to
             // contain only authorised files
-            Set<String> userAuthorizedSheetIds = getUserAuthorizedSheetIds(datasourceConfiguration);
+            Set<String> userAuthorizedSheetIds =
+                    validateAndGetUserAuthorizedSheetIds(datasourceConfiguration, methodConfig);
 
             return triggerMethod
                     .getTriggerClient(client, methodConfig)
diff --git a/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/utils/SheetsUtil.java b/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/utils/SheetsUtil.java
index 90b1e17698db..ee8506e3dfea 100644
--- a/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/utils/SheetsUtil.java
+++ b/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/utils/SheetsUtil.java
@@ -1,7 +1,11 @@
 package com.external.utils;
 
+import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginError;
+import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginException;
 import com.appsmith.external.models.DatasourceConfiguration;
 import com.appsmith.external.models.OAuth2;
+import com.external.config.MethodConfig;
+import com.external.constants.ErrorMessages;
 import com.external.enums.GoogleSheetMethodEnum;
 import com.fasterxml.jackson.databind.JsonNode;
 
@@ -17,8 +21,10 @@ public class SheetsUtil {
     private static final String FILE_SPECIFIC_DRIVE_SCOPE = "https://www.googleapis.com/auth/drive.file";
     private static final int USER_AUTHORIZED_SHEET_IDS_INDEX = 1;
 
-    public static Set<String> getUserAuthorizedSheetIds(DatasourceConfiguration datasourceConfiguration) {
+    public static Set<String> validateAndGetUserAuthorizedSheetIds(
+            DatasourceConfiguration datasourceConfiguration, MethodConfig methodConfig) {
         OAuth2 oAuth2 = (OAuth2) datasourceConfiguration.getAuthentication();
+        Set<String> userAuthorisedSheetIds = null;
         if (!isEmpty(datasourceConfiguration.getProperties())
                 && datasourceConfiguration.getProperties().size() > 1
                 && datasourceConfiguration.getProperties().get(USER_AUTHORIZED_SHEET_IDS_INDEX) != null
@@ -33,9 +39,23 @@ public static Set<String> getUserAuthorizedSheetIds(DatasourceConfiguration data
                     .getProperties()
                     .get(USER_AUTHORIZED_SHEET_IDS_INDEX)
                     .getValue();
-            return new HashSet<String>(temp);
+            userAuthorisedSheetIds = new HashSet<String>(temp);
+
+            // This is added specifically for selected gsheets, so that whenever authorisation changes from one sheet to
+            // another
+            // We throw an error, this is done because when we use drive.file scope which is for selected sheets through
+            // file picker
+            // The access token for this scope grants access to all selected sheets across datasources
+            // we want to constraint the access for datasource to the sheet which was selected during ds authorisation
+            if (methodConfig != null
+                    && methodConfig.getSpreadsheetId() != null
+                    && !userAuthorisedSheetIds.contains(methodConfig.getSpreadsheetId())) {
+                throw new AppsmithPluginException(
+                        AppsmithPluginError.PLUGIN_EXECUTE_ARGUMENT_ERROR,
+                        ErrorMessages.MISSING_SPREADSHEET_URL_SELECTED_SHEETS_ERROR_MSG);
+            }
         }
-        return null;
+        return userAuthorisedSheetIds;
     }
 
     public static Map<String, String> getSpreadsheetData(
diff --git a/app/server/appsmith-plugins/googleSheetsPlugin/src/main/resources/editor/fetch_many.json b/app/server/appsmith-plugins/googleSheetsPlugin/src/main/resources/editor/fetch_many.json
index cbb21cb0f91f..67aa325d2728 100644
--- a/app/server/appsmith-plugins/googleSheetsPlugin/src/main/resources/editor/fetch_many.json
+++ b/app/server/appsmith-plugins/googleSheetsPlugin/src/main/resources/editor/fetch_many.json
@@ -198,6 +198,7 @@
           },
           "children": [
             {
+              "label": "",
               "configProperty": "actionConfiguration.formData.pagination.data",
               "controlType": "PAGINATION",
               "-subtitle": "Object",
diff --git a/app/server/appsmith-plugins/googleSheetsPlugin/src/main/resources/form.json b/app/server/appsmith-plugins/googleSheetsPlugin/src/main/resources/form.json
index d5f7709c310d..8e9fe67783ed 100644
--- a/app/server/appsmith-plugins/googleSheetsPlugin/src/main/resources/form.json
+++ b/app/server/appsmith-plugins/googleSheetsPlugin/src/main/resources/form.json
@@ -33,7 +33,7 @@
         {
           "label": "Permissions | Scope",
           "configProperty": "datasourceConfiguration.authentication.scopeString",
-          "controlType": "DROP_DOWN",
+          "controlType": "RADIO_BUTTON",
           "options": [
             {
               "label": "Read / Write / Delete | Selected google sheets",
diff --git a/app/server/appsmith-plugins/googleSheetsPlugin/src/main/resources/setting.json b/app/server/appsmith-plugins/googleSheetsPlugin/src/main/resources/setting.json
index 5f9686e6b706..ac19bcf35b43 100644
--- a/app/server/appsmith-plugins/googleSheetsPlugin/src/main/resources/setting.json
+++ b/app/server/appsmith-plugins/googleSheetsPlugin/src/main/resources/setting.json
@@ -5,20 +5,19 @@
       "id": 1,
       "children": [
         {
-          "label": "Run query on page load",
+          "label": "Run the query on page load",
           "configProperty": "executeOnLoad",
-          "controlType": "SWITCH",
-          "subtitle": "Will refresh data each time the page is loaded"
+          "controlType": "SWITCH"
         },
         {
-          "label": "Request confirmation before running query",
+          "label": "Request confirmation before running this query",
           "configProperty": "confirmBeforeExecute",
           "controlType": "SWITCH",
-          "subtitle": "Ask confirmation from the user each time before refreshing data"
+          "tooltipText": "Ask confirmation from the user each time before refreshing data"
         },
         {
           "label": "Smart JSON substitution",
-          "subtitle": "Turning on this property fixes the JSON substitution of bindings in the Row objects by adding/removing quotes intelligently and reduces developer errors",
+          "tooltipText": "Turning on this property fixes the JSON substitution of bindings in the Row objects by adding/removing quotes intelligently and reduces developer errors",
           "configProperty": "actionConfiguration.formData.smartSubstitution.data",
           "controlType": "SWITCH",
           "initialValue": true
diff --git a/app/server/appsmith-plugins/googleSheetsPlugin/src/test/java/com/external/config/SheetsUtilTest.java b/app/server/appsmith-plugins/googleSheetsPlugin/src/test/java/com/external/config/SheetsUtilTest.java
index 1b5d7856880a..c99f3f2ecd6f 100644
--- a/app/server/appsmith-plugins/googleSheetsPlugin/src/test/java/com/external/config/SheetsUtilTest.java
+++ b/app/server/appsmith-plugins/googleSheetsPlugin/src/test/java/com/external/config/SheetsUtilTest.java
@@ -1,22 +1,22 @@
 package com.external.config;
 
+import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginException;
 import com.appsmith.external.models.DatasourceConfiguration;
 import com.appsmith.external.models.OAuth2;
 import com.appsmith.external.models.Property;
+import com.external.constants.ErrorMessages;
 import com.external.utils.SheetsUtil;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import org.junit.jupiter.api.Test;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class SheetsUtilTest {
 
     @Test
-    public void testGetUserAuthorizedSheetIds_allsheets_returnsNull() throws JsonProcessingException {
+    public void testValidateAndGetUserAuthorizedSheetIds_allsheets_returnsNull() throws JsonProcessingException {
         DatasourceConfiguration dsConfig = new DatasourceConfiguration();
         List<Property> propList = new ArrayList<Property>();
         Property prop = new Property();
@@ -24,12 +24,13 @@ public void testGetUserAuthorizedSheetIds_allsheets_returnsNull() throws JsonPro
         prop.setValue("test_email");
         propList.add(prop);
         dsConfig.setProperties(propList);
-        Set<String> result = SheetsUtil.getUserAuthorizedSheetIds(dsConfig);
-        assertEquals(result, null);
+        Set<String> result = SheetsUtil.validateAndGetUserAuthorizedSheetIds(dsConfig, null);
+        assertEquals(null, result);
     }
 
     @Test
-    public void testGetUserAuthorizedSheetIds_specificSheets_returnsSetOfFileIds() throws JsonProcessingException {
+    public void testValidateAndGetUserAuthorizedSheetIds_specificSheets_returnsSetOfFileIds()
+            throws JsonProcessingException {
         DatasourceConfiguration dsConfig = new DatasourceConfiguration();
         List<Property> propList = new ArrayList<Property>();
         OAuth2 oAuth2 = new OAuth2();
@@ -47,7 +48,92 @@ public void testGetUserAuthorizedSheetIds_specificSheets_returnsSetOfFileIds() t
         propList.add(prop2);
 
         dsConfig.setProperties(propList);
-        Set<String> result = SheetsUtil.getUserAuthorizedSheetIds(dsConfig);
-        assertEquals(result.size(), 1);
+        Set<String> result = SheetsUtil.validateAndGetUserAuthorizedSheetIds(dsConfig, null);
+        assertEquals(1, result.size());
+    }
+
+    @Test
+    public void testValidateAndGetUserAuthorizedSheetIds_invalidSpecificSheets_throwsException() {
+        DatasourceConfiguration dsConfig = new DatasourceConfiguration();
+        List<Property> propList = new ArrayList<>();
+        OAuth2 oAuth2 = new OAuth2();
+
+        oAuth2.setScopeString("https://www.googleapis.com/auth/drive.file");
+        dsConfig.setAuthentication(oAuth2);
+
+        Property prop1 = new Property("emailAddress", "test_email");
+        propList.add(prop1);
+
+        List<String> ids = new ArrayList<>();
+        ids.add("id1");
+
+        Property prop2 = new Property("userAuthorizedSheetIds", ids);
+        propList.add(prop2);
+
+        dsConfig.setProperties(propList);
+
+        // Create formData map with only the spreadsheetUrl
+        Map<String, Object> formData = new HashMap<>();
+        Map<String, Object> spreadsheetUrlData = new HashMap<>();
+        spreadsheetUrlData.put("data", "https://docs.google.com/spreadsheets/d/id2");
+        formData.put("sheetUrl", spreadsheetUrlData);
+
+        MethodConfig methodConfig = new MethodConfig(formData);
+
+        AppsmithPluginException exception = assertThrows(AppsmithPluginException.class, () -> {
+            SheetsUtil.validateAndGetUserAuthorizedSheetIds(dsConfig, methodConfig);
+        });
+
+        String expectedErrorMessage = ErrorMessages.MISSING_SPREADSHEET_URL_SELECTED_SHEETS_ERROR_MSG;
+        assertEquals(expectedErrorMessage, exception.getMessage());
+    }
+
+    @Test
+    public void testValidateAndGetUserAuthorizedSheetIds_validSpecificSheets_returnsAuthorisedSheetIds() {
+        DatasourceConfiguration dsConfig = new DatasourceConfiguration();
+        List<Property> propList = new ArrayList<>();
+        OAuth2 oAuth2 = new OAuth2();
+
+        oAuth2.setScopeString("https://www.googleapis.com/auth/drive.file");
+        dsConfig.setAuthentication(oAuth2);
+
+        Property prop1 = new Property("emailAddress", "test_email");
+        propList.add(prop1);
+
+        List<String> ids = new ArrayList<>();
+        ids.add("id1");
+
+        Property prop2 = new Property("userAuthorizedSheetIds", ids);
+        propList.add(prop2);
+
+        dsConfig.setProperties(propList);
+
+        // Create formData map with the spreadsheetUrl
+        Map<String, Object> formData = new HashMap<>();
+        Map<String, Object> spreadsheetUrlData = new HashMap<>();
+        spreadsheetUrlData.put("data", "https://docs.google.com/spreadsheets/d/id1");
+        formData.put("sheetUrl", spreadsheetUrlData);
+
+        MethodConfig methodConfig = new MethodConfig(formData);
+
+        Set<String> result = SheetsUtil.validateAndGetUserAuthorizedSheetIds(dsConfig, methodConfig);
+
+        assertEquals(1, result.size());
+        assertTrue(result.contains("id1"));
+    }
+
+    @Test
+    public void testValidateAndGetUserAuthorizedSheetIds_allSheets_returnsNull() {
+        DatasourceConfiguration dsConfig = new DatasourceConfiguration();
+        OAuth2 oAuth2 = new OAuth2();
+
+        oAuth2.setScopeString("https://www.googleapis.com/auth/drive,https://www.googleapis.com/auth/spreadsheets");
+        dsConfig.setAuthentication(oAuth2);
+
+        // Not adding any properties to dsConfig
+
+        Set<String> result = SheetsUtil.validateAndGetUserAuthorizedSheetIds(dsConfig, null);
+
+        assertNull(result);
     }
 }
diff --git a/app/server/appsmith-plugins/graphqlPlugin/pom.xml b/app/server/appsmith-plugins/graphqlPlugin/pom.xml
index a7959f291eb6..18edfe50df55 100644
--- a/app/server/appsmith-plugins/graphqlPlugin/pom.xml
+++ b/app/server/appsmith-plugins/graphqlPlugin/pom.xml
@@ -133,7 +133,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-webflux</artifactId>
-            <version>${spring-boot.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/app/server/appsmith-plugins/mongoPlugin/src/main/resources/setting.json b/app/server/appsmith-plugins/mongoPlugin/src/main/resources/setting.json
index ad4d652db031..7c673d6df3e1 100644
--- a/app/server/appsmith-plugins/mongoPlugin/src/main/resources/setting.json
+++ b/app/server/appsmith-plugins/mongoPlugin/src/main/resources/setting.json
@@ -5,20 +5,19 @@
       "id": 1,
       "children": [
         {
-          "label": "Run query on page load",
+          "label": "Run the query on page load",
           "configProperty": "executeOnLoad",
-          "controlType": "SWITCH",
-          "subtitle": "Will refresh data each time the page is loaded"
+          "controlType": "SWITCH"
         },
         {
-          "label": "Request confirmation before running query",
+          "label": "Request confirmation before running this query",
           "configProperty": "confirmBeforeExecute",
           "controlType": "SWITCH",
-          "subtitle": "Ask confirmation from the user each time before refreshing data"
+          "tooltipText": "Ask confirmation from the user each time before refreshing data"
         },
         {
           "label": "Smart BSON substitution",
-          "subtitle": "Turning on this property fixes the BSON substitution of bindings in the Mongo BSON document by adding/removing quotes intelligently and reduces developer errors",
+          "tooltipText": "Turning on this property fixes the BSON substitution of bindings in the Mongo BSON document by adding/removing quotes intelligently and reduces developer errors",
           "configProperty": "actionConfiguration.formData.smartSubstitution.data",
           "controlType": "SWITCH",
           "initialValue": true
diff --git a/app/server/appsmith-plugins/mongoPlugin/src/test/java/com/external/plugins/MongoPluginErrorsTest.java b/app/server/appsmith-plugins/mongoPlugin/src/test/java/com/external/plugins/MongoPluginErrorsTest.java
index 035b9df192fb..6e5a2cdd0cf1 100644
--- a/app/server/appsmith-plugins/mongoPlugin/src/test/java/com/external/plugins/MongoPluginErrorsTest.java
+++ b/app/server/appsmith-plugins/mongoPlugin/src/test/java/com/external/plugins/MongoPluginErrorsTest.java
@@ -17,10 +17,13 @@
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.mongodb.MongoCommandException;
 import com.mongodb.MongoSecurityException;
+import com.mongodb.reactivestreams.client.ListCollectionNamesPublisher;
 import com.mongodb.reactivestreams.client.MongoClient;
 import com.mongodb.reactivestreams.client.MongoDatabase;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.reactivestreams.Subscriber;
+import org.reactivestreams.Subscription;
 import org.testcontainers.containers.MongoDBContainer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
@@ -54,6 +57,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
@@ -236,8 +240,28 @@ public void testGetStructureReadPermissionError() {
         when(mockConnection.getDatabase(any())).thenReturn(mockDatabase);
 
         MongoCommandException mockMongoCmdException = mock(MongoCommandException.class);
-        when(mockDatabase.listCollectionNames()).thenReturn(Mono.error(mockMongoCmdException));
+        // Mock the ListCollectionNamesPublisher
+        ListCollectionNamesPublisher mockPublisher = mock(ListCollectionNamesPublisher.class);
+
+        // Create a mock subscription
+        Subscription mockSubscription = mock(Subscription.class);
+
+        // Simulate an error when calling listCollectionNames
+        when(mockDatabase.listCollectionNames()).thenReturn(mockPublisher);
         when(mockMongoCmdException.getErrorCode()).thenReturn(13);
+        // Mock the subscribe method to simulate an error
+        doAnswer(invocation -> {
+                    // Extract the Subscriber passed to the subscribe method
+                    Subscriber<?> subscriber = invocation.getArgument(0);
+
+                    subscriber.onSubscribe(mockSubscription); // Provide a subscription
+                    // Call the Subscriber's onError method to simulate an error
+                    subscriber.onError(mockMongoCmdException);
+
+                    return null; // Since subscribe returns void
+                })
+                .when(mockPublisher)
+                .subscribe(any());
 
         DatasourceConfiguration dsConfig = createDatasourceConfiguration();
         Mono<DatasourceStructure> structureMono = pluginExecutor
diff --git a/app/server/appsmith-plugins/mongoPlugin/src/test/java/com/external/plugins/MongoPluginStaleConnTest.java b/app/server/appsmith-plugins/mongoPlugin/src/test/java/com/external/plugins/MongoPluginStaleConnTest.java
index accf9e106764..b93f4cebc1e0 100644
--- a/app/server/appsmith-plugins/mongoPlugin/src/test/java/com/external/plugins/MongoPluginStaleConnTest.java
+++ b/app/server/appsmith-plugins/mongoPlugin/src/test/java/com/external/plugins/MongoPluginStaleConnTest.java
@@ -9,10 +9,13 @@
 import com.appsmith.external.models.Endpoint;
 import com.appsmith.external.models.SSLDetails;
 import com.mongodb.MongoSocketWriteException;
+import com.mongodb.reactivestreams.client.ListCollectionNamesPublisher;
 import com.mongodb.reactivestreams.client.MongoClient;
 import com.mongodb.reactivestreams.client.MongoDatabase;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.reactivestreams.Subscriber;
+import org.reactivestreams.Subscription;
 import org.testcontainers.containers.MongoDBContainer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
@@ -30,8 +33,11 @@
 import static com.external.plugins.constants.FieldName.SMART_SUBSTITUTION;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
 
 /**
  * Unit tests for MongoPlugin
@@ -125,7 +131,27 @@ public void testStaleConnectionOnIllegalStateExceptionOnGetStructure() {
         MongoClient spyMongoClient = spy(MongoClient.class);
         MongoDatabase spyMongoDatabase = spy(MongoDatabase.class);
         doReturn(spyMongoDatabase).when(spyMongoClient).getDatabase(anyString());
-        doReturn(Mono.error(new IllegalStateException())).when(spyMongoDatabase).listCollectionNames();
+        // Mock the ListCollectionNamesPublisher
+        ListCollectionNamesPublisher mockPublisher = mock(ListCollectionNamesPublisher.class);
+
+        // Create a mock subscription
+        Subscription mockSubscription = mock(Subscription.class);
+
+        // Simulate an error when calling listCollectionNames
+        when(spyMongoDatabase.listCollectionNames()).thenReturn(mockPublisher);
+        // Mock the subscribe method to simulate an error
+        doAnswer(invocation -> {
+                    // Extract the Subscriber passed to the subscribe method
+                    Subscriber<?> subscriber = invocation.getArgument(0);
+
+                    subscriber.onSubscribe(mockSubscription); // Provide a subscription
+                    // Call the Subscriber's onError method to simulate an error
+                    subscriber.onError(new IllegalStateException());
+
+                    return null; // Since subscribe returns void
+                })
+                .when(mockPublisher)
+                .subscribe(any());
 
         DatasourceConfiguration dsConfig = createDatasourceConfiguration();
         Mono<DatasourceStructure> structureMono = pluginExecutor.getStructure(spyMongoClient, dsConfig, null);
@@ -139,9 +165,27 @@ public void testStaleConnectionOnMongoSocketWriteExceptionOnGetStructure() {
         MongoClient spyMongoClient = spy(MongoClient.class);
         MongoDatabase spyMongoDatabase = spy(MongoDatabase.class);
         doReturn(spyMongoDatabase).when(spyMongoClient).getDatabase(anyString());
-        doReturn(Mono.error(new MongoSocketWriteException("", null, null)))
-                .when(spyMongoDatabase)
-                .listCollectionNames();
+        // Mock the ListCollectionNamesPublisher
+        ListCollectionNamesPublisher mockPublisher = mock(ListCollectionNamesPublisher.class);
+
+        // Create a mock subscription
+        Subscription mockSubscription = mock(Subscription.class);
+
+        // Simulate an error when calling listCollectionNames
+        when(spyMongoDatabase.listCollectionNames()).thenReturn(mockPublisher);
+        // Mock the subscribe method to simulate an error
+        doAnswer(invocation -> {
+                    // Extract the Subscriber passed to the subscribe method
+                    Subscriber<?> subscriber = invocation.getArgument(0);
+
+                    subscriber.onSubscribe(mockSubscription); // Provide a subscription
+                    // Call the Subscriber's onError method to simulate an error
+                    subscriber.onError(new MongoSocketWriteException("", null, null));
+
+                    return null; // Since subscribe returns void
+                })
+                .when(mockPublisher)
+                .subscribe(any());
 
         DatasourceConfiguration dsConfig = createDatasourceConfiguration();
         Mono<DatasourceStructure> structureMono = pluginExecutor.getStructure(spyMongoClient, dsConfig, null);
diff --git a/app/server/appsmith-plugins/mssqlPlugin/src/main/java/com/external/plugins/MssqlPlugin.java b/app/server/appsmith-plugins/mssqlPlugin/src/main/java/com/external/plugins/MssqlPlugin.java
index afb768c74d33..8521d9dc4e04 100644
--- a/app/server/appsmith-plugins/mssqlPlugin/src/main/java/com/external/plugins/MssqlPlugin.java
+++ b/app/server/appsmith-plugins/mssqlPlugin/src/main/java/com/external/plugins/MssqlPlugin.java
@@ -168,7 +168,7 @@ public Mono<ActionExecutionResult> executeParameterized(
                 return executeCommon(hikariDSConnection, actionConfiguration, FALSE, null, null);
             }
 
-            // Prepared Statement
+            // Prepared statement
             // First extract all the bindings in order
             List<MustacheBindingToken> mustacheKeysInOrder = MustacheHelper.extractMustacheKeysInOrder(query);
             // Replace all the bindings with a `?` as expected in a prepared statement.
diff --git a/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/editor.json b/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/editor.json
index 827377ac8728..4d285134c824 100644
--- a/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/editor.json
+++ b/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/editor.json
@@ -3,6 +3,7 @@
     {
       "controlType": "SECTION_V2",
       "identifier": "SECTION-ONE",
+      "isFullWidth": true,
       "children": [
         {
           "controlType": "SINGLE_COLUMN_ZONE",
diff --git a/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/setting.json b/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/setting.json
index dfcf8fcc376b..3796dc7c50f8 100644
--- a/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/setting.json
+++ b/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/setting.json
@@ -5,20 +5,19 @@
       "id": 1,
       "children": [
         {
-          "label": "Run query on page load",
+          "label": "Run the query on page load",
           "configProperty": "executeOnLoad",
-          "controlType": "SWITCH",
-          "subtitle": "Will refresh data each time the page is loaded"
+          "controlType": "SWITCH"
         },
         {
-          "label": "Request confirmation before running query",
+          "label": "Request confirmation before running this query",
           "configProperty": "confirmBeforeExecute",
           "controlType": "SWITCH",
-          "subtitle": "Ask confirmation from the user each time before refreshing data"
+          "tooltipText": "Ask confirmation from the user each time before refreshing data"
         },
         {
-          "label": "Use Prepared Statement",
-          "subtitle": "Prepared statements prevent SQL injections on your queries but do not support dynamic bindings outside values in your SQL",
+          "label": "Use prepared statements",
+          "tooltipText": "Prepared statements prevent SQL injections on your queries but do not support dynamic bindings outside values in your SQL",
           "configProperty": "actionConfiguration.pluginSpecifiedTemplates[0].value",
           "controlType": "SWITCH",
           "initialValue": true
diff --git a/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/templates/CREATE.sql b/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/templates/CREATE.sql
index cfbb93837767..8588138670d3 100644
--- a/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/templates/CREATE.sql
+++ b/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/templates/CREATE.sql
@@ -1,8 +1,8 @@
 INSERT INTO users
-  (name, gender, email)
+	(name, gender, email)
 VALUES
-  (
-    {{ nameInput.text }},
-    {{ genderDropdown.selectedOptionValue }},
-    {{ emailInput.text }}
-  );
+	(
+		{{ nameInput.text }},
+		{{ genderDropdown.selectedOptionValue }},
+		{{ emailInput.text }}
+	);
diff --git a/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/templates/SELECT.sql b/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/templates/SELECT.sql
index f4d3905f05d3..57ce558bd267 100644
--- a/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/templates/SELECT.sql
+++ b/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/templates/SELECT.sql
@@ -1,3 +1,3 @@
 SELECT TOP 10 * FROM <<your_table_name>>;
 
--- Please enter a valid table name and hit RUN
\ No newline at end of file
+-- Please enter a valid table name and hit RUN
diff --git a/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/templates/UPDATE.sql b/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/templates/UPDATE.sql
index de4915e6fd1b..5ecd96ba4dcf 100644
--- a/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/templates/UPDATE.sql
+++ b/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/templates/UPDATE.sql
@@ -1,3 +1,3 @@
 UPDATE users
-  SET status = 'APPROVED'
-  WHERE id = {{ usersTable.selectedRow.id }};
+	SET status = 'APPROVED'
+	WHERE id = {{ usersTable.selectedRow.id }};
diff --git a/app/server/appsmith-plugins/mssqlPlugin/src/test/java/com/external/plugins/MssqlGetDBSchemaTest.java b/app/server/appsmith-plugins/mssqlPlugin/src/test/java/com/external/plugins/MssqlGetDBSchemaTest.java
index 062fc5aa52d7..4434a3a1c3f6 100644
--- a/app/server/appsmith-plugins/mssqlPlugin/src/test/java/com/external/plugins/MssqlGetDBSchemaTest.java
+++ b/app/server/appsmith-plugins/mssqlPlugin/src/test/java/com/external/plugins/MssqlGetDBSchemaTest.java
@@ -3,7 +3,6 @@
 import com.appsmith.external.models.DatasourceStructure;
 import com.zaxxer.hikari.HikariDataSource;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.MSSQLServerContainer;
 import org.testcontainers.junit.jupiter.Container;
@@ -23,7 +22,6 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @Testcontainers
-@Disabled
 public class MssqlGetDBSchemaTest {
     public static final String SQL_QUERY_TO_CREATE_TABLE_WITH_PRIMARY_KEY =
             "CREATE TABLE supplier\n" + "( supplier_id int not null,\n"
diff --git a/app/server/appsmith-plugins/mssqlPlugin/src/test/java/com/external/plugins/MssqlPluginTest.java b/app/server/appsmith-plugins/mssqlPlugin/src/test/java/com/external/plugins/MssqlPluginTest.java
index 60abcc3161dd..7be16681867a 100755
--- a/app/server/appsmith-plugins/mssqlPlugin/src/test/java/com/external/plugins/MssqlPluginTest.java
+++ b/app/server/appsmith-plugins/mssqlPlugin/src/test/java/com/external/plugins/MssqlPluginTest.java
@@ -23,7 +23,6 @@
 import com.zaxxer.hikari.HikariDataSource;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.MSSQLServerContainer;
 import org.testcontainers.junit.jupiter.Container;
@@ -55,7 +54,6 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @Testcontainers
-@Disabled
 public class MssqlPluginTest {
 
     @SuppressWarnings("rawtypes") // The type parameter for the container type is just itself and is pseudo-optional.
diff --git a/app/server/appsmith-plugins/mssqlPlugin/src/test/java/com/external/plugins/MssqlTestDBContainerManager.java b/app/server/appsmith-plugins/mssqlPlugin/src/test/java/com/external/plugins/MssqlTestDBContainerManager.java
index 8a60bdcb4845..26d833547f15 100644
--- a/app/server/appsmith-plugins/mssqlPlugin/src/test/java/com/external/plugins/MssqlTestDBContainerManager.java
+++ b/app/server/appsmith-plugins/mssqlPlugin/src/test/java/com/external/plugins/MssqlTestDBContainerManager.java
@@ -24,8 +24,7 @@ public class MssqlTestDBContainerManager {
 
     @SuppressWarnings("rawtypes")
     public static MSSQLServerContainer getMssqlDBForTest() {
-        return new MSSQLServerContainer<>(DockerImageName.parse("mcr.microsoft.com/azure-sql-edge:1.0.3")
-                        .asCompatibleSubstituteFor("mcr.microsoft.com/mssql/server:2017-latest"))
+        return new MSSQLServerContainer<>(DockerImageName.parse("mcr.microsoft.com/mssql/server:2022-latest"))
                 .acceptLicense()
                 .withExposedPorts(1433)
                 .withPassword("Mssql12;3");
diff --git a/app/server/appsmith-plugins/mysqlPlugin/src/main/java/com/external/plugins/MySqlPlugin.java b/app/server/appsmith-plugins/mysqlPlugin/src/main/java/com/external/plugins/MySqlPlugin.java
index cd89ea81992e..cf7c8f6dcd5e 100644
--- a/app/server/appsmith-plugins/mysqlPlugin/src/main/java/com/external/plugins/MySqlPlugin.java
+++ b/app/server/appsmith-plugins/mysqlPlugin/src/main/java/com/external/plugins/MySqlPlugin.java
@@ -229,7 +229,7 @@ public Mono<ActionExecutionResult> executeParameterized(
                 return executeCommon(connectionContext, actionConfiguration, FALSE, null, null, requestData);
             }
 
-            // This has to be executed as Prepared Statement
+            // This has to be executed as prepared statement
             // First extract all the bindings in order
             List<MustacheBindingToken> mustacheKeysInOrder = MustacheHelper.extractMustacheKeysInOrder(query);
             // Replace all the bindings with a ? as expected in a prepared statement.
@@ -692,12 +692,11 @@ public void datasourceDestroy(ConnectionContext<ConnectionPool> connectionContex
                                  */
                                 sshTunnelContext.getServerSocket().close();
                                 sshTunnelContext.getSshClient().disconnect();
-                                sshTunnelContext.getThread().stop();
+                                sshTunnelContext.getThread().interrupt(); // Gracefully interrupt the thread
                             } catch (IOException e) {
                                 log.error("Failed to destroy SSH tunnel context: " + e.getMessage());
                             }
                         }
-
                         return Mono.empty();
                     })
                     .subscribeOn(scheduler)
diff --git a/app/server/appsmith-plugins/mysqlPlugin/src/main/java/com/external/utils/MySqlDatasourceUtils.java b/app/server/appsmith-plugins/mysqlPlugin/src/main/java/com/external/utils/MySqlDatasourceUtils.java
index ae001730f3a3..a9921eab4cab 100644
--- a/app/server/appsmith-plugins/mysqlPlugin/src/main/java/com/external/utils/MySqlDatasourceUtils.java
+++ b/app/server/appsmith-plugins/mysqlPlugin/src/main/java/com/external/utils/MySqlDatasourceUtils.java
@@ -38,7 +38,7 @@
 
 public class MySqlDatasourceUtils {
 
-    public static int MAX_CONNECTION_POOL_SIZE = 5;
+    public static int MAX_CONNECTION_POOL_SIZE = 20;
 
     /**
      * 1 sec is the recommended value as shown in the example here:
diff --git a/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/editor.json b/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/editor.json
index 44d07abf46db..9ad56b27b228 100644
--- a/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/editor.json
+++ b/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/editor.json
@@ -3,6 +3,7 @@
     {
       "controlType": "SECTION_V2",
       "identifier": "SECTION-ONE",
+      "isFullWidth": true,
       "children": [
         {
           "controlType": "SINGLE_COLUMN_ZONE",
diff --git a/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/setting.json b/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/setting.json
index dfcf8fcc376b..3796dc7c50f8 100644
--- a/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/setting.json
+++ b/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/setting.json
@@ -5,20 +5,19 @@
       "id": 1,
       "children": [
         {
-          "label": "Run query on page load",
+          "label": "Run the query on page load",
           "configProperty": "executeOnLoad",
-          "controlType": "SWITCH",
-          "subtitle": "Will refresh data each time the page is loaded"
+          "controlType": "SWITCH"
         },
         {
-          "label": "Request confirmation before running query",
+          "label": "Request confirmation before running this query",
           "configProperty": "confirmBeforeExecute",
           "controlType": "SWITCH",
-          "subtitle": "Ask confirmation from the user each time before refreshing data"
+          "tooltipText": "Ask confirmation from the user each time before refreshing data"
         },
         {
-          "label": "Use Prepared Statement",
-          "subtitle": "Prepared statements prevent SQL injections on your queries but do not support dynamic bindings outside values in your SQL",
+          "label": "Use prepared statements",
+          "tooltipText": "Prepared statements prevent SQL injections on your queries but do not support dynamic bindings outside values in your SQL",
           "configProperty": "actionConfiguration.pluginSpecifiedTemplates[0].value",
           "controlType": "SWITCH",
           "initialValue": true
diff --git a/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/templates/CREATE.sql b/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/templates/CREATE.sql
index b5253c2bf8b2..8588138670d3 100644
--- a/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/templates/CREATE.sql
+++ b/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/templates/CREATE.sql
@@ -1,8 +1,8 @@
 INSERT INTO users
-  (name, gender, email)
+	(name, gender, email)
 VALUES
-  (
-    {{ nameInput.text }},
-    {{ genderDropdown.selectedOptionValue }},
-    {{ emailInput.text }}
-  );
\ No newline at end of file
+	(
+		{{ nameInput.text }},
+		{{ genderDropdown.selectedOptionValue }},
+		{{ emailInput.text }}
+	);
diff --git a/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/templates/DELETE.sql b/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/templates/DELETE.sql
index e7014662d50a..459aa04c543d 100644
--- a/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/templates/DELETE.sql
+++ b/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/templates/DELETE.sql
@@ -1 +1 @@
-DELETE FROM users WHERE id = -1;
\ No newline at end of file
+DELETE FROM users WHERE id = -1;
diff --git a/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/templates/UPDATE.sql b/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/templates/UPDATE.sql
index facf9fc3f9d6..5ecd96ba4dcf 100644
--- a/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/templates/UPDATE.sql
+++ b/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/templates/UPDATE.sql
@@ -1,3 +1,3 @@
 UPDATE users
-  SET status = 'APPROVED'
-  WHERE id = {{ usersTable.selectedRow.id }};
\ No newline at end of file
+	SET status = 'APPROVED'
+	WHERE id = {{ usersTable.selectedRow.id }};
diff --git a/app/server/appsmith-plugins/mysqlPlugin/src/test/java/com/external/plugins/MySqlPluginTest.java b/app/server/appsmith-plugins/mysqlPlugin/src/test/java/com/external/plugins/MySqlPluginTest.java
index cd29212ec041..5455415ec627 100755
--- a/app/server/appsmith-plugins/mysqlPlugin/src/test/java/com/external/plugins/MySqlPluginTest.java
+++ b/app/server/appsmith-plugins/mysqlPlugin/src/test/java/com/external/plugins/MySqlPluginTest.java
@@ -29,6 +29,7 @@
 import io.r2dbc.spi.ConnectionFactories;
 import io.r2dbc.spi.ConnectionFactoryOptions;
 import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -77,6 +78,15 @@ public class MySqlPluginTest {
 
     static MySqlPlugin.MySqlPluginExecutor pluginExecutor = new MySqlPlugin.MySqlPluginExecutor();
 
+    ConnectionContext<ConnectionPool> instanceConnectionContext;
+
+    @AfterEach
+    public void cleanup() {
+        if (instanceConnectionContext != null && instanceConnectionContext.getConnection() != null) {
+            instanceConnectionContext.getConnection().close();
+        }
+    }
+
     @SuppressWarnings("rawtypes") // The type parameter for the container type is just itself and is
     // pseudo-optional.
     @Container
@@ -202,7 +212,12 @@ private static DatasourceConfiguration createDatasourceConfiguration() {
     @Test
     public void testConnectMySQLContainer() {
 
-        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor.datasourceCreate(dsConfig);
+        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor
+                .datasourceCreate(dsConfig)
+                .map(connectionPool -> {
+                    instanceConnectionContext = connectionPool;
+                    return connectionPool;
+                });
 
         StepVerifier.create(connectionContextMono)
                 .assertNext(connectionContext -> {
@@ -222,8 +237,12 @@ public void testMySqlNoPasswordExceptionMessage() {
 
         Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor.datasourceCreate(dsConfig);
 
-        Mono<DatasourceTestResult> datasourceTestResultMono =
-                connectionContextMono.flatMap(connectionPool -> pluginExecutor.testDatasource(connectionPool));
+        Mono<DatasourceTestResult> datasourceTestResultMono = connectionContextMono
+                .map(connectionPool -> {
+                    instanceConnectionContext = connectionPool;
+                    return connectionPool;
+                })
+                .flatMap(connectionPool -> pluginExecutor.testDatasource(connectionPool));
 
         String gateway = mySQLContainer.getContainerInfo().getNetworkSettings().getGateway();
         String expectedErrorMessage = new StringBuilder("Access denied for user 'mysql'@'")
@@ -244,7 +263,12 @@ public void testConnectMySQLContainerWithInvalidTimezone() {
         final DatasourceConfiguration dsConfig = createDatasourceConfigForContainerWithInvalidTZ();
         dsConfig.setProperties(List.of(new Property("serverTimezone", "UTC")));
 
-        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor.datasourceCreate(dsConfig);
+        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor
+                .datasourceCreate(dsConfig)
+                .map(connectionPool -> {
+                    instanceConnectionContext = connectionPool;
+                    return connectionPool;
+                });
 
         StepVerifier.create(connectionContextMono)
                 .assertNext(Assertions::assertNotNull)
@@ -330,7 +354,12 @@ public void testDatasourceWithNullPassword() {
         Set<String> output = pluginExecutor.validateDatasource(dsConfig);
         assertTrue(output.isEmpty());
         // test connect
-        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor.datasourceCreate(dsConfig);
+        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor
+                .datasourceCreate(dsConfig)
+                .map(connectionPool -> {
+                    instanceConnectionContext = connectionPool;
+                    return connectionPool;
+                });
 
         StepVerifier.create(connectionContextMono)
                 .assertNext(Assertions::assertNotNull)
@@ -356,7 +385,12 @@ public void testDatasourceWithRootUserAndNullPassword() {
         Set<String> output = pluginExecutor.validateDatasource(dsConfig);
         assertTrue(output.isEmpty());
         // test connect
-        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor.datasourceCreate(dsConfig);
+        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor
+                .datasourceCreate(dsConfig)
+                .map(connectionPool -> {
+                    instanceConnectionContext = connectionPool;
+                    return connectionPool;
+                });
 
         StepVerifier.create(connectionContextMono)
                 .assertNext(Assertions::assertNotNull)
@@ -371,7 +405,12 @@ public void testDatasourceWithRootUserAndNullPassword() {
 
     @Test
     public void testExecute() {
-        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor.datasourceCreate(dsConfig);
+        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor
+                .datasourceCreate(dsConfig)
+                .map(connectionPool -> {
+                    instanceConnectionContext = connectionPool;
+                    return connectionPool;
+                });
 
         ActionConfiguration actionConfiguration = new ActionConfiguration();
         actionConfiguration.setBody("show databases");
@@ -391,7 +430,12 @@ public void testExecute() {
     @Test
     public void testExecuteWithFormattingWithShowCmd() {
         dsConfig = createDatasourceConfiguration();
-        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor.datasourceCreate(dsConfig);
+        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor
+                .datasourceCreate(dsConfig)
+                .map(connectionPool -> {
+                    instanceConnectionContext = connectionPool;
+                    return connectionPool;
+                });
 
         ActionConfiguration actionConfiguration = new ActionConfiguration();
         actionConfiguration.setBody("show\n\tdatabases");
@@ -413,7 +457,12 @@ public void testExecuteWithFormattingWithShowCmd() {
     @Test
     public void testExecuteWithFormattingWithSelectCmd() {
         dsConfig = createDatasourceConfiguration();
-        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor.datasourceCreate(dsConfig);
+        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor
+                .datasourceCreate(dsConfig)
+                .map(connectionPool -> {
+                    instanceConnectionContext = connectionPool;
+                    return connectionPool;
+                });
 
         ActionConfiguration actionConfiguration = new ActionConfiguration();
         actionConfiguration.setBody("select\n\t*\nfrom\nusers where id=1");
@@ -452,7 +501,12 @@ public void testExecuteWithFormattingWithSelectCmd() {
 
     @Test
     public void testExecuteWithLongRunningQuery() {
-        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor.datasourceCreate(dsConfig);
+        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor
+                .datasourceCreate(dsConfig)
+                .map(connectionPool -> {
+                    instanceConnectionContext = connectionPool;
+                    return connectionPool;
+                });
 
         ActionConfiguration actionConfiguration = new ActionConfiguration();
         actionConfiguration.setBody("SELECT SLEEP(20);");
@@ -475,6 +529,7 @@ public void testStaleConnectionCheck() {
         actionConfiguration.setBody("show databases");
         ConnectionContext<ConnectionPool> connectionContext =
                 pluginExecutor.datasourceCreate(dsConfig).block();
+        instanceConnectionContext = connectionContext;
         Flux<ActionExecutionResult> resultFlux = Mono.from((connectionContext.getConnection()).disposeLater())
                 .thenMany(pluginExecutor.executeParameterized(
                         connectionContext, new ExecuteActionDTO(), dsConfig, actionConfiguration));
@@ -487,7 +542,12 @@ public void testStaleConnectionCheck() {
     @Test
     public void testAliasColumnNames() {
         DatasourceConfiguration dsConfig = createDatasourceConfiguration();
-        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor.datasourceCreate(dsConfig);
+        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor
+                .datasourceCreate(dsConfig)
+                .map(connectionPool -> {
+                    instanceConnectionContext = connectionPool;
+                    return connectionPool;
+                });
 
         ActionConfiguration actionConfiguration = new ActionConfiguration();
         actionConfiguration.setBody("SELECT id as user_id FROM users WHERE id = 1");
@@ -513,7 +573,12 @@ public void testAliasColumnNames() {
     @Test
     public void testPreparedStatementErrorWithIsKeyword() {
         DatasourceConfiguration dsConfig = createDatasourceConfiguration();
-        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor.datasourceCreate(dsConfig);
+        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor
+                .datasourceCreate(dsConfig)
+                .map(connectionPool -> {
+                    instanceConnectionContext = connectionPool;
+                    return connectionPool;
+                });
 
         ActionConfiguration actionConfiguration = new ActionConfiguration();
         /**
@@ -563,7 +628,12 @@ public void testPreparedStatementWithRealTypes() {
                 .blockLast(); // wait until completion of all the queries
 
         DatasourceConfiguration dsConfig = createDatasourceConfiguration();
-        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor.datasourceCreate(dsConfig);
+        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor
+                .datasourceCreate(dsConfig)
+                .map(connectionPool -> {
+                    instanceConnectionContext = connectionPool;
+                    return connectionPool;
+                });
 
         ActionConfiguration actionConfiguration = new ActionConfiguration();
         /**
@@ -639,7 +709,12 @@ public void testPreparedStatementWithBooleanType() {
                 .blockLast(); // wait until completion of all the queries
 
         DatasourceConfiguration dsConfig = createDatasourceConfiguration();
-        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor.datasourceCreate(dsConfig);
+        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor
+                .datasourceCreate(dsConfig)
+                .map(connectionPool -> {
+                    instanceConnectionContext = connectionPool;
+                    return connectionPool;
+                });
 
         ActionConfiguration actionConfiguration = new ActionConfiguration();
         actionConfiguration.setBody("SELECT id FROM test_boolean_type WHERE c_boolean={{binding1}};");
@@ -679,7 +754,12 @@ public void testPreparedStatementWithBooleanType() {
     @Test
     public void testExecuteWithPreparedStatement() {
         DatasourceConfiguration dsConfig = createDatasourceConfiguration();
-        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor.datasourceCreate(dsConfig);
+        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor
+                .datasourceCreate(dsConfig)
+                .map(connectionPool -> {
+                    instanceConnectionContext = connectionPool;
+                    return connectionPool;
+                });
 
         ActionConfiguration actionConfiguration = new ActionConfiguration();
         actionConfiguration.setBody("SELECT id FROM users WHERE id = {{binding1}} limit 1 offset {{binding2}};");
@@ -760,7 +840,12 @@ public void testExecuteWithPreparedStatement() {
     @Test
     public void testExecuteDataTypes() {
         DatasourceConfiguration dsConfig = createDatasourceConfiguration();
-        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor.datasourceCreate(dsConfig);
+        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor
+                .datasourceCreate(dsConfig)
+                .map(connectionPool -> {
+                    instanceConnectionContext = connectionPool;
+                    return connectionPool;
+                });
 
         ActionConfiguration actionConfiguration = new ActionConfiguration();
         actionConfiguration.setBody("SELECT * FROM users WHERE id = 1");
@@ -905,7 +990,12 @@ public void testExecuteDataTypesExtensive() throws AppsmithPluginException {
     }
 
     private void testExecute(String query, String expectedResult) {
-        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor.datasourceCreate(dsConfig);
+        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor
+                .datasourceCreate(dsConfig)
+                .map(connectionPool -> {
+                    instanceConnectionContext = connectionPool;
+                    return connectionPool;
+                });
         ActionConfiguration actionConfiguration = new ActionConfiguration();
         actionConfiguration.setBody(query);
         Mono<Object> executeMono = connectionContextMono.flatMap(conn ->
@@ -928,7 +1018,10 @@ public void testStructure() {
         DatasourceConfiguration dsConfig = createDatasourceConfiguration();
         Mono<DatasourceStructure> structureMono = pluginExecutor
                 .datasourceCreate(dsConfig)
-                .flatMap(connection -> pluginExecutor.getStructure(connection, dsConfig));
+                .flatMap(connection -> {
+                    instanceConnectionContext = connection;
+                    return pluginExecutor.getStructure(connection, dsConfig);
+                });
 
         StepVerifier.create(structureMono)
                 .assertNext(structure -> {
@@ -1053,8 +1146,12 @@ public void testSslDisabled() {
 
         DatasourceConfiguration datasourceConfiguration = createDatasourceConfiguration();
         datasourceConfiguration.getConnection().getSsl().setAuthType(SSLDetails.AuthType.DISABLED);
-        Mono<ConnectionContext<ConnectionPool>> connectionContextMono =
-                pluginExecutor.datasourceCreate(datasourceConfiguration);
+        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor
+                .datasourceCreate(datasourceConfiguration)
+                .map(connectionPool -> {
+                    instanceConnectionContext = connectionPool;
+                    return connectionPool;
+                });
         Mono<Object> executeMono = connectionContextMono.flatMap(conn ->
                 pluginExecutor.executeParameterized(conn, new ExecuteActionDTO(), dsConfig, actionConfiguration));
         StepVerifier.create(executeMono)
@@ -1101,8 +1198,12 @@ public void testSslDefault() {
 
         DatasourceConfiguration datasourceConfiguration = createDatasourceConfiguration();
         datasourceConfiguration.getConnection().getSsl().setAuthType(SSLDetails.AuthType.DEFAULT);
-        Mono<ConnectionContext<ConnectionPool>> connectionContextMono =
-                pluginExecutor.datasourceCreate(datasourceConfiguration);
+        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor
+                .datasourceCreate(dsConfig)
+                .map(connectionPool -> {
+                    instanceConnectionContext = connectionPool;
+                    return connectionPool;
+                });
         Mono<Object> executeMono = connectionContextMono.flatMap(conn ->
                 pluginExecutor.executeParameterized(conn, new ExecuteActionDTO(), dsConfig, actionConfiguration));
         StepVerifier.create(executeMono)
@@ -1120,7 +1221,12 @@ public void testSslDefault() {
     @Test
     public void testDuplicateColumnNames() {
         DatasourceConfiguration dsConfig = createDatasourceConfiguration();
-        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor.datasourceCreate(dsConfig);
+        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor
+                .datasourceCreate(dsConfig)
+                .map(connectionPool -> {
+                    instanceConnectionContext = connectionPool;
+                    return connectionPool;
+                });
 
         ActionConfiguration actionConfiguration = new ActionConfiguration();
         actionConfiguration.setBody("SELECT id, username as id, password, email as password FROM users WHERE id = 1");
@@ -1157,7 +1263,12 @@ public void testDuplicateColumnNames() {
     @Test
     public void testExecuteDescribeTableCmd() {
         dsConfig = createDatasourceConfiguration();
-        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor.datasourceCreate(dsConfig);
+        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor
+                .datasourceCreate(dsConfig)
+                .map(connectionPool -> {
+                    instanceConnectionContext = connectionPool;
+                    return connectionPool;
+                });
 
         ActionConfiguration actionConfiguration = new ActionConfiguration();
         actionConfiguration.setBody("describe users");
@@ -1180,7 +1291,12 @@ public void testExecuteDescribeTableCmd() {
     @Test
     public void testExecuteDescTableCmd() {
         dsConfig = createDatasourceConfiguration();
-        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor.datasourceCreate(dsConfig);
+        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor
+                .datasourceCreate(dsConfig)
+                .map(connectionPool -> {
+                    instanceConnectionContext = connectionPool;
+                    return connectionPool;
+                });
 
         ActionConfiguration actionConfiguration = new ActionConfiguration();
         actionConfiguration.setBody("desc users");
@@ -1205,7 +1321,12 @@ public void testNullObjectWithPreparedStatement() {
         pluginExecutor = spy(new MySqlPlugin.MySqlPluginExecutor());
         doReturn(false).when(pluginExecutor).isIsOperatorUsed(any());
         DatasourceConfiguration dsConfig = createDatasourceConfiguration();
-        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor.datasourceCreate(dsConfig);
+        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor
+                .datasourceCreate(dsConfig)
+                .map(connectionPool -> {
+                    instanceConnectionContext = connectionPool;
+                    return connectionPool;
+                });
 
         ActionConfiguration actionConfiguration = new ActionConfiguration();
         actionConfiguration.setBody("SELECT * from (\n" + "\tselect 'Appsmith' as company_name, true as open_source\n"
@@ -1252,7 +1373,12 @@ public void testNullObjectWithPreparedStatement() {
     @Test
     public void testNullAsStringWithPreparedStatement() {
         DatasourceConfiguration dsConfig = createDatasourceConfiguration();
-        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor.datasourceCreate(dsConfig);
+        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor
+                .datasourceCreate(dsConfig)
+                .map(connectionPool -> {
+                    instanceConnectionContext = connectionPool;
+                    return connectionPool;
+                });
 
         ActionConfiguration actionConfiguration = new ActionConfiguration();
         actionConfiguration.setBody("SELECT * from (\n" + "\tselect 'Appsmith' as company_name, true as open_source\n"
@@ -1300,7 +1426,12 @@ public void testNullAsStringWithPreparedStatement() {
     @Test
     public void testNumericValuesHavingLeadingZeroWithPreparedStatement() {
         DatasourceConfiguration dsConfig = createDatasourceConfiguration();
-        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor.datasourceCreate(dsConfig);
+        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor
+                .datasourceCreate(dsConfig)
+                .map(connectionPool -> {
+                    instanceConnectionContext = connectionPool;
+                    return connectionPool;
+                });
 
         ActionConfiguration actionConfiguration = new ActionConfiguration();
         actionConfiguration.setBody("SELECT {{binding1}} as numeric_string;");
@@ -1342,7 +1473,12 @@ public void testNumericValuesHavingLeadingZeroWithPreparedStatement() {
     @Test
     public void testLongValueWithPreparedStatement() {
         DatasourceConfiguration dsConfig = createDatasourceConfiguration();
-        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor.datasourceCreate(dsConfig);
+        Mono<ConnectionContext<ConnectionPool>> connectionContextMono = pluginExecutor
+                .datasourceCreate(dsConfig)
+                .map(connectionPool -> {
+                    instanceConnectionContext = connectionPool;
+                    return connectionPool;
+                });
 
         ActionConfiguration actionConfiguration = new ActionConfiguration();
         actionConfiguration.setBody("select id from users LIMIT {{binding1}}");
@@ -1383,8 +1519,13 @@ public void testLongValueWithPreparedStatement() {
     @Test
     public void testDatasourceDestroy() {
         dsConfig = createDatasourceConfiguration();
-        Mono<ConnectionContext<ConnectionPool>> connectionContextMonoCache =
-                pluginExecutor.datasourceCreate(dsConfig).cache();
+        Mono<ConnectionContext<ConnectionPool>> connectionContextMonoCache = pluginExecutor
+                .datasourceCreate(dsConfig)
+                .map(connectionPool -> {
+                    instanceConnectionContext = connectionPool;
+                    return connectionPool;
+                })
+                .cache();
         Mono<DatasourceTestResult> testConnResultMono =
                 connectionContextMonoCache.flatMap(conn -> pluginExecutor.testDatasource(conn));
         Mono<Tuple2<ConnectionContext<ConnectionPool>, DatasourceTestResult>> zipMono =
@@ -1417,8 +1558,10 @@ public void testExecuteCommon_queryWithComments_callValidationCallsAfterRemoving
         MySqlPlugin.MySqlPluginExecutor spyPlugin = spy(pluginExecutor);
 
         DatasourceConfiguration dsConfig = createDatasourceConfiguration();
-        ConnectionContext<ConnectionPool> connectionContextMono =
+        ConnectionContext<ConnectionPool> connectionContext =
                 pluginExecutor.datasourceCreate(dsConfig).block();
+        instanceConnectionContext = connectionContext;
+
         ActionConfiguration actionConfiguration = new ActionConfiguration();
         actionConfiguration.setBody("SELECT id FROM users WHERE -- IS operator\nid = 1 limit 1;");
 
@@ -1428,7 +1571,7 @@ public void testExecuteCommon_queryWithComments_callValidationCallsAfterRemoving
         HashMap<String, Object> requestData = new HashMap<>();
 
         Mono<ActionExecutionResult> resultMono =
-                spyPlugin.executeCommon(connectionContextMono, actionConfiguration, TRUE, null, null, requestData);
+                spyPlugin.executeCommon(connectionContext, actionConfiguration, TRUE, null, null, requestData);
 
         StepVerifier.create(resultMono)
                 .assertNext(result -> {
diff --git a/app/server/appsmith-plugins/openAiPlugin/pom.xml b/app/server/appsmith-plugins/openAiPlugin/pom.xml
index f19ad0b6bf57..ad65e91c1727 100644
--- a/app/server/appsmith-plugins/openAiPlugin/pom.xml
+++ b/app/server/appsmith-plugins/openAiPlugin/pom.xml
@@ -101,7 +101,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-webflux</artifactId>
-            <version>${spring-boot.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/app/server/appsmith-plugins/openAiPlugin/src/main/resources/setting.json b/app/server/appsmith-plugins/openAiPlugin/src/main/resources/setting.json
index dd959a1b4b72..f24806929a67 100644
--- a/app/server/appsmith-plugins/openAiPlugin/src/main/resources/setting.json
+++ b/app/server/appsmith-plugins/openAiPlugin/src/main/resources/setting.json
@@ -5,16 +5,15 @@
       "id": 1,
       "children": [
         {
-          "label": "Run query on page load",
+          "label": "Run the query on page load",
           "configProperty": "executeOnLoad",
-          "controlType": "SWITCH",
-          "subtitle": "Will refresh data each time the page is loaded"
+          "controlType": "SWITCH"
         },
         {
-          "label": "Request confirmation before running query",
+          "label": "Request confirmation before running this query",
           "configProperty": "confirmBeforeExecute",
           "controlType": "SWITCH",
-          "subtitle": "Ask confirmation from the user each time before refreshing data"
+          "tooltipText": "Ask confirmation from the user each time before refreshing data"
         },
         {
           "label": "Query timeout (in milliseconds)",
diff --git a/app/server/appsmith-plugins/oraclePlugin/src/main/resources/editor.json b/app/server/appsmith-plugins/oraclePlugin/src/main/resources/editor.json
index 9ab0b230f267..9a83e1c35698 100755
--- a/app/server/appsmith-plugins/oraclePlugin/src/main/resources/editor.json
+++ b/app/server/appsmith-plugins/oraclePlugin/src/main/resources/editor.json
@@ -3,6 +3,7 @@
     {
       "controlType": "SECTION_V2",
       "identifier": "SECTION-ONE",
+      "isFullWidth": true,
       "children": [
         {
           "controlType": "SINGLE_COLUMN_ZONE",
diff --git a/app/server/appsmith-plugins/oraclePlugin/src/main/resources/setting.json b/app/server/appsmith-plugins/oraclePlugin/src/main/resources/setting.json
index 458233d4b2e3..e75716975b22 100755
--- a/app/server/appsmith-plugins/oraclePlugin/src/main/resources/setting.json
+++ b/app/server/appsmith-plugins/oraclePlugin/src/main/resources/setting.json
@@ -5,20 +5,19 @@
       "id": 1,
       "children": [
         {
-          "label": "Run query on page load",
+          "label": "Run the query on page load",
           "configProperty": "executeOnLoad",
-          "controlType": "SWITCH",
-          "subtitle": "Will refresh data each time the page is loaded"
+          "controlType": "SWITCH"
         },
         {
-          "label": "Request confirmation before running query",
+          "label": "Request confirmation before running this query",
           "configProperty": "confirmBeforeExecute",
           "controlType": "SWITCH",
-          "subtitle": "Ask confirmation from the user each time before refreshing data"
+          "tooltipText": "Ask confirmation from the user each time before refreshing data"
         },
         {
-          "label": "Use Prepared Statement",
-          "subtitle": "Prepared statements prevent SQL injections on your queries but do not support dynamic bindings outside values in your SQL",
+          "label": "Use prepared statements",
+          "tooltipText": "Prepared statements prevent SQL injections on your queries but do not support dynamic bindings outside values in your SQL",
           "configProperty": "actionConfiguration.formData.preparedStatement.data",
           "controlType": "SWITCH",
           "initialValue": true
diff --git a/app/server/appsmith-plugins/oraclePlugin/src/main/resources/templates/DELETE.sql b/app/server/appsmith-plugins/oraclePlugin/src/main/resources/templates/DELETE.sql
index c5000f4ee8ea..a763c222abbd 100755
--- a/app/server/appsmith-plugins/oraclePlugin/src/main/resources/templates/DELETE.sql
+++ b/app/server/appsmith-plugins/oraclePlugin/src/main/resources/templates/DELETE.sql
@@ -1 +1 @@
-DELETE FROM users WHERE id = {{idInput.text}}
\ No newline at end of file
+DELETE FROM users WHERE id = {{idInput.text}}
diff --git a/app/server/appsmith-plugins/oraclePlugin/src/main/resources/templates/INSERT.sql b/app/server/appsmith-plugins/oraclePlugin/src/main/resources/templates/INSERT.sql
index f59768c5c550..e4a64159fed7 100755
--- a/app/server/appsmith-plugins/oraclePlugin/src/main/resources/templates/INSERT.sql
+++ b/app/server/appsmith-plugins/oraclePlugin/src/main/resources/templates/INSERT.sql
@@ -1,8 +1,8 @@
 INSERT INTO users
-  (name, gender, email)
+	(name, gender, email)
 VALUES
-  (
-    {{ nameInput.text }},
-    {{ genderDropdown.selectedOptionValue }},
-    {{ emailInput.text }}
-  )
\ No newline at end of file
+	(
+		{{ nameInput.text }},
+		{{ genderDropdown.selectedOptionValue }},
+		{{ emailInput.text }}
+	)
diff --git a/app/server/appsmith-plugins/oraclePlugin/src/main/resources/templates/UPDATE.sql b/app/server/appsmith-plugins/oraclePlugin/src/main/resources/templates/UPDATE.sql
index 1e8246500e01..2b9cb5d2a0e2 100755
--- a/app/server/appsmith-plugins/oraclePlugin/src/main/resources/templates/UPDATE.sql
+++ b/app/server/appsmith-plugins/oraclePlugin/src/main/resources/templates/UPDATE.sql
@@ -1 +1 @@
-UPDATE users SET status = 'APPROVED' WHERE id = {{ usersTable.selectedRow.id }}
\ No newline at end of file
+UPDATE users SET status = 'APPROVED' WHERE id = {{ usersTable.selectedRow.id }}
diff --git a/app/server/appsmith-plugins/postgresPlugin/src/main/java/com/external/plugins/PostgresPlugin.java b/app/server/appsmith-plugins/postgresPlugin/src/main/java/com/external/plugins/PostgresPlugin.java
index b933f7212e90..6d963c67b05a 100644
--- a/app/server/appsmith-plugins/postgresPlugin/src/main/java/com/external/plugins/PostgresPlugin.java
+++ b/app/server/appsmith-plugins/postgresPlugin/src/main/java/com/external/plugins/PostgresPlugin.java
@@ -277,7 +277,7 @@ public Mono<ActionExecutionResult> executeParameterized(
                 return executeCommon(connection, datasourceConfiguration, actionConfiguration, FALSE, null, null, null);
             }
 
-            // Prepared Statement
+            // Prepared statement
 
             // First extract all the bindings in order
             List<MustacheBindingToken> mustacheKeysInOrder = MustacheHelper.extractMustacheKeysInOrder(query);
diff --git a/app/server/appsmith-plugins/postgresPlugin/src/main/resources/editor.json b/app/server/appsmith-plugins/postgresPlugin/src/main/resources/editor.json
index 2b6f69d6e8a6..6014a8cbe5a9 100644
--- a/app/server/appsmith-plugins/postgresPlugin/src/main/resources/editor.json
+++ b/app/server/appsmith-plugins/postgresPlugin/src/main/resources/editor.json
@@ -3,6 +3,7 @@
     {
       "controlType": "SECTION_V2",
       "identifier": "SECTION-ONE",
+      "isFullWidth": true,
       "children": [
         {
           "controlType": "SINGLE_COLUMN_ZONE",
diff --git a/app/server/appsmith-plugins/postgresPlugin/src/main/resources/setting.json b/app/server/appsmith-plugins/postgresPlugin/src/main/resources/setting.json
index dfcf8fcc376b..3796dc7c50f8 100644
--- a/app/server/appsmith-plugins/postgresPlugin/src/main/resources/setting.json
+++ b/app/server/appsmith-plugins/postgresPlugin/src/main/resources/setting.json
@@ -5,20 +5,19 @@
       "id": 1,
       "children": [
         {
-          "label": "Run query on page load",
+          "label": "Run the query on page load",
           "configProperty": "executeOnLoad",
-          "controlType": "SWITCH",
-          "subtitle": "Will refresh data each time the page is loaded"
+          "controlType": "SWITCH"
         },
         {
-          "label": "Request confirmation before running query",
+          "label": "Request confirmation before running this query",
           "configProperty": "confirmBeforeExecute",
           "controlType": "SWITCH",
-          "subtitle": "Ask confirmation from the user each time before refreshing data"
+          "tooltipText": "Ask confirmation from the user each time before refreshing data"
         },
         {
-          "label": "Use Prepared Statement",
-          "subtitle": "Prepared statements prevent SQL injections on your queries but do not support dynamic bindings outside values in your SQL",
+          "label": "Use prepared statements",
+          "tooltipText": "Prepared statements prevent SQL injections on your queries but do not support dynamic bindings outside values in your SQL",
           "configProperty": "actionConfiguration.pluginSpecifiedTemplates[0].value",
           "controlType": "SWITCH",
           "initialValue": true
diff --git a/app/server/appsmith-plugins/postgresPlugin/src/main/resources/templates/CREATE.sql b/app/server/appsmith-plugins/postgresPlugin/src/main/resources/templates/CREATE.sql
index b5253c2bf8b2..8588138670d3 100644
--- a/app/server/appsmith-plugins/postgresPlugin/src/main/resources/templates/CREATE.sql
+++ b/app/server/appsmith-plugins/postgresPlugin/src/main/resources/templates/CREATE.sql
@@ -1,8 +1,8 @@
 INSERT INTO users
-  (name, gender, email)
+	(name, gender, email)
 VALUES
-  (
-    {{ nameInput.text }},
-    {{ genderDropdown.selectedOptionValue }},
-    {{ emailInput.text }}
-  );
\ No newline at end of file
+	(
+		{{ nameInput.text }},
+		{{ genderDropdown.selectedOptionValue }},
+		{{ emailInput.text }}
+	);
diff --git a/app/server/appsmith-plugins/postgresPlugin/src/main/resources/templates/DELETE.sql b/app/server/appsmith-plugins/postgresPlugin/src/main/resources/templates/DELETE.sql
index e7014662d50a..459aa04c543d 100644
--- a/app/server/appsmith-plugins/postgresPlugin/src/main/resources/templates/DELETE.sql
+++ b/app/server/appsmith-plugins/postgresPlugin/src/main/resources/templates/DELETE.sql
@@ -1 +1 @@
-DELETE FROM users WHERE id = -1;
\ No newline at end of file
+DELETE FROM users WHERE id = -1;
diff --git a/app/server/appsmith-plugins/postgresPlugin/src/main/resources/templates/SELECT.sql b/app/server/appsmith-plugins/postgresPlugin/src/main/resources/templates/SELECT.sql
index 1c25fafff4ab..036ff8b22974 100644
--- a/app/server/appsmith-plugins/postgresPlugin/src/main/resources/templates/SELECT.sql
+++ b/app/server/appsmith-plugins/postgresPlugin/src/main/resources/templates/SELECT.sql
@@ -1,3 +1,3 @@
 SELECT * FROM <<your_table_name>> LIMIT 10;
 
--- Please enter a valid table name and hit RUN
\ No newline at end of file
+-- Please enter a valid table name and hit RUN
diff --git a/app/server/appsmith-plugins/postgresPlugin/src/main/resources/templates/UPDATE.sql b/app/server/appsmith-plugins/postgresPlugin/src/main/resources/templates/UPDATE.sql
index de4915e6fd1b..5ecd96ba4dcf 100644
--- a/app/server/appsmith-plugins/postgresPlugin/src/main/resources/templates/UPDATE.sql
+++ b/app/server/appsmith-plugins/postgresPlugin/src/main/resources/templates/UPDATE.sql
@@ -1,3 +1,3 @@
 UPDATE users
-  SET status = 'APPROVED'
-  WHERE id = {{ usersTable.selectedRow.id }};
+	SET status = 'APPROVED'
+	WHERE id = {{ usersTable.selectedRow.id }};
diff --git a/app/server/appsmith-plugins/redisPlugin/src/main/resources/editor.json b/app/server/appsmith-plugins/redisPlugin/src/main/resources/editor.json
index 514ce52693a2..d960202031f2 100644
--- a/app/server/appsmith-plugins/redisPlugin/src/main/resources/editor.json
+++ b/app/server/appsmith-plugins/redisPlugin/src/main/resources/editor.json
@@ -3,6 +3,7 @@
     {
       "controlType": "SECTION_V2",
       "identifier": "SECTION-ONE",
+      "isFullWidth": true,
       "children": [
         {
           "controlType": "SINGLE_COLUMN_ZONE",
diff --git a/app/server/appsmith-plugins/redisPlugin/src/test/java/com/external/plugins/RedisPluginTest.java b/app/server/appsmith-plugins/redisPlugin/src/test/java/com/external/plugins/RedisPluginTest.java
index 962e008ae4d2..9cbfbef3716c 100644
--- a/app/server/appsmith-plugins/redisPlugin/src/test/java/com/external/plugins/RedisPluginTest.java
+++ b/app/server/appsmith-plugins/redisPlugin/src/test/java/com/external/plugins/RedisPluginTest.java
@@ -15,7 +15,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.junit.jupiter.Container;
@@ -40,7 +39,6 @@
 
 @Slf4j
 @Testcontainers
-@Disabled
 public class RedisPluginTest {
     @Container
     public static final GenericContainer redis =
diff --git a/app/server/appsmith-plugins/redshiftPlugin/src/main/resources/editor.json b/app/server/appsmith-plugins/redshiftPlugin/src/main/resources/editor.json
index 514ce52693a2..d960202031f2 100644
--- a/app/server/appsmith-plugins/redshiftPlugin/src/main/resources/editor.json
+++ b/app/server/appsmith-plugins/redshiftPlugin/src/main/resources/editor.json
@@ -3,6 +3,7 @@
     {
       "controlType": "SECTION_V2",
       "identifier": "SECTION-ONE",
+      "isFullWidth": true,
       "children": [
         {
           "controlType": "SINGLE_COLUMN_ZONE",
diff --git a/app/server/appsmith-plugins/redshiftPlugin/src/main/resources/templates/CREATE.sql b/app/server/appsmith-plugins/redshiftPlugin/src/main/resources/templates/CREATE.sql
index b5253c2bf8b2..8588138670d3 100644
--- a/app/server/appsmith-plugins/redshiftPlugin/src/main/resources/templates/CREATE.sql
+++ b/app/server/appsmith-plugins/redshiftPlugin/src/main/resources/templates/CREATE.sql
@@ -1,8 +1,8 @@
 INSERT INTO users
-  (name, gender, email)
+	(name, gender, email)
 VALUES
-  (
-    {{ nameInput.text }},
-    {{ genderDropdown.selectedOptionValue }},
-    {{ emailInput.text }}
-  );
\ No newline at end of file
+	(
+		{{ nameInput.text }},
+		{{ genderDropdown.selectedOptionValue }},
+		{{ emailInput.text }}
+	);
diff --git a/app/server/appsmith-plugins/redshiftPlugin/src/main/resources/templates/DELETE.sql b/app/server/appsmith-plugins/redshiftPlugin/src/main/resources/templates/DELETE.sql
index e7014662d50a..459aa04c543d 100644
--- a/app/server/appsmith-plugins/redshiftPlugin/src/main/resources/templates/DELETE.sql
+++ b/app/server/appsmith-plugins/redshiftPlugin/src/main/resources/templates/DELETE.sql
@@ -1 +1 @@
-DELETE FROM users WHERE id = -1;
\ No newline at end of file
+DELETE FROM users WHERE id = -1;
diff --git a/app/server/appsmith-plugins/redshiftPlugin/src/main/resources/templates/SELECT.sql b/app/server/appsmith-plugins/redshiftPlugin/src/main/resources/templates/SELECT.sql
index 1c25fafff4ab..036ff8b22974 100644
--- a/app/server/appsmith-plugins/redshiftPlugin/src/main/resources/templates/SELECT.sql
+++ b/app/server/appsmith-plugins/redshiftPlugin/src/main/resources/templates/SELECT.sql
@@ -1,3 +1,3 @@
 SELECT * FROM <<your_table_name>> LIMIT 10;
 
--- Please enter a valid table name and hit RUN
\ No newline at end of file
+-- Please enter a valid table name and hit RUN
diff --git a/app/server/appsmith-plugins/redshiftPlugin/src/main/resources/templates/UPDATE.sql b/app/server/appsmith-plugins/redshiftPlugin/src/main/resources/templates/UPDATE.sql
index facf9fc3f9d6..5ecd96ba4dcf 100644
--- a/app/server/appsmith-plugins/redshiftPlugin/src/main/resources/templates/UPDATE.sql
+++ b/app/server/appsmith-plugins/redshiftPlugin/src/main/resources/templates/UPDATE.sql
@@ -1,3 +1,3 @@
 UPDATE users
-  SET status = 'APPROVED'
-  WHERE id = {{ usersTable.selectedRow.id }};
\ No newline at end of file
+	SET status = 'APPROVED'
+	WHERE id = {{ usersTable.selectedRow.id }};
diff --git a/app/server/appsmith-plugins/restApiPlugin/pom.xml b/app/server/appsmith-plugins/restApiPlugin/pom.xml
index 775003d9ea5d..60e52b9f1284 100644
--- a/app/server/appsmith-plugins/restApiPlugin/pom.xml
+++ b/app/server/appsmith-plugins/restApiPlugin/pom.xml
@@ -89,7 +89,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-webflux</artifactId>
-            <version>${spring-boot.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/app/server/appsmith-plugins/smtpPlugin/src/main/java/com/external/plugins/SmtpPlugin.java b/app/server/appsmith-plugins/smtpPlugin/src/main/java/com/external/plugins/SmtpPlugin.java
index 69f81748d3fe..403ccd9c2087 100644
--- a/app/server/appsmith-plugins/smtpPlugin/src/main/java/com/external/plugins/SmtpPlugin.java
+++ b/app/server/appsmith-plugins/smtpPlugin/src/main/java/com/external/plugins/SmtpPlugin.java
@@ -212,15 +212,25 @@ public Mono<Session> datasourceCreate(DatasourceConfiguration datasourceConfigur
             prop.put("mail.smtp.port", String.valueOf(port));
             prop.put("mail.smtp.ssl.trust", endpoint.getHost());
 
-            String username = authentication.getUsername();
-            String password = authentication.getPassword();
+            Session session;
 
-            Session session = Session.getInstance(prop, new Authenticator() {
-                @Override
-                protected PasswordAuthentication getPasswordAuthentication() {
-                    return new PasswordAuthentication(username, password);
-                }
-            });
+            if (authentication != null
+                    && StringUtils.hasText(authentication.getUsername())
+                    && StringUtils.hasText(authentication.getPassword())) {
+
+                String username = authentication.getUsername();
+                String password = authentication.getPassword();
+
+                session = Session.getInstance(prop, new Authenticator() {
+                    @Override
+                    protected PasswordAuthentication getPasswordAuthentication() {
+                        return new PasswordAuthentication(username, password);
+                    }
+                });
+            } else {
+                prop.put("mail.smtp.auth", "false");
+                session = Session.getInstance(prop);
+            }
             return Mono.just(session);
         }
 
@@ -248,14 +258,6 @@ public Set<String> validateDatasource(DatasourceConfiguration datasourceConfigur
                     invalids.add(SMTPErrorMessages.DS_MISSING_HOST_ADDRESS_ERROR_MSG);
                 }
             }
-
-            DBAuth authentication = (DBAuth) datasourceConfiguration.getAuthentication();
-            if (authentication == null
-                    || !StringUtils.hasText(authentication.getUsername())
-                    || !StringUtils.hasText(authentication.getPassword())) {
-                invalids.add(new AppsmithPluginException(AppsmithPluginError.PLUGIN_AUTHENTICATION_ERROR).getMessage());
-            }
-
             return invalids;
         }
 
@@ -264,6 +266,7 @@ public Mono<DatasourceTestResult> testDatasource(Session connection) {
             log.debug(Thread.currentThread().getName() + ": testDatasource() called for SMTP plugin.");
             return Mono.fromCallable(() -> {
                         Set<String> invalids = new HashSet<>();
+
                         try {
                             Transport transport = connection.getTransport();
                             if (transport != null) {
diff --git a/app/server/appsmith-plugins/smtpPlugin/src/test/java/com/external/plugins/SmtpPluginTest.java b/app/server/appsmith-plugins/smtpPlugin/src/test/java/com/external/plugins/SmtpPluginTest.java
index 2da564b02d91..3b95047aeebb 100644
--- a/app/server/appsmith-plugins/smtpPlugin/src/test/java/com/external/plugins/SmtpPluginTest.java
+++ b/app/server/appsmith-plugins/smtpPlugin/src/test/java/com/external/plugins/SmtpPluginTest.java
@@ -1,6 +1,5 @@
 package com.external.plugins;
 
-import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginError;
 import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginException;
 import com.appsmith.external.helpers.PluginUtils;
 import com.appsmith.external.models.ActionConfiguration;
@@ -59,12 +58,23 @@ public class SmtpPluginTest {
             .withCommand("bin/maildev --base-pathname /maildev --incoming-user " + username + " --incoming-pass "
                     + password + " -s 25");
 
+    @Container
+    public static final GenericContainer smtpWithoutAuth = new GenericContainer(
+                    DockerImageName.parse("maildev/maildev"))
+            .withExposedPorts(1025)
+            .withCommand("bin/maildev --base-pathname /maildev --smtp-port 1025 --incoming-user '' --incoming-pass ''");
+
     private final SmtpPlugin.SmtpPluginExecutor pluginExecutor = new SmtpPlugin.SmtpPluginExecutor();
 
     @BeforeAll
     public static void setup() {
-        host = smtp.getContainerIpAddress();
-        port = Long.valueOf(smtp.getFirstMappedPort());
+        // Initialize SMTP connection with default configuration (can be changed per test)
+        configureSmtpConnection(smtp); // Default
+    }
+
+    private static void configureSmtpConnection(GenericContainer container) {
+        host = container.getContainerIpAddress();
+        port = Long.valueOf(container.getFirstMappedPort());
     }
 
     private DatasourceConfiguration createDatasourceConfiguration() {
@@ -130,13 +140,21 @@ public void testInvalidPort() {
     }
 
     @Test
-    public void testNullAuthentication() {
-        DatasourceConfiguration invalidDatasourceConfiguration = createDatasourceConfiguration();
-        invalidDatasourceConfiguration.setAuthentication(null);
+    public void testConnectionWithoutAuth() {
+        configureSmtpConnection(smtpWithoutAuth);
+        DatasourceConfiguration noAuthDatasourceConfiguration = createDatasourceConfiguration();
+        noAuthDatasourceConfiguration.setAuthentication(null); // No authentication
 
-        assertEquals(
-                Set.of(new AppsmithPluginException(AppsmithPluginError.PLUGIN_AUTHENTICATION_ERROR).getMessage()),
-                pluginExecutor.validateDatasource(invalidDatasourceConfiguration));
+        Mono<DatasourceTestResult> testDatasourceMono = pluginExecutor.testDatasource(noAuthDatasourceConfiguration);
+
+        StepVerifier.create(testDatasourceMono)
+                .assertNext(datasourceTestResult -> {
+                    assertNotNull(datasourceTestResult);
+                    assertTrue(datasourceTestResult.isSuccess());
+                    assertTrue(datasourceTestResult.getInvalids().isEmpty());
+                })
+                .verifyComplete();
+        configureSmtpConnection(smtp);
     }
 
     @Test
diff --git a/app/server/appsmith-plugins/snowflakePlugin/pom.xml b/app/server/appsmith-plugins/snowflakePlugin/pom.xml
index c545d22dd8c0..25e2da9f0f2e 100644
--- a/app/server/appsmith-plugins/snowflakePlugin/pom.xml
+++ b/app/server/appsmith-plugins/snowflakePlugin/pom.xml
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>net.snowflake</groupId>
             <artifactId>snowflake-jdbc</artifactId>
-            <version>3.13.29</version>
+            <version>3.20.0</version>
         </dependency>
 
         <dependency>
@@ -79,7 +79,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-webflux</artifactId>
-            <version>${spring-boot.version}</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/editor.json b/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/editor.json
index 514ce52693a2..d960202031f2 100644
--- a/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/editor.json
+++ b/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/editor.json
@@ -3,6 +3,7 @@
     {
       "controlType": "SECTION_V2",
       "identifier": "SECTION-ONE",
+      "isFullWidth": true,
       "children": [
         {
           "controlType": "SINGLE_COLUMN_ZONE",
diff --git a/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/CREATE.sql b/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/CREATE.sql
index 3166e4d345dd..85b7e1cce8e9 100644
--- a/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/CREATE.sql
+++ b/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/CREATE.sql
@@ -1,8 +1,8 @@
 INSERT INTO users
-  (name, gender, email)
+	(name, gender, email)
 VALUES
-  (
-    '{{ nameInput.text }}',
-    '{{ genderDropdown.selectedOptionValue }}',
-    '{{ emailInput.text }}'
-  );
\ No newline at end of file
+	(
+		'{{ nameInput.text }}',
+		'{{ genderDropdown.selectedOptionValue }}',
+		'{{ emailInput.text }}'
+	);
diff --git a/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/DELETE.sql b/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/DELETE.sql
index e7014662d50a..459aa04c543d 100644
--- a/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/DELETE.sql
+++ b/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/DELETE.sql
@@ -1 +1 @@
-DELETE FROM users WHERE id = -1;
\ No newline at end of file
+DELETE FROM users WHERE id = -1;
diff --git a/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/SELECT.sql b/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/SELECT.sql
index 1c25fafff4ab..036ff8b22974 100644
--- a/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/SELECT.sql
+++ b/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/SELECT.sql
@@ -1,3 +1,3 @@
 SELECT * FROM <<your_table_name>> LIMIT 10;
 
--- Please enter a valid table name and hit RUN
\ No newline at end of file
+-- Please enter a valid table name and hit RUN
diff --git a/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/UPDATE.sql b/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/UPDATE.sql
index 966633a70592..0a7e95bb77c3 100644
--- a/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/UPDATE.sql
+++ b/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/UPDATE.sql
@@ -1,3 +1,3 @@
 UPDATE users
-  SET status = 'APPROVED'
-  WHERE id = '{{ usersTable.selectedRow.id }}';
\ No newline at end of file
+	SET status = 'APPROVED'
+	WHERE id = '{{ usersTable.selectedRow.id }}';
diff --git a/app/server/appsmith-server/pom.xml b/app/server/appsmith-server/pom.xml
index e9e91196b150..6aaa35893697 100644
--- a/app/server/appsmith-server/pom.xml
+++ b/app/server/appsmith-server/pom.xml
@@ -32,7 +32,7 @@
             <dependency>
                 <groupId>io.opentelemetry</groupId>
                 <artifactId>opentelemetry-bom</artifactId>
-                <version>1.34.1</version>
+                <version>1.43.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -40,22 +40,6 @@
     </dependencyManagement>
 
     <dependencies>
-        <dependency>
-            <groupId>io.opentelemetry.instrumentation</groupId>
-            <artifactId>opentelemetry-micrometer-1.5</artifactId>
-            <version>2.0.0-alpha</version>
-        </dependency>
-        <dependency>
-            <groupId>io.opentelemetry</groupId>
-            <artifactId>opentelemetry-sdk</artifactId>
-            <version>1.34.1</version>
-        </dependency>
-        <dependency>
-            <groupId>io.opentelemetry</groupId>
-            <artifactId>opentelemetry-exporter-otlp</artifactId>
-            <version>1.34.1</version>
-        </dependency>
-
         <!--
             Ideally this dependency should have been added in the pom.xml file of GraphQLPlugin module, but it is
             causing 'java.lang.NoClassDefFoundError' error. Hence, adding it here after many attempts of fixing it the right
@@ -116,7 +100,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-webflux</artifactId>
-            <version>${spring-boot.version}</version>
         </dependency>
         <dependency>
             <groupId>io.projectreactor</groupId>
@@ -199,11 +182,6 @@
             <version>4.11.0</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>2.7</version>
-        </dependency>
         <dependency>
             <groupId>commons-validator</groupId>
             <artifactId>commons-validator</artifactId>
@@ -217,23 +195,17 @@
             <groupId>io.micrometer</groupId>
             <artifactId>micrometer-registry-prometheus</artifactId>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/io.micrometer/micrometer-tracing-bridge-brave -->
+        <!-- https://mvnrepository.com/artifact/io.micrometer/micrometer-tracing-bridge-otel -->
         <dependency>
             <groupId>io.micrometer</groupId>
-            <artifactId>micrometer-tracing-bridge-brave</artifactId>
-            <version>1.0.0</version>
+            <artifactId>micrometer-tracing-bridge-otel</artifactId>
+            <version>1.3.5</version>
         </dependency>
         <dependency>
-            <groupId>io.zipkin.reporter2</groupId>
-            <artifactId>zipkin-reporter-brave</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-exporter-otlp</artifactId>
+            <version>1.43.0</version>
         </dependency>
-        <!--        Commented oout Loki dependency for now, since we haven't fixed associating logs to traces-->
-        <!--        <dependency>-->
-        <!--            <groupId>com.github.loki4j</groupId>-->
-        <!--            <artifactId>loki-logback-appender</artifactId>-->
-        <!--            <version>1.3.2</version>-->
-        <!--        </dependency>-->
-        <!-- Actual Junit5 implementation. Will transitively include junit-jupiter-api -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
@@ -315,7 +287,7 @@
         <dependency>
             <groupId>org.springdoc</groupId>
             <artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
-            <version>2.0.0</version>
+            <version>2.6.0</version>
         </dependency>
 
         <dependency>
@@ -368,11 +340,7 @@
             <groupId>org.mockito</groupId>
             <artifactId>mockito-inline</artifactId>
             <version>${mockito.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>${mockito.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jgrapht</groupId>
@@ -390,6 +358,12 @@
             <version>1.10.0</version>
         </dependency>
 
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.17.1</version>
+        </dependency>
+
         <dependency>
             <groupId>com.appsmith</groupId>
             <artifactId>reactiveCaching</artifactId>
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/annotations/ConditionalOnMicrometerMetricsEnabled.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/annotations/ConditionalOnMicrometerMetricsEnabled.java
index 9627906664b7..adb895737897 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/annotations/ConditionalOnMicrometerMetricsEnabled.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/annotations/ConditionalOnMicrometerMetricsEnabled.java
@@ -15,5 +15,5 @@
 @Target({ElementType.TYPE, ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
-@ConditionalOnExpression("${appsmith.micrometer.metrics.enabled}")
+@ConditionalOnExpression("${appsmith.observability.metrics.enabled}")
 public @interface ConditionalOnMicrometerMetricsEnabled {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/authentication/handlers/ce/AuthenticationSuccessHandlerCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/authentication/handlers/ce/AuthenticationSuccessHandlerCE.java
index e1e7e6136ecd..40e9e0ea9bbc 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/authentication/handlers/ce/AuthenticationSuccessHandlerCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/authentication/handlers/ce/AuthenticationSuccessHandlerCE.java
@@ -78,7 +78,7 @@ private Mono<Boolean> isVerificationRequired(String userEmail, String method) {
         Mono<User> userMono = userRepository.findByEmail(userEmail).cache();
         Mono<Boolean> verificationRequiredMono = null;
 
-        if (method == "signup") {
+        if ("signup".equals(method)) {
             verificationRequiredMono = emailVerificationEnabledMono.flatMap(emailVerificationEnabled -> {
                 // email verification is not enabled at the tenant, so verification not required
                 if (!TRUE.equals(emailVerificationEnabled)) {
@@ -93,7 +93,7 @@ private Mono<Boolean> isVerificationRequired(String userEmail, String method) {
                     });
                 }
             });
-        } else if (method == "login") {
+        } else if ("login".equals(method)) {
             verificationRequiredMono = userMono.flatMap(user -> {
                 Boolean emailVerified = user.getEmailVerified();
                 // email already verified
@@ -159,15 +159,15 @@ private Mono<String> extractRedirectUrlAndSendVerificationMail(
                 .then(Mono.just(redirectUrl));
     }
 
+    /**
+     * This function:
+     * Removes the user session as only post verification login is allowed
+     * Extracts the redirect url post signup/login
+     * Send email verification mail with the redirect url
+     * Redirects the user to verificationPending screen
+     */
     private Mono<Void> postVerificationRequiredHandler(
-            WebFilterExchange webFilterExchange, User user, Application defaultApplication, Boolean isFromSignup) {
-        /**
-         * This function:
-         * Removes the user session as only post verification login is allowed
-         * Extracts the redirect url post signup/login
-         * Send email verification mail with the redirect url
-         * Redirects the user to verificationPending screen
-         */
+            WebFilterExchange webFilterExchange, User user, Application defaultApplication) {
         return webFilterExchange.getExchange().getSession().flatMap(webSession -> {
             webSession.getAttributes().remove(DEFAULT_SPRING_SECURITY_CONTEXT_ATTR_NAME);
             return redirectHelper
@@ -187,34 +187,25 @@ private Mono<Void> postVerificationRequiredHandler(
      * It constructs the redirect uri based on user's request, and if email verification is required
      * then redirects the user to /verificationPending and sends the magic link with the user's redirectUrl
      * in the email.
-     *
-     * @param webFilterExchange
-     * @param defaultWorkspaceId
-     * @param authentication
-     * @param isFromSignup
-     * @param createDefaultApplication
-     * @return
      */
     private Mono<Void> formEmailVerificationRedirectionHandler(
             WebFilterExchange webFilterExchange,
             String defaultWorkspaceId,
             Authentication authentication,
             Boolean isFromSignup,
-            Boolean createDefaultApplication,
-            String originHeader) {
-        Mono<Void> redirectionMono = null;
+            Boolean createDefaultApplication) {
+        Mono<Void> redirectionMono;
         User user = (User) authentication.getPrincipal();
-        Mono<Boolean> isVerificationRequiredMono = Mono.just(FALSE);
+        Mono<Boolean> isVerificationRequiredMono;
 
         if (isFromSignup) {
             isVerificationRequiredMono = isVerificationRequired(user.getEmail(), "signup");
             if (createDefaultApplication) {
-                Mono<Boolean> finalIsVerificationRequiredMono = isVerificationRequiredMono;
-                redirectionMono = finalIsVerificationRequiredMono.flatMap(isVerificationRequired -> {
+                redirectionMono = isVerificationRequiredMono.flatMap(isVerificationRequired -> {
                     if (TRUE.equals(isVerificationRequired)) {
                         return createDefaultApplication(defaultWorkspaceId, authentication)
-                                .flatMap(defaultApplication -> postVerificationRequiredHandler(
-                                        webFilterExchange, user, defaultApplication, TRUE));
+                                .flatMap(defaultApplication ->
+                                        postVerificationRequiredHandler(webFilterExchange, user, defaultApplication));
                     } else {
                         return createDefaultApplication(defaultWorkspaceId, authentication)
                                 .flatMap(application ->
@@ -222,10 +213,9 @@ private Mono<Void> formEmailVerificationRedirectionHandler(
                     }
                 });
             } else {
-                Mono<Boolean> finalIsVerificationRequiredMono1 = isVerificationRequiredMono;
-                redirectionMono = finalIsVerificationRequiredMono1.flatMap(isVerificationRequired -> {
+                redirectionMono = isVerificationRequiredMono.flatMap(isVerificationRequired -> {
                     if (TRUE.equals(isVerificationRequired)) {
-                        return postVerificationRequiredHandler(webFilterExchange, user, null, TRUE);
+                        return postVerificationRequiredHandler(webFilterExchange, user, null);
                     } else {
                         return redirectHelper.handleRedirect(webFilterExchange, null, true);
                     }
@@ -233,10 +223,9 @@ private Mono<Void> formEmailVerificationRedirectionHandler(
             }
         } else {
             isVerificationRequiredMono = isVerificationRequired(user.getEmail(), "login");
-            Mono<Boolean> finalIsVerificationRequiredMono2 = isVerificationRequiredMono;
-            redirectionMono = finalIsVerificationRequiredMono2.flatMap(isVerificationRequired -> {
+            redirectionMono = isVerificationRequiredMono.flatMap(isVerificationRequired -> {
                 if (TRUE.equals(isVerificationRequired)) {
-                    return postVerificationRequiredHandler(webFilterExchange, user, null, FALSE);
+                    return postVerificationRequiredHandler(webFilterExchange, user, null);
                 } else {
                     return redirectHelper.handleRedirect(webFilterExchange, null, false);
                 }
@@ -252,10 +241,8 @@ public Mono<Void> onAuthenticationSuccess(
             boolean isFromSignup,
             String defaultWorkspaceId) {
         log.debug("Login succeeded for user: {}", authentication.getPrincipal());
-        Mono<Void> redirectionMono = null;
+        Mono<Void> redirectionMono;
         User user = (User) authentication.getPrincipal();
-        String originHeader =
-                webFilterExchange.getExchange().getRequest().getHeaders().getOrigin();
 
         if (authentication instanceof OAuth2AuthenticationToken) {
             // for oauth type signups, we don't need to verify email
@@ -265,7 +252,8 @@ public Mono<Void> onAuthenticationSuccess(
             // creation) or if this was a login (existing user). What we do here to identify this, is an approximation.
             // If and when we find a better way to do identify this, let's please move away from this approximation.
             // If the user object was created within the last 5 seconds, we treat it as a new user.
-            isFromSignup = user.getCreatedAt().isAfter(Instant.now().minusSeconds(5));
+            final boolean oauthIsFromSignup =
+                    user.getCreatedAt().isAfter(Instant.now().minusSeconds(5));
 
             // Check the existing login source with the authentication source and then update the login source,
             // if they are not the same.
@@ -282,34 +270,26 @@ public Mono<Void> onAuthenticationSuccess(
                         .subscribeOn(Schedulers.boundedElastic())
                         .subscribe();
             }
-            if (isFromSignup) {
-                boolean finalIsFromSignup = isFromSignup;
+            if (oauthIsFromSignup) {
                 redirectionMono = workspaceServiceHelper
                         .isCreateWorkspaceAllowed(TRUE)
                         .flatMap(isCreateWorkspaceAllowed -> {
                             if (isCreateWorkspaceAllowed.equals(Boolean.TRUE)) {
                                 return createDefaultApplication(defaultWorkspaceId, authentication)
                                         .flatMap(application -> handleOAuth2Redirect(
-                                                webFilterExchange, application, finalIsFromSignup));
+                                                webFilterExchange, application, oauthIsFromSignup));
                             }
-                            return handleOAuth2Redirect(webFilterExchange, null, finalIsFromSignup);
+                            return handleOAuth2Redirect(webFilterExchange, null, oauthIsFromSignup);
                         });
             } else {
-                redirectionMono = handleOAuth2Redirect(webFilterExchange, null, isFromSignup);
+                redirectionMono = handleOAuth2Redirect(webFilterExchange, null, oauthIsFromSignup);
             }
         } else {
             // form type signup/login handler
             redirectionMono = formEmailVerificationRedirectionHandler(
-                    webFilterExchange,
-                    defaultWorkspaceId,
-                    authentication,
-                    isFromSignup,
-                    createDefaultApplication,
-                    originHeader);
+                    webFilterExchange, defaultWorkspaceId, authentication, isFromSignup, createDefaultApplication);
         }
 
-        final boolean isFromSignupFinal = isFromSignup;
-
         Mono<Void> finalRedirectionMono = redirectionMono;
         return sessionUserService
                 .getCurrentUser()
@@ -327,7 +307,7 @@ public Mono<Void> onAuthenticationSuccess(
                         modeOfLogin = ((OAuth2AuthenticationToken) authentication).getAuthorizedClientRegistrationId();
                     }
 
-                    if (isFromSignupFinal) {
+                    if (isFromSignup) {
                         final String inviteToken = currentUser.getInviteToken();
                         final boolean isFromInvite = inviteToken != null;
 
@@ -396,7 +376,7 @@ protected Mono<Application> createDefaultApplication(String defaultWorkspaceId,
                     });
         }
 
-        return applicationMono.flatMap(application1 -> applicationPageService.createApplication(application1));
+        return applicationMono.flatMap(applicationPageService::createApplication);
     }
 
     /**
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/CommonConfig.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/CommonConfig.java
index 9ff767657283..00efcaa7626c 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/CommonConfig.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/CommonConfig.java
@@ -64,13 +64,13 @@ public class CommonConfig {
     @Value("${disable.telemetry:true}")
     private boolean isTelemetryDisabled;
 
-    @Value("${appsmith.micrometer.tracing.detail.enabled:false}")
+    @Value("${appsmith.observability.tracing.detail.enabled:false}")
     private boolean tracingDetail;
 
-    @Value("${appsmith.micrometer.metrics.detail.enabled:false}")
+    @Value("${appsmith.observability.metrics.detail.enabled:false}")
     private boolean metricsDetail;
 
-    @Value("${appsmith.micrometer.metrics.interval.millis:60000}")
+    @Value("${appsmith.observability.metrics.interval.millis:60000}")
     private int metricsIntervalMillis;
 
     private List<String> allowedDomains;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/CommonDBConfig.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/CommonDBConfig.java
index b7bd7a52f11d..417cb3de2bdd 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/CommonDBConfig.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/CommonDBConfig.java
@@ -69,10 +69,23 @@ public DataSourceProperties extractJdbcProperties(String dbUrl) {
                 ds.setUsername(userDetails[0]);
                 ds.setPassword(userDetails[1]);
             }
-            // If the port is not mentioned default it to standard 5432
+            // If the port is not mentioned, default it to the standard PostgreSQL port 5432
             int port = uri.getPort() == -1 ? 5432 : uri.getPort();
-            String updatedUrl =
-                    String.format("%s%s://%s:%s%s", JDBC_PREFIX, uri.getScheme(), uri.getHost(), port, uri.getPath());
+
+            // Check if the URL already has query parameters
+            String query = uri.getQuery();
+            String updatedUrl;
+            if (StringUtils.hasLength(query)) {
+                // Append currentSchema=appsmith if there are already parameters
+                updatedUrl = String.format(
+                        "%s%s://%s:%s%s?%s&currentSchema=appsmith",
+                        JDBC_PREFIX, uri.getScheme(), uri.getHost(), port, uri.getPath(), query);
+            } else {
+                // No parameters, just append currentSchema
+                updatedUrl = String.format(
+                        "%s%s://%s:%s%s?currentSchema=appsmith",
+                        JDBC_PREFIX, uri.getScheme(), uri.getHost(), port, uri.getPath());
+            }
             ds.setUrl(updatedUrl);
             return ds;
         } catch (URISyntaxException e) {
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/InstanceConfig.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/InstanceConfig.java
index 0e150ab57d1e..879780c0bb71 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/InstanceConfig.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/InstanceConfig.java
@@ -22,7 +22,7 @@
 @Slf4j
 @RequiredArgsConstructor
 @Component
-@Observed(name = "Server startup")
+@Observed(name = "serverStartup")
 public class InstanceConfig implements ApplicationListener<ApplicationReadyEvent> {
 
     private final ConfigService configService;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/MetricsConfig.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/MetricsConfig.java
deleted file mode 100644
index a4a6d1576ee8..000000000000
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/MetricsConfig.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package com.appsmith.server.configurations;
-
-import com.appsmith.server.annotations.ConditionalOnMicrometerMetricsEnabled;
-import io.micrometer.core.aop.TimedAspect;
-import io.micrometer.core.instrument.MeterRegistry;
-import io.micrometer.observation.ObservationRegistry;
-import io.micrometer.observation.aop.ObservedAspect;
-import io.opentelemetry.api.OpenTelemetry;
-import io.opentelemetry.exporter.otlp.metrics.OtlpGrpcMetricExporter;
-import io.opentelemetry.instrumentation.micrometer.v1_5.OpenTelemetryMeterRegistry;
-import io.opentelemetry.sdk.OpenTelemetrySdk;
-import io.opentelemetry.sdk.metrics.Aggregation;
-import io.opentelemetry.sdk.metrics.InstrumentType;
-import io.opentelemetry.sdk.metrics.SdkMeterProvider;
-import io.opentelemetry.sdk.metrics.export.AggregationTemporalitySelector;
-import io.opentelemetry.sdk.metrics.export.DefaultAggregationSelector;
-import io.opentelemetry.sdk.metrics.export.PeriodicMetricReader;
-import io.opentelemetry.sdk.resources.Resource;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import java.time.Duration;
-
-/**
- * This configuration file configures beans as required by NewRelic
- */
-@RequiredArgsConstructor
-@Configuration
-public class MetricsConfig {
-
-    public static final String NEW_RELIC_MICROMETER_METRICS_ENDPOINT = "https://otlp.nr-data.net:4317";
-    public static final String API_KEY = "api-key";
-    public static final String CONTAINER_NAME_KEY = "container.name";
-
-    public static final String SERVICE_NAME_KEY = "service.name";
-    public static final String INSTRUMENTATION_PROVIDER_KEY = "instrumentation.provider";
-    public static final String MICROMETER = "micrometer";
-
-    @Value("${appsmith.newrelic.micrometer.metrics.application.name}")
-    private String newRelicApplicationName;
-
-    @Value("${appsmith.newrelic.licensekey}")
-    private String newRelicKey;
-
-    @Value("${appsmith.newrelic.micrometer.metrics.container.name}")
-    private String newRelicContainerName;
-
-    private final CommonConfig commonConfig;
-
-    @Bean
-    @ConditionalOnMicrometerMetricsEnabled
-    public TimedAspect timedAspect(MeterRegistry registry) {
-        return new TimedAspect(registry);
-    }
-
-    @Bean
-    @ConditionalOnMicrometerMetricsEnabled
-    public MeterRegistry meterRegistry(OpenTelemetry openTelemetry) {
-        return OpenTelemetryMeterRegistry.builder(openTelemetry).build();
-    }
-
-    @Bean
-    @ConditionalOnMicrometerMetricsEnabled
-    public OpenTelemetry openTelemetry() {
-        return OpenTelemetrySdk.builder()
-                .setMeterProvider(SdkMeterProvider.builder()
-                        .setResource(Resource.getDefault().toBuilder()
-                                .put(SERVICE_NAME_KEY, newRelicApplicationName)
-                                // Include instrumentation.provider=micrometer to enable micrometer metrics
-                                // experience in New Relic
-                                .put(INSTRUMENTATION_PROVIDER_KEY, MICROMETER)
-                                .put(CONTAINER_NAME_KEY, newRelicContainerName)
-                                .build())
-                        .registerMetricReader(PeriodicMetricReader.builder(OtlpGrpcMetricExporter.builder()
-                                        .setEndpoint(NEW_RELIC_MICROMETER_METRICS_ENDPOINT)
-                                        .addHeader(API_KEY, newRelicKey)
-                                        // IMPORTANT: New Relic requires metrics to be delta temporality
-
-                                        .setAggregationTemporalitySelector(
-                                                AggregationTemporalitySelector.deltaPreferred())
-                                        // Use exponential histogram aggregation for histogram instruments
-                                        // to produce better data and compression
-                                        .setDefaultAggregationSelector(DefaultAggregationSelector.getDefault()
-                                                .with(
-                                                        InstrumentType.HISTOGRAM,
-                                                        Aggregation.base2ExponentialBucketHistogram()))
-                                        .build())
-                                // Match default micrometer collection interval of 60 seconds
-                                .setInterval(Duration.ofMillis(commonConfig.getMetricsIntervalMillis()))
-                                .build())
-                        .build())
-                .build();
-    }
-
-    @Bean
-    @ConditionalOnExpression("${logging.verbose.enabled}")
-    ObservedAspect observedAspect(ObservationRegistry observationRegistry) {
-        return new ObservedAspect(observationRegistry);
-    }
-}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/MicrometerTraceHeaderWebFilter.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/MicrometerTraceHeaderWebFilter.java
deleted file mode 100644
index 2f1e28a8c509..000000000000
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/MicrometerTraceHeaderWebFilter.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.appsmith.server.configurations;
-
-import org.springframework.core.Ordered;
-import org.springframework.core.annotation.Order;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.server.reactive.ServerHttpRequest;
-import org.springframework.stereotype.Component;
-import org.springframework.web.server.ServerWebExchange;
-import org.springframework.web.server.WebFilter;
-import org.springframework.web.server.WebFilterChain;
-import reactor.core.publisher.Mono;
-
-import static org.springframework.util.CollectionUtils.isEmpty;
-
-/**
- * This webfilter copies the value of traceparent-otlp header into traceparent header. This is required because at
- * the moment the client application has two different services that creates traces and sends to the NewRelic server
- * - one that gathers web vitals information like LCP, FCP etc. and another one that creates user defined traces. They
- * both have different traceparent header and hence to overcome this conflict of headers the client has copied the
- * user defined trace header into traceparent-otlp. However, Micrometer expects the traceparent information to be
- * present in the traceparent header - hence this method copies the correct header data into traceparent header
- * before it gets set into Micrometer context.
- * In cases where traceparent-otlp header is not present but the traceparent header is present, this method removes
- * the traceparent header because if it is present then the Micrometer trace would use its value for trace id (which
- * is incorrect).
- * As per measurement on my local setup this webFilter generally takes around 0.5 milliseconds to complete hence should
- * not have any practical impact on response times.
- */
-@Order(Ordered.HIGHEST_PRECEDENCE)
-@Component
-public class MicrometerTraceHeaderWebFilter implements WebFilter {
-
-    public static final String TRACEPARENT_OTLP_HEADER_KEY = "traceparent-otlp";
-    public static final String TRACEPARENT_HEADER_KEY = "traceparent";
-
-    @Override
-    public Mono<Void> filter(ServerWebExchange serverWebExchange, WebFilterChain webFilterChain) {
-        HttpHeaders requestHeaders = serverWebExchange.getRequest().getHeaders();
-
-        if (isTraceparentOtlpHeaderPresent(requestHeaders)) {
-            ServerHttpRequest newRequest = serverWebExchange
-                    .getRequest()
-                    .mutate()
-                    .header(
-                            TRACEPARENT_HEADER_KEY,
-                            requestHeaders.get(TRACEPARENT_OTLP_HEADER_KEY).get(0))
-                    .build();
-            ServerWebExchange newExchange =
-                    serverWebExchange.mutate().request(newRequest).build();
-
-            return webFilterChain.filter(newExchange);
-        } else if (isTraceparentHeaderPresent(requestHeaders)) {
-            ServerHttpRequest newRequest = serverWebExchange
-                    .getRequest()
-                    .mutate()
-                    .headers((httpHeader) -> {
-                        httpHeader.remove(TRACEPARENT_HEADER_KEY);
-                    })
-                    .build();
-            ServerWebExchange newExchange =
-                    serverWebExchange.mutate().request(newRequest).build();
-
-            return webFilterChain.filter(newExchange);
-        }
-
-        return webFilterChain.filter(serverWebExchange);
-    }
-
-    private boolean isTraceparentHeaderPresent(HttpHeaders requestHeaders) {
-        return requestHeaders != null
-                && requestHeaders.containsKey(TRACEPARENT_HEADER_KEY)
-                && !isEmpty(requestHeaders.get(TRACEPARENT_HEADER_KEY));
-    }
-
-    private boolean isTraceparentOtlpHeaderPresent(HttpHeaders requestHeaders) {
-        return requestHeaders != null && requestHeaders.containsKey(TRACEPARENT_OTLP_HEADER_KEY);
-    }
-}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/RedisConfig.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/RedisConfig.java
index 8b255dea33f5..6a8a6cc6c7b2 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/RedisConfig.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/RedisConfig.java
@@ -215,7 +215,7 @@ public byte[] serialize(Object t) {
                 boolean allValuesAreClientDTOs = true;
                 for (final LoginSource loginSource : LoginSource.oauthSources) {
                     final Object value = data.get(loginSource.name().toLowerCase());
-                    if (value != null && !(value instanceof OAuth2AuthorizedClientDTO)) {
+                    if (value != null && !(value instanceof OAuth2AuthorizedClient)) {
                         allValuesAreClientDTOs = false;
                         break;
                     }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/TracingConfig.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/TracingConfig.java
index a6cb5092d50d..2e4a1ef2254f 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/TracingConfig.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/TracingConfig.java
@@ -3,14 +3,10 @@
 import io.micrometer.observation.Observation;
 import io.micrometer.observation.ObservationPredicate;
 import io.micrometer.observation.ObservationView;
-import io.micrometer.tracing.Span;
-import io.micrometer.tracing.exporter.SpanExportingPredicate;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.server.reactive.observation.ServerRequestObservationContext;
 
-import static com.appsmith.external.constants.spans.BaseSpan.APPSMITH_SPAN_PREFIX;
-
 /**
  * This configuration file creates beans that are required to filter just Appsmith specific spans
  */
@@ -40,17 +36,4 @@ ObservationPredicate noActuatorServerObservations() {
             }
         };
     }
-
-    @Bean
-    SpanExportingPredicate onlyAppsmithSpans() {
-        return (finishedSpan) -> {
-            if ((finishedSpan.getKind() != null && finishedSpan.getKind().equals(Span.Kind.SERVER))
-                    || finishedSpan.getName().startsWith(APPSMITH_SPAN_PREFIX)) {
-                // A span is either an http server request root or Appsmith specific
-                return true;
-            } else {
-                return false;
-            }
-        };
-    }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/ZipkinMicrometerTraceConfiguration.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/ZipkinMicrometerTraceConfiguration.java
deleted file mode 100644
index 7ac8b9719247..000000000000
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/ZipkinMicrometerTraceConfiguration.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.appsmith.server.configurations;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.actuate.autoconfigure.tracing.zipkin.ZipkinWebClientBuilderCustomizer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class ZipkinMicrometerTraceConfiguration {
-    public static final String DATA_FORMAT = "zipkin";
-    public static final String DATA_VERSION = "2";
-
-    @Value("${appsmith.newrelic.licensekey}")
-    private String newRelicKey;
-
-    @Bean
-    public ZipkinWebClientBuilderCustomizer zipkinCustomizer() {
-        return webClientBuilder -> webClientBuilder
-                .defaultHeader("Api-Key", newRelicKey)
-                .defaultHeader("Data-Format", DATA_FORMAT)
-                .defaultHeader("Data-Format-Version", DATA_VERSION);
-    }
-}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/UserControllerCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/UserControllerCE.java
index 70c461dd732f..b7813b5505bb 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/UserControllerCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/UserControllerCE.java
@@ -9,7 +9,6 @@
 import com.appsmith.server.dtos.ResetUserPasswordDTO;
 import com.appsmith.server.dtos.ResponseDTO;
 import com.appsmith.server.dtos.UserProfileDTO;
-import com.appsmith.server.dtos.UserSignupRequestDTO;
 import com.appsmith.server.dtos.UserUpdateDTO;
 import com.appsmith.server.services.SessionUserService;
 import com.appsmith.server.services.UserDataService;
@@ -18,7 +17,6 @@
 import com.appsmith.server.solutions.UserAndAccessManagementService;
 import com.appsmith.server.solutions.UserSignup;
 import com.fasterxml.jackson.annotation.JsonView;
-import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
@@ -54,15 +52,6 @@ public class UserControllerCE {
     private final UserDataService userDataService;
     private final UserAndAccessManagementService userAndAccessManagementService;
 
-    @JsonView(Views.Public.class)
-    @PostMapping(consumes = {MediaType.APPLICATION_JSON_VALUE})
-    @ResponseStatus(HttpStatus.CREATED)
-    public Mono<ResponseDTO<User>> create(@Valid @RequestBody User resource, ServerWebExchange exchange) {
-        return userSignup
-                .signupAndLogin(resource, exchange)
-                .map(created -> new ResponseDTO<>(HttpStatus.CREATED.value(), created, null));
-    }
-
     @JsonView(Views.Public.class)
     @PostMapping(consumes = {MediaType.APPLICATION_FORM_URLENCODED_VALUE})
     @ResponseStatus(HttpStatus.CREATED)
@@ -70,19 +59,6 @@ public Mono<Void> createFormEncoded(ServerWebExchange exchange) {
         return userSignup.signupAndLoginFromFormData(exchange);
     }
 
-    @JsonView(Views.Public.class)
-    @PostMapping(
-            value = "/super",
-            consumes = {MediaType.APPLICATION_JSON_VALUE})
-    public Mono<ResponseDTO<User>> createSuperUser(
-            @Valid @RequestBody UserSignupRequestDTO resource,
-            @RequestHeader("Origin") String originHeader,
-            ServerWebExchange exchange) {
-        return userSignup
-                .signupAndLoginSuper(resource, originHeader, exchange)
-                .map(created -> new ResponseDTO<>(HttpStatus.CREATED.value(), created, null));
-    }
-
     @JsonView(Views.Public.class)
     @PostMapping(
             value = "/super",
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/UserData.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/UserData.java
index c7e8362a9bef..6daca7445769 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/UserData.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/UserData.java
@@ -33,11 +33,6 @@ public class UserData extends BaseDomain {
     @JsonView(Views.Internal.class)
     String userId;
 
-    // Role of the user in their workspace, example, Designer, Developer, Product Lead etc.
-    @JsonView(Views.Public.class)
-    @Deprecated
-    private String role;
-
     // The development proficiency of the user for example, Beginner, Novice, Intermediate, Advanced.
     @JsonView(Views.Public.class)
     private String proficiency;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/UserSignupRequestDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/UserSignupRequestDTO.java
index 1ef47a488822..e37213905b2d 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/UserSignupRequestDTO.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/UserSignupRequestDTO.java
@@ -19,9 +19,6 @@ public class UserSignupRequestDTO {
 
     private String password;
 
-    @Deprecated
-    private String role;
-
     private String proficiency;
 
     private String useCase;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ce/UserUpdateCE_DTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ce/UserUpdateCE_DTO.java
index be2ae09ee4c8..9a289ea1dc56 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ce/UserUpdateCE_DTO.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ce/UserUpdateCE_DTO.java
@@ -9,8 +9,6 @@
 public class UserUpdateCE_DTO {
     private String name;
 
-    private String role;
-
     private String proficiency;
 
     private String useCase;
@@ -22,6 +20,6 @@ public boolean hasUserUpdates() {
     }
 
     public boolean hasUserDataUpdates() {
-        return role != null || proficiency != null || useCase != null || isIntercomConsentGiven;
+        return proficiency != null || useCase != null || isIntercomConsentGiven;
     }
 }
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 098f8c6667a1..93c08cdf2484 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
@@ -1487,18 +1487,15 @@ private Mono<? extends Artifact> checkoutRemoteBranch(Artifact baseArtifact, Str
                     // Get the latest artifact mono with all the changes
                     ArtifactExchangeJson artifactExchangeJson = tuple.getT1();
                     Artifact artifact = tuple.getT2();
-                    return importService
-                            .importArtifactInWorkspaceFromGit(
-                                    artifact.getWorkspaceId(),
-                                    artifact.getId(),
-                                    artifactExchangeJson,
-                                    finalRemoteBranchName)
-                            .flatMap(artifact1 -> addAnalyticsForGitOperation(
-                                    AnalyticsEvents.GIT_CHECKOUT_REMOTE_BRANCH,
-                                    artifact1,
-                                    Boolean.TRUE.equals(
-                                            artifact1.getGitArtifactMetadata().getIsRepoPrivate())));
+                    return importService.importArtifactInWorkspaceFromGit(
+                            artifact.getWorkspaceId(), artifact.getId(), artifactExchangeJson, finalRemoteBranchName);
                 })
+                .flatMap(importedArtifact -> gitArtifactHelper.publishArtifact(importedArtifact, false))
+                .flatMap(publishedArtifact -> addAnalyticsForGitOperation(
+                        AnalyticsEvents.GIT_CHECKOUT_REMOTE_BRANCH,
+                        publishedArtifact,
+                        Boolean.TRUE.equals(
+                                publishedArtifact.getGitArtifactMetadata().getIsRepoPrivate())))
                 .tag(GitConstants.GitMetricConstants.CHECKOUT_REMOTE, TRUE.toString())
                 .name(GitSpan.OPS_CHECKOUT_BRANCH)
                 .tap(Micrometer.observation(observationRegistry));
@@ -1870,9 +1867,11 @@ private Mono<GitPullDTO> pullAndRehydrateArtifact(Artifact baseArtifact, Artifac
                                 gitPullDTO.setMergeStatus(status);
                                 gitPullDTO.setArtifact(importedBranchedArtifact);
 
-                                return this.commitArtifact(
-                                                commitDTO, baseArtifact, importedBranchedArtifact, false, false)
-                                        .thenReturn(gitPullDTO);
+                                return gitArtifactHelper
+                                        .publishArtifact(importedBranchedArtifact, false)
+                                        .then(commitArtifact(
+                                                        commitDTO, baseArtifact, importedBranchedArtifact, false, false)
+                                                .thenReturn(gitPullDTO));
                             });
                 });
     }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ActionExecutionSolutionHelper.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ActionExecutionSolutionHelper.java
new file mode 100644
index 000000000000..76b4011c0685
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ActionExecutionSolutionHelper.java
@@ -0,0 +1,5 @@
+package com.appsmith.server.helpers;
+
+import com.appsmith.server.helpers.ce.ActionExecutionSolutionHelperCE;
+
+public interface ActionExecutionSolutionHelper extends ActionExecutionSolutionHelperCE {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ActionExecutionSolutionHelperImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ActionExecutionSolutionHelperImpl.java
new file mode 100644
index 000000000000..b0dcc2884c3a
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ActionExecutionSolutionHelperImpl.java
@@ -0,0 +1,8 @@
+package com.appsmith.server.helpers;
+
+import com.appsmith.server.helpers.ce.ActionExecutionSolutionHelperCEImpl;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ActionExecutionSolutionHelperImpl extends ActionExecutionSolutionHelperCEImpl
+        implements ActionExecutionSolutionHelper {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ObservationHelperImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ObservationHelperImpl.java
index 328c6b2f2bb9..ee4ad90f9317 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ObservationHelperImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ObservationHelperImpl.java
@@ -32,6 +32,7 @@ public Span createSpan(String name) {
             return Span.NOOP;
         } else {
             TraceContext traceContext = tracer.traceContextBuilder()
+                    .sampled(true)
                     .traceId(contextMap.get(TRACE_ID))
                     .spanId(contextMap.get(SPAN_ID))
                     .build();
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/RTSCaller.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/RTSCaller.java
index d14132a352e7..ff7f9ac934f1 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/RTSCaller.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/RTSCaller.java
@@ -1,5 +1,6 @@
 package com.appsmith.server.helpers;
 
+import io.micrometer.observation.ObservationRegistry;
 import jakarta.annotation.PostConstruct;
 import lombok.NonNull;
 import org.springframework.beans.factory.annotation.Value;
@@ -24,6 +25,8 @@
 @Component
 public class RTSCaller {
 
+    private final ObservationRegistry observationRegistry;
+
     private WebClient webClient;
 
     @Value("${appsmith.rts.port:}")
@@ -31,6 +34,10 @@ public class RTSCaller {
 
     private static final int MAX_IN_MEMORY_SIZE_IN_BYTES = 16 * 1024 * 1024;
 
+    public RTSCaller(ObservationRegistry observationRegistry) {
+        this.observationRegistry = observationRegistry;
+    }
+
     @PostConstruct
     private void makeWebClient() {
         if (isEmpty(rtsPort)) {
@@ -53,6 +60,7 @@ private void makeWebClient() {
                         .build())
                 .clientConnector(new ReactorClientHttpConnector(HttpClient.create(connectionProvider)))
                 .baseUrl("http://127.0.0.1:" + rtsPort)
+                .observationRegistry(observationRegistry)
                 .build();
     }
 
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/ActionExecutionSolutionHelperCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/ActionExecutionSolutionHelperCE.java
new file mode 100644
index 000000000000..6f48c5a8a05e
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/ActionExecutionSolutionHelperCE.java
@@ -0,0 +1,8 @@
+package com.appsmith.server.helpers.ce;
+
+import com.appsmith.external.dtos.ExecuteActionDTO;
+import reactor.core.publisher.Mono;
+
+public interface ActionExecutionSolutionHelperCE {
+    Mono<ExecuteActionDTO> populateExecuteActionDTOWithSystemInfo(ExecuteActionDTO executeActionDTO);
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/ActionExecutionSolutionHelperCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/ActionExecutionSolutionHelperCEImpl.java
new file mode 100644
index 000000000000..69df9c328280
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/ActionExecutionSolutionHelperCEImpl.java
@@ -0,0 +1,13 @@
+package com.appsmith.server.helpers.ce;
+
+import com.appsmith.external.dtos.ExecuteActionDTO;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Mono;
+
+@Component
+public class ActionExecutionSolutionHelperCEImpl implements ActionExecutionSolutionHelperCE {
+    @Override
+    public Mono<ExecuteActionDTO> populateExecuteActionDTOWithSystemInfo(ExecuteActionDTO executeActionDTO) {
+        return Mono.just(executeActionDTO);
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/layouts/UpdateLayoutServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/layouts/UpdateLayoutServiceCEImpl.java
index d9d44d439ff9..b4d159e67b7e 100755
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/layouts/UpdateLayoutServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/layouts/UpdateLayoutServiceCEImpl.java
@@ -17,6 +17,7 @@
 import com.appsmith.server.dtos.UpdateMultiplePageLayoutDTO;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.helpers.ObservationHelperImpl;
 import com.appsmith.server.helpers.WidgetSpecificUtils;
 import com.appsmith.server.newpages.base.NewPageService;
 import com.appsmith.server.onload.internal.OnLoadExecutablesUtil;
@@ -26,6 +27,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.micrometer.observation.ObservationRegistry;
+import io.micrometer.tracing.Span;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import net.minidev.json.JSONObject;
@@ -48,6 +50,7 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import static com.appsmith.external.constants.spans.LayoutSpan.EXTRACT_ALL_WIDGET_NAMES_AND_DYNAMIC_BINDINGS_FROM_DSL;
 import static com.appsmith.external.constants.spans.LayoutSpan.FIND_ALL_ON_LOAD_EXECUTABLES;
 import static com.appsmith.external.constants.spans.LayoutSpan.FIND_AND_UPDATE_LAYOUT;
 import static com.appsmith.external.constants.spans.LayoutSpan.UPDATE_EXECUTABLES_EXECUTE_ONLOAD;
@@ -70,6 +73,7 @@ public class UpdateLayoutServiceCEImpl implements UpdateLayoutServiceCE {
     private final ApplicationService applicationService;
     private final ObjectMapper objectMapper;
     private final ObservationRegistry observationRegistry;
+    private final ObservationHelperImpl observationHelper;
 
     private final String layoutOnLoadActionErrorToastMessage =
             "A cyclic dependency error has been encountered on current page, \nqueries on page load will not run. \n Please check debugger and Appsmith documentation for more information";
@@ -127,6 +131,12 @@ private Mono<LayoutDTO> updateLayoutDsl(
         Set<String> widgetNames = new HashSet<>();
         Map<String, Set<String>> widgetDynamicBindingsMap = new HashMap<>();
         Set<String> escapedWidgetNames = new HashSet<>();
+
+        Span extractAllWidgetNamesAndDynamicBindingsFromDSLSpan =
+                observationHelper.createSpan(EXTRACT_ALL_WIDGET_NAMES_AND_DYNAMIC_BINDINGS_FROM_DSL);
+
+        observationHelper.startSpan(extractAllWidgetNamesAndDynamicBindingsFromDSLSpan, true);
+
         try {
             dsl = extractAllWidgetNamesAndDynamicBindingsFromDSL(
                     dsl, widgetNames, widgetDynamicBindingsMap, creatorId, layoutId, escapedWidgetNames, creatorType);
@@ -136,6 +146,8 @@ private Mono<LayoutDTO> updateLayoutDsl(
                     .then(Mono.error(t));
         }
 
+        observationHelper.endSpan(extractAllWidgetNamesAndDynamicBindingsFromDSLSpan, true);
+
         layout.setWidgetNames(widgetNames);
 
         if (!escapedWidgetNames.isEmpty()) {
@@ -151,7 +163,8 @@ private Mono<LayoutDTO> updateLayoutDsl(
 
         AtomicReference<Boolean> validOnLoadExecutables = new AtomicReference<>(Boolean.TRUE);
 
-        // setting the layoutOnLoadActionActionErrors to empty to remove the existing errors before new DAG calculation.
+        // setting the layoutOnLoadActionActionErrors to empty to remove the existing
+        // errors before new DAG calculation.
         layout.setLayoutOnLoadActionErrors(new ArrayList<>());
 
         Mono<List<Set<DslExecutableDTO>>> allOnLoadExecutablesMono = onLoadExecutablesUtil
@@ -180,14 +193,18 @@ private Mono<LayoutDTO> updateLayoutDsl(
 
         // First update the actions and set execute on load to true
         JSONObject finalDsl = dsl;
-        return allOnLoadExecutablesMono
+
+        Mono<LayoutDTO> layoutDTOMono = allOnLoadExecutablesMono
                 .flatMap(allOnLoadExecutables -> {
-                    // If there has been an error (e.g. cyclical dependency), then don't update any actions.
-                    // This is so that unnecessary updates don't happen to actions while the page is in invalid state.
+                    // If there has been an error (e.g. cyclical dependency), then don't update any
+                    // actions.
+                    // This is so that unnecessary updates don't happen to actions while the page is
+                    // in invalid state.
                     if (!validOnLoadExecutables.get()) {
                         return Mono.just(allOnLoadExecutables);
                     }
-                    // Update these executables to be executed on load, unless the user has touched the executeOnLoad
+                    // Update these executables to be executed on load, unless the user has touched
+                    // the executeOnLoad
                     // setting for this
                     return onLoadExecutablesUtil
                             .updateExecutablesExecuteOnLoad(
@@ -201,12 +218,15 @@ private Mono<LayoutDTO> updateLayoutDsl(
                     layout.setLayoutOnLoadActions(onLoadExecutables);
                     layout.setAllOnPageLoadActionNames(executableNames);
                     layout.setActionsUsedInDynamicBindings(executablesUsedInDSL);
-                    // The below field is to ensure that we record if the page load actions computation was
+                    // The below field is to ensure that we record if the page load actions
+                    // computation was
                     // valid when last stored in the database.
                     layout.setValidOnPageLoadActions(validOnLoadExecutables.get());
 
                     return onLoadExecutablesUtil
                             .findAndUpdateLayout(creatorId, creatorType, layoutId, layout)
+                            .tag("no_of_widgets", String.valueOf(widgetNames.size()))
+                            .tag("no_of_executables", String.valueOf(executableNames.size()))
                             .name(FIND_AND_UPDATE_LAYOUT)
                             .tap(Micrometer.observation(observationRegistry));
                 })
@@ -222,6 +242,8 @@ private Mono<LayoutDTO> updateLayoutDsl(
                     return sendUpdateLayoutAnalyticsEvent(creatorId, layoutId, finalDsl, true, null, creatorType)
                             .thenReturn(layoutDTO);
                 });
+
+        return layoutDTOMono;
     }
 
     @Override
@@ -326,6 +348,7 @@ public Mono<List<Set<DslExecutableDTO>>> getOnPageLoadActions(
         Set<String> widgetNames = new HashSet<>();
         Map<String, Set<String>> widgetDynamicBindingsMap = new HashMap<>();
         Set<String> escapedWidgetNames = new HashSet<>();
+        // observationHelper.createSpan()
         try {
             dsl = extractAllWidgetNamesAndDynamicBindingsFromDSL(
                     dsl, widgetNames, widgetDynamicBindingsMap, creatorId, layoutId, escapedWidgetNames, creatorType);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/layouts/UpdateLayoutServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/layouts/UpdateLayoutServiceImpl.java
index 4d1689947366..a50e3e7c66fe 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/layouts/UpdateLayoutServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/layouts/UpdateLayoutServiceImpl.java
@@ -1,6 +1,7 @@
 package com.appsmith.server.layouts;
 
 import com.appsmith.server.applications.base.ApplicationService;
+import com.appsmith.server.helpers.ObservationHelperImpl;
 import com.appsmith.server.newpages.base.NewPageService;
 import com.appsmith.server.onload.internal.OnLoadExecutablesUtil;
 import com.appsmith.server.services.AnalyticsService;
@@ -21,7 +22,8 @@ public UpdateLayoutServiceImpl(
             PagePermission pagePermission,
             ApplicationService applicationService,
             ObjectMapper objectMapper,
-            ObservationRegistry observationRegistry) {
+            ObservationRegistry observationRegistry,
+            ObservationHelperImpl observationHelper) {
         super(
                 onLoadExecutablesUtil,
                 sessionUserService,
@@ -30,6 +32,7 @@ public UpdateLayoutServiceImpl(
                 pagePermission,
                 applicationService,
                 objectMapper,
-                observationRegistry);
+                observationRegistry,
+                observationHelper);
     }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/db/ce/Migration063CacheBustSpringBoot3_3.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/db/ce/Migration063CacheBustSpringBoot3_3.java
new file mode 100644
index 000000000000..217feb8abd15
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/db/ce/Migration063CacheBustSpringBoot3_3.java
@@ -0,0 +1,45 @@
+package com.appsmith.server.migrations.db.ce;
+
+import io.mongock.api.annotations.ChangeUnit;
+import io.mongock.api.annotations.Execution;
+import io.mongock.api.annotations.RollbackExecution;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.data.redis.core.ReactiveRedisOperations;
+import org.springframework.data.redis.core.ScanOptions;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.nio.ByteBuffer;
+
+@Slf4j
+@ChangeUnit(order = "063", id = "reset_session_oauth2_spring_3_3")
+public class Migration063CacheBustSpringBoot3_3 {
+
+    @RollbackExecution
+    public void rollbackExecution() {}
+
+    @Execution
+    public void execute(
+            @Qualifier("reactiveRedisOperations") ReactiveRedisOperations<String, Object> reactiveRedisOperations) {
+        scanForKeysAcrossCluster(reactiveRedisOperations, "*").block();
+    }
+
+    private Mono<Void> scanForKeysAcrossCluster(
+            ReactiveRedisOperations<String, Object> reactiveRedisOperations, String pattern) {
+        return reactiveRedisOperations
+                .execute(connection -> {
+                    Flux<ByteBuffer> scanFlux = connection
+                            .keyCommands()
+                            .scan(ScanOptions.scanOptions()
+                                    .match(pattern)
+                                    .count(1000)
+                                    .build());
+                    return scanFlux.flatMap(scannedKey -> {
+                                return connection.keyCommands().del(scannedKey);
+                            })
+                            .then();
+                })
+                .then();
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/solutions/ce/UpdateSuperUserMigrationHelperCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/solutions/ce/UpdateSuperUserMigrationHelperCE.java
index 0140775476e6..0c9836a18c2e 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/solutions/ce/UpdateSuperUserMigrationHelperCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/solutions/ce/UpdateSuperUserMigrationHelperCE.java
@@ -8,6 +8,7 @@
 import com.appsmith.server.domains.User;
 import com.appsmith.server.dtos.Permission;
 import com.appsmith.server.solutions.PolicySolution;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.data.mongodb.core.MongoTemplate;
 
 import java.time.Instant;
@@ -56,7 +57,17 @@ public User createNewUser(
         user.setCreatedAt(Instant.now());
         user = mongoTemplate.save(user);
 
-        // Assign the user to the default permissions
+        PermissionGroup userManagementPermissionGroup = createUserManagementPermissionGroup(mongoTemplate, user);
+
+        Set<Policy> userPolicies = this.generateUserPolicy(
+                user, userManagementPermissionGroup, instanceAdminRole, tenant, policySolution, policyGenerator);
+
+        user.setPolicies(userPolicies);
+
+        return mongoTemplate.save(user);
+    }
+
+    @NotNull public static PermissionGroup createUserManagementPermissionGroup(MongoTemplate mongoTemplate, User user) {
         PermissionGroup userManagementPermissionGroup = new PermissionGroup();
         userManagementPermissionGroup.setName(user.getUsername() + FieldName.SUFFIX_USER_MANAGEMENT_ROLE);
         // Add CRUD permissions for user to the group
@@ -66,12 +77,6 @@ public User createNewUser(
         userManagementPermissionGroup.setAssignedToUserIds(Set.of(user.getId()));
 
         PermissionGroup savedPermissionGroup = mongoTemplate.save(userManagementPermissionGroup);
-
-        Set<Policy> userPolicies = this.generateUserPolicy(
-                user, savedPermissionGroup, instanceAdminRole, tenant, policySolution, policyGenerator);
-
-        user.setPolicies(userPolicies);
-
-        return mongoTemplate.save(user);
+        return savedPermissionGroup;
     }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/onload/ExecutableOnPageLoadServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/onload/ExecutableOnPageLoadServiceCEImpl.java
index ae70869d13b6..d33cddf85137 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/onload/ExecutableOnPageLoadServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/onload/ExecutableOnPageLoadServiceCEImpl.java
@@ -14,15 +14,21 @@
 import com.appsmith.server.onload.executables.ExecutableOnLoadServiceCE;
 import com.appsmith.server.solutions.ActionPermission;
 import com.appsmith.server.solutions.PagePermission;
+import io.micrometer.observation.ObservationRegistry;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import reactor.core.observability.micrometer.Micrometer;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.util.List;
 
+import static com.appsmith.external.constants.spans.ActionSpan.FILL_SELF_REFERENCING_PATHS_ACTION;
+import static com.appsmith.external.constants.spans.ApplicationSpan.APPLICATION_SAVE_LAST_EDIT_INFO_SPAN;
+import static com.appsmith.external.constants.spans.PageSpan.GET_PAGE_BY_ID_AND_LAYOUTS_ID;
+
 @Slf4j
 @RequiredArgsConstructor
 @Service
@@ -34,6 +40,7 @@ public class ExecutableOnPageLoadServiceCEImpl implements ExecutableOnLoadServic
 
     private final ActionPermission actionPermission;
     private final PagePermission pagePermission;
+    private final ObservationRegistry observationRegistry;
 
     @Override
     public Flux<Executable> getAllExecutablesByCreatorIdFlux(String creatorId) {
@@ -48,6 +55,8 @@ public Flux<Executable> getAllExecutablesByCreatorIdFlux(String creatorId) {
     public Mono<Executable> fillSelfReferencingPaths(Executable executable) {
         return newActionService
                 .fillSelfReferencingDataPaths((ActionDTO) executable)
+                .name(FILL_SELF_REFERENCING_PATHS_ACTION)
+                .tap(Micrometer.observation(observationRegistry))
                 .map(actionDTO -> actionDTO);
     }
 
@@ -69,6 +78,8 @@ public Mono<Executable> updateUnpublishedExecutable(String id, Executable execut
     public Mono<Layout> findAndUpdateLayout(String creatorId, String layoutId, Layout layout) {
         Mono<PageDTO> pageDTOMono = newPageService
                 .findByIdAndLayoutsId(creatorId, layoutId, pagePermission.getEditPermission(), false)
+                .name(GET_PAGE_BY_ID_AND_LAYOUTS_ID)
+                .tap(Micrometer.observation(observationRegistry))
                 .switchIfEmpty(Mono.error(new AppsmithException(
                         AppsmithError.ACL_NO_RESOURCE_FOUND,
                         FieldName.PAGE_ID + " or " + FieldName.LAYOUT_ID,
@@ -93,6 +104,8 @@ public Mono<Layout> findAndUpdateLayout(String creatorId, String layoutId, Layou
                     page.setLayouts(layoutList);
                     return applicationService
                             .saveLastEditInformation(page.getApplicationId())
+                            .name(APPLICATION_SAVE_LAST_EDIT_INFO_SPAN)
+                            .tap(Micrometer.observation(observationRegistry))
                             .then(newPageService.saveUnpublishedPage(page));
                 })
                 .flatMap(page -> {
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/onload/ExecutableOnPageLoadServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/onload/ExecutableOnPageLoadServiceImpl.java
index d83de5800519..f684b4c8889d 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/onload/ExecutableOnPageLoadServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/onload/ExecutableOnPageLoadServiceImpl.java
@@ -7,6 +7,7 @@
 import com.appsmith.server.onload.executables.ExecutableOnLoadService;
 import com.appsmith.server.solutions.ActionPermission;
 import com.appsmith.server.solutions.PagePermission;
+import io.micrometer.observation.ObservationRegistry;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -19,7 +20,14 @@ public ExecutableOnPageLoadServiceImpl(
             NewPageService newPageService,
             ApplicationService applicationService,
             ActionPermission actionPermission,
-            PagePermission pagePermission) {
-        super(newActionService, newPageService, applicationService, actionPermission, pagePermission);
+            PagePermission pagePermission,
+            ObservationRegistry observationRegistry) {
+        super(
+                newActionService,
+                newPageService,
+                applicationService,
+                actionPermission,
+                pagePermission,
+                observationRegistry);
     }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/onload/internal/OnLoadExecutablesUtilCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/onload/internal/OnLoadExecutablesUtilCEImpl.java
index a998a695ffe2..08c6840bc62c 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/onload/internal/OnLoadExecutablesUtilCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/onload/internal/OnLoadExecutablesUtilCEImpl.java
@@ -14,16 +14,20 @@
 import com.appsmith.server.domains.NewPage;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.helpers.ObservationHelperImpl;
 import com.appsmith.server.onload.executables.ExecutableOnLoadService;
 import com.appsmith.server.services.AstService;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import io.micrometer.observation.ObservationRegistry;
+import io.micrometer.tracing.Span;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import net.minidev.json.JSONObject;
 import org.jgrapht.graph.DefaultEdge;
 import org.jgrapht.graph.DirectedAcyclicGraph;
 import org.jgrapht.traverse.BreadthFirstIterator;
+import reactor.core.observability.micrometer.Micrometer;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.util.function.Tuple2;
@@ -43,6 +47,17 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import static com.appsmith.external.constants.spans.LayoutSpan.ADD_WIDGET_RELATIONSHIP_TO_GRAPH;
+import static com.appsmith.external.constants.spans.LayoutSpan.COMPUTE_ON_PAGE_LOAD_EXECUTABLES_SCHEDULING_ORDER;
+import static com.appsmith.external.constants.spans.LayoutSpan.EXTRACT_AND_SET_EXECUTABLE_BINDINGS_IN_GRAPH_EDGES;
+import static com.appsmith.external.constants.spans.LayoutSpan.FILTER_AND_TRANSFORM_SCHEDULING_ORDER_TO_DTO;
+import static com.appsmith.external.constants.spans.LayoutSpan.RECURSIVELY_ADD_EXECUTABLES_AND_THEIR_DEPENDENTS_TO_GRAPH_FROM_BINDINGS;
+import static com.appsmith.external.constants.spans.OnLoadSpan.ADD_DIRECTLY_REFERENCED_EXECUTABLES_TO_GRAPH;
+import static com.appsmith.external.constants.spans.OnLoadSpan.ADD_EXPLICIT_USER_SET_ON_LOAD_EXECUTABLES_TO_GRAPH;
+import static com.appsmith.external.constants.spans.OnLoadSpan.EXECUTABLE_NAME_TO_EXECUTABLE_MAP;
+import static com.appsmith.external.constants.spans.OnLoadSpan.GET_ALL_EXECUTABLES_BY_CREATOR_ID;
+import static com.appsmith.external.constants.spans.OnLoadSpan.GET_UNPUBLISHED_ON_LOAD_EXECUTABLES_EXPLICIT_SET_BY_USER_IN_CREATOR_CONTEXT;
+import static com.appsmith.external.constants.spans.OnLoadSpan.UPDATE_EXECUTABLE_SELF_REFERENCING_PATHS;
 import static com.appsmith.external.helpers.MustacheHelper.EXECUTABLE_ENTITY_REFERENCES;
 import static com.appsmith.external.helpers.MustacheHelper.WIDGET_ENTITY_REFERENCES;
 import static com.appsmith.external.helpers.MustacheHelper.getPossibleParents;
@@ -71,6 +86,8 @@ public class OnLoadExecutablesUtilCEImpl implements OnLoadExecutablesUtilCE {
     // TODO : This should contain all the static global variables present on the page like `appsmith`, etc.
     // TODO : Add all the global variables exposed on the client side.
     private final Set<String> APPSMITH_GLOBAL_VARIABLES = Set.of();
+    private final ObservationRegistry observationRegistry;
+    private final ObservationHelperImpl observationHelper;
 
     /**
      * This function computes the sequenced on page load executables.
@@ -129,6 +146,8 @@ public Mono<List<Set<DslExecutableDTO>>> findAllOnLoadExecutables(
                             .toList();
                 })
                 .collectMap(Tuple2::getT1, Tuple2::getT2)
+                .name(EXECUTABLE_NAME_TO_EXECUTABLE_MAP)
+                .tap(Micrometer.observation(observationRegistry))
                 .cache();
 
         Mono<Set<String>> executablesInCreatorContextMono = allExecutablesByCreatorIdFlux
@@ -140,14 +159,16 @@ public Mono<List<Set<DslExecutableDTO>>> findAllOnLoadExecutables(
 
         Mono<Set<ExecutableDependencyEdge>> directlyReferencedExecutablesToGraphMono =
                 addDirectlyReferencedExecutablesToGraph(
-                        edgesRef,
-                        executablesUsedInDSLRef,
-                        bindingsFromExecutablesRef,
-                        executablesFoundDuringWalkRef,
-                        widgetDynamicBindingsMap,
-                        executableNameToExecutableMapMono,
-                        executableBindingsInDslRef,
-                        evaluatedVersion);
+                                edgesRef,
+                                executablesUsedInDSLRef,
+                                bindingsFromExecutablesRef,
+                                executablesFoundDuringWalkRef,
+                                widgetDynamicBindingsMap,
+                                executableNameToExecutableMapMono,
+                                executableBindingsInDslRef,
+                                evaluatedVersion)
+                        .name(ADD_DIRECTLY_REFERENCED_EXECUTABLES_TO_GRAPH)
+                        .tap(Micrometer.observation(observationRegistry));
 
         // This following `createAllEdgesForPageMono` publisher traverses the executables and widgets to add all
         // possible edges between all possible entity paths
@@ -157,15 +178,17 @@ public Mono<List<Set<DslExecutableDTO>>> findAllOnLoadExecutables(
         Mono<Set<ExecutableDependencyEdge>> createAllEdgesForPageMono = directlyReferencedExecutablesToGraphMono
                 // Add dependencies of all on page load executables set by the user in the graph
                 .flatMap(updatedEdges -> addExplicitUserSetOnLoadExecutablesToGraph(
-                        creatorId,
-                        updatedEdges,
-                        explicitUserSetOnLoadExecutablesRef,
-                        executablesFoundDuringWalkRef,
-                        bindingsFromExecutablesRef,
-                        executableNameToExecutableMapMono,
-                        executableBindingsInDslRef,
-                        evaluatedVersion,
-                        creatorType))
+                                creatorId,
+                                updatedEdges,
+                                explicitUserSetOnLoadExecutablesRef,
+                                executablesFoundDuringWalkRef,
+                                bindingsFromExecutablesRef,
+                                executableNameToExecutableMapMono,
+                                executableBindingsInDslRef,
+                                evaluatedVersion,
+                                creatorType)
+                        .name(ADD_EXPLICIT_USER_SET_ON_LOAD_EXECUTABLES_TO_GRAPH)
+                        .tap(Micrometer.observation(observationRegistry)))
                 // For all the executables found so far, recursively walk the dynamic bindings of the executables to
                 // find more relationships with other executables (& widgets)
                 .flatMap(updatedEdges -> recursivelyAddExecutablesAndTheirDependentsToGraphFromBindings(
@@ -174,11 +197,15 @@ public Mono<List<Set<DslExecutableDTO>>> findAllOnLoadExecutables(
                         bindingsFromExecutablesRef,
                         executableNameToExecutableMapMono,
                         evaluatedVersion))
+                .name(RECURSIVELY_ADD_EXECUTABLES_AND_THEIR_DEPENDENTS_TO_GRAPH_FROM_BINDINGS)
+                .tap(Micrometer.observation(observationRegistry))
                 // At last, add all the widget relationships to the graph as well.
                 .zipWith(executablesInCreatorContextMono)
                 .flatMap(tuple -> {
                     Set<ExecutableDependencyEdge> updatedEdges = tuple.getT1();
-                    return addWidgetRelationshipToGraph(updatedEdges, widgetDynamicBindingsMap, evaluatedVersion);
+                    return addWidgetRelationshipToGraph(updatedEdges, widgetDynamicBindingsMap, evaluatedVersion)
+                            .name(ADD_WIDGET_RELATIONSHIP_TO_GRAPH)
+                            .tap(Micrometer.observation(observationRegistry));
                 });
 
         // Create a graph given edges
@@ -198,11 +225,20 @@ public Mono<List<Set<DslExecutableDTO>>> findAllOnLoadExecutables(
                     Map<String, Executable> executableNameToExecutableMap = tuple.getT1();
                     DirectedAcyclicGraph<String, DefaultEdge> graph = tuple.getT2();
 
-                    return computeOnPageLoadExecutablesSchedulingOrder(
+                    Span computeOnPageLoadExecutablesSchedulingOrderSpan =
+                            observationHelper.createSpan(COMPUTE_ON_PAGE_LOAD_EXECUTABLES_SCHEDULING_ORDER);
+
+                    observationHelper.startSpan(computeOnPageLoadExecutablesSchedulingOrderSpan, true);
+
+                    List<Set<String>> executablesList = computeOnPageLoadExecutablesSchedulingOrder(
                             graph,
                             onLoadExecutableSetRef,
                             executableNameToExecutableMap,
                             explicitUserSetOnLoadExecutablesRef);
+
+                    observationHelper.endSpan(computeOnPageLoadExecutablesSchedulingOrderSpan, true);
+
+                    return executablesList;
                 })
                 .map(onPageLoadExecutablesSchedulingOrder -> {
                     // Find all explicitly turned on executables which haven't found their way into the scheduling order
@@ -237,6 +273,8 @@ public Mono<List<Set<DslExecutableDTO>>> findAllOnLoadExecutables(
                                 onLoadExecutableSetRef,
                                 executableNameToExecutableMapMono,
                                 computeOnPageLoadScheduleNamesMono)
+                        .name(FILTER_AND_TRANSFORM_SCHEDULING_ORDER_TO_DTO)
+                        .tap(Micrometer.observation(observationRegistry))
                         .cache();
 
         // With the final on page load scheduling order, also set the on page load executables which would be updated
@@ -398,7 +436,10 @@ private List<LayoutExecutableUpdateDTO> addExecutableUpdatesForExecutableNames(
     }
 
     protected Flux<Executable> getAllExecutablesByCreatorIdFlux(String creatorId, CreatorContextType creatorType) {
-        return pageExecutableOnLoadService.getAllExecutablesByCreatorIdFlux(creatorId);
+        return pageExecutableOnLoadService
+                .getAllExecutablesByCreatorIdFlux(creatorId)
+                .name(GET_ALL_EXECUTABLES_BY_CREATOR_ID)
+                .tap(Micrometer.observation(observationRegistry));
     }
 
     /**
@@ -612,6 +653,8 @@ private Mono<Set<ExecutableDependencyEdge>> addDirectlyReferencedExecutablesToGr
                                     // for on page load
                                     executablesUsedInDSLRef.add(possibleEntity.getValidEntityName());
                                     return updateExecutableSelfReferencingPaths(possibleEntity)
+                                            .name(UPDATE_EXECUTABLE_SELF_REFERENCING_PATHS)
+                                            .tap(Micrometer.observation(observationRegistry))
                                             .flatMap(executable -> extractAndSetExecutableBindingsInGraphEdges(
                                                     possibleEntity,
                                                     edgesRef,
@@ -620,6 +663,8 @@ private Mono<Set<ExecutableDependencyEdge>> addDirectlyReferencedExecutablesToGr
                                                     executablesFoundDuringWalkRef,
                                                     null,
                                                     evalVersion))
+                                            .name(EXTRACT_AND_SET_EXECUTABLE_BINDINGS_IN_GRAPH_EDGES)
+                                            .tap(Micrometer.observation(observationRegistry))
                                             .thenReturn(possibleEntity);
                                 }
                                 return Mono.just(possibleEntity);
@@ -891,6 +936,8 @@ private Mono<Set<ExecutableDependencyEdge>> recursivelyAddExecutablesAndTheirDep
                 .flatMap(possibleEntity -> {
                     if (getExecutableTypes().contains(possibleEntity.getEntityReferenceType())) {
                         return updateExecutableSelfReferencingPaths(possibleEntity)
+                                .name(UPDATE_EXECUTABLE_SELF_REFERENCING_PATHS)
+                                .tap(Micrometer.observation(observationRegistry))
                                 .then(extractAndSetExecutableBindingsInGraphEdges(
                                         possibleEntity,
                                         edges,
@@ -899,6 +946,8 @@ private Mono<Set<ExecutableDependencyEdge>> recursivelyAddExecutablesAndTheirDep
                                         executablesFoundDuringWalk,
                                         null,
                                         evalVersion))
+                                .name(EXTRACT_AND_SET_EXECUTABLE_BINDINGS_IN_GRAPH_EDGES)
+                                .tap(Micrometer.observation(observationRegistry))
                                 .thenReturn(possibleEntity);
                     } else {
                         return Mono.empty();
@@ -910,7 +959,13 @@ private Mono<Set<ExecutableDependencyEdge>> recursivelyAddExecutablesAndTheirDep
             // Now that the next set of bindings have been found, find recursively all executables by these names
             // and their bindings
             return recursivelyAddExecutablesAndTheirDependentsToGraphFromBindings(
-                    edges, executablesFoundDuringWalk, newBindings, executableNameToExecutableMapMono, evalVersion);
+                            edges,
+                            executablesFoundDuringWalk,
+                            newBindings,
+                            executableNameToExecutableMapMono,
+                            evalVersion)
+                    .name(RECURSIVELY_ADD_EXECUTABLES_AND_THEIR_DEPENDENTS_TO_GRAPH_FROM_BINDINGS)
+                    .tap(Micrometer.observation(observationRegistry));
         });
     }
 
@@ -945,6 +1000,8 @@ private Mono<Set<ExecutableDependencyEdge>> addExplicitUserSetOnLoadExecutablesT
 
         // First fetch all the executables which have been tagged as on load by the user explicitly.
         return getUnpublishedOnLoadExecutablesExplicitSetByUserInCreatorContextFlux(creatorId, creatorType)
+                .name(GET_UNPUBLISHED_ON_LOAD_EXECUTABLES_EXPLICIT_SET_BY_USER_IN_CREATOR_CONTEXT)
+                .tap(Micrometer.observation(observationRegistry))
                 .flatMap(this::fillSelfReferencingPaths)
                 // Add the vertices and edges to the graph for these executables
                 .flatMap(executable -> {
@@ -963,6 +1020,8 @@ private Mono<Set<ExecutableDependencyEdge>> addExplicitUserSetOnLoadExecutablesT
                                     executablesFoundDuringWalkRef,
                                     executableBindingsInDsl,
                                     evalVersion)
+                            .name(EXTRACT_AND_SET_EXECUTABLE_BINDINGS_IN_GRAPH_EDGES)
+                            .tap(Micrometer.observation(observationRegistry))
                             .thenReturn(executable);
                 })
                 .collectList()
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/onload/internal/OnLoadExecutablesUtilImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/onload/internal/OnLoadExecutablesUtilImpl.java
index fd04d515198a..acb26e326cbe 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/onload/internal/OnLoadExecutablesUtilImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/onload/internal/OnLoadExecutablesUtilImpl.java
@@ -1,9 +1,11 @@
 package com.appsmith.server.onload.internal;
 
 import com.appsmith.server.domains.NewPage;
+import com.appsmith.server.helpers.ObservationHelperImpl;
 import com.appsmith.server.onload.executables.ExecutableOnLoadService;
 import com.appsmith.server.services.AstService;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import io.micrometer.observation.ObservationRegistry;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
@@ -14,7 +16,9 @@ public class OnLoadExecutablesUtilImpl extends OnLoadExecutablesUtilCEImpl imple
     public OnLoadExecutablesUtilImpl(
             AstService astService,
             ObjectMapper objectMapper,
-            ExecutableOnLoadService<NewPage> pageExecutableOnLoadService) {
-        super(astService, objectMapper, pageExecutableOnLoadService);
+            ExecutableOnLoadService<NewPage> pageExecutableOnLoadService,
+            ObservationRegistry observationRegistry,
+            ObservationHelperImpl observationHelper) {
+        super(astService, objectMapper, pageExecutableOnLoadService, observationRegistry, observationHelper);
     }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AnalyticsServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AnalyticsServiceCE.java
index 3dcd578b4c3d..8c6153f94888 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AnalyticsServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AnalyticsServiceCE.java
@@ -17,13 +17,7 @@ public interface AnalyticsServiceCE {
     Mono<User> identifyUser(User user, UserData userData, String recentlyUsedWorkspaceId);
 
     void identifyInstance(
-            String instanceId,
-            String role,
-            String proficiency,
-            String useCase,
-            String adminEmail,
-            String adminFullName,
-            String ip);
+            String instanceId, String proficiency, String useCase, String adminEmail, String adminFullName, String ip);
 
     Mono<Void> sendEvent(String event, String userId, Map<String, ?> properties);
 
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AnalyticsServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AnalyticsServiceCEImpl.java
index 8c41a2fc8514..6887c468d162 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AnalyticsServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AnalyticsServiceCEImpl.java
@@ -141,7 +141,7 @@ public Mono<User> identifyUser(User user, UserData userData, String recentlyUsed
                                     "isSuperUser", isSuperUser,
                                     "instanceId", instanceId,
                                     "mostRecentlyUsedWorkspaceId", tuple.getT4(),
-                                    "role", ObjectUtils.defaultIfNull(userData.getRole(), ""),
+                                    "role", "",
                                     "proficiency", ObjectUtils.defaultIfNull(userData.getProficiency(), ""),
                                     "goal", ObjectUtils.defaultIfNull(userData.getUseCase(), ""))));
                     analytics.flush();
@@ -150,13 +150,7 @@ public Mono<User> identifyUser(User user, UserData userData, String recentlyUsed
     }
 
     public void identifyInstance(
-            String instanceId,
-            String role,
-            String proficiency,
-            String useCase,
-            String adminEmail,
-            String adminFullName,
-            String ip) {
+            String instanceId, String proficiency, String useCase, String adminEmail, String adminFullName, String ip) {
         if (!isActive()) {
             return;
         }
@@ -167,7 +161,7 @@ public void identifyInstance(
                         "isInstance",
                         true, // Is this "identify" data-point for a user or an instance?
                         ROLE,
-                        ObjectUtils.defaultIfNull(role, ""),
+                        "",
                         PROFICIENCY,
                         ObjectUtils.defaultIfNull(proficiency, ""),
                         GOAL,
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ConsolidatedAPIServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ConsolidatedAPIServiceCEImpl.java
index 1f046c8ba290..71c417afaf18 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ConsolidatedAPIServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ConsolidatedAPIServiceCEImpl.java
@@ -8,6 +8,7 @@
 import com.appsmith.server.datasources.base.DatasourceService;
 import com.appsmith.server.domains.Application;
 import com.appsmith.server.domains.ApplicationMode;
+import com.appsmith.server.domains.GitArtifactMetadata;
 import com.appsmith.server.domains.NewPage;
 import com.appsmith.server.domains.Plugin;
 import com.appsmith.server.dtos.ApplicationPagesDTO;
@@ -42,6 +43,7 @@
 import reactor.core.observability.micrometer.Micrometer;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
+import reactor.util.function.Tuple2;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -204,7 +206,7 @@ public Mono<ConsolidatedAPIResponseDTO> getConsolidatedInfoForPageLoad(
         if (isBlank(basePageId)) {
             return Mono.when(fetches).thenReturn(consolidatedAPIResponseDTO);
         }
-        Mono<Application> branchedApplicationMonoCached;
+
         Mono<String> baseApplicationIdMono = Mono.just("");
         if (isViewMode) {
             // Attempt to retrieve the application ID associated with the given base page ID from the cache.
@@ -213,40 +215,139 @@ public Mono<ConsolidatedAPIResponseDTO> getConsolidatedInfoForPageLoad(
                     .switchIfEmpty(Mono.just(""))
                     .cast(String.class);
         }
+
         baseApplicationIdMono = baseApplicationIdMono
                 .name(getQualifiedSpanName(APPLICATION_ID_FETCH_REDIS_SPAN, mode))
                 .tap(Micrometer.observation(observationRegistry))
                 .cache();
 
-        Mono<NewPage> branchedPageMonoCached = newPageService
-                .findByBranchNameAndBasePageIdAndApplicationMode(branchName, basePageId, mode)
-                .cache();
+        Mono<Tuple2<Application, NewPage>> applicationAndPageTupleMono = baseApplicationIdMono
+                .flatMap(cachedBaseApplicationId -> {
+                    Mono<Application> applicationMono;
+                    Mono<NewPage> branchedPageMonoCached;
+
+                    branchedPageMonoCached = newPageService
+                            .findByBranchNameAndBasePageIdAndApplicationMode(branchName, basePageId, mode)
+                            .cache();
+
+                    if (StringUtils.hasText(cachedBaseApplicationId)) {
+                        // Handle non-empty baseApplicationId
+                        applicationMono = applicationService.findByBaseIdBranchNameAndApplicationMode(
+                                cachedBaseApplicationId, branchName, mode);
+                    } else {
+                        // Handle empty or null baseApplicationId
+                        applicationMono = branchedPageMonoCached.flatMap(branchedPage ->
+                                // Use the application ID to find the complete application details.
+                                applicationService
+                                        .findByBranchedApplicationIdAndApplicationMode(
+                                                branchedPage.getApplicationId(), mode)
+                                        .flatMap(application -> {
+                                            if (isViewMode) {
+                                                // Update the cache with the new application’s base ID for future
+                                                // queries.
+                                                return cacheableRepositoryHelper
+                                                        .fetchBaseApplicationId(basePageId, application.getBaseId())
+                                                        .thenReturn(application)
+                                                        .name(getQualifiedSpanName(
+                                                                APPLICATION_ID_UPDATE_REDIS_SPAN, mode))
+                                                        .tap(Micrometer.observation(observationRegistry));
+                                            }
+                                            return Mono.just(application);
+                                        }));
+                    }
 
-        branchedApplicationMonoCached = baseApplicationIdMono.flatMap(cachedBaseApplicationId -> {
-            if (!StringUtils.hasText(cachedBaseApplicationId)) {
-                // Handle empty or null baseApplicationId
-                return branchedPageMonoCached.flatMap(branchedPage ->
-                        // Use the application ID to find the complete application details.
-                        applicationService
-                                .findByBranchedApplicationIdAndApplicationMode(branchedPage.getApplicationId(), mode)
-                                .flatMap(application -> {
-                                    if (isViewMode) {
-                                        // Update the cache with the new application’s base ID for future
-                                        // queries.
-                                        return cacheableRepositoryHelper
-                                                .fetchBaseApplicationId(basePageId, application.getBaseId())
-                                                .thenReturn(application)
-                                                .name(getQualifiedSpanName(APPLICATION_ID_UPDATE_REDIS_SPAN, mode))
-                                                .tap(Micrometer.observation(observationRegistry));
+                    if (StringUtils.hasText(branchName)) {
+
+                        // If in case the application is a non git connected application and the branch name url param
+                        // is present, then we must default to the app without any branches.
+                        return applicationMono.zipWith(branchedPageMonoCached).onErrorResume(error -> {
+                            // This situation would arise if page or application is not returned.
+                            // here we would land on error instead of empty because both apis which are being
+                            // called errors out on empty returns.
+
+                            log.info(
+                                    "application or page has for base pageId {} and branchName {} has not been found.",
+                                    basePageId,
+                                    branchName);
+                            if (error instanceof AppsmithException) {
+                                Mono<NewPage> basePageMono =
+                                        newPageService.findByBranchNameAndBasePageIdAndApplicationMode(
+                                                null, basePageId, mode);
+
+                                return basePageMono.flatMap(basePage -> {
+                                    if (StringUtils.hasText(basePage.getBranchName())) {
+                                        // If the branch name is present then the application is git connected
+                                        // the error should be thrown.
+                                        // TODO: verify if branch name could be residue from old git connection
+                                        // Application metadata is absolute check for the same.
+                                        return Mono.error(error);
                                     }
-                                    return Mono.just(application);
-                                }));
-            } else {
-                // Handle non-empty baseApplicationId
-                return applicationService.findByBaseIdBranchNameAndApplicationMode(
-                        cachedBaseApplicationId, branchName, mode);
-            }
-        });
+
+                                    return applicationService
+                                            .findByBranchedApplicationIdAndApplicationMode(
+                                                    basePage.getApplicationId(), mode)
+                                            .zipWith(basePageMono)
+                                            .map(tuple2 -> {
+                                                log.info(
+                                                        "The branchName url param should not be associated with application {} as this is not a git connected application",
+                                                        tuple2.getT1().getId());
+                                                return tuple2;
+                                            });
+                                });
+                            }
+
+                            return Mono.error(error);
+                        });
+                    }
+
+                    return applicationMono.zipWith(branchedPageMonoCached).flatMap(tuple2 -> {
+                        Application application = tuple2.getT1();
+                        NewPage branchedPage = tuple2.getT2();
+
+                        GitArtifactMetadata gitMetadata = application.getGitArtifactMetadata();
+
+                        boolean isNotAGitApp = gitMetadata == null;
+                        boolean isDefaultBranchNameAbsent =
+                                isNotAGitApp || !StringUtils.hasText(gitMetadata.getDefaultBranchName());
+                        boolean isBranchDefault = !isDefaultBranchNameAbsent
+                                && gitMetadata.getDefaultBranchName().equals(gitMetadata.getBranchName());
+
+                        // This last check is specially for view mode, when a queried page which is not present
+                        // in default branch, and cacheable repository refers to the base application
+                        // from given page id. then the branched page may not belong to the base application
+                        // hence a validation is required.
+                        // This condition is always true for a non git app
+                        boolean isPageFromSameApplication = application.getId().equals(branchedPage.getApplicationId());
+
+                        if ((isNotAGitApp || isDefaultBranchNameAbsent || isBranchDefault)
+                                && (!isViewMode || isPageFromSameApplication)) {
+                            return applicationMono.zipWith(branchedPageMonoCached);
+                        }
+
+                        log.info(
+                                "ConsolidatedApi for page id {}, and application id {} has been queried without a branch url param",
+                                branchedPage.getId(),
+                                application.getId());
+
+                        // The git connected application has not been queried with branch param,
+                        // and the base branch is not same as the default branch.
+                        // we need to find return the default branch from here.
+
+                        String defaultBranchName = gitMetadata.getDefaultBranchName();
+
+                        return applicationService
+                                .findByBaseIdBranchNameAndApplicationMode(application.getId(), defaultBranchName, mode)
+                                .zipWith(newPageService.findByBranchNameAndBasePageIdAndApplicationMode(
+                                        defaultBranchName, basePageId, mode));
+                    });
+                })
+                .cache();
+
+        Mono<NewPage> branchedPageMonoCached =
+                applicationAndPageTupleMono.map(Tuple2::getT2).cache();
+
+        Mono<Application> branchedApplicationMonoCached =
+                applicationAndPageTupleMono.map(Tuple2::getT1).cache();
 
         branchedApplicationMonoCached = branchedApplicationMonoCached
                 .name(getQualifiedSpanName(APPLICATION_ID_SPAN, mode))
@@ -307,8 +408,9 @@ public Mono<ConsolidatedAPIResponseDTO> getConsolidatedInfoForPageLoad(
 
         if (!isBlank(basePageId)) {
             /* Get current page */
-            fetches.add(applicationPageService
-                    .getPageAndMigrateDslByBranchAndBasePageId(basePageId, branchName, isViewMode, true)
+            fetches.add(branchedPageMonoCached
+                    .flatMap(branchedPage -> applicationPageService.getPageAndMigrateDslByBranchedPageId(
+                            branchedPage.getId(), isViewMode, true))
                     .as(this::toResponseDTO)
                     .doOnError(e -> log.error("Error fetching current page", e))
                     .doOnSuccess(consolidatedAPIResponseDTO::setPageWithMigratedDsl)
@@ -320,11 +422,9 @@ public Mono<ConsolidatedAPIResponseDTO> getConsolidatedInfoForPageLoad(
         if (isViewMode) {
             /* Get list of all actions of the page in view mode */
             if (!isBlank(basePageId)) {
-                // When branchName is null, we don't need to fetch page from DB to derive pageId
-                // We can simply reuse the pageId that is passed by client to query actions
-                Mono<String> branchedPageIdMono = !StringUtils.hasText(branchName)
-                        ? Mono.just(basePageId)
-                        : branchedPageMonoCached.map(NewPage::getId);
+                // For a git connected application the desired branch name may differ from the base if no
+                // branch name is provided hence, we would still need to check this.
+                Mono<String> branchedPageIdMono = branchedPageMonoCached.map(NewPage::getId);
                 fetches.add(branchedPageIdMono
                         .flatMap(branchedPageId -> newActionService
                                 .getActionsForViewModeByPageId(branchedPageId)
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutActionServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutActionServiceCEImpl.java
index 43a29dcca185..0efe0e9e4f38 100755
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutActionServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutActionServiceCEImpl.java
@@ -5,6 +5,7 @@
 import com.appsmith.external.models.ActionDTO;
 import com.appsmith.external.models.CreatorContextType;
 import com.appsmith.external.models.Datasource;
+import com.appsmith.external.models.PluginType;
 import com.appsmith.server.acl.AclPermission;
 import com.appsmith.server.constants.FieldName;
 import com.appsmith.server.datasources.base.DatasourceService;
@@ -36,7 +37,12 @@
 import static com.appsmith.external.constants.spans.ActionSpan.GET_ACTION_BY_ID;
 import static com.appsmith.external.constants.spans.ActionSpan.UPDATE_ACTION_BASED_ON_CONTEXT;
 import static com.appsmith.external.constants.spans.ActionSpan.UPDATE_SINGLE_ACTION;
+import static com.appsmith.external.constants.spans.ActionSpan.VALIDATE_AND_GENERATE_ACTION_DOMAIN_BASED_ON_CONTEXT;
+import static com.appsmith.external.constants.spans.ActionSpan.VALIDATE_AND_SAVE_ACTION_TO_REPOSITORY;
+import static com.appsmith.external.constants.spans.DatasourceSpan.FIND_DATASOURCE_BY_ID;
 import static com.appsmith.external.constants.spans.LayoutSpan.UPDATE_PAGE_LAYOUT_BY_PAGE_ID;
+import static com.appsmith.external.constants.spans.PageSpan.GET_PAGE_BY_ID;
+import static com.appsmith.external.constants.spans.PageSpan.IS_NAME_ALLOWED;
 import static java.util.stream.Collectors.toSet;
 
 @Slf4j
@@ -79,6 +85,8 @@ public Mono<ActionDTO> updateAction(String id, ActionDTO actionDTO) {
         if (actionDTO.getCollectionId() == null) {
             return this.updateSingleAction(id, actionDTO).flatMap(updatedAction -> updateLayoutService
                     .updatePageLayoutsByPageId(updatedAction.getPageId())
+                    .name(UPDATE_PAGE_LAYOUT_BY_PAGE_ID)
+                    .tap(Micrometer.observation(observationRegistry))
                     .thenReturn(updatedAction));
         } else if (actionDTO.getCollectionId().length() == 0) {
             // The Action has been removed from existing collection.
@@ -91,6 +99,8 @@ public Mono<ActionDTO> updateAction(String id, ActionDTO actionDTO) {
                         actionDTO.setCollectionId(null);
                         return this.updateSingleAction(id, actionDTO).flatMap(updatedAction -> updateLayoutService
                                 .updatePageLayoutsByPageId(updatedAction.getPageId())
+                                .name(UPDATE_PAGE_LAYOUT_BY_PAGE_ID)
+                                .tap(Micrometer.observation(observationRegistry))
                                 .thenReturn(updatedAction));
                     });
         } else {
@@ -120,6 +130,8 @@ public Mono<ActionDTO> updateAction(String id, ActionDTO actionDTO) {
                                 action1.getId());
                         return this.updateSingleAction(id, actionDTO).flatMap(updatedAction -> updateLayoutService
                                 .updatePageLayoutsByPageId(updatedAction.getPageId())
+                                .name(UPDATE_PAGE_LAYOUT_BY_PAGE_ID)
+                                .tap(Micrometer.observation(observationRegistry))
                                 .thenReturn(updatedAction));
                     });
         }
@@ -237,27 +249,40 @@ protected Mono<ActionDTO> updateActionBasedOnContextType(NewAction newAction, Ac
         String pageId = newAction.getUnpublishedAction().getPageId();
         action.setApplicationId(null);
         action.setPageId(null);
-        return updateSingleAction(newAction.getId(), action)
-                .name(UPDATE_SINGLE_ACTION)
-                .tap(Micrometer.observation(observationRegistry))
-                .flatMap(updatedAction -> updateLayoutService
-                        .updatePageLayoutsByPageId(pageId)
-                        .name(UPDATE_PAGE_LAYOUT_BY_PAGE_ID)
-                        .tap(Micrometer.observation(observationRegistry))
-                        .thenReturn(updatedAction))
-                .zipWhen(actionDTO -> newPageService.findPageById(pageId, pagePermission.getEditPermission(), false))
-                .map(tuple2 -> {
-                    ActionDTO actionDTO = tuple2.getT1();
-                    PageDTO pageDTO = tuple2.getT2();
-                    // redundant check
-                    if (pageDTO.getLayouts().size() > 0) {
-                        actionDTO.setErrorReports(pageDTO.getLayouts().get(0).getLayoutOnLoadActionErrors());
-                    }
-                    log.debug(
-                            "Update action based on context type completed, returning actionDTO with action id: {}",
-                            actionDTO != null ? actionDTO.getId() : null);
-                    return actionDTO;
-                });
+
+        // Update page layout is skipped for JS actions here because when JSobject is updated, we first
+        // update all actions, action
+        // collection and then we update the page layout, hence updating page layout with each action update
+        // is not required here
+        if (action.getPluginType() == PluginType.JS) {
+            return updateSingleAction(newAction.getId(), action)
+                    .name(UPDATE_SINGLE_ACTION)
+                    .tap(Micrometer.observation(observationRegistry));
+        } else {
+            return updateSingleAction(newAction.getId(), action)
+                    .name(UPDATE_SINGLE_ACTION)
+                    .tap(Micrometer.observation(observationRegistry))
+                    .flatMap(updatedAction -> updateLayoutService
+                            .updatePageLayoutsByPageId(pageId)
+                            .name(UPDATE_PAGE_LAYOUT_BY_PAGE_ID)
+                            .tap(Micrometer.observation(observationRegistry))
+                            .thenReturn(updatedAction))
+                    .zipWhen(
+                            actionDTO -> newPageService.findPageById(pageId, pagePermission.getEditPermission(), false))
+                    .map(tuple2 -> {
+                        ActionDTO actionDTO = tuple2.getT1();
+                        PageDTO pageDTO = tuple2.getT2();
+                        // redundant check
+                        if (pageDTO.getLayouts().size() > 0) {
+                            actionDTO.setErrorReports(
+                                    pageDTO.getLayouts().get(0).getLayoutOnLoadActionErrors());
+                        }
+                        log.debug(
+                                "Update action based on context type completed, returning actionDTO with action id: {}",
+                                actionDTO != null ? actionDTO.getId() : null);
+                        return actionDTO;
+                    });
+        }
     }
 
     @Override
@@ -276,6 +301,8 @@ public Mono<ActionDTO> setExecuteOnLoad(String id, Boolean isExecuteOnLoad) {
                     return newActionService.save(newAction).flatMap(savedAction -> updateLayoutService
                             .updatePageLayoutsByPageId(
                                     savedAction.getUnpublishedAction().getPageId())
+                            .name(UPDATE_PAGE_LAYOUT_BY_PAGE_ID)
+                            .tap(Micrometer.observation(observationRegistry))
                             .thenReturn(newActionService.generateActionByViewMode(savedAction, false)));
                 });
     }
@@ -289,6 +316,8 @@ public Mono<ActionDTO> deleteUnpublishedAction(String id) {
                 .deleteUnpublishedAction(id)
                 .flatMap(actionDTO -> Mono.zip(
                         Mono.just(actionDTO), updateLayoutService.updatePageLayoutsByPageId(actionDTO.getPageId())))
+                .name(UPDATE_PAGE_LAYOUT_BY_PAGE_ID)
+                .tap(Micrometer.observation(observationRegistry))
                 .flatMap(tuple -> {
                     ActionDTO actionDTO = tuple.getT1();
                     return Mono.just(actionDTO);
@@ -327,6 +356,8 @@ protected Mono<ActionDTO> createAction(ActionDTO actionDTO, Boolean isJsAction)
     public Mono<ActionDTO> createAction(ActionDTO actionDTO, AppsmithEventContext eventContext, Boolean isJsAction) {
 
         return validateAndGenerateActionDomainBasedOnContext(actionDTO, isJsAction)
+                .name(VALIDATE_AND_GENERATE_ACTION_DOMAIN_BASED_ON_CONTEXT)
+                .tap(Micrometer.observation(observationRegistry))
                 .flatMap(newAction -> {
                     // If the datasource is embedded, check for workspaceId and set it in action
                     if (actionDTO.getDatasource() != null
@@ -351,13 +382,17 @@ public Mono<ActionDTO> createAction(ActionDTO actionDTO, AppsmithEventContext ev
                 })
                 .flatMap(savedNewAction -> newActionService
                         .validateAndSaveActionToRepository(savedNewAction)
+                        .name(VALIDATE_AND_SAVE_ACTION_TO_REPOSITORY)
+                        .tap(Micrometer.observation(observationRegistry))
                         .zipWith(Mono.just(savedNewAction)))
                 .zipWhen(zippedActions -> {
                     ActionDTO savedActionDTO = zippedActions.getT1();
                     if (savedActionDTO.getDatasource() != null
                             && savedActionDTO.getDatasource().getId() != null) {
-                        return datasourceService.findById(
-                                savedActionDTO.getDatasource().getId());
+                        return datasourceService
+                                .findById(savedActionDTO.getDatasource().getId())
+                                .name(FIND_DATASOURCE_BY_ID)
+                                .tap(Micrometer.observation(observationRegistry));
                     } else {
                         return Mono.justOrEmpty(savedActionDTO.getDatasource());
                     }
@@ -388,6 +423,8 @@ protected Mono<NewAction> validateAndGenerateActionDomainBasedOnContext(ActionDT
 
         Mono<NewPage> pageMono = newPageService
                 .findById(action.getPageId(), aclPermission)
+                .name(GET_PAGE_BY_ID)
+                .tap(Micrometer.observation(observationRegistry))
                 .switchIfEmpty(Mono.error(
                         new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.PAGE, action.getPageId())))
                 .cache();
@@ -399,7 +436,10 @@ protected Mono<NewAction> validateAndGenerateActionDomainBasedOnContext(ActionDT
                     String name = action.getValidName();
                     CreatorContextType contextType =
                             action.getContextType() == null ? CreatorContextType.PAGE : action.getContextType();
-                    return refactoringService.isNameAllowed(page.getId(), contextType, layout.getId(), name);
+                    return refactoringService
+                            .isNameAllowed(page.getId(), contextType, layout.getId(), name)
+                            .name(IS_NAME_ALLOWED)
+                            .tap(Micrometer.observation(observationRegistry));
                 })
                 .flatMap(nameAllowed -> {
                     // If the name is allowed, return pageMono for further processing
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutCollectionServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutCollectionServiceCEImpl.java
index d4cc9fcbdf65..aa0d73de132e 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutCollectionServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutCollectionServiceCEImpl.java
@@ -375,6 +375,17 @@ public Mono<ActionCollectionDTO> updateUnpublishedActionCollection(
                 .name(DELETE_ACTION)
                 .tap(Micrometer.observation(observationRegistry));
 
+        String body = actionCollectionDTO.getBody();
+        Number lineCount = 0;
+        if (body != null && !body.isEmpty()) {
+            lineCount = body.split("\n").length;
+        }
+        Number actionCount = 0;
+        if (actionCollectionDTO.getActions() != null
+                && !actionCollectionDTO.getActions().isEmpty()) {
+            actionCount = actionCollectionDTO.getActions().size();
+        }
+
         return deleteNonExistingActionMono
                 .then(newValidActionIdsMono)
                 .flatMap(tuple -> {
@@ -392,6 +403,8 @@ public Mono<ActionCollectionDTO> updateUnpublishedActionCollection(
                     });
                 })
                 .flatMap(actionCollection -> actionCollectionService.update(actionCollection.getId(), actionCollection))
+                .tag("lineCount", lineCount.toString())
+                .tag("actionCount", actionCount.toString())
                 .name(ACTION_COLLECTION_UPDATE)
                 .tap(Micrometer.observation(observationRegistry))
                 .flatMap(actionCollectionRepository::setUserPermissionsInObject)
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserServiceCEImpl.java
index 1589daf14bde..9cede7c2f620 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserServiceCEImpl.java
@@ -618,9 +618,6 @@ public Mono<User> updateCurrentUser(final UserUpdateDTO allUpdates, ServerWebExc
 
         if (allUpdates.hasUserDataUpdates()) {
             final UserData updates = new UserData();
-            if (StringUtils.hasLength(allUpdates.getRole())) {
-                updates.setRole(allUpdates.getRole());
-            }
             if (StringUtils.hasLength(allUpdates.getProficiency())) {
                 updates.setProficiency(allUpdates.getProficiency());
             }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ActionExecutionSolutionImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ActionExecutionSolutionImpl.java
index de3ae719512c..1412bd1b6e70 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ActionExecutionSolutionImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ActionExecutionSolutionImpl.java
@@ -4,6 +4,7 @@
 import com.appsmith.server.configurations.CommonConfig;
 import com.appsmith.server.datasources.base.DatasourceService;
 import com.appsmith.server.datasourcestorages.base.DatasourceStorageService;
+import com.appsmith.server.helpers.ActionExecutionSolutionHelper;
 import com.appsmith.server.helpers.PluginExecutorHelper;
 import com.appsmith.server.newactions.base.NewActionService;
 import com.appsmith.server.newpages.base.NewPageService;
@@ -40,7 +41,8 @@ public ActionExecutionSolutionImpl(
             EnvironmentPermission environmentPermission,
             ConfigService configService,
             TenantService tenantService,
-            CommonConfig commonConfig) {
+            CommonConfig commonConfig,
+            ActionExecutionSolutionHelper actionExecutionSolutionHelper) {
         super(
                 newActionService,
                 actionPermission,
@@ -60,6 +62,7 @@ public ActionExecutionSolutionImpl(
                 environmentPermission,
                 configService,
                 tenantService,
-                commonConfig);
+                commonConfig,
+                actionExecutionSolutionHelper);
     }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCEImpl.java
index fa8172f2fd04..38c8664141d0 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCEImpl.java
@@ -34,6 +34,7 @@
 import com.appsmith.server.dtos.ExecuteActionMetaDTO;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.helpers.ActionExecutionSolutionHelper;
 import com.appsmith.server.helpers.DatasourceAnalyticsUtils;
 import com.appsmith.server.helpers.DateUtils;
 import com.appsmith.server.helpers.PluginExecutorHelper;
@@ -119,6 +120,7 @@ public class ActionExecutionSolutionCEImpl implements ActionExecutionSolutionCE
     private final EnvironmentPermission environmentPermission;
     private final ConfigService configService;
     private final TenantService tenantService;
+    private final ActionExecutionSolutionHelper actionExecutionSolutionHelper;
     private final CommonConfig commonConfig;
 
     static final String PARAM_KEY_REGEX = "^k\\d+$";
@@ -147,7 +149,8 @@ public ActionExecutionSolutionCEImpl(
             EnvironmentPermission environmentPermission,
             ConfigService configService,
             TenantService tenantService,
-            CommonConfig commonConfig) {
+            CommonConfig commonConfig,
+            ActionExecutionSolutionHelper actionExecutionSolutionHelper) {
         this.newActionService = newActionService;
         this.actionPermission = actionPermission;
         this.observationRegistry = observationRegistry;
@@ -167,6 +170,7 @@ public ActionExecutionSolutionCEImpl(
         this.configService = configService;
         this.tenantService = tenantService;
         this.commonConfig = commonConfig;
+        this.actionExecutionSolutionHelper = actionExecutionSolutionHelper;
 
         this.patternList.add(Pattern.compile(PARAM_KEY_REGEX));
         this.patternList.add(Pattern.compile(BLOB_KEY_REGEX));
@@ -245,15 +249,20 @@ private Mono<ExecuteActionDTO> populateExecuteActionDTO(ExecuteActionDTO execute
         Mono<String> instanceIdMono = configService.getInstanceId();
         Mono<String> defaultTenantIdMono = tenantService.getDefaultTenantId();
 
-        return Mono.zip(instanceIdMono, defaultTenantIdMono).map(tuple -> {
-            String instanceId = tuple.getT1();
-            String tenantId = tuple.getT2();
-            executeActionDTO.setActionId(newAction.getId());
-            executeActionDTO.setWorkspaceId(newAction.getWorkspaceId());
-            executeActionDTO.setInstanceId(instanceId);
-            executeActionDTO.setTenantId(tenantId);
-            return executeActionDTO;
-        });
+        Mono<ExecuteActionDTO> systemInfoPopulatedExecuteActionDTOMono =
+                actionExecutionSolutionHelper.populateExecuteActionDTOWithSystemInfo(executeActionDTO);
+
+        return systemInfoPopulatedExecuteActionDTOMono.flatMap(
+                populatedExecuteActionDTO -> Mono.zip(instanceIdMono, defaultTenantIdMono)
+                        .map(tuple -> {
+                            String instanceId = tuple.getT1();
+                            String tenantId = tuple.getT2();
+                            populatedExecuteActionDTO.setActionId(newAction.getId());
+                            populatedExecuteActionDTO.setWorkspaceId(newAction.getWorkspaceId());
+                            populatedExecuteActionDTO.setInstanceId(instanceId);
+                            populatedExecuteActionDTO.setTenantId(tenantId);
+                            return populatedExecuteActionDTO;
+                        }));
     }
 
     /**
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/DatasourceStructureSolutionCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/DatasourceStructureSolutionCEImpl.java
index e93c4c13149c..19fec9feea6e 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/DatasourceStructureSolutionCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/DatasourceStructureSolutionCEImpl.java
@@ -183,7 +183,7 @@ public Mono<DatasourceStructure> getStructure(DatasourceStorage datasourceStorag
     public Mono<ActionExecutionResult> getSchemaPreviewData(
             String datasourceId, String environmentId, Template queryTemplate) {
         return datasourceService
-                .findById(datasourceId, datasourcePermission.getExecutePermission())
+                .findById(datasourceId, datasourcePermission.getActionCreatePermission())
                 .zipWhen(datasource -> datasourceService.getTrueEnvironmentId(
                         datasource.getWorkspaceId(),
                         environmentId,
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EnvManagerCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EnvManagerCEImpl.java
index e21a319193cc..af74b26950ed 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EnvManagerCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EnvManagerCEImpl.java
@@ -725,7 +725,7 @@ public Mono<User> verifyCurrentUserIsSuper() {
 
     @Override
     public Mono<Void> restart() {
-        return verifyCurrentUserIsSuper().then(restartWithoutAclCheck());
+        return verifyCurrentUserIsSuper().flatMap(user -> restartWithoutAclCheck());
     }
 
     /**
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/UserSignupCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/UserSignupCEImpl.java
index 75133d866d02..b60a7faae798 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/UserSignupCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/UserSignupCEImpl.java
@@ -300,7 +300,6 @@ public Mono<User> signupAndLoginSuper(
                 })
                 .flatMap(user -> {
                     final UserData userData = new UserData();
-                    userData.setRole(userFromRequest.getRole());
                     userData.setProficiency(userFromRequest.getProficiency());
                     userData.setUseCase(userFromRequest.getUseCase());
 
@@ -380,9 +379,6 @@ public Mono<Void> signupAndLoginSuperFromFormData(String originHeader, ServerWeb
                     if (formData.containsKey(FieldName.NAME)) {
                         user.setName(formData.getFirst(FieldName.NAME));
                     }
-                    if (formData.containsKey("role")) {
-                        user.setRole(formData.getFirst("role"));
-                    }
                     if (formData.containsKey("proficiency")) {
                         user.setProficiency(formData.getFirst("proficiency"));
                     }
@@ -446,7 +442,7 @@ private Mono<Void> sendInstallationSetupAnalytics(
                     analyticsProps.put(DISABLE_TELEMETRY, !userFromRequest.isAllowCollectingAnonymousData());
                     analyticsProps.put(SUBSCRIBE_MARKETING, userFromRequest.isSignupForNewsletter());
                     analyticsProps.put(EMAIL, newsletterSignedUpUserEmail);
-                    analyticsProps.put(ROLE, ObjectUtils.defaultIfNull(userData.getRole(), ""));
+                    analyticsProps.put(ROLE, "");
                     analyticsProps.put(PROFICIENCY, ObjectUtils.defaultIfNull(userData.getProficiency(), ""));
                     analyticsProps.put(GOAL, ObjectUtils.defaultIfNull(userData.getUseCase(), ""));
                     // ip is a reserved keyword for tracking events in Mixpanel though this is allowed in
@@ -460,7 +456,6 @@ private Mono<Void> sendInstallationSetupAnalytics(
 
                     analyticsService.identifyInstance(
                             instanceId,
-                            userData.getRole(),
                             userData.getProficiency(),
                             userData.getUseCase(),
                             newsletterSignedUpUserEmail,
diff --git a/app/server/appsmith-server/src/main/resources/application.properties b/app/server/appsmith-server/src/main/resources/application.properties
index 3db4bfbfa753..915829656909 100644
--- a/app/server/appsmith-server/src/main/resources/application.properties
+++ b/app/server/appsmith-server/src/main/resources/application.properties
@@ -1,3 +1,4 @@
+spring.application.name=appsmith-server
 server.port=${PORT:8080}
 # Allow the Spring context to close all active requests before shutting down the server
 # Please ref: https://docs.spring.io/spring-boot/docs/2.3.0.RELEASE/reference/html/spring-boot-features.html#boot-features-graceful-shutdown
@@ -90,11 +91,22 @@ github_repo = ${APPSMITH_GITHUB_REPO:}
 # The following configurations are to help support prometheus scraping for monitoring
 management.endpoints.web.exposure.include=prometheus,metrics
 management.tracing.enabled=${APPSMITH_TRACING_ENABLED:false}
-management.zipkin.tracing.endpoint=${APPSMITH_TRACING_ENDPOINT:http://localhost:9411/api/v2/spans}
+management.otlp.tracing.endpoint=${APPSMITH_NEW_RELIC_OTEL_EXPORTER_OTLP_ENDPOINT:http://localhost:4318}/v1/traces
+management.otlp.tracing.headers.api-key=${APPSMITH_NEW_RELIC_OTLP_LICENSE_KEY:}
+management.opentelemetry.resource-attributes.service.name=appsmith-server
+management.opentelemetry.resource-attributes.service.instance.id=${HOSTNAME:appsmith-0}
+management.opentelemetry.resource-attributes.deployment.name=${APPSMITH_DEPLOYMENT_NAME:self-hosted}
 management.tracing.sampling.probability=${APPSMITH_SAMPLING_PROBABILITY:0.1}
 management.prometheus.metrics.export.descriptions=true
 management.metrics.distribution.percentiles-histogram.http.server.requests=true
 
+# Observability and Micrometer related configs
+# Keeping this license key around, until later
+appsmith.observability.metrics.enabled=${APPSMITH_MICROMETER_METRICS_ENABLED:false}
+appsmith.observability.tracing.detail.enabled=${APPSMITH_ENABLE_TRACING_DETAIL:false}
+appsmith.observability.metrics.detail.enabled=${APPSMITH_ENABLE_METRICS_DETAIL:false}
+appsmith.observability.metrics.interval.millis=${APPSMITH_METRICS_INTERVAL_MILLIS:60000}
+
 # Support disabling signup with an environment variable
 signup.disabled = ${APPSMITH_SIGNUP_DISABLED:false}
 signup.allowed-domains=${APPSMITH_SIGNUP_ALLOWED_DOMAINS:}
@@ -117,15 +129,5 @@ appsmith.internal.password=${APPSMITH_INTERNAL_PASSWORD:}
 # GIT stale index.lock file valid time
 appsmith.index.lock.file.time=${APPSMITH_INDEX_LOCK_FILE_TIME:300}
 
-# NewRelic and Micrometer related configs
-appsmith.newrelic.licensekey=${APPSMITH_NEW_RELIC_OTLP_LICENSE_KEY:}
-appsmith.newrelic.micrometer.metrics.container.name=${NEW_RELIC_METADATA_KUBERNETES_POD_NAME:appsmith-0}
-appsmith.newrelic.micrometer.metrics.application.name=${APPSMITH_NEWRELIC_MICROMETER_SERVICE_NAME:}
-spring.application.name=${OTEL_SERVICE_NAME:appsmith-anonymous}
-appsmith.micrometer.metrics.enabled=${APPSMITH_MICROMETER_METRICS_ENABLED:false}
-appsmith.micrometer.tracing.detail.enabled=${APPSMITH_ENABLE_TRACING_DETAIL:false}
-appsmith.micrometer.metrics.detail.enabled=${APPSMITH_ENABLE_METRICS_DETAIL:false}
-appsmith.micrometer.metrics.interval.millis=${APPSMITH_METRICS_INTERVAL_MILLIS:60000}
-
 springdoc.api-docs.path=/v3/docs
 springdoc.swagger-ui.path=/v3/swagger
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/configurations/CommonConfigTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/configurations/CommonConfigTest.java
index 6975f764cd61..661657535189 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/configurations/CommonConfigTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/configurations/CommonConfigTest.java
@@ -22,12 +22,11 @@ public class CommonConfigTest {
     @Test
     public void objectMapper_BeanCreated_WithPublicJsonViewAsDefault() throws JsonProcessingException {
         UserData userData = new UserData();
-        userData.setRole("new_role");
         userData.setProficiency("abcd"); // this is public field
         userData.setUserId("userId"); // this is internal field
         userData.setUserPermissions(null);
 
         String value = objectMapper.writeValueAsString(userData);
-        JSONAssert.assertEquals("{\"proficiency\":\"abcd\",\"role\":\"new_role\"}", value, true);
+        JSONAssert.assertEquals("{\"proficiency\":\"abcd\"}", value, true);
     }
 }
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/configurations/CommonDBConfigTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/configurations/CommonDBConfigTest.java
index 1332b7241deb..eb8591786374 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/configurations/CommonDBConfigTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/configurations/CommonDBConfigTest.java
@@ -16,13 +16,13 @@ public void testExtractAndSaveJdbcParams_validDbUrlWithUsernameAndPassword() {
         DataSourceProperties ds = commonDBConfig.extractJdbcProperties(dbUrl);
         assertEquals("postgres", ds.getUsername());
         assertEquals("password", ds.getPassword());
-        assertEquals("jdbc:postgresql://localhost:5432/postgres", ds.getUrl());
+        assertEquals("jdbc:postgresql://localhost:5432/postgres?currentSchema=appsmith", ds.getUrl());
 
         String dbUrlWithPort = "postgresql://postgres:password@localhost:1234/postgres";
         ds = commonDBConfig.extractJdbcProperties(dbUrlWithPort);
         assertEquals("postgres", ds.getUsername());
         assertEquals("password", ds.getPassword());
-        assertEquals("jdbc:postgresql://localhost:1234/postgres", ds.getUrl());
+        assertEquals("jdbc:postgresql://localhost:1234/postgres?currentSchema=appsmith", ds.getUrl());
     }
 
     @Test
@@ -32,7 +32,7 @@ public void testExtractAndSaveJdbcParams_validDbUrlWithoutUsernameAndPassword()
         DataSourceProperties ds = commonDBConfig.extractJdbcProperties(dbUrl);
         assertNull(ds.getUsername());
         assertNull(ds.getPassword());
-        assertEquals("jdbc:postgresql://localhost:5432/postgres", ds.getUrl());
+        assertEquals("jdbc:postgresql://localhost:5432/postgres?currentSchema=appsmith", ds.getUrl());
     }
 
     @Test
@@ -44,4 +44,31 @@ public void testExtractAndSaveJdbcParams_invalidDbUrl() {
                 dbUrl);
         assertThrows(IllegalArgumentException.class, () -> commonDBConfig.extractJdbcProperties(dbUrl), errorString);
     }
+
+    @Test
+    void testExtractJdbcPropertiesWithQueryParams() {
+        CommonDBConfig commonDBConfig = new CommonDBConfig();
+        String dbUrl = "postgresql://user:password@localhost:5432/mydb?sslmode=require";
+
+        DataSourceProperties dataSourceProperties = commonDBConfig.extractJdbcProperties(dbUrl);
+
+        String expectedUrl = "jdbc:postgresql://localhost:5432/mydb?sslmode=require&currentSchema=appsmith";
+        assertEquals(
+                expectedUrl,
+                dataSourceProperties.getUrl(),
+                "URL with existing query params should append the currentSchema correctly.");
+    }
+
+    @Test
+    void testExtractJdbcPropertiesWithoutQueryParams() {
+        CommonDBConfig commonDBConfig = new CommonDBConfig();
+        String dbUrl = "postgresql://user:password@localhost:5432/mydb";
+        DataSourceProperties dataSourceProperties = commonDBConfig.extractJdbcProperties(dbUrl);
+
+        String expectedUrl = "jdbc:postgresql://localhost:5432/mydb?currentSchema=appsmith";
+        assertEquals(
+                expectedUrl,
+                dataSourceProperties.getUrl(),
+                "URL without query params should append the currentSchema correctly.");
+    }
 }
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/git/CommonGitServiceCETest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/git/CommonGitServiceCETest.java
index 31d88eaa56b5..307014c1735a 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/git/CommonGitServiceCETest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/git/CommonGitServiceCETest.java
@@ -2025,8 +2025,10 @@ public void checkoutRemoteBranch_CustomThemeSetToDefaultAppAndRemoteBranch_AppAn
                     // names should be same as the name from the application JSON
                     assertThat(editModeThemeInBranchedApp.getDisplayName())
                             .isEqualTo(editModeCustomTheme.getDisplayName());
+                    // While checking out from remote, it's also published.
+                    // When published, the resources are copied from unpublished field to published filed.
                     assertThat(viewModeThemeInBranchedApp.getDisplayName())
-                            .isEqualTo(viewModeCustomTheme.getDisplayName());
+                            .isEqualTo(editModeCustomTheme.getDisplayName());
                 })
                 .verifyComplete();
     }
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ActionCollectionServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ActionCollectionServiceTest.java
index b13dd94a39c1..c21a0f495892 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ActionCollectionServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ActionCollectionServiceTest.java
@@ -26,8 +26,10 @@
 import com.appsmith.server.dtos.PluginWorkspaceDTO;
 import com.appsmith.server.dtos.RefactorEntityNameDTO;
 import com.appsmith.server.dtos.WorkspacePluginStatus;
+import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.helpers.MockPluginExecutor;
 import com.appsmith.server.helpers.PluginExecutorHelper;
+import com.appsmith.server.layouts.UpdateLayoutService;
 import com.appsmith.server.newactions.base.NewActionService;
 import com.appsmith.server.newpages.base.NewPageService;
 import com.appsmith.server.plugins.base.PluginService;
@@ -47,6 +49,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.security.test.context.support.WithUserDetails;
 import org.springframework.test.annotation.DirtiesContext;
 import reactor.core.publisher.Mono;
@@ -71,6 +74,7 @@
 import static com.appsmith.server.constants.FieldName.VIEWER;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 @SpringBootTest
 @Slf4j
@@ -134,6 +138,9 @@ public class ActionCollectionServiceTest {
     @MockBean
     PluginExecutor pluginExecutor;
 
+    @SpyBean
+    UpdateLayoutService updateLayoutService;
+
     Application testApp = null;
 
     PageDTO testPage = null;
@@ -700,4 +707,101 @@ public void testDeleteActionCollection_afterApplicationPublish_clearsActionColle
                 })
                 .verifyComplete();
     }
+
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void
+            testUpdateUnpublishedActionCollection_withValidCollection_callsPageLayoutOnlyOnceAndAssertCyclicDependencyError() {
+        Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(pluginExecutor));
+        Mockito.when(pluginExecutor.getHintMessages(Mockito.any(), Mockito.any()))
+                .thenReturn(Mono.zip(Mono.just(new HashSet<>()), Mono.just(new HashSet<>())));
+
+        ActionCollectionDTO actionCollectionDTO = new ActionCollectionDTO();
+        actionCollectionDTO.setName("testCollection1");
+        actionCollectionDTO.setPageId(testPage.getId());
+        actionCollectionDTO.setApplicationId(testApp.getId());
+        actionCollectionDTO.setWorkspaceId(workspaceId);
+        actionCollectionDTO.setPluginId(datasource.getPluginId());
+        actionCollectionDTO.setVariables(List.of(new JSValue("test", "String", "test", true)));
+        actionCollectionDTO.setBody("collectionBody");
+        actionCollectionDTO.setPluginType(PluginType.JS);
+
+        // Create actions
+        ActionDTO action1 = new ActionDTO();
+        action1.setName("testAction1");
+        action1.setActionConfiguration(new ActionConfiguration());
+        action1.getActionConfiguration().setBody("initial body");
+        action1.getActionConfiguration().setIsValid(false);
+
+        ActionDTO action2 = new ActionDTO();
+        action2.setName("testAction2");
+        action2.setActionConfiguration(new ActionConfiguration());
+        action2.getActionConfiguration().setBody("mockBody");
+        action2.getActionConfiguration().setIsValid(false);
+
+        ActionDTO action3 = new ActionDTO();
+        action3.setName("testAction3");
+        action3.setActionConfiguration(new ActionConfiguration());
+        action3.getActionConfiguration().setBody("mockBody");
+        action3.getActionConfiguration().setIsValid(false);
+
+        actionCollectionDTO.setActions(List.of(action1, action2, action3));
+
+        Layout layout = testPage.getLayouts().get(0);
+        ArrayList dslList = (ArrayList) layout.getDsl().get("children");
+        JSONObject tableDsl = (JSONObject) dslList.get(0);
+        tableDsl.put("tableData", "{{testCollection1.testAction1.data}}");
+        JSONArray temp2 = new JSONArray();
+        temp2.add(new JSONObject(Map.of("key", "tableData")));
+        tableDsl.put("dynamicBindingPathList", temp2);
+        JSONArray temp3 = new JSONArray();
+        temp3.add(new JSONObject(Map.of("key", "tableData")));
+        tableDsl.put("dynamicPropertyPathList", temp3);
+        layout.getDsl().put("widgetName", "MainContainer");
+
+        testPage.setLayouts(List.of(layout));
+        PageDTO updatedPage =
+                newPageService.updatePage(testPage.getId(), testPage).block();
+
+        // Create Js object
+        ActionCollectionDTO createdActionCollectionDTO =
+                layoutCollectionService.createCollection(actionCollectionDTO).block();
+        assert createdActionCollectionDTO != null;
+        assert createdActionCollectionDTO.getId() != null;
+        String createdActionCollectionId = createdActionCollectionDTO.getId();
+
+        // Update JS object to create cyclic dependency
+        actionCollectionDTO.getActions().stream()
+                .filter(action -> "testAction1".equals(action.getName()))
+                .findFirst()
+                .ifPresent(action ->
+                        action.getActionConfiguration().setBody("function () {\n  return Table1.tableData;\n}"));
+
+        final Mono<ActionCollectionDTO> updatedActionCollectionDTO =
+                layoutCollectionService.updateUnpublishedActionCollection(
+                        createdActionCollectionId, actionCollectionDTO);
+
+        StepVerifier.create(updatedActionCollectionDTO)
+                .assertNext(actionCollectionDTO1 -> {
+                    assertEquals(createdActionCollectionId, actionCollectionDTO1.getId());
+
+                    // This invocation will happen here twice, once during create collection and once during update
+                    // collection as expected
+                    Mockito.verify(updateLayoutService, Mockito.times(2))
+                            .updatePageLayoutsByPageId(Mockito.anyString());
+
+                    assertEquals(1, actionCollectionDTO1.getErrorReports().size());
+                    assertEquals(
+                            AppsmithError.CYCLICAL_DEPENDENCY_ERROR.getAppErrorCode(),
+                            actionCollectionDTO1.getErrorReports().get(0).getCode());
+
+                    // Iterate over each action and assert that errorReports is null as action collection already has
+                    // error reports
+                    // it's not required in each action
+                    actionCollectionDTO
+                            .getActions()
+                            .forEach(action -> assertNull(action.getErrorReports(), "Error reports should be null"));
+                })
+                .verifyComplete();
+    }
 }
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserServiceTest.java
index 03b2cdd7105a..7edad2e12835 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserServiceTest.java
@@ -425,21 +425,6 @@ public void updateNameOfUser_WithAccentedCharacters_IsValid() {
                 .verifyComplete();
     }
 
-    @Test
-    @WithUserDetails(value = "api_user")
-    public void updateRoleOfUser() {
-        UserUpdateDTO updateUser = new UserUpdateDTO();
-        updateUser.setRole("New role of user");
-        final Mono<UserData> resultMono =
-                userService.updateCurrentUser(updateUser, null).then(userDataService.getForUserEmail("api_user"));
-        StepVerifier.create(resultMono)
-                .assertNext(userData -> {
-                    assertNotNull(userData);
-                    assertThat(userData.getRole()).isEqualTo("New role of user");
-                })
-                .verifyComplete();
-    }
-
     @Test
     @WithUserDetails(value = "api_user")
     public void updateIntercomConsentOfUser() {
@@ -499,10 +484,9 @@ public void getIntercomConsentOfUserOnCloudHosting_AlwaysTrue() {
 
     @Test
     @WithUserDetails(value = "api_user")
-    public void updateNameRoleAndUseCaseOfUser() {
+    public void updateNameAndUseCaseOfUser() {
         UserUpdateDTO updateUser = new UserUpdateDTO();
         updateUser.setName("New name of user here");
-        updateUser.setRole("New role of user");
         updateUser.setUseCase("New use case");
         final Mono<Tuple2<User, UserData>> resultMono = userService
                 .updateCurrentUser(updateUser, null)
@@ -514,7 +498,6 @@ public void updateNameRoleAndUseCaseOfUser() {
                     assertNotNull(user);
                     assertNotNull(userData);
                     assertEquals("New name of user here", user.getName());
-                    assertEquals("New role of user", userData.getRole());
                     assertEquals("New use case", userData.getUseCase());
                 })
                 .verifyComplete();
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ConsolidatedAPIServiceImplTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ConsolidatedAPIServiceImplTest.java
index 97e651a6b2ea..ccc70eb9315a 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ConsolidatedAPIServiceImplTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ConsolidatedAPIServiceImplTest.java
@@ -8,12 +8,15 @@
 import com.appsmith.server.datasources.base.DatasourceService;
 import com.appsmith.server.domains.Application;
 import com.appsmith.server.domains.ApplicationMode;
+import com.appsmith.server.domains.ApplicationPage;
 import com.appsmith.server.domains.CustomJSLib;
+import com.appsmith.server.domains.GitArtifactMetadata;
 import com.appsmith.server.domains.NewPage;
 import com.appsmith.server.domains.Plugin;
 import com.appsmith.server.domains.Tenant;
 import com.appsmith.server.domains.Theme;
 import com.appsmith.server.domains.User;
+import com.appsmith.server.domains.UserData;
 import com.appsmith.server.dtos.ActionCollectionDTO;
 import com.appsmith.server.dtos.ActionCollectionViewDTO;
 import com.appsmith.server.dtos.ActionViewDTO;
@@ -24,13 +27,16 @@
 import com.appsmith.server.dtos.PageDTO;
 import com.appsmith.server.dtos.PageNameIdDTO;
 import com.appsmith.server.dtos.ProductAlertResponseDTO;
+import com.appsmith.server.dtos.ResponseDTO;
 import com.appsmith.server.dtos.UserProfileDTO;
+import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
 import com.appsmith.server.jslibs.base.CustomJSLibService;
 import com.appsmith.server.newactions.base.NewActionService;
 import com.appsmith.server.newpages.base.NewPageService;
 import com.appsmith.server.plugins.base.PluginService;
 import com.appsmith.server.repositories.ApplicationRepository;
+import com.appsmith.server.repositories.CacheableRepositoryHelper;
 import com.appsmith.server.repositories.NewPageRepository;
 import com.appsmith.server.services.ApplicationPageService;
 import com.appsmith.server.services.ConsolidatedAPIService;
@@ -62,10 +68,12 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.when;
 
@@ -127,6 +135,9 @@ public class ConsolidatedAPIServiceImplTest {
     @SpyBean
     NewPageRepository mockNewPageRepository;
 
+    @Autowired
+    CacheableRepositoryHelper cacheableRepositoryHelper;
+
     @Test
     public void testErrorWhenModeIsNullAndPageIdAvailable() {
         Mono<ConsolidatedAPIResponseDTO> consolidatedInfoForPageLoad =
@@ -231,6 +242,7 @@ public void testPageLoadResponseForViewMode() {
         NewPage mockNewPage = new NewPage();
         mockNewPage.setApplicationId("mockApplicationId");
         mockNewPage.setId("mockPageId");
+        mockNewPage.setBranchName("branch");
         doReturn(Mono.just(mockNewPage))
                 .when(spyNewPageService)
                 .findByBranchNameAndBasePageId(anyString(), anyString(), any(), any());
@@ -239,10 +251,6 @@ public void testPageLoadResponseForViewMode() {
                 .when(spyApplicationPageService)
                 .getPagesBasedOnApplicationMode(any(), any());
 
-        doReturn(Mono.just(new PageDTO()))
-                .when(spyApplicationPageService)
-                .getPageAndMigrateDslByBranchAndBasePageId(anyString(), anyString(), anyBoolean(), anyBoolean());
-
         doReturn(Mono.just(sampleApplicationPagesDTO))
                 .when(spyNewPageService)
                 .createApplicationPagesDTO(any(), any(), anyBoolean(), anyBoolean());
@@ -262,7 +270,7 @@ public void testPageLoadResponseForViewMode() {
         samplePageDTO.setName("samplePageDTO");
         doReturn(Mono.just(samplePageDTO))
                 .when(spyApplicationPageService)
-                .getPageAndMigrateDslByBranchAndBasePageId(anyString(), anyString(), anyBoolean(), anyBoolean());
+                .getPageAndMigrateDslByBranchedPageId(anyString(), anyBoolean(), anyBoolean());
 
         ActionViewDTO sampleActionViewDTO = new ActionViewDTO();
         sampleActionViewDTO.setName("sampleActionViewDTO");
@@ -432,7 +440,7 @@ public void testPageLoadResponseForEditMode() {
 
         doReturn(Mono.just(new PageDTO()))
                 .when(spyApplicationPageService)
-                .getPageAndMigrateDslByBranchAndBasePageId(anyString(), anyString(), anyBoolean(), anyBoolean());
+                .getPageAndMigrateDslByBranchedPageId(anyString(), anyBoolean(), anyBoolean());
 
         doReturn(Mono.just(sampleApplicationPagesDTO))
                 .when(spyNewPageService)
@@ -454,7 +462,7 @@ public void testPageLoadResponseForEditMode() {
         doReturn(Mono.just(samplePageDTO))
                 .doReturn(Mono.just(samplePageDTO))
                 .when(spyApplicationPageService)
-                .getPageAndMigrateDslByBranchAndBasePageId(anyString(), anyString(), anyBoolean(), anyBoolean());
+                .getPageAndMigrateDslByBranchedPageId(anyString(), anyBoolean(), anyBoolean());
 
         doReturn(Mono.just(samplePageDTO))
                 .doReturn(Mono.just(samplePageDTO))
@@ -877,4 +885,736 @@ public void testErrorResponseWhenAnonymousUserAccessPrivateApp() {
                 })
                 .verifyComplete();
     }
+
+    @Test
+    public void testPageLoadResponseForViewMode_whenBranchNameIsPresentInNonGitApp() {
+        User sampleUser = new User();
+        when(mockSessionUserService.getCurrentUser()).thenReturn(Mono.just(sampleUser));
+
+        UserProfileDTO sampleUserProfileDTO = new UserProfileDTO();
+        sampleUserProfileDTO.setName("sampleUserProfileDTO");
+        when(mockUserService.buildUserProfileDTO(any())).thenReturn(Mono.just(sampleUserProfileDTO));
+
+        Map<String, Boolean> sampleFeatureFlagMap = new HashMap<>();
+        sampleFeatureFlagMap.put("sampleFeatureFlag", true);
+        when(mockUserDataService.getFeatureFlagsForCurrentUser()).thenReturn(Mono.just(sampleFeatureFlagMap));
+
+        Tenant sampleTenant = new Tenant();
+        sampleTenant.setDisplayName("sampleTenant");
+        when(mockTenantService.getTenantConfiguration()).thenReturn(Mono.just(sampleTenant));
+
+        ProductAlertResponseDTO sampleProductAlertResponseDTO = new ProductAlertResponseDTO();
+        sampleProductAlertResponseDTO.setTitle("sampleProductAlert");
+        when(mockProductAlertService.getSingleApplicableMessage())
+                .thenReturn(Mono.just(List.of(sampleProductAlertResponseDTO)));
+
+        ApplicationPagesDTO sampleApplicationPagesDTO = new ApplicationPagesDTO();
+        sampleApplicationPagesDTO.setWorkspaceId("sampleWorkspaceId");
+
+        Application mockApplication = new Application();
+        mockApplication.setId("mockApplicationId");
+        doReturn(Mono.just(mockApplication))
+                .when(spyApplicationService)
+                .findByBranchedApplicationIdAndApplicationMode(anyString(), any());
+
+        NewPage mockNewPage = new NewPage();
+        mockNewPage.setApplicationId("mockApplicationId");
+        mockNewPage.setId("mockPageId");
+
+        doReturn(Mono.just(mockNewPage))
+                .when(spyNewPageService)
+                .findByBranchNameAndBasePageId(eq(null), eq("mockPageId"), any(), any());
+
+        doReturn(Mono.just(List.of(mockNewPage)))
+                .when(spyApplicationPageService)
+                .getPagesBasedOnApplicationMode(any(), any());
+
+        doReturn(Mono.just(sampleApplicationPagesDTO))
+                .when(spyNewPageService)
+                .createApplicationPagesDTO(any(), any(), anyBoolean(), anyBoolean());
+
+        Theme sampleTheme = new Theme();
+        sampleTheme.setName("sampleTheme");
+        doReturn(Mono.just(sampleTheme)).when(spyThemeService).getApplicationTheme(anyString(), any());
+        doReturn(Flux.just(sampleTheme)).when(spyThemeService).getApplicationThemes(anyString());
+
+        CustomJSLib sampleCustomJSLib = new CustomJSLib();
+        sampleCustomJSLib.setName("sampleJSLib");
+        doReturn(Mono.just(List.of(sampleCustomJSLib)))
+                .when(spyCustomJSLibService)
+                .getAllJSLibsInContext(anyString(), any(), anyBoolean());
+
+        PageDTO samplePageDTO = new PageDTO();
+        samplePageDTO.setName("samplePageDTO");
+        doReturn(Mono.just(samplePageDTO))
+                .when(spyApplicationPageService)
+                .getPageAndMigrateDslByBranchedPageId(anyString(), anyBoolean(), anyBoolean());
+
+        ActionViewDTO sampleActionViewDTO = new ActionViewDTO();
+        sampleActionViewDTO.setName("sampleActionViewDTO");
+        doReturn(Flux.just(sampleActionViewDTO)).when(spyNewActionService).getActionsForViewModeByPageId(anyString());
+
+        ActionCollectionViewDTO sampleActionCollectionViewDTO = new ActionCollectionViewDTO();
+        sampleActionCollectionViewDTO.setName("sampleActionCollectionViewDTO");
+        doReturn(Flux.just(sampleActionCollectionViewDTO))
+                .when(spyActionCollectionService)
+                .getActionCollectionsForViewMode(anyString());
+
+        Mono<ConsolidatedAPIResponseDTO> consolidatedInfoForPageLoad =
+                consolidatedAPIService.getConsolidatedInfoForPageLoad(
+                        "mockPageId", null, "branch", ApplicationMode.PUBLISHED);
+        StepVerifier.create(consolidatedInfoForPageLoad)
+                .assertNext(consolidatedAPIResponseDTO -> {
+                    assertNotNull(consolidatedAPIResponseDTO.getPublishedActions());
+                    assertEquals(
+                            1,
+                            consolidatedAPIResponseDTO
+                                    .getPublishedActions()
+                                    .getData()
+                                    .size());
+                    assertEquals(
+                            "sampleActionViewDTO",
+                            consolidatedAPIResponseDTO
+                                    .getPublishedActions()
+                                    .getData()
+                                    .get(0)
+                                    .getName());
+
+                    assertNotNull(consolidatedAPIResponseDTO.getUserProfile());
+                    assertEquals(
+                            "sampleUserProfileDTO",
+                            consolidatedAPIResponseDTO
+                                    .getUserProfile()
+                                    .getData()
+                                    .getName());
+
+                    assertNotNull(consolidatedAPIResponseDTO.getTenantConfig());
+                    assertEquals(
+                            "sampleTenant",
+                            consolidatedAPIResponseDTO
+                                    .getTenantConfig()
+                                    .getData()
+                                    .getDisplayName());
+
+                    assertNotNull(consolidatedAPIResponseDTO.getFeatureFlags());
+                    assertTrue(consolidatedAPIResponseDTO
+                            .getFeatureFlags()
+                            .getData()
+                            .get("sampleFeatureFlag"));
+
+                    assertNotNull(consolidatedAPIResponseDTO.getPages());
+                    assertEquals(
+                            "sampleWorkspaceId",
+                            consolidatedAPIResponseDTO.getPages().getData().getWorkspaceId());
+
+                    assertNotNull(consolidatedAPIResponseDTO.getCurrentTheme());
+                    assertEquals(
+                            "sampleTheme",
+                            consolidatedAPIResponseDTO
+                                    .getCurrentTheme()
+                                    .getData()
+                                    .getName());
+
+                    assertNotNull(consolidatedAPIResponseDTO.getThemes());
+                    assertEquals(
+                            1, consolidatedAPIResponseDTO.getThemes().getData().size());
+                    assertEquals(
+                            "sampleTheme",
+                            consolidatedAPIResponseDTO
+                                    .getThemes()
+                                    .getData()
+                                    .get(0)
+                                    .getName());
+
+                    assertNotNull(consolidatedAPIResponseDTO.getPublishedActionCollections());
+                    assertEquals(
+                            1,
+                            consolidatedAPIResponseDTO
+                                    .getPublishedActionCollections()
+                                    .getData()
+                                    .size());
+                    assertEquals(
+                            "sampleActionCollectionViewDTO",
+                            consolidatedAPIResponseDTO
+                                    .getPublishedActionCollections()
+                                    .getData()
+                                    .get(0)
+                                    .getName());
+
+                    assertNotNull(consolidatedAPIResponseDTO.getPageWithMigratedDsl());
+                    assertEquals(
+                            "samplePageDTO",
+                            consolidatedAPIResponseDTO
+                                    .getPageWithMigratedDsl()
+                                    .getData()
+                                    .getName());
+
+                    assertNotNull(consolidatedAPIResponseDTO.getCustomJSLibraries());
+                    assertEquals(
+                            1,
+                            consolidatedAPIResponseDTO
+                                    .getCustomJSLibraries()
+                                    .getData()
+                                    .size());
+                    assertEquals(
+                            "sampleJSLib",
+                            consolidatedAPIResponseDTO
+                                    .getCustomJSLibraries()
+                                    .getData()
+                                    .get(0)
+                                    .getName());
+
+                    assertNotNull(consolidatedAPIResponseDTO.getProductAlert());
+                    assertEquals(
+                            "sampleProductAlert",
+                            consolidatedAPIResponseDTO
+                                    .getProductAlert()
+                                    .getData()
+                                    .getTitle());
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    public void testPageLoadResponseForEditModeWhenDefaultBranchIsDifferentFromDefault() {
+        User sampleUser = new User();
+        when(mockSessionUserService.getCurrentUser()).thenReturn(Mono.just(sampleUser));
+
+        UserProfileDTO sampleUserProfileDTO = new UserProfileDTO();
+        sampleUserProfileDTO.setName("sampleUserProfileDTO");
+        when(mockUserService.buildUserProfileDTO(any())).thenReturn(Mono.just(sampleUserProfileDTO));
+
+        Map<String, Boolean> sampleFeatureFlagMap = new HashMap<>();
+        sampleFeatureFlagMap.put("sampleFeatureFlag", true);
+        when(mockUserDataService.getFeatureFlagsForCurrentUser()).thenReturn(Mono.just(sampleFeatureFlagMap));
+
+        when(mockUserDataService.updateLastUsedResourceAndWorkspaceList(any(), any(), any()))
+                .thenReturn(Mono.just(new UserData()));
+
+        Tenant sampleTenant = new Tenant();
+        sampleTenant.setDisplayName("sampleTenant");
+        when(mockTenantService.getTenantConfiguration()).thenReturn(Mono.just(sampleTenant));
+
+        ProductAlertResponseDTO sampleProductAlertResponseDTO = new ProductAlertResponseDTO();
+        sampleProductAlertResponseDTO.setTitle("sampleProductAlert");
+        when(mockProductAlertService.getSingleApplicableMessage())
+                .thenReturn(Mono.just(List.of(sampleProductAlertResponseDTO)));
+
+        ApplicationPagesDTO sampleApplicationPagesDTO = new ApplicationPagesDTO();
+        sampleApplicationPagesDTO.setWorkspaceId("sampleWorkspaceId");
+
+        Application mockApplicationBaseBranch = new Application();
+        GitArtifactMetadata baseMetadata = new GitArtifactMetadata();
+        baseMetadata.setBranchName("master");
+        baseMetadata.setDefaultBranchName("newDefaultBranch");
+        baseMetadata.setDefaultApplicationId("mockBaseId");
+        mockApplicationBaseBranch.setGitArtifactMetadata(baseMetadata);
+        mockApplicationBaseBranch.setId("mockId");
+
+        doReturn(Mono.just(mockApplicationBaseBranch))
+                .when(spyApplicationService)
+                .findByBranchedApplicationIdAndApplicationMode(anyString(), any());
+
+        ApplicationPage defaultApplicationPage = new ApplicationPage();
+        defaultApplicationPage.setIsDefault(true);
+        defaultApplicationPage.setId("defaultPageId");
+
+        Application mockDefaultApplication = new Application();
+        GitArtifactMetadata defaultMetadata = new GitArtifactMetadata();
+        defaultMetadata.setBranchName("newDefaultBranch");
+        defaultMetadata.setDefaultApplicationId("mockBaseId");
+        mockDefaultApplication.setGitArtifactMetadata(defaultMetadata);
+        mockDefaultApplication.setId("defaultApplicationId");
+        mockDefaultApplication.setPages(List.of(defaultApplicationPage));
+        mockDefaultApplication.setWorkspaceId("sampleWorkspaceId");
+
+        doReturn(Mono.just(mockDefaultApplication))
+                .when(spyApplicationService)
+                .findByBaseIdBranchNameAndApplicationMode(anyString(), anyString(), any());
+
+        NewPage basePage = new NewPage();
+        basePage.setApplicationId("mockBaseId");
+
+        PageDTO unpublishedPage = new PageDTO();
+        NewPage defaultAppDefaultPage = new NewPage();
+        defaultAppDefaultPage.setId("defaultPageId");
+        defaultAppDefaultPage.setApplicationId("defaultApplicationId");
+        defaultAppDefaultPage.setUnpublishedPage(unpublishedPage);
+
+        doReturn(Mono.just(basePage))
+                .when(spyNewPageService)
+                .findByBranchNameAndBasePageId(eq(null), anyString(), any(), any());
+
+        doReturn(Mono.just(defaultAppDefaultPage))
+                .when(spyNewPageService)
+                .findByBranchNameAndBasePageId(anyString(), anyString(), any(), any());
+
+        doReturn(Mono.just(List.of(defaultAppDefaultPage)))
+                .when(spyApplicationPageService)
+                .getPagesBasedOnApplicationMode(any(), any());
+
+        doReturn(Mono.just(new PageDTO()))
+                .when(spyApplicationPageService)
+                .getPageAndMigrateDslByBranchedPageId(anyString(), anyBoolean(), anyBoolean());
+
+        Theme sampleTheme = new Theme();
+        sampleTheme.setName("sampleTheme");
+        doReturn(Mono.just(sampleTheme)).when(spyThemeService).getApplicationTheme(anyString(), any());
+        doReturn(Flux.just(sampleTheme)).when(spyThemeService).getApplicationThemes(anyString());
+
+        CustomJSLib sampleCustomJSLib = new CustomJSLib();
+        sampleCustomJSLib.setName("sampleJSLib");
+        doReturn(Mono.just(List.of(sampleCustomJSLib)))
+                .when(spyCustomJSLibService)
+                .getAllJSLibsInContext(anyString(), any(), anyBoolean());
+
+        PageDTO samplePageDTO = new PageDTO();
+        samplePageDTO.setName("samplePageDTO");
+        doReturn(Mono.just(samplePageDTO))
+                .doReturn(Mono.just(samplePageDTO))
+                .when(spyApplicationPageService)
+                .getPageAndMigrateDslByBranchedPageId(anyString(), anyBoolean(), anyBoolean());
+
+        doReturn(Mono.just(samplePageDTO))
+                .doReturn(Mono.just(samplePageDTO))
+                .when(spyApplicationPageService)
+                .getPageDTOAfterMigratingDSL(any(), anyBoolean(), anyBoolean());
+
+        doReturn(Mono.just(samplePageDTO))
+                .doReturn(Mono.just(samplePageDTO))
+                .when(spyApplicationPageService)
+                .getPageDTOAfterMigratingDSL(any(), anyBoolean(), anyBoolean());
+
+        ActionDTO sampleActionDTO = new ActionDTO();
+        sampleActionDTO.setName("sampleActionDTO");
+        sampleActionDTO.setUpdatedAt(Instant.now());
+        doReturn(Flux.just(sampleActionDTO)).when(spyNewActionService).getUnpublishedActions(any(), anyBoolean());
+
+        ActionCollectionDTO sampleActionCollectionDTO = new ActionCollectionDTO();
+        sampleActionCollectionDTO.setName("sampleActionCollectionDTO");
+        doReturn(Flux.just(sampleActionCollectionDTO))
+                .when(spyActionCollectionService)
+                .getPopulatedActionCollectionsByViewMode(any(), anyBoolean());
+
+        PageNameIdDTO samplePageNameIdDTO = new PageNameIdDTO();
+        samplePageNameIdDTO.setName("samplePageNameIdDTO");
+        sampleApplicationPagesDTO.setPages(List.of(samplePageNameIdDTO));
+
+        Plugin samplePlugin = new Plugin();
+        samplePlugin.setName("samplePlugin");
+        samplePlugin.setId("samplePluginId");
+        samplePlugin.setPackageName("sample-plugin");
+        Plugin sampleRestApiPlugin = new Plugin();
+        sampleRestApiPlugin.setName("sampleRestApiPlugin");
+        sampleRestApiPlugin.setId("sampleRestApiPluginId");
+        sampleRestApiPlugin.setPackageName(REST_API_PLUGIN);
+        Plugin sampleGraphqlPlugin = new Plugin();
+        sampleGraphqlPlugin.setName("sampleGraphqlPlugin");
+        sampleGraphqlPlugin.setId("sampleGraphqlPluginId");
+        sampleGraphqlPlugin.setPackageName(GRAPHQL_PLUGIN);
+        Plugin sampleAiPlugin = new Plugin();
+        sampleAiPlugin.setName("sampleAiPlugin");
+        sampleAiPlugin.setId("sampleAiPluginId");
+        sampleAiPlugin.setPackageName(APPSMITH_AI_PLUGIN);
+        when(mockPluginService.getInWorkspace(anyString()))
+                .thenReturn(Flux.just(samplePlugin, sampleRestApiPlugin, sampleGraphqlPlugin, sampleAiPlugin));
+
+        Datasource sampleDatasource = new Datasource();
+        sampleDatasource.setName("sampleDatasource");
+        sampleDatasource.setPluginId("samplePluginId");
+        when(mockDatasourceService.getAllWithStorages(any())).thenReturn(Flux.just(sampleDatasource));
+
+        Map<String, Map<?, ?>> sampleFormConfig = new HashMap<>();
+        sampleFormConfig.put("key", Map.of());
+        when(mockPluginService.getFormConfig(anyString())).thenReturn(Mono.just(sampleFormConfig));
+
+        MockDataSet sampleMockDataSet = new MockDataSet();
+        sampleMockDataSet.setName("sampleMockDataSet");
+        MockDataDTO sampleMockDataDTO = new MockDataDTO();
+        sampleMockDataDTO.setMockdbs(List.of(sampleMockDataSet));
+        when(mockMockDataService.getMockDataSet()).thenReturn(Mono.just(sampleMockDataDTO));
+
+        Mono<ConsolidatedAPIResponseDTO> consolidatedInfoForPageLoad =
+                consolidatedAPIService.getConsolidatedInfoForPageLoad("pageId", null, null, ApplicationMode.EDIT);
+        StepVerifier.create(consolidatedInfoForPageLoad)
+                .assertNext(consolidatedAPIResponseDTO -> {
+                    assertNotNull(consolidatedAPIResponseDTO.getUserProfile());
+                    assertEquals(
+                            "sampleUserProfileDTO",
+                            consolidatedAPIResponseDTO
+                                    .getUserProfile()
+                                    .getData()
+                                    .getName());
+
+                    assertNotNull(consolidatedAPIResponseDTO.getTenantConfig());
+                    assertEquals(
+                            "sampleTenant",
+                            consolidatedAPIResponseDTO
+                                    .getTenantConfig()
+                                    .getData()
+                                    .getDisplayName());
+
+                    assertNotNull(consolidatedAPIResponseDTO.getFeatureFlags());
+                    assertTrue(consolidatedAPIResponseDTO
+                            .getFeatureFlags()
+                            .getData()
+                            .get("sampleFeatureFlag"));
+
+                    assertNotNull(consolidatedAPIResponseDTO.getCurrentTheme());
+                    assertEquals(
+                            "sampleTheme",
+                            consolidatedAPIResponseDTO
+                                    .getCurrentTheme()
+                                    .getData()
+                                    .getName());
+
+                    assertNotNull(consolidatedAPIResponseDTO.getThemes());
+                    assertEquals(
+                            1, consolidatedAPIResponseDTO.getThemes().getData().size());
+                    assertEquals(
+                            "sampleTheme",
+                            consolidatedAPIResponseDTO
+                                    .getThemes()
+                                    .getData()
+                                    .get(0)
+                                    .getName());
+
+                    assertNotNull(consolidatedAPIResponseDTO.getCustomJSLibraries());
+                    assertEquals(
+                            1,
+                            consolidatedAPIResponseDTO
+                                    .getCustomJSLibraries()
+                                    .getData()
+                                    .size());
+                    assertEquals(
+                            "sampleJSLib",
+                            consolidatedAPIResponseDTO
+                                    .getCustomJSLibraries()
+                                    .getData()
+                                    .get(0)
+                                    .getName());
+
+                    assertNotNull(consolidatedAPIResponseDTO.getProductAlert());
+                    assertEquals(
+                            "sampleProductAlert",
+                            consolidatedAPIResponseDTO
+                                    .getProductAlert()
+                                    .getData()
+                                    .getTitle());
+
+                    assertNotNull(consolidatedAPIResponseDTO.getUnpublishedActions());
+                    assertEquals(
+                            1,
+                            consolidatedAPIResponseDTO
+                                    .getUnpublishedActions()
+                                    .getData()
+                                    .size());
+                    assertEquals(
+                            "sampleActionDTO",
+                            consolidatedAPIResponseDTO
+                                    .getUnpublishedActions()
+                                    .getData()
+                                    .get(0)
+                                    .getName());
+
+                    assertNotNull(consolidatedAPIResponseDTO.getUnpublishedActionCollections());
+                    assertEquals(
+                            1,
+                            consolidatedAPIResponseDTO
+                                    .getUnpublishedActionCollections()
+                                    .getData()
+                                    .size());
+                    assertEquals(
+                            "sampleActionCollectionDTO",
+                            consolidatedAPIResponseDTO
+                                    .getUnpublishedActionCollections()
+                                    .getData()
+                                    .get(0)
+                                    .getName());
+
+                    assertNotNull(consolidatedAPIResponseDTO.getPagesWithMigratedDsl());
+                    assertNotNull(consolidatedAPIResponseDTO.getUnpublishedActions());
+                    assertEquals(
+                            1,
+                            consolidatedAPIResponseDTO
+                                    .getUnpublishedActions()
+                                    .getData()
+                                    .size());
+                    assertNotNull(consolidatedAPIResponseDTO
+                            .getUnpublishedActions()
+                            .getData()
+                            .get(0)
+                            .getUpdatedAt());
+                    assertEquals(
+                            1,
+                            consolidatedAPIResponseDTO
+                                    .getPagesWithMigratedDsl()
+                                    .getData()
+                                    .size());
+                    assertEquals(
+                            "samplePageDTO",
+                            consolidatedAPIResponseDTO
+                                    .getPagesWithMigratedDsl()
+                                    .getData()
+                                    .get(0)
+                                    .getName());
+
+                    assertNotNull(consolidatedAPIResponseDTO.getPlugins());
+                    assertEquals(
+                            4, consolidatedAPIResponseDTO.getPlugins().getData().size());
+                    List<String> pluginPackageNameList = consolidatedAPIResponseDTO.getPlugins().getData().stream()
+                            .map(Plugin::getPackageName)
+                            .toList();
+                    assertTrue(pluginPackageNameList.contains(REST_API_PLUGIN));
+                    assertTrue(pluginPackageNameList.contains(GRAPHQL_PLUGIN));
+                    assertTrue(pluginPackageNameList.contains(APPSMITH_AI_PLUGIN));
+
+                    assertNotNull(consolidatedAPIResponseDTO.getPluginFormConfigs());
+                    assertEquals(
+                            4,
+                            consolidatedAPIResponseDTO
+                                    .getPluginFormConfigs()
+                                    .getData()
+                                    .keySet()
+                                    .size());
+                    assertTrue(consolidatedAPIResponseDTO
+                            .getPluginFormConfigs()
+                            .getData()
+                            .containsKey("samplePluginId"));
+                    assertTrue(consolidatedAPIResponseDTO
+                            .getPluginFormConfigs()
+                            .getData()
+                            .containsKey("sampleRestApiPluginId"));
+                    assertTrue(consolidatedAPIResponseDTO
+                            .getPluginFormConfigs()
+                            .getData()
+                            .containsKey("sampleGraphqlPluginId"));
+                    assertTrue(consolidatedAPIResponseDTO
+                            .getPluginFormConfigs()
+                            .getData()
+                            .containsKey("sampleAiPluginId"));
+
+                    assertNotNull(consolidatedAPIResponseDTO.getMockDatasources());
+                    assertEquals(
+                            1,
+                            consolidatedAPIResponseDTO
+                                    .getMockDatasources()
+                                    .getData()
+                                    .size());
+                    assertEquals(
+                            "sampleMockDataSet",
+                            consolidatedAPIResponseDTO
+                                    .getMockDatasources()
+                                    .getData()
+                                    .get(0)
+                                    .getName());
+
+                    assertNotNull(consolidatedAPIResponseDTO.getPages());
+                    assertEquals(
+                            "defaultApplicationId",
+                            consolidatedAPIResponseDTO
+                                    .getPages()
+                                    .getData()
+                                    .getApplication()
+                                    .getId());
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    public void testPageLoadWhenPageFromFeatureBranchAndCacheableRepositoryReturnsBaseApplicationId() {
+        User sampleUser = new User();
+        when(mockSessionUserService.getCurrentUser()).thenReturn(Mono.just(sampleUser));
+
+        UserProfileDTO sampleUserProfileDTO = new UserProfileDTO();
+        sampleUserProfileDTO.setName("sampleUserProfileDTO");
+        when(mockUserService.buildUserProfileDTO(any())).thenReturn(Mono.just(sampleUserProfileDTO));
+
+        Map<String, Boolean> sampleFeatureFlagMap = new HashMap<>();
+        sampleFeatureFlagMap.put("sampleFeatureFlag", true);
+        when(mockUserDataService.getFeatureFlagsForCurrentUser()).thenReturn(Mono.just(sampleFeatureFlagMap));
+
+        when(mockUserDataService.updateLastUsedResourceAndWorkspaceList(any(), any(), any()))
+                .thenReturn(Mono.just(new UserData()));
+
+        Tenant sampleTenant = new Tenant();
+        sampleTenant.setDisplayName("sampleTenant");
+        when(mockTenantService.getTenantConfiguration()).thenReturn(Mono.just(sampleTenant));
+
+        ProductAlertResponseDTO sampleProductAlertResponseDTO = new ProductAlertResponseDTO();
+        sampleProductAlertResponseDTO.setTitle("sampleProductAlert");
+        when(mockProductAlertService.getSingleApplicableMessage())
+                .thenReturn(Mono.just(List.of(sampleProductAlertResponseDTO)));
+
+        final String WORKSPACE_ID = "sampleWorkspaceId";
+        final String DEFAULT_APPLICATION_ID = "defaultApplicationId";
+        final String BASE_APPLICATION_ID = "baseApplicationId";
+        final String FEATURE_APPLICATION_ID = "featureApplicationId";
+        final String DEFAULT_BRANCH = "defaultBranch";
+        final String BASE_BRANCH = "baseBranch";
+        final String FEATURE_PAGE_ID = "featurePageId";
+
+        ApplicationPagesDTO sampleApplicationPagesDTO = new ApplicationPagesDTO();
+        sampleApplicationPagesDTO.setWorkspaceId(WORKSPACE_ID);
+
+        // base metadata
+        GitArtifactMetadata baseMetadata = new GitArtifactMetadata();
+        baseMetadata.setBranchName(BASE_BRANCH);
+        baseMetadata.setDefaultBranchName(DEFAULT_BRANCH);
+        baseMetadata.setDefaultApplicationId(DEFAULT_APPLICATION_ID);
+
+        Application baseBranchApplication = new Application();
+        baseBranchApplication.setGitArtifactMetadata(baseMetadata);
+        baseBranchApplication.setWorkspaceId(WORKSPACE_ID);
+        baseBranchApplication.setId(BASE_APPLICATION_ID);
+
+        // caching the base application id for the test case.
+        cacheableRepositoryHelper
+                .fetchBaseApplicationId(FEATURE_PAGE_ID, BASE_APPLICATION_ID)
+                .block();
+
+        doReturn(Mono.just(baseBranchApplication))
+                .when(spyApplicationService)
+                .findByBaseIdBranchNameAndApplicationMode(eq(BASE_APPLICATION_ID), eq(null), any());
+
+        ApplicationPage defaultApplicationPage = new ApplicationPage();
+        defaultApplicationPage.setIsDefault(true);
+        defaultApplicationPage.setId("defaultPageId");
+
+        // default metadata
+        GitArtifactMetadata defaultMetadata = new GitArtifactMetadata();
+        defaultMetadata.setBranchName(DEFAULT_BRANCH);
+        defaultMetadata.setDefaultBranchName(DEFAULT_BRANCH);
+        defaultMetadata.setDefaultApplicationId(DEFAULT_APPLICATION_ID);
+
+        Application defaultBranchApplication = new Application();
+        defaultBranchApplication.setGitArtifactMetadata(defaultMetadata);
+        defaultBranchApplication.setWorkspaceId(WORKSPACE_ID);
+        defaultBranchApplication.setId(DEFAULT_APPLICATION_ID);
+        defaultBranchApplication.setPages(List.of(defaultApplicationPage));
+
+        doReturn(Mono.just(defaultBranchApplication))
+                .when(spyApplicationService)
+                .findByBaseIdBranchNameAndApplicationMode(eq(BASE_APPLICATION_ID), eq(DEFAULT_BRANCH), any());
+
+        NewPage featureBranchPage = new NewPage();
+        featureBranchPage.setId(FEATURE_PAGE_ID);
+        featureBranchPage.setApplicationId(FEATURE_APPLICATION_ID);
+        featureBranchPage.setUnpublishedPage(new PageDTO());
+
+        doReturn(Mono.just(featureBranchPage))
+                .when(spyNewPageService)
+                .findByBranchNameAndBasePageIdAndApplicationMode(eq(null), eq(FEATURE_PAGE_ID), any());
+
+        doReturn(Mono.just(new PageDTO()))
+                .when(spyApplicationPageService)
+                .getPageAndMigrateDslByBranchedPageId(anyString(), anyBoolean(), anyBoolean());
+
+        Theme sampleTheme = new Theme();
+        sampleTheme.setName("sampleTheme");
+        doReturn(Mono.just(sampleTheme)).when(spyThemeService).getApplicationTheme(anyString(), any());
+        doReturn(Flux.just(sampleTheme)).when(spyThemeService).getApplicationThemes(anyString());
+
+        CustomJSLib sampleCustomJSLib = new CustomJSLib();
+        sampleCustomJSLib.setName("sampleJSLib");
+        doReturn(Mono.just(List.of(sampleCustomJSLib)))
+                .when(spyCustomJSLibService)
+                .getAllJSLibsInContext(anyString(), any(), anyBoolean());
+
+        PageDTO samplePageDTO = new PageDTO();
+        samplePageDTO.setName("samplePageDTO");
+        doReturn(Mono.just(samplePageDTO))
+                .doReturn(Mono.just(samplePageDTO))
+                .when(spyApplicationPageService)
+                .getPageAndMigrateDslByBranchedPageId(anyString(), anyBoolean(), anyBoolean());
+
+        doReturn(Mono.just(samplePageDTO))
+                .doReturn(Mono.just(samplePageDTO))
+                .when(spyApplicationPageService)
+                .getPageDTOAfterMigratingDSL(any(), anyBoolean(), anyBoolean());
+
+        doReturn(Mono.just(samplePageDTO))
+                .doReturn(Mono.just(samplePageDTO))
+                .when(spyApplicationPageService)
+                .getPageDTOAfterMigratingDSL(any(), anyBoolean(), anyBoolean());
+
+        ActionDTO sampleActionDTO = new ActionDTO();
+        sampleActionDTO.setName("sampleActionDTO");
+        sampleActionDTO.setUpdatedAt(Instant.now());
+        doReturn(Flux.just(sampleActionDTO)).when(spyNewActionService).getUnpublishedActions(any(), anyBoolean());
+
+        ActionCollectionDTO sampleActionCollectionDTO = new ActionCollectionDTO();
+        sampleActionCollectionDTO.setName("sampleActionCollectionDTO");
+        doReturn(Flux.just(sampleActionCollectionDTO))
+                .when(spyActionCollectionService)
+                .getPopulatedActionCollectionsByViewMode(any(), anyBoolean());
+
+        PageNameIdDTO samplePageNameIdDTO = new PageNameIdDTO();
+        samplePageNameIdDTO.setName("samplePageNameIdDTO");
+        sampleApplicationPagesDTO.setPages(List.of(samplePageNameIdDTO));
+
+        Plugin samplePlugin = new Plugin();
+        samplePlugin.setName("samplePlugin");
+        samplePlugin.setId("samplePluginId");
+        samplePlugin.setPackageName("sample-plugin");
+        Plugin sampleRestApiPlugin = new Plugin();
+        sampleRestApiPlugin.setName("sampleRestApiPlugin");
+        sampleRestApiPlugin.setId("sampleRestApiPluginId");
+        sampleRestApiPlugin.setPackageName(REST_API_PLUGIN);
+        Plugin sampleGraphqlPlugin = new Plugin();
+        sampleGraphqlPlugin.setName("sampleGraphqlPlugin");
+        sampleGraphqlPlugin.setId("sampleGraphqlPluginId");
+        sampleGraphqlPlugin.setPackageName(GRAPHQL_PLUGIN);
+        Plugin sampleAiPlugin = new Plugin();
+        sampleAiPlugin.setName("sampleAiPlugin");
+        sampleAiPlugin.setId("sampleAiPluginId");
+        sampleAiPlugin.setPackageName(APPSMITH_AI_PLUGIN);
+        when(mockPluginService.getInWorkspace(anyString()))
+                .thenReturn(Flux.just(samplePlugin, sampleRestApiPlugin, sampleGraphqlPlugin, sampleAiPlugin));
+
+        Datasource sampleDatasource = new Datasource();
+        sampleDatasource.setName("sampleDatasource");
+        sampleDatasource.setPluginId("samplePluginId");
+        when(mockDatasourceService.getAllWithStorages(any())).thenReturn(Flux.just(sampleDatasource));
+
+        Map<String, Map<?, ?>> sampleFormConfig = new HashMap<>();
+        sampleFormConfig.put("key", Map.of());
+        when(mockPluginService.getFormConfig(anyString())).thenReturn(Mono.just(sampleFormConfig));
+
+        MockDataSet sampleMockDataSet = new MockDataSet();
+        sampleMockDataSet.setName("sampleMockDataSet");
+        MockDataDTO sampleMockDataDTO = new MockDataDTO();
+        sampleMockDataDTO.setMockdbs(List.of(sampleMockDataSet));
+        when(mockMockDataService.getMockDataSet()).thenReturn(Mono.just(sampleMockDataDTO));
+
+        Mono<ConsolidatedAPIResponseDTO> consolidatedInfoForPageLoad =
+                consolidatedAPIService.getConsolidatedInfoForPageLoad(
+                        FEATURE_PAGE_ID, null, null, ApplicationMode.PUBLISHED);
+        StepVerifier.create(consolidatedInfoForPageLoad)
+                .assertNext(consolidatedAPIResponseDTO -> {
+                    assertNotNull(consolidatedAPIResponseDTO);
+
+                    ResponseDTO<ApplicationPagesDTO> pages = consolidatedAPIResponseDTO.getPages();
+                    ResponseDTO<PageDTO> pageWithMigratedDsl = consolidatedAPIResponseDTO.getPageWithMigratedDsl();
+
+                    assertNull(pages.getData());
+                    assertNotNull(pages.getResponseMeta());
+                    assertNotNull(pages.getResponseMeta().getError());
+
+                    assertThat(pages.getResponseMeta().getError().getCode())
+                            .isEqualTo(AppsmithError.NO_RESOURCE_FOUND.getAppErrorCode());
+                    assertThat(pages.getResponseMeta().getError().getMessage())
+                            .isEqualTo("Unable to find page featurePageId, defaultBranch");
+
+                    assertNull(pageWithMigratedDsl.getData());
+                    assertNotNull(pageWithMigratedDsl.getResponseMeta());
+                    assertNotNull(pageWithMigratedDsl.getResponseMeta().getError());
+
+                    assertThat(pageWithMigratedDsl.getResponseMeta().getError().getCode())
+                            .isEqualTo(AppsmithError.NO_RESOURCE_FOUND.getAppErrorCode());
+                    assertThat(pageWithMigratedDsl.getResponseMeta().getError().getMessage())
+                            .isEqualTo("Unable to find page featurePageId, defaultBranch");
+                })
+                .verifyComplete();
+    }
 }
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCEImplTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCEImplTest.java
index 9aac576ae4bd..603142af9435 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCEImplTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCEImplTest.java
@@ -15,6 +15,7 @@
 import com.appsmith.server.domains.NewAction;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.helpers.ActionExecutionSolutionHelper;
 import com.appsmith.server.helpers.PluginExecutorHelper;
 import com.appsmith.server.newactions.base.NewActionService;
 import com.appsmith.server.newpages.base.NewPageService;
@@ -108,7 +109,7 @@ class ActionExecutionSolutionCEImplTest {
     @MockBean
     ApplicationService applicationService;
 
-    @MockBean
+    @SpyBean
     SessionUserService sessionUserService;
 
     @MockBean
@@ -132,6 +133,9 @@ class ActionExecutionSolutionCEImplTest {
     @SpyBean
     CommonConfig commonConfig;
 
+    @SpyBean
+    ActionExecutionSolutionHelper actionExecutionSolutionHelper;
+
     @Autowired
     EnvironmentPermission environmentPermission;
 
@@ -162,7 +166,8 @@ public void beforeEach() {
                 environmentPermission,
                 configService,
                 tenantService,
-                commonConfig);
+                commonConfig,
+                actionExecutionSolutionHelper);
 
         ObservationRegistry.ObservationConfig mockObservationConfig =
                 Mockito.mock(ObservationRegistry.ObservationConfig.class);
diff --git a/app/server/pom.xml b/app/server/pom.xml
index ccee774a5e50..814ba6851871 100644
--- a/app/server/pom.xml
+++ b/app/server/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.0.9</version>
+        <version>3.3.3</version>
         <relativePath/>
         <!-- lookup parent from repository -->
     </parent>
@@ -31,7 +31,6 @@
         <jackson.version>2.17.0</jackson.version>
         <java.version>17</java.version>
         <javadoc.disabled>true</javadoc.disabled>
-        <logback.version>1.4.14</logback.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <mockito.version>4.4.0</mockito.version>
@@ -48,8 +47,7 @@
         <snakeyaml.version>2.0</snakeyaml.version>
         <source.disabled>true</source.disabled>
         <spotless.version>2.36.0</spotless.version>
-        <spring-boot.version>3.0.9</spring-boot.version>
-        <testcontainers.version>1.19.3</testcontainers.version>
+        <testcontainers.version>1.20.1</testcontainers.version>
     </properties>
 
     <build>
@@ -136,6 +134,7 @@
                             <includes>
                                 <include>*.md</include>
                                 <include>.gitignore</include>
+                                <include>**/*.sql</include>
                             </includes>
                             <!-- define the steps to apply to those files -->
                             <trimTrailingWhitespace/>
diff --git a/app/server/reactive-caching/pom.xml b/app/server/reactive-caching/pom.xml
index c375907b16cc..3321b759e1cc 100644
--- a/app/server/reactive-caching/pom.xml
+++ b/app/server/reactive-caching/pom.xml
@@ -32,7 +32,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-webflux</artifactId>
-            <version>${spring-boot.version}</version>
         </dependency>
 
         <dependency>
diff --git a/deploy/ansible/appsmith_playbook/roles/setup-appsmith/templates/appsmith/scripts/first-time-setup.sh b/deploy/ansible/appsmith_playbook/roles/setup-appsmith/templates/appsmith/scripts/first-time-setup.sh
index 72acbe17a815..0bda58015f38 100644
--- a/deploy/ansible/appsmith_playbook/roles/setup-appsmith/templates/appsmith/scripts/first-time-setup.sh
+++ b/deploy/ansible/appsmith_playbook/roles/setup-appsmith/templates/appsmith/scripts/first-time-setup.sh
@@ -111,16 +111,13 @@ if [[ $status_code -eq 401 ]]; then
     default_user_name="${tokens[0]}"
     default_user_password="${tokens[1]}"
 
-    curl -k -X POST 'http://localhost/api/v1/users/super' \
-    --header 'Content-Type: application/json' \
-    --data-raw '{
-        "name" : "'"$default_user_name"'",
-        "email" : "'"$default_user_name"'",
-        "source" : "FORM",
-        "state" : "ACTIVATED",
-        "isEnabled" : "true",
-        "password": "'"$default_user_password"'"
-    }'
+    curl http://localhost/api/v1/users/super \
+      --data-urlencode "name=$default_user_name" \
+      --data-urlencode "email=$default_user_name" \
+      --data-urlencode "password=$default_user_password" \
+      -d source=FORM \
+      -d state=ACTIVATED \
+      -d isEnabled=true
 
     curl -s --location --request POST 'https://hook.integromat.com/dkwb6i52am93pi30ojeboktvj32iw0fa' \
     --header 'Content-Type: text/plain' \
diff --git a/deploy/aws_ami/first-time-setup.sh b/deploy/aws_ami/first-time-setup.sh
index 1299e0915dec..32a714bf997b 100755
--- a/deploy/aws_ami/first-time-setup.sh
+++ b/deploy/aws_ami/first-time-setup.sh
@@ -110,16 +110,13 @@ if [[ $status_code -eq 401 ]]; then
     default_user_name="${tokens[0]}"
     default_user_password="${tokens[1]}"
 
-    curl -k -X POST 'http://localhost/api/v1/users/super' \
-    --header 'Content-Type: application/json' \
-    --data-raw '{
-        "name" : "'"$default_user_name"'",
-        "email" : "'"$default_user_name"'",
-        "source" : "FORM",
-        "state" : "ACTIVATED",
-        "isEnabled" : "true",
-        "password": "'"$default_user_password"'"
-    }'
+    curl http://localhost/api/v1/users/super \
+      --data-urlencode "name=$default_user_name" \
+      --data-urlencode "email=$default_user_name" \
+      --data-urlencode "password=$default_user_password" \
+      -d source=FORM \
+      -d state=ACTIVATED \
+      -d isEnabled=true
 
     curl -s --location --request POST 'https://hook.integromat.com/dkwb6i52am93pi30ojeboktvj32iw0fa' \
     --header 'Content-Type: text/plain' \
diff --git a/deploy/docker/base.dockerfile b/deploy/docker/base.dockerfile
index 8549406ebc37..5ea5ec48541d 100644
--- a/deploy/docker/base.dockerfile
+++ b/deploy/docker/base.dockerfile
@@ -10,8 +10,8 @@ LABEL maintainer="tech@appsmith.com"
 WORKDIR /opt/appsmith
 
 # The env variables are needed for Appsmith server to correctly handle non-roman scripts like Arabic.
-ENV LANG C.UTF-8
-ENV LC_ALL C.UTF-8
+ENV LANG=C.UTF-8
+ENV LC_ALL=C.UTF-8
 
 # Install dependency packages
 RUN set -o xtrace \
@@ -44,10 +44,21 @@ RUN set -o xtrace \
   | tar -xz -C /opt/java --strip-components 1
 
 # Install NodeJS
-RUN set -o xtrace \
-  && mkdir -p /opt/node \
-  && file="$(curl -sS 'https://nodejs.org/dist/latest-v20.x/' | awk -F\" '$2 ~ /linux-'"$(uname -m | sed 's/x86_64/x64/; s/aarch64/arm64/')"'.tar.gz/ {print $2}')" \
-  && curl "https://nodejs.org/dist/latest-v20.x/$file" | tar -xz -C /opt/node --strip-components 1
+RUN <<END
+  set -eo xtrace
+
+  mkdir -p /opt/node
+  arch="$(uname -m | sed 's/x86_64/x64/; s/aarch64/arm64/')"
+
+  curl -LOsS "https://nodejs.org/dist/latest-v20.x/SHASUMS256.txt"
+  filename="$(awk '/linux-'"$arch"'.tar.gz/ {print $2}' SHASUMS256.txt)"
+
+  curl -LOsS "https://nodejs.org/dist/latest-v20.x/$filename"
+  grep "$filename" SHASUMS256.txt | sha256sum -c -
+  tar -xzf "$filename" -C /opt/node --strip-components 1
+
+  rm "$filename" SHASUMS256.txt
+END
 
 # Install Caddy
 RUN set -o xtrace \
diff --git a/deploy/docker/fs/opt/appsmith/caddy-reconfigure.mjs b/deploy/docker/fs/opt/appsmith/caddy-reconfigure.mjs
index 75d5e9296f95..b4cc80762aed 100644
--- a/deploy/docker/fs/opt/appsmith/caddy-reconfigure.mjs
+++ b/deploy/docker/fs/opt/appsmith/caddy-reconfigure.mjs
@@ -74,13 +74,13 @@ parts.push(`
   }
 
   # skip logs for health check
-  skip_log /api/v1/health
+  log_skip /api/v1/health
 
   # skip logs for sourcemap files
   @source-map-files {
     path_regexp ^.*\.(js|css)\.map$
   }
-  skip_log @source-map-files
+  log_skip @source-map-files
 
   # The internal request ID header should never be accepted from an incoming request.
   request_header -X-Appsmith-Request-Id
@@ -154,7 +154,12 @@ parts.push(`
 
   handle_errors {
     respond "{err.status_code} {err.status_text}" {err.status_code}
-    header -Server
+    header {
+      # Remove the Server header from the response.
+      -Server
+      # Remove Cache-Control header from the response.
+      -Cache-Control
+    }
   }
 }
 
diff --git a/deploy/docker/fs/opt/appsmith/entrypoint.sh b/deploy/docker/fs/opt/appsmith/entrypoint.sh
index 3d73af5b391a..ce39e43598f1 100644
--- a/deploy/docker/fs/opt/appsmith/entrypoint.sh
+++ b/deploy/docker/fs/opt/appsmith/entrypoint.sh
@@ -6,6 +6,7 @@ tlog "Running as: $(id)"
 
 stacks_path=/appsmith-stacks
 
+export APPSMITH_PG_DATABASE="appsmith"
 export SUPERVISORD_CONF_TARGET="$TMP/supervisor-conf.d/"  # export for use in supervisord.conf
 export MONGODB_TMP_KEY_PATH="$TMP/mongodb-key"  # export for use in supervisor process mongodb.conf
 
@@ -24,6 +25,13 @@ setup_proxy_variables() {
     export NO_PROXY="127.0.0.1,$NO_PROXY"
   fi
 
+  # If one of NO_PROXY or no_proxy are set, copy it to the other. If both are set, prefer NO_PROXY.
+  if [[ -n ${NO_PROXY-} ]]; then
+    export no_proxy="$NO_PROXY"
+  elif [[ -n ${no_proxy-} ]]; then
+    export NO_PROXY="$no_proxy"
+  fi
+
   # If one of HTTPS_PROXY or https_proxy are set, copy it to the other. If both are set, prefer HTTPS_PROXY.
   if [[ -n ${HTTPS_PROXY-} ]]; then
     export https_proxy="$HTTPS_PROXY"
@@ -58,6 +66,7 @@ init_env_file() {
     # Generate new docker.env file when initializing container for first time or in Heroku which does not have persistent volume
     tlog "Generating default configuration file"
     mkdir -p "$CONF_PATH"
+
     local default_appsmith_mongodb_user="appsmith"
     local generated_appsmith_mongodb_password=$(
       tr -dc A-Za-z0-9 </dev/urandom | head -c 13
@@ -75,10 +84,10 @@ init_env_file() {
       tr -dc A-Za-z0-9 </dev/urandom | head -c 13
       echo ''
     )
+
     bash "$TEMPLATES_PATH/docker.env.sh" "$default_appsmith_mongodb_user" "$generated_appsmith_mongodb_password" "$generated_appsmith_encryption_password" "$generated_appsmith_encription_salt" "$generated_appsmith_supervisor_password" > "$ENV_PATH"
   fi
 
-
   tlog "Load environment configuration"
 
   # Load the ones in `docker.env` in the stacks folder.
@@ -431,6 +440,7 @@ init_postgres() {
       tlog "Initializing local Postgres data folder"
       su postgres -c "env PATH='$PATH' initdb -D $POSTGRES_DB_PATH"
     fi
+    create_appsmith_pg_db "$POSTGRES_DB_PATH"
   else
     runEmbeddedPostgres=0
   fi
@@ -452,6 +462,40 @@ safe_init_postgres() {
   fi
 }
 
+# Method to create a appsmith database in the postgres 
+# Args:
+#     POSTGRES_DB_PATH (string): Path to the postgres data directory
+# Returns:
+#     None
+# Example:
+#     create_appsmith_pg_db "/appsmith-stacks/data/postgres/main"
+create_appsmith_pg_db() {
+  POSTGRES_DB_PATH=$1
+  # Start the postgres , wait for it to be ready and create a appsmith db
+  su postgres -c "env PATH='$PATH' pg_ctl -D $POSTGRES_DB_PATH -l $POSTGRES_DB_PATH/logfile start"
+  echo "Waiting for Postgres to start"
+  local max_attempts=300
+  local attempt=0
+
+  until su postgres -c "env PATH='$PATH' pg_isready -h 127.0.0.1"; do
+    if (( attempt >= max_attempts )); then
+      echo "Postgres failed to start within 300 seconds."
+      return 1
+    fi
+    tlog "Waiting for Postgres to be ready... Attempt $((++attempt))/$max_attempts"
+    sleep 1
+  done
+  # Check if the appsmith DB is present
+  DB_EXISTS=$(su postgres -c "env PATH='$PATH' psql -tAc \"SELECT 1 FROM pg_database WHERE datname='${APPSMITH_PG_DATABASE}'\"")
+
+  if [[ "$DB_EXISTS" != "1" ]]; then
+    su postgres -c "env PATH='$PATH' psql -c \"CREATE DATABASE ${APPSMITH_PG_DATABASE}\""
+  else
+    echo "Database ${APPSMITH_PG_DATABASE} already exists."
+  fi
+  su postgres -c "env PATH='$PATH' pg_ctl -D $POSTGRES_DB_PATH stop"
+}
+
 setup_caddy() {
   if [[ "$APPSMITH_RATE_LIMIT" == "disabled" ]]; then
     export _APPSMITH_CADDY="/opt/caddy/caddy_vanilla"
diff --git a/deploy/docker/fs/opt/appsmith/pg-utils.sh b/deploy/docker/fs/opt/appsmith/pg-utils.sh
index 315446f552d7..27ad26efdccc 100755
--- a/deploy/docker/fs/opt/appsmith/pg-utils.sh
+++ b/deploy/docker/fs/opt/appsmith/pg-utils.sh
@@ -1,5 +1,13 @@
 #!/bin/bash
 
+# default values
+DB_USER="appsmith"
+DB_HOST="127.0.0.1"
+DB_PORT="5432"
+DB_SCHEMA="appsmith"
+DB_NAME="appsmith"
+postgres_admin_user="postgres"
+
 waitForPostgresAvailability() {
   if [ -z "$PG_DB_HOST" ]; then
     tlog "PostgreSQL host name is empty. Check env variables. Error. Exiting java setup"
@@ -87,6 +95,83 @@ extract_postgres_db_params() {
   export PG_DB_NAME="$DB"
 }
 
+init_pg_db() {
+  # Create the appsmith schema
+  echo "Initializing PostgreSQL with schema..."
+
+  # Check if APPSMITH_DB_URL is a PostgreSQL URL
+  if [[ -n "$APPSMITH_DB_URL" && "$APPSMITH_DB_URL" == postgres*://* ]]; then
+    echo "APPSMITH_DB_URL is a valid PostgreSQL URL."
+
+    # Check if the DB_HOST is local (localhost or 127.0.0.1)
+    if [[ "$PG_DB_HOST" == "localhost" || "$PG_DB_HOST" == "127.0.0.1" ]]; then
+
+      # Check if the database exists
+      DB_CHECK=$(psql -h "$PG_DB_HOST" -p "$PG_DB_PORT" -U postgres -d "postgres" -tAc "SELECT 1 FROM pg_database WHERE datname='$PG_DB_NAME'")
+
+      if [ "$DB_CHECK" != "1" ]; then
+        echo "Database $PG_DB_NAME does not exist. Creating database..."
+        psql -h "$PG_DB_HOST" -p "$PG_DB_PORT" -U postgres -d "postgres" -c "CREATE DATABASE $PG_DB_NAME;"
+      else
+        echo "Database $PG_DB_NAME already exists."
+      fi
+
+      # Check if the schema exists
+      SCHEMA_CHECK=$(psql -h "$PG_DB_HOST" -p "$PG_DB_PORT" -U postgres -d "$PG_DB_NAME" -tAc "SELECT 1 FROM information_schema.schemata WHERE schema_name='appsmith'")
+
+      # Create schema and user if not exists
+      if [ "$SCHEMA_CHECK" != "1" ]; then
+        echo "Creating user '$PG_DB_USER' with password "
+        psql -h "$PG_DB_HOST" -p "$PG_DB_PORT" -U postgres -d "$PG_DB_NAME" -c "CREATE USER \"$PG_DB_USER\" WITH PASSWORD '$PG_DB_PASSWORD';"
+
+        echo "Schema 'appsmith' does not exist. Creating schema..."
+        psql -h "$PG_DB_HOST" -p "$PG_DB_PORT" -U postgres -d "$PG_DB_NAME" -c "CREATE SCHEMA appsmith;"
+      fi
+      USER=$PG_DB_USER SCHEMA="appsmith" DB=$PG_DB_NAME HOST=$PG_DB_HOST PORT=$PG_DB_PORT grant_permissions_for_schema
+
+      echo "Creating pg_trgm extension..."
+      psql -h "$PG_DB_HOST" -p "$PG_DB_PORT" -U postgres -d "$PG_DB_NAME" -c "CREATE EXTENSION IF NOT EXISTS pg_trgm;"
+    else
+      echo "Remote PostgreSQL detected, running as current user."
+      PGPASSWORD=$PG_DB_PASSWORD psql -h "$PG_DB_HOST" -p "$PG_DB_PORT" -U "$PG_DB_USER" -d "$PG_DB_NAME" -c "CREATE SCHEMA IF NOT EXISTS appsmith;"
+
+      echo "Creating pg_trgm extension..."
+      PGPASSWORD=$PG_DB_PASSWORD psql -h "$PG_DB_HOST" -p "$PG_DB_PORT" -U "$PG_DB_USER" -d "$PG_DB_NAME" -c "CREATE EXTENSION IF NOT EXISTS pg_trgm;"
+    fi
+
+    # Check if the schema creation was successful
+    if [ $? -eq 0 ]; then
+      echo "Schema 'appsmith' created or already exists."
+    else
+      echo "Failed to create schema 'appsmith'."
+      exit 1
+    fi
+    echo "PostgreSQL initialization completed."
+  fi
+}
+
+# Utility function to grant permissions to a user on a schema in a database on a host and port in PostgreSQL database
+# Args:
+#     USER (string): User to grant permissions to
+#     SCHEMA (string): Schema to grant permissions on
+#     DB (string): Database to grant permissions on
+#     HOST (string): Host to grant permissions on
+#     PORT (int): Port to grant permissions on
+# Returns:
+#     None
+# Example:
+#     USER="user" SCHEMA="schema" DB="db" HOST="host" PORT="port" grant_permissions_for_schema
+grant_permissions_for_schema() {
+  local user=${USER-$DB_USER} schema=${SCHEMA-$DB_SCHEMA} db=${DB-$DB_NAME} host=${HOST-$DB_HOST} port=${PORT-$DB_PORT}
+  tlog "Granting permissions to user '${user}' on schema '$schema' in database '$db' on host '$host' and port '$port'..."
+  psql -h ${host} -p ${port} -U ${postgres_admin_user} -d ${db} -c "GRANT ALL PRIVILEGES ON SCHEMA ${schema} TO ${user};"
+  psql -h ${host} -p ${port} -U ${postgres_admin_user} -d ${db} -c "GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA ${schema} TO ${user};"
+  psql -h ${host} -p ${port} -U ${postgres_admin_user} -d ${db} -c "ALTER DEFAULT PRIVILEGES IN SCHEMA ${schema} GRANT ALL PRIVILEGES ON TABLES TO ${user};"
+  psql -h ${host} -p ${port} -U ${postgres_admin_user} -d ${db} -c "GRANT CONNECT ON DATABASE ${db} TO ${user};"
+}
+
 # Example usage of the functions
 # waitForPostgresAvailability
-# extract_postgres_db_params "postgresql://user:password@localhost:5432/dbname"
\ No newline at end of file
+# extract_postgres_db_params "postgresql://user:password@localhost:5432/dbname"
+# init_pg_db
+# USER="user" SCHEMA="schema" DB="db" HOST="host" PORT="port" grant_permissions_for_schema
diff --git a/deploy/docker/fs/opt/appsmith/run-java.sh b/deploy/docker/fs/opt/appsmith/run-java.sh
index ed88e26e1191..77d5ccfe7442 100755
--- a/deploy/docker/fs/opt/appsmith/run-java.sh
+++ b/deploy/docker/fs/opt/appsmith/run-java.sh
@@ -36,6 +36,7 @@ match-proxy-url() {
 if [[ "$mode" == "pg" ]]; then
   extract_postgres_db_params "$APPSMITH_DB_URL"
   waitForPostgresAvailability
+  init_pg_db
 fi
 
 if match-proxy-url "${HTTP_PROXY-}"; then
diff --git a/deploy/docker/fs/opt/appsmith/templates/docker.env.sh b/deploy/docker/fs/opt/appsmith/templates/docker.env.sh
index e80133242808..d183f24767a9 100644
--- a/deploy/docker/fs/opt/appsmith/templates/docker.env.sh
+++ b/deploy/docker/fs/opt/appsmith/templates/docker.env.sh
@@ -2,7 +2,7 @@
 
 set -o nounset
 MONGO_USER="$1"
-MONGO_PASSWORD="$2"
+DB_PASSWORD="$2"
 ENCRYPTION_PASSWORD="$3"
 ENCRYPTION_SALT="$4"
 SUPERVISOR_PASSWORD="$5"
@@ -63,10 +63,10 @@ APPSMITH_RECAPTCHA_SITE_KEY=
 APPSMITH_RECAPTCHA_SECRET_KEY=
 APPSMITH_RECAPTCHA_ENABLED=
 
-APPSMITH_DB_URL=mongodb://$MONGO_USER:$MONGO_PASSWORD@localhost:27017/appsmith
+APPSMITH_DB_URL=mongodb://$MONGO_USER:$DB_PASSWORD@localhost:27017/appsmith
+APPSMITH_POSTGRES_DB_URL=postgresql://appsmith:$DB_PASSWORD@localhost:5432/appsmith
 APPSMITH_MONGODB_USER=$MONGO_USER
-APPSMITH_MONGODB_PASSWORD=$MONGO_PASSWORD
-APPSMITH_API_BASE_URL=http://localhost:8080/api/v1
+APPSMITH_MONGODB_PASSWORD=$DB_PASSWORD
 
 APPSMITH_REDIS_URL=redis://127.0.0.1:6379
 
diff --git a/deploy/docker/fs/opt/appsmith/utils/bin/backup.js b/deploy/docker/fs/opt/appsmith/utils/bin/backup.js
index a2ef2b85578f..539d9fedd2d0 100644
--- a/deploy/docker/fs/opt/appsmith/utils/bin/backup.js
+++ b/deploy/docker/fs/opt/appsmith/utils/bin/backup.js
@@ -1,7 +1,6 @@
 const fsPromises = require('fs/promises');
 const path = require('path');
 const os = require('os');
-const shell = require('shelljs');
 const utils = require('./utils');
 const Constants = require('./constants');
 const logger = require('./logger');
@@ -16,22 +15,17 @@ async function run() {
   let errorCode = 0;
   let backupRootPath, archivePath, encryptionPassword;
   let encryptArchive = false;
-  try {
-    const check_supervisord_status_cmd = '/usr/bin/supervisorctl >/dev/null 2>&1';
-    shell.exec(check_supervisord_status_cmd, function (code) {
-      if (code > 0) {
-        shell.echo('application is not running, starting supervisord');
-        shell.exec('/usr/bin/supervisord');
-      }
-    });
 
+  await utils.ensureSupervisorIsRunning();
+
+  try {
     console.log('Available free space at /appsmith-stacks');
-    const availSpaceInBytes = getAvailableBackupSpaceInBytes();
+    const availSpaceInBytes = getAvailableBackupSpaceInBytes("/appsmith-stacks");
     console.log('\n');
 
     checkAvailableBackupSpace(availSpaceInBytes);
 
-    const backupRootPath = await generateBackupRootPath();
+    backupRootPath = await generateBackupRootPath();
     const backupContentsPath = getBackupContentsPath(backupRootPath, timestamp);
 
     await fsPromises.mkdir(backupContentsPath);
@@ -51,17 +45,17 @@ async function run() {
     }
     await exportDockerEnvFile(backupContentsPath, encryptArchive);
 
-    const archivePath = await createFinalArchive(backupRootPath, timestamp);
+    archivePath = await createFinalArchive(backupRootPath, timestamp);
     // shell.exec("openssl enc -aes-256-cbc -pbkdf2 -iter 100000 -in " + archivePath + " -out " + archivePath + ".enc");
     if (encryptArchive){
         const encryptedArchivePath = await encryptBackupArchive(archivePath,encryptionPassword);
-        logger.backup_info('Finished creating an encrypted a backup archive at ' + encryptedArchivePath);
+        await logger.backup_info('Finished creating an encrypted a backup archive at ' + encryptedArchivePath);
         if (archivePath != null) {
           await fsPromises.rm(archivePath, { recursive: true, force: true });
         }
     }
     else {
-      logger.backup_info('Finished creating a backup archive at ' + archivePath);
+      await logger.backup_info('Finished creating a backup archive at ' + archivePath);
       console.log('********************************************************* IMPORTANT!!! *************************************************************');
       console.log('*** Please ensure you have saved the APPSMITH_ENCRYPTION_SALT and APPSMITH_ENCRYPTION_PASSWORD variables from the docker.env file **')
       console.log('*** These values are not included in the backup export.                                                                           **');
@@ -70,7 +64,7 @@ async function run() {
 
     await fsPromises.rm(backupRootPath, { recursive: true, force: true });
 
-    logger.backup_info('Finished taking a backup at ' + archivePath);
+    await logger.backup_info('Finished taking a backup at ' + archivePath);
 
   } catch (err) {
     errorCode = 1;
@@ -194,9 +188,8 @@ function getGitRoot(gitRoot) {
   return gitRoot
 }
 
-async function generateBackupRootPath() {
-  const backupRootPath = await fsPromises.mkdtemp(path.join(os.tmpdir(), 'appsmithctl-backup-'));
-  return backupRootPath
+function generateBackupRootPath() {
+  return fsPromises.mkdtemp(path.join(os.tmpdir(), 'appsmithctl-backup-'));
 }
 
 function getBackupContentsPath(backupRootPath, timestamp) {
@@ -232,13 +225,14 @@ function getTimeStampInISO() {
   return new Date().toISOString().replace(/:/g, '-')
 }
 
-function getAvailableBackupSpaceInBytes() {
-  return parseInt(shell.exec('df --output=avail -B 1 /appsmith-stacks | tail -n 1'), 10)
+async function getAvailableBackupSpaceInBytes(path) {
+  const stat = await fsPromises.statfs(path);
+  return stat.bsize * stat.bfree;
 }
 
 function checkAvailableBackupSpace(availSpaceInBytes) {
   if (availSpaceInBytes < Constants.MIN_REQUIRED_DISK_SPACE_IN_BYTES) {
-    throw new Error('Not enough space avaliable at /appsmith-stacks. Please ensure availability of atleast 2GB to backup successfully.');
+    throw new Error("Not enough space available at /appsmith-stacks. Please ensure availability of at least 2GB to backup successfully.");
   }
 }
 
@@ -259,4 +253,4 @@ module.exports = {
   removeOldBackups,
   getEncryptionPasswordFromUser,
   encryptBackupArchive,
-};
\ No newline at end of file
+};
diff --git a/deploy/docker/fs/opt/appsmith/utils/bin/backup.test.js b/deploy/docker/fs/opt/appsmith/utils/bin/backup.test.js
index 335dfd71a427..d49e4eff4f59 100644
--- a/deploy/docker/fs/opt/appsmith/utils/bin/backup.test.js
+++ b/deploy/docker/fs/opt/appsmith/utils/bin/backup.test.js
@@ -3,7 +3,6 @@ const Constants = require('./constants');
 const os = require('os');
 const fsPromises = require('fs/promises');
 const utils = require('./utils');
-const shell = require('shelljs');
 const readlineSync = require('readline-sync');
 
 describe('Backup Tests', () => {
@@ -13,19 +12,19 @@ test('Timestamp string in ISO format', () => {
   expect(backup.getTimeStampInISO()).toMatch(/(\d{4})-(\d{2})-(\d{2})T(\d{2})\-(\d{2})\-(\d{2})\.(\d{3})Z/)
 });
 
-test('Available Space in /appsmith-stacks volume in Bytes', () => {
-  shell.exec = jest.fn((format) => '20');
-  const res = expect(backup.getAvailableBackupSpaceInBytes())
-  res.toBe(20)
-
+test('Available Space in /appsmith-stacks volume in Bytes', async () => {
+  const res = expect(await backup.getAvailableBackupSpaceInBytes("/"))
+  res.toBeGreaterThan(1024 * 1024)
 });
+
 it('Checkx the constant is 2 GB', () => {
   let size = 2 * 1024 * 1024 * 1024
   expect(Constants.MIN_REQUIRED_DISK_SPACE_IN_BYTES).toBe(size)
 });
+
 it('Should throw Error when the available size is below MIN_REQUIRED_DISK_SPACE_IN_BYTES', () => {
   let size = Constants.MIN_REQUIRED_DISK_SPACE_IN_BYTES - 1;
-  expect(() => {backup.checkAvailableBackupSpace(size)}).toThrow('Not enough space avaliable at /appsmith-stacks. Please ensure availability of atleast 2GB to backup successfully.');
+  expect(() => backup.checkAvailableBackupSpace(size)).toThrow();
 });
 
 it('Should not hould throw Error when the available size is >= MIN_REQUIRED_DISK_SPACE_IN_BYTES', () => {
@@ -35,7 +34,6 @@ it('Should not hould throw Error when the available size is >= MIN_REQUIRED_DISK
 it('Generates t', async () => {
   os.tmpdir =  jest.fn().mockReturnValue('temp/dir');
   fsPromises.mkdtemp =  jest.fn().mockImplementation((a) => a);
-  backup.generateBackupRootPath().then((response)=>{console.log(response)})
   const res = await backup.generateBackupRootPath()
   expect(res).toBe('temp/dir/appsmithctl-backup-')
 });
diff --git a/deploy/docker/fs/opt/appsmith/utils/bin/constants.js b/deploy/docker/fs/opt/appsmith/utils/bin/constants.js
index 369fd5042e45..ae44158c82e2 100644
--- a/deploy/docker/fs/opt/appsmith/utils/bin/constants.js
+++ b/deploy/docker/fs/opt/appsmith/utils/bin/constants.js
@@ -11,9 +11,9 @@ const LAST_ERROR_MAIL_TS = "/appsmith-stacks/data/backup/last-error-mail-ts"
 
 const ENV_PATH = "/appsmith-stacks/configuration/docker.env"
 
-const MIN_REQUIRED_DISK_SPACE_IN_BYTES = 2147483648 // 2GB
+const MIN_REQUIRED_DISK_SPACE_IN_BYTES = 2_147_483_648 // 2GB
 
-const DURATION_BETWEEN_BACKUP_ERROR_MAILS_IN_MILLI_SEC = 21600000 // 6 hrs
+const DURATION_BETWEEN_BACKUP_ERROR_MAILS_IN_MILLI_SEC = 21_600_000 // 6 hrs
 
 const APPSMITH_DEFAULT_BACKUP_ARCHIVE_LIMIT = 4 // 4 backup archives
 
@@ -27,4 +27,4 @@ module.exports = {
     DURATION_BETWEEN_BACKUP_ERROR_MAILS_IN_MILLI_SEC,
     APPSMITH_DEFAULT_BACKUP_ARCHIVE_LIMIT,
     ENV_PATH
-}
\ No newline at end of file
+}
diff --git a/deploy/docker/fs/opt/appsmith/utils/bin/export_db.js b/deploy/docker/fs/opt/appsmith/utils/bin/export_db.js
index 9072479450da..6ef9131c127b 100644
--- a/deploy/docker/fs/opt/appsmith/utils/bin/export_db.js
+++ b/deploy/docker/fs/opt/appsmith/utils/bin/export_db.js
@@ -1,66 +1,49 @@
-// Init function export mongodb
-const shell = require('shelljs');
+const fsPromises = require("fs/promises");
 const Constants = require('./constants');
 const utils = require('./utils');
 
-function export_database() {
+async function exportDatabase() {
   console.log('export_database  ....');
-  dbUrl = utils.getDburl();
-  shell.mkdir('-p', [Constants.BACKUP_PATH]);
-  const cmd = `mongodump --uri='${dbUrl}' --archive='${Constants.BACKUP_PATH}/${Constants.DUMP_FILE_NAME}' --gzip`;
-  shell.exec(cmd);
+  const dbUrl = utils.getDburl();
+  await fsPromises.mkdir(Constants.BACKUP_PATH, { recursive: true });
+  await utils.execCommand([
+    "mongodump",
+    "--uri=" + dbUrl,
+    `--archive=${Constants.BACKUP_PATH}/${Constants.DUMP_FILE_NAME}`,
+    "--gzip",
+  ])
   console.log('export_database done');
 }
 
-function stop_application() {
-  console.log('stop_application  ....');
-  shell.exec('/usr/bin/supervisorctl stop backend rts');
-  console.log('stop_application done');
-}
+async function run() {
+  let errorCode = 0;
 
-function start_application() {
-  console.log('start_application  ....');
-  shell.exec('/usr/bin/supervisorctl start backend rts');
-  console.log('start_application done');
-}
+  await utils.ensureSupervisorIsRunning();
 
-// Main application workflow
-function run() {
-  let errorCode = 0;
   try {
-    check_supervisord_status_cmd = '/usr/bin/supervisorctl >/dev/null 2>&1 ';
-    shell.exec(check_supervisord_status_cmd, function (code) {
-      if (code > 0) {
-        shell.echo('application is not running, starting supervisord');
-        shell.exec('/usr/bin/supervisord');
-      }
-    });
-
-    shell.echo('stop backend & rts application before export database');
-    stop_application();
-    export_database();
-    shell.echo('start backend & rts application after export database');
-    shell.echo();
-    shell.echo('\033[0;33m++++++++++++++++++++ NOTE ++++++++++++++++++++');
-    shell.echo();
-    shell.echo(
+    console.log('stop backend & rts application before export database');
+    await utils.stop(["backend", "rts"]);
+    await exportDatabase();
+    console.log('start backend & rts application after export database');
+    console.log();
+    console.log('\033[0;33m++++++++++++++++++++ NOTE ++++++++++++++++++++');
+    console.log();
+    console.log(
       'Please remember to also copy APPSMITH_ENCRYPTION_SALT and APPSMITH_ENCRYPTION_PASSWORD variables from the docker.env file to the target instance where you intend to import this database dump.',
     );
-    shell.echo();
-    shell.echo('++++++++++++++++++++++++++++++++++++++++++++++\033[0m');
-    shell.echo();
+    console.log();
+    console.log('++++++++++++++++++++++++++++++++++++++++++++++\033[0m');
+    console.log();
   } catch (err) {
-    shell.echo(err);
+    console.log(err);
     errorCode = 1;
   } finally {
-    start_application();
+    await utils.start(["backend", "rts"]);
     process.exit(errorCode);
   }
 }
 
 module.exports = {
   run,
-  exportDatabase: export_database,
-  stopApplication: stop_application,
-  startApplication: start_application,
-};
\ No newline at end of file
+  exportDatabase,
+};
diff --git a/deploy/docker/fs/opt/appsmith/utils/bin/import_db.js b/deploy/docker/fs/opt/appsmith/utils/bin/import_db.js
index 0d575e4ff16e..0fdf31a087f1 100644
--- a/deploy/docker/fs/opt/appsmith/utils/bin/import_db.js
+++ b/deploy/docker/fs/opt/appsmith/utils/bin/import_db.js
@@ -30,12 +30,12 @@ const main = (forceOption) => {
     check_supervisord_status_cmd = '/usr/bin/supervisorctl'
     shell.exec(check_supervisord_status_cmd, function (code) {
       if (code > 0) {
-        shell.echo('application is not running, starting supervisord')
+        console.log('application is not running, starting supervisord')
         shell.exec('/usr/bin/supervisord')
       }
     })
 
-    shell.echo('stop backend & rts application before import database')
+    console.log('stop backend & rts application before import database')
     stop_application()
     const shellCmdResult = shell.exec(`mongo ${process.env.APPSMITH_DB_URL} --quiet --eval "db.getCollectionNames().length"`)
     const collectionsLen = parseInt(shellCmdResult.stdout.toString().trimEnd())
@@ -44,9 +44,9 @@ const main = (forceOption) => {
         import_database()
         return
       }
-      shell.echo()
-      shell.echo('**************************** WARNING ****************************')
-      shell.echo(`Your target database is not empty, it has data in ${collectionsLen} collections.`)
+      console.log()
+      console.log('**************************** WARNING ****************************')
+      console.log(`Your target database is not empty, it has data in ${collectionsLen} collections.`)
       const input = readlineSync.question('Importing this DB will erase this data. Are you sure you want to proceed?[Yes/No] ')
       const answer = input && input.toLocaleUpperCase()
       if (answer === 'Y' || answer === 'YES') {
@@ -55,17 +55,17 @@ const main = (forceOption) => {
       } else if (answer === 'N' || answer === 'NO') {
         return
       }
-      shell.echo(`Your input is invalid. Please try to run import command again.`)
+      console.log(`Your input is invalid. Please try to run import command again.`)
       return
     } else {
       import_database()
       return
     }
   } catch (err) {
-    shell.echo(err)
+    console.log(err)
     errorCode = 1
   } finally {
-    shell.echo('start backend & rts application after import database')
+    console.log('start backend & rts application after import database')
     start_application()
     process.exit(errorCode)
   }
@@ -73,4 +73,4 @@ const main = (forceOption) => {
 
 module.exports = {
   runImportDatabase: main,
-}
\ No newline at end of file
+}
diff --git a/deploy/docker/fs/opt/appsmith/utils/bin/mailer.js b/deploy/docker/fs/opt/appsmith/utils/bin/mailer.js
index 20ed96748ea2..32e11127f5f0 100644
--- a/deploy/docker/fs/opt/appsmith/utils/bin/mailer.js
+++ b/deploy/docker/fs/opt/appsmith/utils/bin/mailer.js
@@ -1,7 +1,4 @@
 const nodemailer = require('nodemailer');
-const shell = require('shelljs');
-
-
 const Constants = require('./constants');
 const utils = require('./utils');
 const logger = require('./logger');
@@ -66,10 +63,9 @@ async function sendBackupErrorToAdmins(err, backupTimestamp) {
     }
   } catch (err) {
     await logger.backup_error(err.stack);
-    return;
   }
 }
 
 module.exports = {
   sendBackupErrorToAdmins,
-};
\ No newline at end of file
+};
diff --git a/deploy/docker/fs/opt/appsmith/utils/bin/move-to-postgres.mjs b/deploy/docker/fs/opt/appsmith/utils/bin/move-to-postgres.mjs
index de799d3b6afc..a8cd9c65dcda 100644
--- a/deploy/docker/fs/opt/appsmith/utils/bin/move-to-postgres.mjs
+++ b/deploy/docker/fs/opt/appsmith/utils/bin/move-to-postgres.mjs
@@ -18,6 +18,11 @@ let mongoDbUrl;
 let mongoDumpFile = null;
 const EXPORT_ROOT = "/appsmith-stacks/mongo-data";
 
+// The minimum version of the MongoDB changeset that must be present in the mongockChangeLog collection to run this script.
+// This is to ensure we are migrating the data from the stable version of MongoDB.
+const MINIMUM_MONGO_CHANGESET = "add_empty_policyMap_for_null_entries";
+const MONGO_MIGRATION_COLLECTION = "mongockChangeLog";
+
 for (let i = 2; i < process.argv.length; ++i) {
   const arg = process.argv[i];
   if (arg.startsWith("--mongodb-url=") && !mongoDbUrl) {
@@ -77,6 +82,15 @@ if (isBaselineMode) {
 const collectionNames = await mongoDb.listCollections({}, { nameOnly: true }).toArray();
 const sortedCollectionNames = collectionNames.map(collection => collection.name).sort();
 
+// Verify that the MongoDB data has been migrated to a stable version i.e. v1.43 before we start migrating the data to Postgres.
+if (!await isMongoDataMigratedToStableVersion(mongoDb)) {
+  console.error("MongoDB migration check failed: Try upgrading the Appsmith instance to latest before opting for data migration.");
+  console.error(`Could not find the valid migration execution entry for "${MINIMUM_MONGO_CHANGESET}" in the "${MONGO_MIGRATION_COLLECTION}" collection.`);
+  await mongoClient.close();
+  mongoServer?.kill();
+  process.exit(1);
+}
+
 for await (const collectionName of sortedCollectionNames) {
 
   console.log("Collection:", collectionName);
@@ -91,7 +105,7 @@ for await (const collectionName of sortedCollectionNames) {
     if (isArchivedObject(doc)) {
       continue;
     }
-    transformFields(doc);
+    transformFields(doc);  // This now handles the _class to type transformation.
     if (doc.policyMap == null) {
       doc.policyMap = {};
     }
@@ -147,16 +161,52 @@ function replacer(key, value) {
  * Method to transform the data in the object to be compatible with Postgres.
  * Updates:
  * 1. Changes the _id field to id, and removes the _id field.
+ * 2. Replaces the _class field with the appropriate type field.
  * @param {Document} obj - The object to transform.
  * @returns {void} - No return value.
  */
 function transformFields(obj) {
   for (const key in obj) {
-    if (key === "_id") {  // Change the _id field to id
+    if (key === "_id") {
       obj.id = obj._id.toString();
       delete obj._id;
-    } else if (typeof obj[key] === "object") {
+    } else if (key === "_class") {
+      const type = mapClassToType(obj._class);
+      if (type) {
+        obj.type = type;  // Add the type field
+      }
+      delete obj._class;  // Remove the _class field
+    } else if (typeof obj[key] === "object" && obj[key] !== null) {
       transformFields(obj[key]);
     }
   }
-}
\ No newline at end of file
+}
+
+/**
+ * Map the _class field to the appropriate type value. The DatasourceStorage class requires this check
+ * @param {string} _class - The _class field value.
+ * @returns {string|null} - The corresponding type value, or null if no match is found.
+ */
+function mapClassToType(_class) {
+  switch (_class) {
+    case "com.appsmith.external.models.DatasourceStructure$PrimaryKey":
+      return "primary key";
+    case "com.appsmith.external.models.DatasourceStructure$ForeignKey":
+      return "foreign key";
+    default:
+      return null;
+  }
+}
+
+/**
+ * Method to check if MongoDB data has migrated to a stable version before we start migrating the data to Postgres.
+ * @param {*} mongoDb - The MongoDB client.
+ * @returns {Promise<boolean>} - A promise that resolves to true if the data has been migrated to a stable version, false otherwise.
+ */
+async function isMongoDataMigratedToStableVersion(mongoDb) {
+  const doc = await mongoDb.collection(MONGO_MIGRATION_COLLECTION).findOne({
+    changeId: MINIMUM_MONGO_CHANGESET,
+    state: "EXECUTED",
+  });
+  return doc !== null;
+}
diff --git a/deploy/docker/fs/opt/appsmith/utils/bin/restore.js b/deploy/docker/fs/opt/appsmith/utils/bin/restore.js
index 780ac3d0050c..a88878ccc93e 100644
--- a/deploy/docker/fs/opt/appsmith/utils/bin/restore.js
+++ b/deploy/docker/fs/opt/appsmith/utils/bin/restore.js
@@ -3,8 +3,6 @@ const path = require('path');
 const os = require('os');
 const readlineSync = require('readline-sync');
 
-const shell = require('shelljs');
-
 const utils = require('./utils');
 const Constants = require('./constants');
 const command_args = process.argv.slice(3);
@@ -174,14 +172,10 @@ async function run() {
   let cleanupArchive = false;
   let overwriteEncryptionKeys = true;
   let backupFilePath;
-  try {
-    shell.exec('/usr/bin/supervisorctl >/dev/null 2>&1', function (code) {
-      if (code > 0) {
-        shell.echo('application is not running, starting supervisord');
-        shell.exec('/usr/bin/supervisord');
-      }
-    });
 
+  await utils.ensureSupervisorIsRunning();
+
+  try {
     let backupFileName = await getBackupFileName();
     if (backupFileName == null) {
       process.exit(errorCode);
@@ -209,7 +203,7 @@ async function run() {
 
       console.log('****************************************************************');
       console.log('Restoring Appsmith instance from the backup at ' + backupFilePath);
-      utils.stop(['backend', 'rts']);
+      await utils.stop(["backend", "rts"]);
       await restoreDatabase(restoreContentsPath, utils.getDburl());
       await restoreDockerEnvFile(restoreContentsPath, backupName, overwriteEncryptionKeys);
       await restoreGitStorageArchive(restoreContentsPath, backupName);
@@ -224,7 +218,7 @@ async function run() {
     if (cleanupArchive){
       await fsPromises.rm(backupFilePath, { force: true });
     }
-    utils.start(['backend', 'rts']);
+    await utils.start(["backend", "rts"]);
     process.exit(errorCode);
 
   }
diff --git a/deploy/docker/fs/opt/appsmith/utils/bin/utils.js b/deploy/docker/fs/opt/appsmith/utils/bin/utils.js
index 8b70980adc0c..319c3d1a72dd 100644
--- a/deploy/docker/fs/opt/appsmith/utils/bin/utils.js
+++ b/deploy/docker/fs/opt/appsmith/utils/bin/utils.js
@@ -1,4 +1,3 @@
-const shell = require("shelljs");
 const fsPromises = require("fs/promises");
 const Constants = require("./constants");
 const childProcess = require("child_process");
@@ -18,18 +17,25 @@ function showHelp() {
   console.log("\t--help\t\t\t" + "Show help.");
 }
 
-function stop(apps) {
-  const appsStr = apps.join(" ");
-  console.log("Stopping " + appsStr);
-  shell.exec("/usr/bin/supervisorctl stop " + appsStr);
-  console.log("Stopped " + appsStr);
+async function ensureSupervisorIsRunning() {
+  try {
+    await execCommandSilent(["/usr/bin/supervisorctl"]);
+  } catch (e) {
+    console.error('Supervisor is not running, exiting.');
+    throw e;
+  }
+}
+
+async function stop(apps) {
+  console.log("Stopping", apps);
+  await execCommand(["/usr/bin/supervisorctl", "stop", ...apps]);
+  console.log("Stopped", apps);
 }
 
-function start(apps) {
-  const appsStr = apps.join(" ");
-  console.log("Starting " + appsStr);
-  shell.exec("/usr/bin/supervisorctl start " + appsStr);
-  console.log("Started " + appsStr);
+async function start(apps) {
+  console.log("Starting", apps);
+  await execCommand(["/usr/bin/supervisorctl", "start", ...apps]);
+  console.log("Started", apps);
 }
 
 function getDburl() {
@@ -154,9 +160,10 @@ function execCommandSilent(cmd, options) {
 
     const p = childProcess.spawn(cmd[0], cmd.slice(1), {
       ...options,
+      stdio: "ignore",
     });
 
-    p.on("exit", (code) => {
+    p.on("close", (code) => {
       if (isPromiseDone) {
         return;
       }
@@ -173,8 +180,7 @@ function execCommandSilent(cmd, options) {
         return;
       }
       isPromiseDone = true;
-      console.error("Error running command", err);
-      reject();
+      reject(err);
     });
   });
 }
@@ -186,6 +192,7 @@ function getDatabaseNameFromMongoURI(uri) {
 
 module.exports = {
   showHelp,
+  ensureSupervisorIsRunning,
   start,
   stop,
   execCommand,
@@ -196,5 +203,5 @@ module.exports = {
   preprocessMongoDBURI,
   execCommandSilent,
   getDatabaseNameFromMongoURI,
-  getDburl
+  getDburl,
 };
diff --git a/deploy/docker/fs/opt/appsmith/utils/bin/utils.test.js b/deploy/docker/fs/opt/appsmith/utils/bin/utils.test.js
new file mode 100644
index 000000000000..f707f2778c5b
--- /dev/null
+++ b/deploy/docker/fs/opt/appsmith/utils/bin/utils.test.js
@@ -0,0 +1,22 @@
+const { describe, test, expect } = require("@jest/globals");
+const utils = require("./utils");
+
+describe("execCommandSilent", () => {
+
+  test("Runs a command", async () => {
+    await utils.execCommandSilent(["echo"]);
+  });
+
+  test("silences stdout and stderr", async () => {
+    const consoleSpy = jest.spyOn(console, "log");
+    await utils.execCommandSilent(["node", "--eval", "console.log('test')"]);
+    expect(consoleSpy).not.toHaveBeenCalled();
+    consoleSpy.mockRestore();
+  });
+
+  test("handles errors silently", async () => {
+    await expect(utils.execCommandSilent(["nonexistentcommand"]))
+      .rejects.toThrow();
+  });
+
+});
diff --git a/deploy/helm/Chart.yaml b/deploy/helm/Chart.yaml
index 9792aa61fc50..c62ecf37fd93 100644
--- a/deploy/helm/Chart.yaml
+++ b/deploy/helm/Chart.yaml
@@ -11,7 +11,7 @@ sources:
   - https://github.com/appsmithorg/appsmith
 home: https://www.appsmith.com/
 icon: https://assets.appsmith.com/appsmith-icon.png
-version: 2.1.0
+version: 2.2.1
 dependencies:
 - condition: redis.enabled
   name: redis
diff --git a/deploy/helm/templates/statefulset.yaml b/deploy/helm/templates/statefulset.yaml
index e2f2857c63fe..9a17907b27cd 100644
--- a/deploy/helm/templates/statefulset.yaml
+++ b/deploy/helm/templates/statefulset.yaml
@@ -70,7 +70,7 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: http
-              containerPort: 80
+              containerPort: {{ .Values.HTTPContainerPort | default 80 }}
               protocol: TCP
             - name: https
               containerPort: 443
@@ -101,6 +101,10 @@ spec:
             - name: data
               mountPath: /appsmith-stacks
           env:
+          {{- if .Values.HTTPContainerPort }}
+            - name: PORT
+              value: "{{ .Values.HTTPContainerPort }}"
+          {{- end }}
             - name: APPSMITH_ENABLE_EMBEDDED_DB
               value: "0"
           envFrom:
diff --git a/deploy/helm/values.yaml b/deploy/helm/values.yaml
index 030335ccfd33..56169971999e 100644
--- a/deploy/helm/values.yaml
+++ b/deploy/helm/values.yaml
@@ -9,7 +9,9 @@ redis:
     replicaCount: 1
     nodeSelector: {}
   image:
-    tag: 7.0.13-debian-11-r10
+    registry: docker.io
+    repository: redis
+    tag: 7.0.15
 
 mongodb:
   enabled: true
@@ -23,12 +25,15 @@ mongodb:
   replicaSetName: rs0
   nodeSelector: {}
   image:
-    tag: 5.0.21-debian-11-r5
+    registry: docker.io
+    repository: bitnami/mongodb
+    tag: 5.0.24
   arbiter:
     nodeSelector: {}
   hidden:
     nodeSelector: {}
 
+
 ## @section Global parameters
 ## Global Docker image parameters
 ## Please, note that this will override the image parameters, including dependencies, configured to use the global value
@@ -311,3 +316,5 @@ applicationConfig:
   APPSMITH_ENCRYPTION_SALT: ""
   APPSMITH_CUSTOM_DOMAIN: ""
   APPSMITH_DISABLE_IFRAME_WIDGET_SANDBOX: "false"
+
+#HTTPContainerPort: 8080
diff --git a/scripts/scout_vulnerabilities_data.sh b/scripts/scout_vulnerabilities_data.sh
new file mode 100755
index 000000000000..ab37dcf4fe06
--- /dev/null
+++ b/scripts/scout_vulnerabilities_data.sh
@@ -0,0 +1,134 @@
+#!/bin/bash
+
+# Check required environment variables
+required_vars=("DB_HOST" "DB_NAME" "DB_USER" "DB_PWD")
+for var in "${required_vars[@]}"; do
+  if [ -z "${!var}" ] || [[ "${!var}" == "your_${var,,}" ]]; then
+    echo "Error: Required environment variable $var is missing or not set correctly."
+    exit 1
+  fi
+done
+
+DB_HOST="${DB_HOST}"
+DB_NAME="${DB_NAME}"
+DB_USER="${DB_USER}"
+DB_PWD="${DB_PWD}"
+
+# Assign the parameters from the workflow
+IMAGE="$1"
+GITHUB_PR_ID="$2"
+GITHUB_PR_LINK="$3"
+GITHUB_RUN_ID="$4"
+OLD_VULN_FILE="${5:-vulnerability_base_data.csv}"
+
+# Function to install Docker Scout
+install_docker_scout() {
+    echo "Installing Docker Scout..."
+    local attempts=0
+    while [ $attempts -lt 5 ]; do
+        echo "Attempt $((attempts + 1))..."
+        curl -fsSL https://raw.githubusercontent.com/docker/scout-cli/main/install.sh -o install-scout.sh
+        sh install-scout.sh &> install_scout_log.txt
+        if [ $? -eq 0 ]; then
+            echo "Docker Scout installed successfully."
+            return 0
+        fi
+        echo "Attempt $((attempts + 1)) failed. Check install_scout_log.txt for details."
+        ((attempts++))
+        sleep 2
+    done
+    echo "Error: Docker Scout installation failed after $attempts attempts."
+    exit 1
+}
+
+# Check if Docker is installed
+if ! command -v docker &> /dev/null; then
+    echo "Error: Docker is not installed. Please install Docker and try again."
+    exit 1
+fi
+
+# Ensure Docker is running
+if ! systemctl is-active --quiet docker; then
+    echo "Starting Docker..."
+    sudo systemctl start docker
+fi
+
+# Check if Docker Scout is installed
+if ! command -v scout &> /dev/null; then
+    install_docker_scout
+fi
+
+# Prepare the output CSV file
+CSV_OUTPUT_FILE="scout_vulnerabilities.csv"
+rm -f "$CSV_OUTPUT_FILE"
+
+# Extract the product name from the image name
+case "$IMAGE" in
+    *appsmith/appsmith-ce:*) product_name="CE" ;;
+    *appsmith/appsmith-ee:*) product_name="EE" ;;
+    *appsmith/cloud-services:*) product_name="CLOUD" ;;
+    *) product_name="UNKNOWN" ;;
+esac
+
+# Fetch vulnerabilities and format the output correctly
+docker scout cves "$IMAGE" | grep -E "✗ |CVE-" | awk -v product_name="$product_name" -F' ' '
+{
+    # Check for valid vulnerability data and format it correctly
+    if ($2 != "" && $3 ~ /^CVE-/) {
+        # Extract severity level, CVE ID, and format output correctly
+        print $3","product_name",""SCOUT"","$2
+    }
+}' | sort -u > "$CSV_OUTPUT_FILE"
+
+# Check if the CSV output file is empty
+[ -s "$CSV_OUTPUT_FILE" ] || echo "No vulnerabilities found for image: $IMAGE" > "$CSV_OUTPUT_FILE"
+
+
+# Compare each vulnerability with the database and store new ones in a CSV file
+compare_and_store_vulns() {
+  local new_vulns_file="scout_new_vulnerabilities.csv"
+  
+  echo "vurn_id,product,scanner_tool,priority" > "$new_vulns_file"  # CSV header
+
+  while IFS=, read -r vurn_id product scanner_tool priority; do
+    if [[ -z "$vurn_id" || -z "$priority" || -z "$product" || -z "$scanner_tool" ]]; then
+      echo "Skipping empty vulnerability entry"
+      continue
+    fi
+
+    # Clean up and trim spaces from input values
+    vurn_id=$(echo "$vurn_id" | sed "s/'/''/g" | sed 's/^[ \t]*//;s/[ \t]*$//')
+    priority=$(echo "$priority" | sed "s/'/''/g" | sed 's/^[ \t]*//;s/[ \t]*$//')
+    product=$(echo "$product" | sed "s/'/''/g" | sed 's/^[ \t]*//;s/[ \t]*$//' | tr -d '[:space:]')
+    scanner_tool=$(echo "$scanner_tool" | sed "s/'/''/g" | sed 's/^[ \t]*//;s/[ \t]*$//' | tr -d '[:space:]')
+
+    # Check if vurn_id exists in the database
+    existing_entry=$(psql -t -c "SELECT vurn_id FROM vulnerability_tracking WHERE vurn_id = '$vurn_id'" "postgresql://$DB_USER:$DB_PWD@$DB_HOST/$DB_NAME" 2>/dev/null)
+
+    if [[ -z "$existing_entry" ]]; then
+      # If vurn_id doesn't exist, store data in CSV file
+      echo "$vurn_id,$product,$scanner_tool,$priority" >> "$new_vulns_file"
+      echo "New vulnerability detected: $vurn_id"
+    else
+      echo "Skipping existing vulnerability: $vurn_id"
+    fi
+
+  done < "$CSV_OUTPUT_FILE"
+
+  # Print the contents of new vulnerabilities
+  if [ -s "$new_vulns_file" ]; then
+    echo "****************************************************************"
+    echo "New vulnerabilities stored in $new_vulns_file:"
+    cat "$new_vulns_file"
+    echo "****************************************************************"
+  else
+    echo "No new vulnerabilities to store."
+  fi
+}
+
+# Check if there are vulnerabilities to process
+if [ -s "$CSV_OUTPUT_FILE" ]; then
+  compare_and_store_vulns
+else
+  echo "No vulnerabilities to process."
+fi
\ No newline at end of file
diff --git a/scripts/trivy_vulnerabilities_data.sh b/scripts/trivy_vulnerabilities_data.sh
new file mode 100755
index 000000000000..cf96a99a8123
--- /dev/null
+++ b/scripts/trivy_vulnerabilities_data.sh
@@ -0,0 +1,156 @@
+#!/bin/bash
+
+# Check required environment variables
+required_vars=("DB_HOST" "DB_NAME" "DB_USER" "DB_PWD")
+for var in "${required_vars[@]}"; do
+  if [ -z "${!var}" ] || [[ "${!var}" == "your_${var,,}" ]]; then
+    echo "Error: Required environment variable $var is missing or not set correctly."
+    exit 1
+  fi
+done
+
+DB_HOST="${DB_HOST}"
+DB_NAME="${DB_NAME}"
+DB_USER="${DB_USER}"
+DB_PWD="${DB_PWD}"
+
+# Assign parameters from the workflow
+IMAGE="$1"
+GITHUB_PR_ID="$2"
+GITHUB_PR_LINK="$3"
+GITHUB_RUN_ID="$4"
+
+MAX_RETRIES=5
+
+# Function to install Trivy with retry logic
+install_trivy_with_retry() {
+    local count=0
+    local success=false
+
+    while [[ $count -lt $MAX_RETRIES ]]; do
+        echo "Attempting to install Trivy (attempt $((count + 1)))..."
+        
+        TRIVY_VERSION=$(curl -s https://api.github.com/repos/aquasecurity/trivy/releases/latest | grep '"tag_name"' | sed -E 's/.*"v([^"]+)".*/\1/')
+        TRIVY_URL="https://github.com/aquasecurity/trivy/releases/download/v$TRIVY_VERSION/trivy_${TRIVY_VERSION}_Linux-64bit.tar.gz"
+        
+        curl -sfL "$TRIVY_URL" | tar -xzf - trivy
+        if [[ $? -eq 0 ]]; then
+            mkdir -p "$HOME/bin"
+            mv trivy "$HOME/bin/"
+            export PATH="$HOME/bin:$PATH"
+            if command -v trivy &> /dev/null; then
+                success=true
+                break
+            fi
+        fi
+        
+        echo "Trivy installation failed. Retrying..."
+        count=$((count + 1))
+    done
+
+    if [[ $success = false ]]; then
+        echo "Error: Trivy installation failed after $MAX_RETRIES attempts."
+        exit 1
+    fi
+    echo "Trivy installed successfully."
+}
+
+# Check if Trivy is installed, if not, install it
+if ! command -v trivy &> /dev/null; then
+    install_trivy_with_retry
+fi
+
+NEW_VULN_FILE="trivy_vulnerabilities_new.csv"
+rm -f "$NEW_VULN_FILE"
+
+# Determine product name based on the image name
+case "$IMAGE" in
+    *appsmith/appsmith-ce:*) product_name="CE" ;;
+    *appsmith/appsmith-ee:*) product_name="EE" ;;
+    *appsmith/cloud-services:*) product_name="CLOUD" ;;
+    *) product_name="UNKNOWN" ;;
+esac
+
+# Run Trivy scan
+echo "Running Trivy scan for image: $IMAGE..."
+trivy image --db-repository public.ecr.aws/aquasecurity/trivy-db --java-db-repository public.ecr.aws/aquasecurity/trivy-java-db --insecure --format json "$IMAGE" > "trivy_vulnerabilities.json" || {
+    echo "Error: Trivy scan failed for image: $IMAGE"
+    exit 1
+}
+
+
+# Process vulnerabilities and generate CSV
+if jq -e '.Results | length > 0' "trivy_vulnerabilities.json" > /dev/null; then
+    jq -r --arg product "$product_name" '.Results[]? | .Vulnerabilities[]? | "\(.VulnerabilityID),\($product),TRIVY,\(.Severity)"' "trivy_vulnerabilities.json" | sort -u > "$NEW_VULN_FILE"
+    echo "Vulnerabilities saved to $NEW_VULN_FILE"
+else
+    echo "No vulnerabilities found for image: $IMAGE"
+    echo "No vulnerabilities found." > "$NEW_VULN_FILE"
+fi
+
+# Compare each vulnerability with the database and store new ones in a CSV file
+compare_and_store_vulns() {
+    local new_vulns_file="trivy_new_vulnerabilities.csv"
+    
+    echo "vurn_id,product,scanner_tool,priority" > "$new_vulns_file"  # CSV header
+
+    while IFS=, read -r vurn_id product scanner_tool priority; do
+        if [[ -z "$vurn_id" || -z "$priority" || -z "$product" || -z "$scanner_tool" ]]; then
+            continue
+        fi
+
+        # Remove spaces and redundant commas, and escape single quotes for SQL
+        vurn_id=$(echo "$vurn_id" | sed "s/'/''/g")
+        priority=$(echo "$priority" | sed "s/'/''/g")
+        product=$(echo "$product" | sed "s/'/''/g" | tr -d ' ' | sed 's/,*$//')
+        scanner_tool=$(echo "$scanner_tool" | sed "s/'/''/g" | tr -d ' ' | sed 's/,*$//')
+
+        # Check if vurn_id exists in the database
+        existing_entry=$(psql -t -c "SELECT product, scanner_tool FROM vulnerability_tracking WHERE vurn_id = '$vurn_id'" "postgresql://$DB_USER:$DB_PWD@$DB_HOST/$DB_NAME" 2>/dev/null)
+
+        if [ -n "$existing_entry" ]; then
+            # Parse existing products and tools
+            existing_product=$(echo "$existing_entry" | cut -d '|' -f 1 | tr -d ' ')
+            existing_scanner_tool=$(echo "$existing_entry" | cut -d '|' -f 2 | tr -d ' ')
+
+            # Merge with new values, ensuring uniqueness
+            combined_products="$existing_product,$product"
+            unique_products=$(echo "$combined_products" | tr ',' '\n' | sed '/^$/d' | sort -u | tr '\n' ',' | sed 's/^,//; s/,$//')
+
+            combined_scanner_tools="$existing_scanner_tool,$scanner_tool"
+            unique_scanner_tools=$(echo "$combined_scanner_tools" | tr ',' '\n' | sed '/^$/d' | sort -u | tr '\n' ',' | sed 's/^,//; s/,$//')
+        else
+            unique_products="$product"
+            unique_scanner_tools="$scanner_tool"
+        fi
+
+        # If the vulnerability is new, store it in the CSV file
+        if [[ -z "$existing_entry" ]]; then
+            echo "$vurn_id,$unique_products,$unique_scanner_tools,$priority" >> "$new_vulns_file"
+            echo "New vulnerability detected: $vurn_id"
+        else
+            echo "Skipping existing vulnerability: $vurn_id"
+        fi
+
+    done < "$NEW_VULN_FILE"
+
+    # Print the contents of new vulnerabilities
+    if [ -s "$new_vulns_file" ]; then
+        echo "****************************************************************"
+        echo "New vulnerabilities stored in $new_vulns_file:"
+        cat "$new_vulns_file"
+        echo "****************************************************************"
+    else
+        echo "No new vulnerabilities to store."
+    fi
+}
+
+# Run comparison and storage if vulnerabilities are found
+if [ -s "$NEW_VULN_FILE" ]; then
+    compare_and_store_vulns
+else
+    echo "No vulnerabilities to process."
+fi
+
+# Cleanup
+rm -f "trivy_vulnerabilities.json"
\ No newline at end of file