diff --git a/.github/config.json b/.github/config.json
index 28c550304b10..d5e17dc2d4ef 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":"Branch protection","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}],"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}],"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"},"Branch protection":{"name":"Branch protection","description":"Issues related to using a protected branch on git","color":"ab511a"},"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"}},"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}],"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}],"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"}},"success":true}
\ No newline at end of file
diff --git a/.github/workflows/build-client-server-count.yml b/.github/workflows/build-client-server-count.yml
index b2ad99cac36e..7f2210f32063 100644
--- a/.github/workflows/build-client-server-count.yml
+++ b/.github/workflows/build-client-server-count.yml
@@ -16,6 +16,7 @@ jobs:
       runId: ${{steps.args.outputs.runId}}
       matrix_count: ${{steps.matrix.outputs.matrix_count}}
       run_count: ${{ steps.countArgs.outputs.run_count }}
+      is-pg-build: ${{steps.args.outputs.is-pg-build}}
     steps:
       - name: Checkout the head commit of the branch
         uses: actions/checkout@v4
@@ -29,6 +30,7 @@ jobs:
         id: args
         run: |
           echo "pr=${{ github.event.client_payload.pull_request.number }}" >> $GITHUB_OUTPUT
+          echo "is-pg-build=${{ github.event.client_payload.pull_request.base.ref == 'pg' }}" >> $GITHUB_OUTPUT
           checkArg=${{ github.event.client_payload.slash_command.args.named.runId }}
           if [[ -z "$checkArg" ]]; then
               echo "runId=0" >> $GITHUB_OUTPUT
@@ -106,6 +108,7 @@ jobs:
     with:
       pr: ${{fromJson(needs.file-check.outputs.pr)}}
       skip-tests: "true"
+      is-pg-build: ${{fromJson(needs.file-check.outputs.is-pg-build)}}
 
   client-build:
     name: client-build
@@ -252,6 +255,18 @@ jobs:
           echo "$new_failed_spec_env" >> $GITHUB_ENV
           echo "EOF" >> $GITHUB_ENV
 
+      - name: Download the client build artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: cypress-repeat-logs
+          path: app/client
+  
+      - name: Read and Set File Content as ENV Variable
+        id: set-summary-content
+        run: |
+            summary_content=$(cat app/client/cy-repeat-summary.txt | tr '\n' ' ')
+            echo "summary_content=$summary_content" >> $GITHUB_ENV     
+
       - name: Add a comment on the PR with new CI failures
         if: needs.ci-test-limited.result != 'success' && needs.file-check.outputs.pr != '0'
         uses: peter-evans/create-or-update-comment@v3
@@ -262,6 +277,9 @@ jobs:
             Cypress dashboard: <a href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=${{ github.run_id }}&attempt=${{ github.run_attempt }}&selectiontype=test&testsstatus=failed&specsstatus=fail" target="_blank"> Click here!</a>
             The following are new failures, please fix them before merging the PR: ${{env.new_failed_spec_env}}
             To know the list of identified flaky tests - <a href="https://internal.appsmith.com/app/cypress-dashboard/identified-flaky-tests-65890b3c81d7400d08fa9ee3?branch=master" target="_blank">Refer here</a>
+            ```
+            ${{ env.summary_content }}
+            ```
 
       - name: Add a comment on the PR when ci-test-limited is success
         if: needs.ci-test-limited.result == 'success' && needs.file-check.outputs.pr != '0'
@@ -272,6 +290,9 @@ jobs:
             Workflow run: <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}>.
             Cypress dashboard url: <a href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=${{ github.run_id }}&attempt=${{ github.run_attempt }}" target="_blank">Click here!</a>
             All cypress tests have passed 🎉🎉🎉
+            ```
+            ${{ env.summary_content }}
+            ```
 
       - name: Check ci-test-limited set status
         if: needs.ci-test-limited.result != 'success'
@@ -369,6 +390,19 @@ jobs:
           echo "new_failed_spec_env<<EOF" >> $GITHUB_ENV
           echo "$new_failed_spec_env" >> $GITHUB_ENV
           echo "EOF" >> $GITHUB_ENV
+       
+      - name: Download the client build artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: cypress-repeat-logs
+          path: app/client
+  
+      - name: Read and Set File Content as ENV Variable
+        id: set-summary-content
+        run: |
+            summary_content=$(cat app/client/cy-repeat-summary.txt | tr '\n' ' ')
+            echo "summary_content=$summary_content" >> $GITHUB_ENV     
+    
 
       - name: Add a comment on the PR with new CI failures
         if: needs.ci-test-limited-existing-docker-image.result != 'success' && needs.file-check.outputs.pr != '0'
@@ -380,6 +414,9 @@ jobs:
             Cypress dashboard: <a href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=${{ github.run_id }}&attempt=${{ github.run_attempt }}&selectiontype=test&testsstatus=failed&specsstatus=fail" target="_blank"> Click here!</a>
             The following are new failures, please fix them before merging the PR: ${{env.new_failed_spec_env}}
             To know the list of identified flaky tests - <a href="https://internal.appsmith.com/app/cypress-dashboard/identified-flaky-tests-65890b3c81d7400d08fa9ee3?branch=master" target="_blank">Refer here</a>
+            ```
+            ${{ env.summary_content }}
+            ```
 
       - name: Add a comment on the PR when ci-test-limited-existing-docker-image is success
         if: needs.ci-test-limited-existing-docker-image.result == 'success' && needs.file-check.outputs.pr != '0'
@@ -390,7 +427,10 @@ jobs:
             Workflow run: <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}>.
             Cypress dashboard url: <a href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=${{ github.run_id }}&attempt=${{ github.run_attempt }}" target="_blank">Click here!</a>
             All cypress tests have passed 🎉🎉🎉
-
+            ```
+            ${{ env.summary_content }}
+            ```
+            
       - name: Check ci-test-limited-existing-docker-image set status
         if: needs.ci-test-limited-existing-docker-image.result != 'success'
         run: exit 1
\ No newline at end of file
diff --git a/.github/workflows/build-client-server.yml b/.github/workflows/build-client-server.yml
index 550758e0fcbd..b3191415e7da 100644
--- a/.github/workflows/build-client-server.yml
+++ b/.github/workflows/build-client-server.yml
@@ -14,6 +14,7 @@ jobs:
       pr: ${{steps.args.outputs.pr}}
       runId: ${{steps.args.outputs.runId}}
       matrix_count: ${{steps.matrix.outputs.matrix_count}}
+      is-pg-build: ${{steps.args.outputs.is-pg-build}}
     steps:
       - name: Checkout the head commit of the branch
         uses: actions/checkout@v4
@@ -27,6 +28,7 @@ jobs:
         id: args
         run: |
           echo "pr=${{ github.event.client_payload.pull_request.number }}" >> $GITHUB_OUTPUT
+          echo "is-pg-build=${{ github.event.client_payload.pull_request.base.ref == 'pg' }}" >> $GITHUB_OUTPUT
           checkArg=`echo '${{toJSON(github.event.client_payload.slash_command.args.named)}}' | jq 'has("runId")'`
           if [[ $checkArg == 'true' ]]; then
             echo "runId=${{ github.event.client_payload.slash_command.args.named.runId }}" >> $GITHUB_OUTPUT
@@ -92,6 +94,7 @@ jobs:
     with:
       pr: ${{fromJson(needs.file-check.outputs.pr)}}
       skip-tests: "true"
+      is-pg-build: ${{fromJson(needs.file-check.outputs.is-pg-build)}}
 
   client-build:
     name: client-build
diff --git a/.github/workflows/ci-test-limited-with-count.yml b/.github/workflows/ci-test-limited-with-count.yml
index 8790ca231881..3399eaddb703 100644
--- a/.github/workflows/ci-test-limited-with-count.yml
+++ b/.github/workflows/ci-test-limited-with-count.yml
@@ -346,15 +346,29 @@ jobs:
             NODE_ENV: development
         run: |
             cd app/client
-            npx cypress-repeat run -n ${{ inputs.run_count }} --force \
+            npx cypress-repeat-pro run -n ${{ inputs.run_count }} --force \
                 --spec ${{ env.specs_to_run }} \
-                --config-file "cypress_ci_custom.config.ts"   
+                --config-file "cypress_ci_custom.config.ts"
+            cat cy-repeat-summary.txt  
+            # Check if "Total Failed: 0" is present
+            if ! grep -q "Total Failed: 0" cy-repeat-summary.txt; then
+              echo "Tests failed, failing the GitHub Action."
+              exit 1  # Fails the step if tests failed
+            fi     
 
       - name: Trim number of cypress log files
         if: failure()
         run: |
           find ${{ github.workspace }}/app/client/cypress/cypress-logs -name '*.json' -type f | tail -n +11 | xargs -I {} rm -- {}
 
+      - name: Upload repeat-pro logs artifact
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: cypress-repeat-logs
+          path: ${{ github.workspace }}/app/client/cy-repeat-summary.txt
+          overwrite: true
+
       - name: Upload failed test cypress logs artifact
         if: failure()
         uses: actions/upload-artifact@v4
diff --git a/.github/workflows/sync-release-to-pg.yml b/.github/workflows/sync-release-to-pg.yml
index b3a9c6ab3991..2e50073a07b1 100644
--- a/.github/workflows/sync-release-to-pg.yml
+++ b/.github/workflows/sync-release-to-pg.yml
@@ -14,9 +14,13 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: release  # Checkout the release branch
+          fetch-depth: 0
 
-      - name: Fetch all branches
-        run: git fetch origin pg
+      - name: Set Git config values
+        run: |
+          git config pull.rebase false
+          git config user.email "automated@github.com"
+          git config user.name "Automated Github Action"
 
       - name: Checkout pg branch
         run: git checkout pg
@@ -24,16 +28,12 @@ jobs:
       - name: Merge release to pg
         id: merge_commits
         run: |
-
           PG_HEAD=$(git rev-parse pg)
           RELEASE_HEAD=$(git rev-parse release)
 
           echo "PG_HEAD=$PG_HEAD"
           echo "RELEASE_HEAD=$RELEASE_HEAD"
 
-          # Checkout the pg branch
-          git checkout pg
-
           # Attempt to merge release into pg
           if ! git merge release; then
             echo "Merge conflict detected during merge"
@@ -42,7 +42,6 @@ jobs:
             CONFLICTING_COMMIT=$(git log -1 --pretty=format:"%H")
             echo "CONFLICTING_COMMIT=$CONFLICTING_COMMIT" >> $GITHUB_ENV
 
-            git merge --abort
             echo "MERGE_CONFLICT=true" >> $GITHUB_ENV
           else
             echo "MERGE_CONFLICT=false" >> $GITHUB_ENV
@@ -68,6 +67,8 @@ jobs:
           # This unwieldy horror of a sed command, converts standard Markdown links to Slack's unwieldy link syntax.
           slack_message="$(echo "$message" | sed -E 's/\[([^]]+)\]\(([^)]+)\)/<\2|\1>/g')"
 
+          echo "$slack_message"
+
           # This is the ChannelId of the proj postgres channel.
           body="$(jq -nc \
             --arg channel C06Q3A97USE \
diff --git a/.github/workflows/test-build-docker-image.yml b/.github/workflows/test-build-docker-image.yml
index 2a874e3e5167..9384df2101e2 100644
--- a/.github/workflows/test-build-docker-image.yml
+++ b/.github/workflows/test-build-docker-image.yml
@@ -21,9 +21,9 @@ on:
         type: string
         default: latest
 
-  # trigger for pushes to master
+  # trigger for pushes to master and pg
   push:
-    branches: [master]
+    branches: [master, pg]
     paths:
       - "app/client/**"
       - "app/server/**"
@@ -100,7 +100,7 @@ jobs:
   ci-test:
     needs: [setup, build-docker-image]
     # Only run if the build step is successful
-    if: success() && ( github.event_name != 'push' || github.ref == 'refs/heads/master' )
+    if: success() && ( github.event_name != 'push' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/pg' )
     name: ci-test
     uses: ./.github/workflows/ci-test-custom-script.yml
     secrets: inherit
@@ -113,7 +113,7 @@ jobs:
   server-unit-tests:
     name: server-unit-tests
     needs: [build-docker-image]
-    if: success() && ( github.event_name != 'push' || github.ref == 'refs/heads/master' )
+    if: success() && ( github.event_name != 'push' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/pg' )
     uses: ./.github/workflows/server-build.yml
     secrets: inherit
     with:
@@ -123,7 +123,7 @@ jobs:
   client-unit-tests:
     name: client-unit-tests
     needs: [build-docker-image]
-    if: success() && ( github.event_name != 'push' || github.ref == 'refs/heads/master' )
+    if: success() && ( github.event_name != 'push' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/pg' )
     uses: ./.github/workflows/client-unit-tests.yml
     secrets: inherit
     with:
@@ -341,6 +341,12 @@ jobs:
             scripts/generate_info_json.sh
           fi
 
+      - name: Place server artifacts-es
+        run: |
+          if [[ -f scripts/prepare_server_artifacts.sh ]]; then
+            scripts/prepare_server_artifacts.sh
+          fi
+
       - name: Set up Depot CLI
         uses: depot/setup-action@v1
 
@@ -362,7 +368,7 @@ jobs:
             APPSMITH_CLOUD_SERVICES_BASE_URL=https://release-cs.appsmith.com
             BASE=${{ vars.DOCKER_HUB_ORGANIZATION }}/base-${{ vars.EDITION }}:release
           tags: |
-            ${{ vars.DOCKER_HUB_ORGANIZATION }}/appsmith-${{ vars.EDITION }}:release
+            ${{ vars.DOCKER_HUB_ORGANIZATION }}/appsmith-${{ vars.EDITION }}:${{ github.ref_name }}
 
   package-master:
     needs: [ci-test, client-unit-tests, server-unit-tests]
diff --git a/app/client/cypress/e2e/GSheet/AllAccess_Spec.ts b/app/client/cypress/e2e/GSheet/AllAccess_Spec.ts
index 0f4ac2f2d2a1..aca3a5ab40df 100644
--- a/app/client/cypress/e2e/GSheet/AllAccess_Spec.ts
+++ b/app/client/cypress/e2e/GSheet/AllAccess_Spec.ts
@@ -15,7 +15,7 @@ const workspaceName = "gsheet apps";
 const dataSourceName = "gsheet-all";
 let appName = "gsheet-app";
 let spreadSheetName = "test-sheet";
-describe(
+describe.skip(
   "GSheet-Functional Tests With All Access",
   { tags: ["@tag.Datasource", "@tag.GSheet"] },
   function () {
diff --git a/app/client/cypress/e2e/GSheet/GsheetMisc_Spec.ts b/app/client/cypress/e2e/GSheet/GsheetMisc_Spec.ts
index 479c3b65b52e..b54a27b257c2 100644
--- a/app/client/cypress/e2e/GSheet/GsheetMisc_Spec.ts
+++ b/app/client/cypress/e2e/GSheet/GsheetMisc_Spec.ts
@@ -21,7 +21,7 @@ const workspaceName = "gsheet apps";
 const dataSourceName = "gsheet-all";
 let appName = "gsheet-app";
 let spreadSheetName = "test-sheet";
-describe(
+describe.skip(
   "GSheet Miscellaneous Tests",
   { tags: ["@tag.Datasource", "@tag.GSheet"] },
   function () {
diff --git a/app/client/cypress/e2e/GSheet/ReadNWrite_Access_Spec.ts b/app/client/cypress/e2e/GSheet/ReadNWrite_Access_Spec.ts
index 38bfcc82f85e..8d5a72c78b33 100644
--- a/app/client/cypress/e2e/GSheet/ReadNWrite_Access_Spec.ts
+++ b/app/client/cypress/e2e/GSheet/ReadNWrite_Access_Spec.ts
@@ -11,7 +11,7 @@ import {
   appSettings,
 } from "../../support/Objects/ObjectsCore";
 
-describe(
+describe.skip(
   "GSheet-Functional Tests With Read/Write Access",
   { tags: ["@tag.Datasource", "@tag.GSheet"] },
   function () {
diff --git a/app/client/cypress/e2e/GSheet/ReadOnly_Access_Spec.ts b/app/client/cypress/e2e/GSheet/ReadOnly_Access_Spec.ts
index 95ad0629d440..e90840f7d3ca 100644
--- a/app/client/cypress/e2e/GSheet/ReadOnly_Access_Spec.ts
+++ b/app/client/cypress/e2e/GSheet/ReadOnly_Access_Spec.ts
@@ -11,7 +11,7 @@ import {
   appSettings,
 } from "../../support/Objects/ObjectsCore";
 
-describe(
+describe.skip(
   "GSheet-Functional Tests With Read Access",
   { tags: ["@tag.Datasource", "@tag.GSheet"] },
   function () {
diff --git a/app/client/cypress/e2e/GSheet/WidgetBinding_AllAccess_Spec.ts b/app/client/cypress/e2e/GSheet/WidgetBinding_AllAccess_Spec.ts
index 1bf593992248..a3afbd77610c 100644
--- a/app/client/cypress/e2e/GSheet/WidgetBinding_AllAccess_Spec.ts
+++ b/app/client/cypress/e2e/GSheet/WidgetBinding_AllAccess_Spec.ts
@@ -21,7 +21,7 @@ const workspaceName = "gsheet apps";
 const dataSourceName = "gsheet-all";
 let appName = "gsheet-app";
 let spreadSheetName = "test-sheet";
-describe(
+describe.skip(
   "GSheet-widget binding",
   { tags: ["@tag.Datasource", "@tag.GSheet"] },
   function () {
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 8ce32c6a015e..e13c374025a3 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/StoreValue_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/StoreValue_spec.ts
@@ -238,7 +238,7 @@ describe("storeValue Action test", { tags: ["@tag.JS"] }, () => {
     });
     agHelper.ClickButton("Test store logs");
 
-    debuggerHelper.ClickDebuggerIcon();
+    debuggerHelper.OpenDebugger();
     debuggerHelper.ClickLogsTab();
     debuggerHelper.changeLogsGroup("System logs");
     debuggerHelper.DoesConsoleLogExist("storeValue('xyz', '123', true)");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug29566_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug29566_Spec.ts
deleted file mode 100644
index e4e8d6d378cf..000000000000
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug29566_Spec.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-import largeJSONData from "../../../../fixtures/largeJSONData.json";
-import {
-  agHelper,
-  deployMode,
-  jsEditor,
-} from "../../../../support/Objects/ObjectsCore";
-
-describe("JS Function execution data mutation", function () {
-  before(() => {
-    agHelper.AddDsl("listwidgetData");
-  });
-
-  it("1. List widget gets populated on page load", function () {
-    const APIJS = `export default {
-
-        async runFetch(dataRequest) {
-            return fetch(dataRequest.url, dataRequest.config)
-                .then(response => {
-                return response.json();
-            }).catch(error => {
-                showAlert('API error')
-            });
-        },
-    
-        async getConditionGroups() {
-            const dataRequest = {
-                url: "https://api.jsonbin.io/v3/b/656ed15d54105e766fd9ca52",
-                config: {
-                    method: 'GET',
-                },
-                name: 'getConditionGroups'
-            };
-            return await this.runFetch(dataRequest);
-        },
-    
-        async getConditionListData() {
-            const dataRequest = {
-                url: "https://api.jsonbin.io/v3/b/656ed18454105e766fd9ca6c",
-                config: {
-                    method: 'GET',
-                },
-                name: 'getConditionGroups'
-            };
-            return await this.runFetch(dataRequest);
-        },
-    
-    }`;
-    const PAGE1JS = `export default {
-
-        conditionGroups: [],
-        allConditionGroups: [],
-        maxItemsOnPageMachineConditionGroups: 6,
-        startIndex_MCG: 0,
-        conditionGroupsToShow: [],
-        splittingDataOf_MCG_ToShowIntoThreeColumns: [[],[],[]],
-        selectedMachineConditionGroups: [],
-    
-        async getAllConditionGroupsData() {
-          const conditionGroups = await ApiJS.getConditionGroups()|| [];
-            this.conditionGroups =  conditionGroups.record
-            console.log("conditionGroups ====> ",conditionGroups);
-             this.conditionGroups.filter((item) => {
-                 this.allConditionGroups.push(item.conditionGroup);
-             });
-    this.allConditionGroupsSplitedIntoThreeColumns()
-        },
-    
-        allConditionGroupsSplitedIntoThreeColumns() {
-            let tmpCounter_MCG = 0;
-            for(let i = 0; i < this.maxItemsOnPageMachineConditionGroups; i++) {
-                this.conditionGroupsToShow.push([this.allConditionGroups[this.startIndex_MCG]]);
-                this.splittingDataOf_MCG_ToShowIntoThreeColumns[tmpCounter_MCG].push(this.allConditionGroups[this.startIndex_MCG]);
-                this.startIndex_MCG++;
-                tmpCounter_MCG === 2 ? tmpCounter_MCG = 0 : tmpCounter_MCG++;
-            }
-        },
-    
-        setBgSelected_MCG(id) {
-            return this.selectedMachineConditionGroups.includes(id) ? '#0d9be2' : '#383838';
-        },
-        test(){
-            this.splittingDataOf_MCG_ToShowIntoThreeColumns = [[],[],[]]
-            return this.splittingDataOf_MCG_ToShowIntoThreeColumns
-        }
-    
-    }`;
-    jsEditor.CreateJSObject(APIJS, {
-      paste: true,
-      completeReplace: true,
-      toRun: false,
-      shouldCreateNewJSObj: true,
-      prettify: false,
-    });
-    jsEditor.RenameJSObjFromPane("ApiJS");
-    cy.wait(5000);
-
-    jsEditor.CreateJSObject(PAGE1JS, {
-      paste: true,
-      completeReplace: true,
-      toRun: false,
-      shouldCreateNewJSObj: true,
-      prettify: false,
-    });
-    jsEditor.RenameJSObjFromPane("Page1JS");
-    cy.wait(5000);
-    jsEditor.EnableDisableAsyncFuncSettings(
-      "getAllConditionGroupsData",
-      true,
-      false,
-    );
-    deployMode.DeployApp();
-    agHelper.AssertContains("MK Condition");
-  });
-});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/InputTruncateCheck_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/InputTruncateCheck_Spec.ts
index df67f114d67a..d3c7ca26b1d4 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/InputTruncateCheck_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/InputTruncateCheck_Spec.ts
@@ -11,6 +11,7 @@ import {
   draggableWidgets,
   fakerHelper,
   dataManager,
+  debuggerHelper,
 } from "../../../../support/Objects/ObjectsCore";
 
 const widgetsToTest = {
@@ -180,8 +181,18 @@ Object.entries(widgetsToTest).forEach(([widgetSelector, testConfig], index) => {
         agHelper.GetNClick(locators._widgetInputSelector(widgetSelector));
         agHelper.PressDelete();
 
+        //Since widget is removed & Button is still holding its reference
+        debuggerHelper.AssertDebugError(
+          `'${testConfig.widgetPrefixName}1' is not defined.`,
+          "",
+          true,
+          false,
+        );
+        debuggerHelper.CloseBottomBar();
         agHelper.GetNClick(getWidgetSelector(draggableWidgets.BUTTON));
-        agHelper.AssertContains("is not defined"); //Since widget is removed & Button is still holding its reference
+        agHelper.ValidateToastMessage(
+          `${testConfig.widgetPrefixName}1 is not defined`,
+        );
         agHelper.PressDelete();
 
         agHelper.GetNClick(getWidgetSelector(draggableWidgets.TEXT)).click();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/ListWidgetOnPageLoad_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/ListWidgetOnPageLoad_Spec.ts
new file mode 100644
index 000000000000..4826088ab6d7
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/ListWidgetOnPageLoad_Spec.ts
@@ -0,0 +1,59 @@
+import {
+  agHelper,
+  dataSources,
+  deployMode,
+  locators,
+  propPane,
+} from "../../../../support/Objects/ObjectsCore";
+import EditorNavigation, {
+  AppSidebar,
+  AppSidebarButton,
+  EntityType,
+  PageLeftPane,
+  PagePaneSegment,
+} from "../../../../support/Pages/EditorNavigation";
+
+describe(
+  "JS Function execution data mutation",
+  { tags: ["@tag.Widget", "@tag.List"] },
+  function () {
+    before(() => {
+      agHelper.AddDsl("Listv2/simpleList");
+    });
+
+    it("1. List widget gets populated on page load. Bug: 29566", function () {
+      dataSources.CreateDataSource("Postgres");
+      cy.get("@dsName").then(() => {
+        dataSources.CreateQueryAfterDSSaved(
+          "SELECT id,name FROM public.users LIMIT 10;",
+        );
+        dataSources.ToggleUsePreparedStatement(false);
+        dataSources.RunQuery();
+      });
+      AppSidebar.navigate(AppSidebarButton.Editor);
+      PageLeftPane.switchSegment(PagePaneSegment.UI);
+      EditorNavigation.SelectEntityByName("List1", EntityType.Widget);
+      propPane.UpdatePropertyFieldValue("Items", "{{Query1.data}}");
+      propPane.TogglePropertyState("Server side pagination", "Off");
+      propPane.SelectPropertiesDropDown("Data Identifier", "id");
+      agHelper
+        .GetText(locators._widgetInCanvas("textwidget") + " span")
+        .then((initialTexts: string[]) => {
+          deployMode.DeployApp();
+          agHelper.AssertElementLength(locators._textWidgetInDeployed, 6);
+          agHelper
+            .GetText(locators._textWidgetInDeployed)
+            .then((deployedTexts: string[]) => {
+              expect(deployedTexts).to.deep.equal(initialTexts);
+            });
+          agHelper.CypressReload();
+          agHelper.AssertElementLength(locators._textWidgetInDeployed, 6);
+          agHelper
+            .GetText(locators._textWidgetInDeployed)
+            .then((deployedTexts: string[]) => {
+              expect(deployedTexts).to.deep.equal(initialTexts);
+            });
+        });
+    });
+  },
+);
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 9cb9c89457fe..a17f26f09537 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Moment_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Moment_Spec.ts
@@ -122,7 +122,7 @@ describe(
         deployMode.NavigateBacktoEditor();
 
         //verify runAstros triggered on PageLaoad of Edit page!
-        debuggerHelper.ClickDebuggerIcon();
+        debuggerHelper.OpenDebugger();
         debuggerHelper.ClickLogsTab();
         debuggerHelper.DebuggerLogsFilter("JSObject1.runAstros");
         debuggerHelper.DoesConsoleLogExist("JS Function executed successfully");
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 d8d690583351..5bacf30fa3d1 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
@@ -27,7 +27,7 @@ describe(
       apiPage.EnterHeader("test", "test");
       debuggerHelper.AssertErrorCount(1);
       EditorNavigation.ShowCanvas();
-      debuggerHelper.ClickDebuggerIcon();
+      debuggerHelper.OpenDebugger();
       debuggerHelper.ClicklogEntityLink();
 
       agHelper.AssertElementVisibility(apiPage._nextCursorValue);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Debugger/JSObjects_navigation_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Debugger/JSObjects_navigation_spec.ts
index 0446d7cb696a..6d00f9aecd6d 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Debugger/JSObjects_navigation_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Debugger/JSObjects_navigation_spec.ts
@@ -30,7 +30,7 @@ describe("JSObjects", () => {
       shouldCreateNewJSObj: true,
     });
 
-    debuggerHelper.ClickDebuggerIcon();
+    debuggerHelper.OpenDebugger();
     debuggerHelper.ClicklogEntityLink();
     agHelper.AssertCursorInput(".js-editor", { ch: 20, line: 6 });
 
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Debugger/Query_pane_navigation.ts b/app/client/cypress/e2e/Regression/ClientSide/Debugger/Query_pane_navigation.ts
index 4dc7732fb30c..5ba9fa87bc5f 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Debugger/Query_pane_navigation.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Debugger/Query_pane_navigation.ts
@@ -66,8 +66,7 @@ describe(
       );
       debuggerHelper.AssertErrorCount(2);
 
-      debuggerHelper.ClickDebuggerIcon();
-      debuggerHelper.ClicklogEntityLink();
+      debuggerHelper.OpenDebugger();
       agHelper.AssertElementVisibility(
         ".t--actionConfiguration\\.formData\\.limitDocuments\\.data",
       );
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 1f9699579c2c..30a27209444a 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
@@ -14,7 +14,7 @@ describe(
       _.debuggerHelper.AssertErrorCount(1);
       _.propPane.ToggleSection("general");
       _.agHelper.AssertElementAbsence("animateloading");
-      _.debuggerHelper.ClickDebuggerIcon();
+      _.debuggerHelper.OpenDebugger();
       _.debuggerHelper.ClicklogEntityLink();
       _.propPane.AssertIfPropertyIsVisible("animateloading");
 
@@ -28,7 +28,7 @@ describe(
       _.propPane.EnterJSContext("visible", "{{test}}", true, false);
       _.debuggerHelper.AssertErrorCount(1);
       _.propPane.NavigateBackToPropertyPane();
-      _.debuggerHelper.ClickDebuggerIcon();
+      _.debuggerHelper.OpenDebugger();
       _.debuggerHelper.ClicklogEntityLink();
       _.agHelper.GetNAssertContains(_.propPane._paneTitle, "Tab 2");
       _.propPane.AssertIfPropertyIsVisible("visible");
@@ -48,7 +48,7 @@ describe(
       _.debuggerHelper.AssertErrorCount(1);
       _.propPane.NavigateBackToPropertyPane(false);
       _.propPane.NavigateBackToPropertyPane();
-      _.debuggerHelper.ClickDebuggerIcon();
+      _.debuggerHelper.OpenDebugger();
       _.debuggerHelper.ClicklogEntityLink();
       _.agHelper.GetNAssertContains(_.propPane._paneTitle, "Menu Item");
       _.propPane.AssertIfPropertyIsVisible("icon");
@@ -65,7 +65,7 @@ describe(
       _.propPane.MoveToTab("Style");
       _.debuggerHelper.AssertErrorCount(1);
       _.propPane.NavigateBackToPropertyPane();
-      _.debuggerHelper.ClickDebuggerIcon();
+      _.debuggerHelper.OpenDebugger();
       _.debuggerHelper.ClicklogEntityLink();
       _.agHelper.GetNAssertContains(_.propPane._paneTitle, "Second Menu Item");
       _.propPane.AssertIfPropertyIsVisible("disabled");
@@ -110,7 +110,7 @@ describe(
       _.propPane.NavigateBackToPropertyPane(false);
       _.propPane.NavigateBackToPropertyPane();
 
-      _.debuggerHelper.ClickDebuggerIcon();
+      _.debuggerHelper.OpenDebugger();
       _.debuggerHelper.ClicklogEntityLink();
       _.agHelper.GetNAssertContains(_.propPane._paneTitle, "Custom Field 2");
       _.propPane.AssertIfPropertyIsVisible("borderradius");
@@ -133,7 +133,7 @@ describe(
       _.propPane.EnterJSContext("disabled", "{{test}}", true, false);
       _.debuggerHelper.AssertErrorCount(2);
 
-      _.debuggerHelper.ClickDebuggerIcon();
+      _.debuggerHelper.OpenDebugger();
       _.debuggerHelper.ClicklogEntityLink(true);
       _.agHelper.GetNAssertContains(_.propPane._paneTitle, "First Menu Item");
       _.debuggerHelper.CloseBottomBar();
@@ -173,7 +173,7 @@ describe(
       _.propPane.ToggleSection("validation");
       _.propPane.NavigateBackToPropertyPane();
 
-      _.debuggerHelper.ClickDebuggerIcon();
+      _.debuggerHelper.OpenDebugger();
       _.debuggerHelper.ClicklogEntityLink();
       _.agHelper.GetNAssertContains(_.propPane._paneTitle, "imdb_id");
       _.debuggerHelper.CloseBottomBar();
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 ed8b4056207f..cf1d77b9dd19 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Pages_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Pages_spec.js
@@ -3,9 +3,6 @@ import EditorNavigation, {
   EntityType,
 } from "../../../../support/Pages/EditorNavigation";
 import PageList from "../../../../support/Pages/PageList";
-const locators = {
-  errorPageTitle: ".t--error-page-title",
-};
 
 describe("Pages", { tags: ["@tag.IDE"] }, function () {
   let veryLongPageName = `abcdefghijklmnopqrstuvwxyz1234`;
@@ -36,7 +33,7 @@ describe("Pages", { tags: ["@tag.IDE"] }, function () {
     EditorNavigation.SelectEntityByName("Page1 Copy", EntityType.Page);
     //Checks if 404 is showing correct route
     cy.visit("/route-that-does-not-exist");
-    cy.get(locators.errorPageTitle).should(($x) => {
+    cy.get(_.locators.errorPageTitle).should(($x) => {
       expect($x).contain(Cypress.env("MESSAGES").PAGE_NOT_FOUND());
     });
   });
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitAutocommit_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Git/GitAutocommit_spec.ts
new file mode 100644
index 000000000000..fbc7b921c5a3
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitAutocommit_spec.ts
@@ -0,0 +1,57 @@
+import ReconnectLocators from "../../../../locators/ReconnectLocators";
+import { featureFlagIntercept } from "../../../../support/Objects/FeatureFlags";
+import {
+  agHelper,
+  gitSync,
+  homePage,
+} from "../../../../support/Objects/ObjectsCore";
+
+let wsName: string;
+let repoName: string = "TED-testrepo1";
+
+describe(
+  "Git Autocommit",
+  { tags: ["@tag.Git", "@tag.GitAutocommit"] },
+  function () {
+    it("Check if autocommit progress bar is visible and network requests are properly called", function () {
+      featureFlagIntercept({
+        release_git_autocommit_feature_enabled: true,
+      });
+      agHelper.GenerateUUID();
+      cy.get("@guid").then((uid) => {
+        wsName = "GitAC-" + uid;
+        homePage.CreateNewWorkspace(wsName, true);
+
+        cy.intercept({
+          method: "POST",
+          url: "/api/v1/git/auto-commit/app/*",
+        }).as("gitAutocommitTriggerApi");
+
+        cy.intercept(
+          {
+            method: "GET",
+            url: "/api/v1/git/auto-commit/progress/app/*",
+          },
+          (req) => {
+            req.on("response", (res) => {
+              res.setDelay(500);
+            });
+          },
+        ).as("gitAutocommitProgressApi");
+
+        gitSync.ImportAppFromGit(wsName, repoName);
+        agHelper.GetNClick(ReconnectLocators.SkipToAppBtn);
+        cy.wait("@gitAutocommitTriggerApi").then((interception) => {
+          expect(interception?.response?.statusCode).to.equal(200);
+          expect(
+            interception?.response?.body?.data?.autoCommitResponse,
+          ).to.equal("PUBLISHED");
+          agHelper.WaitUntilEleAppear(gitSync._autocommitStatusbar);
+        });
+        cy.wait("@gitAutocommitProgressApi").then((interceptions) => {
+          expect(interceptions?.response?.statusCode).to.equal(200);
+        });
+      });
+    });
+  },
+);
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 92c3858ea3e2..6a27f57bb7b1 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
@@ -36,10 +36,7 @@ describe("Git Branch Protection", { tags: ["@tag.Git"] }, function () {
         cy.wait("@gitProtectApi").then((res1) => {
           _.agHelper.GetNClick(_.gitSync._closeGitSettingsModal);
           expect(res1.response).to.have.property("statusCode", 200);
-          _.agHelper.AssertElementVisibility(
-            AppSidebar.locators.sidebar,
-            false,
-          );
+          _.agHelper.AssertElementAbsence(AppSidebar.locators.sidebar);
           _.agHelper.AssertElementVisibility(
             PageLeftPane.locators.selector,
             false,
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 fae97f66f8e2..23d9464dffc1 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/EntityBottomBar_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/EntityBottomBar_spec.ts
@@ -7,7 +7,7 @@ describe("Entity bottom bar", { tags: ["@tag.IDE"] }, () => {
     //Verify if bottom bar is closed.
     _.debuggerHelper.AssertClosed();
     //verify if bottom bar is open on clicking debugger icon in canvas.
-    _.debuggerHelper.ClickDebuggerIcon();
+    _.debuggerHelper.OpenDebugger();
     _.debuggerHelper.AssertOpen(PageType.Canvas);
     //Verify if selected tab is errors in tab title.
     _.debuggerHelper.AssertSelectedTab(
@@ -48,7 +48,7 @@ describe("Entity bottom bar", { tags: ["@tag.IDE"] }, () => {
     //Verify that the errors tab is still closed.
     _.debuggerHelper.AssertClosed();
     //Verify if bottom bar opens on clicking debugger icon in api page.
-    _.debuggerHelper.ClickDebuggerIcon();
+    _.debuggerHelper.OpenDebugger();
     _.debuggerHelper.AssertOpen(PageType.API);
     //Verify if selected tab is errors in tab title.
     _.debuggerHelper.AssertSelectedTab(
@@ -70,7 +70,7 @@ describe("Entity bottom bar", { tags: ["@tag.IDE"] }, () => {
     //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.ClickDebuggerIcon();
+    _.debuggerHelper.OpenDebugger();
     _.debuggerHelper.AssertOpen(PageType.DataSources);
   });
 
@@ -91,7 +91,7 @@ describe("Entity bottom bar", { tags: ["@tag.IDE"] }, () => {
         _.debuggerHelper.AssertClosed();
         //Verify if bottom bar opens on clicking debugger icon in query page.
         _.dataSources.CreateQueryAfterDSSaved();
-        _.debuggerHelper.ClickDebuggerIcon();
+        _.debuggerHelper.OpenDebugger();
         _.debuggerHelper.AssertOpen(PageType.Query);
         //Verify if bottom bar is closed on clicking close icon in query page.
         _.debuggerHelper.CloseBottomBar();
@@ -130,7 +130,7 @@ describe("Entity bottom bar", { tags: ["@tag.IDE"] }, () => {
     _.debuggerHelper.AssertClosed();
     //Verify if bottom bar opens on clicking debugger icon in query page.
     _.dataSources.CreateQueryAfterDSSaved();
-    _.debuggerHelper.ClickDebuggerIcon();
+    _.debuggerHelper.OpenDebugger();
     _.debuggerHelper.AssertOpen(PageType.Query);
     //Verify if bottom bar is closed on clicking close icon in query page.
     _.debuggerHelper.CloseBottomBar();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/ErrorMessages_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/ErrorMessages_spec.ts
index c0e974e15a03..6bc10f52d431 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/ErrorMessages_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/ErrorMessages_spec.ts
@@ -33,13 +33,21 @@ describe("Sanitise toast error messages", () => {
     EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
     _.propPane.EnterJSContext("onClick", "{{a.kjbfjdfbkds()}}");
     _.agHelper.ClickButton("Submit");
-    _.agHelper.WaitUntilToastDisappear("a is not defined");
+    _.debuggerHelper.AssertDebugError("'a' is not defined.", "", true, false);
   });
 
   it("2. Does not show type error label when js obj function does not exist", () => {
     EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
     _.propPane.EnterJSContext("onClick", "{{JSObject1.myFun1efef()}}");
+    // Assert the lint error that shows up
+    _.debuggerHelper.AssertDebugError(
+      `"myFun1efef" doesn't exist in JSObject1`,
+      "",
+      false,
+      false,
+    );
     _.agHelper.ClickButton("Submit");
+    // Assert the execution error that shows up
     _.agHelper.WaitUntilToastDisappear("Object1.myFun1efef is not a function");
   });
 
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 ca9ba9a553fc..b4f51bc7282f 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
@@ -7,7 +7,7 @@ describe("Inspect Entity", function () {
   it("1. Check whether depedencies and references are shown correctly", function () {
     cy.openPropertyPane("inputwidgetv2");
     cy.testJsontext("defaultvalue", "{{Button1.text}}");
-    _.agHelper.GetNClick(".t--debugger-count");
+    _.debuggerHelper.OpenDebugger();
     cy.contains(".ads-v2-tabs__list-tab", "Inspect entity").click();
     cy.contains(".t--dependencies-item", "Button1").click();
     cy.contains(".t--dependencies-item", "Input1");
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 a3e7ffa11e78..42b84b43474b 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Logs1_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Logs1_spec.js
@@ -1,5 +1,3 @@
-import commonlocators from "../../../../locators/commonlocators.json";
-import { homePage } from "../../../../support/Objects/ObjectsCore";
 import { ObjectsRegistry } from "../../../../support/Objects/Registry";
 import EditorNavigation, {
   EntityType,
@@ -26,18 +24,18 @@ describe("Debugger logs", function () {
     logString = generateTestLogString();
   });
 
-  it("3. Console log on button click with normal moustache binding", function () {
+  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.ClickDebuggerIcon();
+    debuggerHelper.OpenDebugger();
     agHelper.GetNClick(jsEditor._logsTab);
     debuggerHelper.DoesConsoleLogExist(logString);
   });
 
-  it("4. Console log on button click with arrow function IIFE", function () {
+  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
@@ -51,7 +49,7 @@ describe("Debugger logs", function () {
     debuggerHelper.DoesConsoleLogExist(logString);
   });
 
-  it("5. Console log on button click with function keyword IIFE", 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
@@ -65,7 +63,7 @@ describe("Debugger logs", function () {
     debuggerHelper.DoesConsoleLogExist(logString);
   });
 
-  it("6. Console log on button click with async function IIFE", function () {
+  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);
@@ -79,7 +77,7 @@ describe("Debugger logs", function () {
     debuggerHelper.DoesConsoleLogExist(logString);
   });
 
-  it("7. Console log on button click with mixed function IIFE", 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);
@@ -96,7 +94,7 @@ describe("Debugger logs", function () {
     debuggerHelper.DoesConsoleLogExist(logStringChild);
   });
 
-  it("8. Console log grouping on button click", function () {
+  it("6. Console log grouping on button click", function () {
     debuggerHelper.ClearLogs();
     // Testing with normal log in iifee
     EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
@@ -116,7 +114,7 @@ describe("Debugger logs", function () {
     debuggerHelper.AssertConsecutiveConsoleLogCount(5);
   });
 
-  it("9. Console log grouping on button click with different log in between", 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);
@@ -135,7 +133,7 @@ describe("Debugger logs", function () {
     debuggerHelper.AssertConsecutiveConsoleLogCount(2);
   });
 
-  it("10. Console log grouping on button click from different source", function () {
+  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);
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 84207474a4c8..fa3358209b5d 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Logs2_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Logs2_spec.js
@@ -34,7 +34,7 @@ describe("Debugger logs", { tags: ["@tag.IDE"] }, function () {
     _.agHelper.RefreshPage();
     // Wait for the debugger icon to be visible
     _.agHelper.AssertElementVisibility(".t--debugger-count");
-    _.debuggerHelper.ClickDebuggerIcon();
+    _.debuggerHelper.OpenDebugger();
     _.agHelper.GetNClick(_.jsEditor._logsTab);
     _.debuggerHelper.DoesConsoleLogExist(logString);
   });
@@ -286,7 +286,7 @@ describe("Debugger logs", { tags: ["@tag.IDE"] }, function () {
 
     EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
     _.agHelper.AssertElementVisibility(".t--debugger-count");
-    _.debuggerHelper.ClickDebuggerIcon();
+    _.debuggerHelper.OpenDebugger();
 
     _.debuggerHelper.ClicklogEntityLink();
 
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 ae53291a32a1..5b35f24d7960 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
@@ -23,7 +23,7 @@ describe("Widget error state", function () {
 
     //Check if the current value is shown in the debugger
 
-    _.debuggerHelper.ClickDebuggerIcon();
+    _.debuggerHelper.OpenDebugger();
     cy.get("[data-testid=t--tab-ERROR]").click();
     //This feature is disabled in updated error log - epic 17720
     // _.debuggerHelper.LogStateContains("Test");
@@ -44,8 +44,8 @@ describe("Widget error state", function () {
     );
 
     // All errors should be expanded by default
-    //Updated count to 1 as the decision not to show triggerexecution/uncaughtpromise error in - epic 17720
-    _.debuggerHelper.AssertVisibleErrorMessagesCount(1);
+    //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", "{{[]}}");
@@ -63,7 +63,7 @@ describe("Widget error state", function () {
     cy.deleteWidget();
     _.debuggerHelper.AssertVisibleErrorMessagesCount(0);
     cy.get("body").type(`{${modifierKey}}z`);
-    _.debuggerHelper.AssertVisibleErrorMessagesCount(2);
+    _.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);
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 2838e49a8674..46bd1a99a335 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
@@ -15,17 +15,14 @@ describe(
     it("1. Fork a template to the current app + Bug 17477", () => {
       PageList.AddNewPage("Add page from template");
       agHelper.AssertElementVisibility(template.templateDialogBox);
-      agHelper.GetNClick("//h1[text()='Applicant Tracker-test']");
+      agHelper.GetNClick(template.templateCard, 0, true);
       agHelper.FailIfErrorToast("INTERNAL_SERVER_ERROR");
       agHelper.GetNClick(template.templateViewForkButton);
       agHelper.WaitUntilToastDisappear("template added successfully");
       assertHelper.AssertNetworkStatus("updateLayout");
-      // [Bug]: Getting 'Resource not found' error on deploying template #17477
+      PageList.AddNewPage("Generate page with data");
       deployMode.DeployApp();
-      agHelper.GetNClickByContains(
-        ".t--page-switch-tab",
-        "1 Track Applications",
-      );
+      agHelper.GetNClick(locators._deployedPage, 0, true);
       deployMode.NavigateBacktoEditor();
       homePage.NavigateToHome();
       agHelper.WaitUntilAllToastsDisappear();
@@ -35,14 +32,13 @@ describe(
       homePage.CreateNewApplication();
       PageList.AddNewPage("Add page from template");
       agHelper.AssertElementVisibility(template.templateDialogBox);
-      agHelper.GetNClick("//h1[text()='Applicant Tracker-test']");
+      agHelper.GetNClick(template.templateCard, 0, true);
       agHelper.FailIfErrorToast(
         "Internal server error while processing request",
       );
       assertHelper.AssertNetworkStatus("getTemplatePages");
       agHelper.CheckUncheck(template.selectAllPages, false);
       agHelper.GetNClick(template.selectCheckbox, 1);
-      // [Bug]: On forking selected pages from a template, resource not found error is shown #17270
       agHelper.GetNClick(template.templateViewForkButton);
       agHelper.AssertElementAbsence(
         locators._visibleTextSpan("Setting up the template"),
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 ecf774670d18..0f149cf2179a 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
@@ -1,6 +1,7 @@
 const commonlocators = require("../../../../locators/commonlocators.json");
 const themelocator = require("../../../../locators/ThemeLocators.json");
 
+import { multiSelectWidgetLocators } from "../../../../locators/WidgetLocators";
 import {
   agHelper,
   locators,
@@ -26,49 +27,19 @@ describe(
       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(1).click({ force: true });
-      cy.wait("@updateTheme").should(
-        "have.nested.property",
-        "response.body.responseMeta.status",
-        200,
-      );
-      cy.wait(1000);
-      cy.contains("Border").click({ force: true });
-
-      //Shadow validation
-      //cy.contains("Shadow").click({ force: true });
-      cy.wait(2000);
-      cy.xpath(theme.locators._boxShadow("L")).click({ force: true });
-      cy.wait("@updateTheme").should(
-        "have.nested.property",
-        "response.body.responseMeta.status",
-        200,
-      );
-      cy.wait(1000);
-      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;
-        });
+        agHelper.GetNClick($elem);
 
-        cy.get(themelocator.fontsSelected)
-          //.eq(10)
+        agHelper
+          .GetElement(themelocator.fontsSelected)
           .should("contain.text", "Nunito Sans");
 
-        cy.get(".rc-virtual-list .rc-select-item-option")
-          .find(".leading-normal")
+        agHelper
+          .GetElement(themelocator.fontOption)
+          .find(themelocator.fontsSelected)
           .eq(3)
           .then(($childElem) => {
             cy.get($childElem).click({ force: true });
@@ -80,60 +51,46 @@ describe(
             themeFont = `Inter, sans-serif`;
           });
       });
-      cy.contains("Font").click({ force: true });
 
-      //Color - Bug 23501 - hence skipping
-      // cy.wait(1000);
-      // theme.ChangeThemeColor("purple", "Primary");
-      // cy.get(themelocator.inputColor).should("have.value", "purple");
-      // cy.wait(1000);
+      cy.contains("Font").click({ force: true });
 
-      // theme.ChangeThemeColor("brown", "Background");
-      // cy.get(themelocator.inputColor).should("have.value", "brown");
-      // cy.wait(1000);
-      // cy.contains("Color").click({ force: true });
       appSettings.ClosePane();
     });
 
-    //Skipping due to mentioned bug
-    it.skip("2. Publish the App and validate Font across the app + Bug 15007", function () {
+    it("2. Publish the App and validate Font across the app", function () {
       deployMode.DeployApp();
-      cy.get(".rc-select-selection-item > .rc-select-selection-item-content")
+      agHelper
+        .GetElement(
+          multiSelectWidgetLocators.multiSelectWidgetSelectedOptionContent,
+        )
         .first()
         .should("have.css", "font-family", themeFont);
-      cy.get(".rc-select-selection-item > .rc-select-selection-item-content")
+      agHelper
+        .GetElement(
+          multiSelectWidgetLocators.multiSelectWidgetSelectedOptionContent,
+        )
         .last()
         .should("have.css", "font-family", themeFont);
       deployMode.NavigateBacktoEditor();
     });
 
-    it.skip("3. Validate current theme feature", function () {
-      cy.get("#canvas-selection-0").click({ force: true });
+    it("3. Apply theme and validate the color", function () {
       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(() => {
-          cy.get(".t--draggable-multiselectwidgetv2:contains('more')")
-            .last()
-            .invoke("css", "background-color")
-            .then((selectedBackgroudColor) => {
-              expect("rgba(0, 0, 0, 0)").to.equal(selectedBackgroudColor);
-              appSettings.ClosePane();
-            });
-        });
+      agHelper.GetNClick(commonlocators.changeThemeBtn, 0, true);
+      agHelper.GetNClick(
+        `${themelocator.featuredThemeSection} [data-testid='t--theme-card-Sunrise']`,
+      );
 
-      //Publish the App and validate change of Theme across the app in publish mode
       deployMode.DeployApp();
-      cy.xpath("//div[@id='root']//section/parent::div").should(
-        "have.css",
-        "background-color",
-        "rgb(165, 42, 42)",
-      );
+
+      agHelper.GetNClick(multiSelectWidgetLocators.multiSelectWidgetTrigger);
+      agHelper
+        .GetElement(
+          multiSelectWidgetLocators.multiSelectWidgetDropdownOptionCheckbox,
+        )
+        .first()
+        .should("have.css", "background-color", "rgb(239, 68, 68)");
     });
   },
 );
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 c65da1768296..93bcb3dbd81d 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
@@ -43,13 +43,7 @@ describe(
         .should("be.visible")
         .contains("'lintError' is not defined.");
 
-      cy.get(commonlocators.debugger)
-        .should("be.visible")
-        .click({ force: true });
-
-      cy.get(commonlocators.errorTab)
-        .should("be.visible")
-        .click({ force: true });
+      _.debuggerHelper.OpenDebugger();
 
       cy.get(commonlocators.debugErrorMsg).should("have.length", 3);
     });
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 cbdab81e2ce3..10c00970efb8 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
@@ -77,8 +77,6 @@ describe(
     it("3. handleSelectAllChange: unchecked", function () {
       const selectAllSelector = formWidgetsPage.selectAllCheckboxControl;
       const uncheckedOptionInputs = `${formWidgetsPage.checkboxGroupOptionInputs} input:not(:checked)`;
-      // Deselect all
-      cy.get(selectAllSelector).click();
       // Should get 2 unchecked option inputs
       cy.get(uncheckedOptionInputs).should("have.length", 2);
       //handleSelectAllChange: checked", function () {
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/List/ListWidgetLintErrorValidation.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/List/ListWidgetLintErrorValidation.js
index 60b164133a0a..87c5d382fdd9 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/List/ListWidgetLintErrorValidation.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/List/ListWidgetLintErrorValidation.js
@@ -43,13 +43,7 @@ describe(
         .should("be.visible")
         .contains("'DATA' is not defined.");
 
-      cy.get(commonlocators.debugger)
-        .should("be.visible")
-        .click({ force: true });
-
-      cy.get(commonlocators.errorTab)
-        .should("be.visible")
-        .click({ force: true });
+      _.debuggerHelper.OpenDebugger();
 
       cy.get(commonlocators.debugErrorMsg).should("have.length", 6);
     });
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 88681abef13e..d734b16281c0 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
@@ -149,12 +149,7 @@ describe("Select Widgets", { tags: ["@tag.Widget", "@tag.List"] }, function () {
       .first()
       .should("have.text", `undefined_undefined_true_false`);
 
-    cy.get(`${widgetSelectorByType("selectwidget")} .cancel-icon`).click({
-      force: true,
-    });
-    cy.get(`${widgetSelector("Select_Widget")} ${commonlocators.bodyTextStyle}`)
-      .first()
-      .should("have.text", `__true_false`);
+    cy.get(_.locators._selectClearButton_dataTestId).should("not.exist");
   });
 
   it("3. Select Widgets onOptionChange", function () {
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 d0f15f8e521b..1d64e70592b6 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
@@ -91,10 +91,11 @@ describe(
         1,
       );
       //Open debugger by clicking debugger icon in canvas.
-      debuggerHelper.ClickDebuggerIcon();
-      agHelper.GetNAssertContains(
-        debuggerHelper.locators._debuggerList,
+      debuggerHelper.AssertDebugError(
         "This data identifier is evaluating to a duplicate value. Please use an identifier that evaluates to a unique value.",
+        "",
+        true,
+        false,
       );
     });
   },
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 2ce68154fbc8..594f05b44743 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
@@ -9,6 +9,7 @@ import {
 import EditorNavigation, {
   EntityType,
 } from "../../../../../support/Pages/EditorNavigation";
+import * as _ from "../../../../../support/Objects/ObjectsCore";
 
 describe(
   "Nested List widget V2 ",
@@ -40,8 +41,11 @@ describe(
         "List3",
       ]);
       agHelper.GetElement("body").type(`{${agHelper._modifierKey}}{v}`);
-      agHelper.ValidateToastMessage(
+      _.debuggerHelper.OpenDebugger();
+      _.debuggerHelper.ClickLogsTab();
+      _.debuggerHelper.DoesConsoleLogExist(
         "Cannot have more than 3 levels of nesting in the list widget",
+        true,
       );
     });
 
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 6c42b5af52d1..4d6a2525baa6 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
@@ -6,9 +6,11 @@ const commonlocators = require("../../../../../locators/commonlocators.json");
 import {
   agHelper,
   assertHelper,
+  debuggerHelper,
   entityExplorer,
   propPane,
 } from "../../../../../support/Objects/ObjectsCore";
+import * as _ from "../../../../../support/Objects/ObjectsCore";
 const widgetsPage = require("../../../../../locators/Widgets.json");
 
 const widgetSelector = (name) => `[data-widgetname-cy="${name}"]`;
@@ -72,7 +74,12 @@ describe(
         .type(`{${modifierKey}}{v}`);
 
       cy.wait(500);
-      cy.validateToastMessage("Cannot have more than 3 levels of nesting");
+      _.debuggerHelper.OpenDebugger();
+      _.debuggerHelper.ClickLogsTab();
+      _.debuggerHelper.DoesConsoleLogExist(
+        "Cannot have more than 3 levels of nesting",
+        true,
+      );
       cy.get(`${widgetSelector("List2Copy1")}`).should("not.exist");
     });
 
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 b35dc5683c7c..f6c14c63db3c 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
@@ -42,14 +42,19 @@ describe(
       _.debuggerHelper.AssertErrorCount(0);
     });
 
-    it("2. shows correct number of items", () => {
-      _.agHelper.AddDsl("Listv2/simpleList");
+    it("2. test delete of list widget without errors", () => {
+      cy.get(commonlocators.deleteWidget).click({ force: true });
+      _.debuggerHelper.AssertErrorCount(0);
+    });
+
+    it("3. shows correct number of items", () => {
+      cy.dragAndDropToCanvas("listwidgetv2", { x: 200, y: 200 });
       cy.get(publishLocators.containerWidget).should("have.length", 3);
       cy.get(publishLocators.imageWidget).should("have.length", 3);
       cy.get(publishLocators.textWidget).should("have.length", 6);
     });
 
-    it("3. shows correct text from binding", () => {
+    it("4. shows correct text from binding", () => {
       cy.get(publishLocators.containerWidget).each(($containerEl, index) => {
         cy.wrap($containerEl)
           .find(publishLocators.textWidget)
@@ -62,7 +67,7 @@ describe(
       });
     });
 
-    it("4. retains input values when pages are switched", () => {
+    it("5. retains input values when pages are switched", () => {
       _.agHelper.AddDsl("Listv2/simpleListWithInputAndButton");
 
       cy.get(publishLocators.inputWidget).should("have.length", 2);
@@ -125,7 +130,7 @@ describe(
       });
     });
 
-    it("5. Reset pageNo when serverside pagination is enabled", () => {
+    it("6. Reset pageNo when serverside pagination is enabled", () => {
       cy.get(`${widgetSelector("List1")} .rc-pagination-item-3`).click({
         force: true,
       });
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 426c5ca04afe..30f1a3f108df 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
@@ -316,13 +316,7 @@ describe(
       agHelper.AssertExistingToggleState("Required", "false");
       propPane.TogglePropertyState("Required", "On");
       deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.FORM));
-      agHelper.GetNClick(widgetLocators.selectWidgetClear, 1);
-      agHelper.AssertCSS(
-        widgetLocators.selectWidgetBtn,
-        "border-color",
-        "rgb(217, 25, 33)",
-        1,
-      );
+      cy.get(locators._selectClearButton_testId).should("not.exist");
     });
 
     it("10.Validate using function inside label key and value key returns correct label options", () => {
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 22b09155681a..40da3f138e35 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
@@ -3,7 +3,9 @@ const widgetsPage = require("../../../../../locators/Widgets.json");
 import {
   agHelper,
   table as tableHelper,
+  propPane,
 } from "../../../../../support/Objects/ObjectsCore";
+import { PROPERTY_SELECTOR } from "../../../../../locators/WidgetLocators";
 
 describe(
   "Table widget inline editing functionality",
@@ -161,7 +163,12 @@ describe(
     it("6. should check that onsubmit event is available for the columns that are editable", () => {
       cy.openPropertyPane("tablewidgetv2");
       cy.editColumn("step");
-      cy.wait(500);
+      cy.get(commonlocators.changeColType).last().click();
+      cy.get(tableHelper._dropdownText)
+        .children()
+        .contains("Plain text")
+        .click();
+      propPane.TogglePropertyState("Editable", "Off", "");
       [
         {
           columnType: "URL",
@@ -206,8 +213,7 @@ describe(
           .contains(data.columnType)
           .click();
         cy.wait("@updateLayout");
-        cy.wait(500);
-        cy.get(".t--property-control-onsubmit").should(data.expected);
+        cy.get(PROPERTY_SELECTOR.onSubmit).should(data.expected);
       });
 
       cy.get(propPaneBack).click();
@@ -262,8 +268,7 @@ describe(
           .contains(data.columnType)
           .click();
         cy.wait("@updateLayout");
-        cy.wait(500);
-        cy.get(".t--property-control-onsubmit").should(data.expected);
+        cy.get(PROPERTY_SELECTOR.onSubmit).should(data.expected);
       });
     });
 
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 fafe2da10f90..f65933708669 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
@@ -162,6 +162,7 @@ describe(
     });
 
     it("6. should check that on option select is working", () => {
+      _.agHelper.CheckForPageSaveError();
       featureFlagIntercept({ release_table_cell_label_value_enabled: true });
       cy.openPropertyPane("tablewidgetv2");
       cy.editColumn("step");
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 2a941b2004c2..b473a01b24d6 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
@@ -44,15 +44,7 @@ describe(
         .should("be.visible")
         .contains("'lintErrror' is not defined.");
 
-      cy.get(commonlocators.debugger)
-        .should("be.visible")
-        .click({ force: true });
-
-      cy.get(commonlocators.errorTab)
-        .should("be.visible")
-        .click({ force: true });
-
-      cy.get(commonlocators.debugErrorMsg).should("have.length", 3);
+      _.debuggerHelper.AssertErrorCount(3);
     });
   },
 );
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 6490f5c8af53..55ab1a650cd0 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
@@ -49,34 +49,7 @@ describe(
       agHelper.AssertProperty(widgetLocators.video, "ended", true);
     });
 
-    it("2. Verify Basic Functionality of Video Widget - muted", function () {
-      deployMode.NavigateBacktoEditor();
-      EditorNavigation.SelectEntityByName("Video1", EntityType.Widget);
-      //Validate video for youtube url
-      propPane.TypeTextIntoField("URL", testdata.videoUrl);
-      deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.VIDEO));
-      agHelper.GetNClick(locators._widgetInDeployed(draggableWidgets.VIDEO));
-      agHelper.Sleep(2000);
-      agHelper.GetElement(widgetLocators.iFrame).then(($iframe) => {
-        const doc = $iframe.contents();
-        const video = doc.find(widgetLocators.video);
-        //Check play, mute & unmute, volume buttons
-        cy.wrap(
-          doc.find(widgetLocators.videoWidgetYoutubeLargePlayBtn),
-        ).click();
-        cy.wrap(video).click();
-        agHelper.Sleep(1000);
-        cy.wrap(doc.find(widgetLocators.videoWidgetYoutubeMuteBtn)).click();
-        agHelper.AssertProperty(video, "muted", true);
-        agHelper.AssertProperty(video, "paused", true);
-        cy.wrap(doc.find(widgetLocators.videoWidgetYoutubeVolumeBtn)).type(
-          "{rightarrow}{rightarrow}",
-        );
-        agHelper.AssertProperty(video, "muted", false);
-      });
-    });
-
-    it("3. Verify widget for invalid URL's", function () {
+    it("2. Verify widget for invalid URL's", function () {
       deployMode.NavigateBacktoEditor();
       EditorNavigation.SelectEntityByName("Video1", EntityType.Widget);
       propPane.RemoveText("URL");
@@ -107,7 +80,7 @@ describe(
       });
     });
 
-    it("4. Verify auto play property", function () {
+    it("3. Verify auto play property", function () {
       deployMode.NavigateBacktoEditor();
       EditorNavigation.SelectEntityByName("Video1", EntityType.Widget);
       agHelper.AssertExistingToggleState("Autoplay", "false");
@@ -128,7 +101,7 @@ describe(
       agHelper.AssertProperty(widgetLocators.video, "paused", true);
     });
 
-    it("5. Verify visible property", function () {
+    it("4. Verify visible property", function () {
       deployMode.NavigateBacktoEditor();
       EditorNavigation.SelectEntityByName("Video1", EntityType.Widget);
       agHelper.AssertExistingToggleState("Visible", "true");
@@ -154,7 +127,7 @@ describe(
       );
     });
 
-    it("6. Verify OnPlay, OnPause, OnEnd events are JS convertible", function () {
+    it("5. Verify OnPlay, OnPause, OnEnd events are JS convertible", function () {
       deployMode.NavigateBacktoEditor();
       EditorNavigation.SelectEntityByName("Video1", EntityType.Widget);
       propPane.EnterJSContext(
@@ -193,7 +166,7 @@ describe(
       });
     });
 
-    it("7. Verify video styles", function () {
+    it("6. Verify video styles", function () {
       deployMode.NavigateBacktoEditor();
       EditorNavigation.SelectEntityByName("Video1", EntityType.Widget);
       propPane.MoveToTab("Style");
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 b43881d53c75..5154a056401d 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Workspace/MemberRoles_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Workspace/MemberRoles_Spec.ts
@@ -202,7 +202,6 @@ describe(
       );
       if (CURRENT_REPO === REPO.EE)
         _.adminSettings.EnableGAC(false, true, "home");
-      _.homePage.SelectWorkspace(workspaceId);
       _.homePage.LeaveWorkspace(workspaceId);
     });
   },
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 9dbc5a43a009..ee6b2466475f 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Workspace/ShareAppTests_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Workspace/ShareAppTests_Spec.ts
@@ -124,7 +124,17 @@ describe(
         Cypress.env("TESTPASSWORD2"),
       );
       agHelper.VisitNAssert(currentUrl);
-      agHelper.ValidateToastMessage("Resource Not Found"); //for 404 screen
+      cy.get(locators.errorPageTitle).should(($x) => {
+        //for 404 screen
+        expect($x).contain(Cypress.env("MESSAGES").PAGE_NOT_FOUND());
+      });
+      cy.get(locators.errorPageDescription).should(($x) => {
+        //for 404 screen
+        expect($x).contain(
+          "Either this page doesn't exist, or you don't have access to this page",
+        );
+      });
+      agHelper.ValidateToastMessage("Resource Not Found");
       homePage.LogOutviaAPI();
       // visit the app as anonymous user and validate redirection to login page
       agHelper.VisitNAssert(currentUrl);
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 e16c4acebbd9..d88c2c7ba3e8 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
@@ -5,6 +5,7 @@ import {
 
 const testdata = require("../../../../fixtures/testdata.json");
 const apiwidget = require("../../../../locators/apiWidgetslocator.json");
+import apiLocators from "../../../../locators/ApiEditor";
 
 import {
   agHelper,
@@ -17,6 +18,7 @@ describe(
   "API Panel Test Functionality",
   { tags: ["@tag.Datasource"] },
   function () {
+    const successMsg = "Executed successfully from user request";
     afterEach(function () {
       agHelper.ActionContextMenuWithInPane({
         action: "Delete",
@@ -39,12 +41,8 @@ describe(
         agHelper.AssertAutoSave();
         apiPage.RunAPI();
         apiPage.ResponseStatusCheck("200 OK");
-        cy.validateRequest(
-          "Executed successfully",
-          testdata.baseUrl,
-          testdata.echoMethod,
-          testdata.Put,
-        );
+        agHelper.GetNClickByContains(apiLocators.apiResponseTabsList, "Logs");
+        agHelper.AssertContains(successMsg);
       });
       cy.ResponseCheck("updatedAt");
     });
@@ -63,12 +61,8 @@ describe(
         agHelper.AssertAutoSave();
         apiPage.RunAPI();
         apiPage.ResponseStatusCheck("200 OK");
-        cy.validateRequest(
-          "Executed successfully",
-          testdata.baseUrl,
-          testdata.echoMethod,
-          testdata.Post,
-        );
+        agHelper.GetNClickByContains(apiLocators.apiResponseTabsList, "Logs");
+        agHelper.AssertContains(successMsg);
       });
       cy.ResponseCheck("createdAt");
     });
@@ -87,12 +81,8 @@ describe(
         agHelper.AssertAutoSave();
         apiPage.RunAPI();
         apiPage.ResponseStatusCheck("200 OK");
-        cy.validateRequest(
-          "Executed successfully",
-          testdata.baseUrl,
-          testdata.echoMethod,
-          testdata.Patch,
-        );
+        agHelper.GetNClickByContains(apiLocators.apiResponseTabsList, "Logs");
+        agHelper.AssertContains(successMsg);
       });
       cy.ResponseCheck("updatedAt");
     });
@@ -111,12 +101,8 @@ describe(
         agHelper.AssertAutoSave();
         apiPage.RunAPI();
         apiPage.ResponseStatusCheck("200 OK");
-        cy.validateRequest(
-          "Executed successfully",
-          testdata.baseUrl,
-          testdata.echoMethod,
-          testdata.Delete,
-        );
+        agHelper.GetNClickByContains(apiLocators.apiResponseTabsList, "Logs");
+        agHelper.AssertContains(successMsg);
       });
     });
 
@@ -127,12 +113,8 @@ describe(
       apiPage.RunAPI();
       apiPage.ResponseStatusCheck("200 OK");
       cy.ResponseCheck(testdata.responsetext);
-      cy.validateRequest(
-        "Executed successfully",
-        testdata.baseUrl,
-        testdata.methods,
-        testdata.Get,
-      );
+      agHelper.GetNClickByContains(apiLocators.apiResponseTabsList, "Logs");
+      agHelper.AssertContains(successMsg);
 
       apiPage.SelectPaneTab("Pagination");
       agHelper.GetNClick(apiwidget.paginationWithUrl);
@@ -144,12 +126,8 @@ describe(
       cy.clickTest(apiwidget.TestNextUrl);
       apiPage.ResponseStatusCheck("200 OK");
       cy.ResponseCheck("Josh M Krantz");
-      cy.validateRequest(
-        "Executed successfully",
-        testdata.baseUrl,
-        testdata.next,
-        testdata.Get,
-      );
+      agHelper.GetNClickByContains(apiLocators.apiResponseTabsList, "Logs");
+      agHelper.AssertContains(successMsg);
 
       apiPage.SelectPaneTab("Pagination");
       cy.enterUrl(
@@ -160,12 +138,8 @@ describe(
       cy.clickTest(apiwidget.TestPreUrl);
       apiPage.ResponseStatusCheck("200 OK");
       cy.ResponseCheck(testdata.responsetext);
-      cy.validateRequest(
-        "Executed successfully",
-        testdata.baseUrl,
-        testdata.prev,
-        testdata.Get,
-      );
+      agHelper.GetNClickByContains(apiLocators.apiResponseTabsList, "Logs");
+      agHelper.AssertContains(successMsg);
     });
 
     it("6. API check with query params test API feature", function () {
@@ -174,12 +148,8 @@ describe(
       apiPage.RunAPI();
       apiPage.ResponseStatusCheck("200 OK");
       cy.ResponseCheck(testdata.responsetext3);
-      cy.validateRequest(
-        "Executed successfully",
-        testdata.baseUrl,
-        testdata.queryAndValue,
-        testdata.Get,
-      );
+      agHelper.GetNClickByContains(apiLocators.apiResponseTabsList, "Logs");
+      agHelper.AssertContains(successMsg);
     });
 
     it("7. API check with Invalid Header", function () {
@@ -188,13 +158,8 @@ describe(
       agHelper.AssertAutoSave();
       apiPage.RunAPI(false);
       apiPage.ResponseStatusCheck("5000");
-      cy.validateRequest(
-        "Execution failed",
-        testdata.baseUrl,
-        testdata.methods,
-        testdata.Get,
-        true,
-      );
+      agHelper.GetNClickByContains(apiLocators.apiResponseTabsList, "Logs");
+      agHelper.AssertContains(successMsg);
       cy.ResponseCheck("Invalid value for Content-Type");
     });
   },
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 ec7e2ab5801e..e2007f6b0c95 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
@@ -2,6 +2,7 @@ import {
   agHelper,
   apiPage,
   assertHelper,
+  dataManager,
   deployMode,
   entityItems,
   jsEditor,
@@ -128,8 +129,8 @@ describe(
       agHelper.AddDsl("multiPartFormDataDsl");
 
       apiPage.CreateAndFillApi(
-        "https://api.cloudinary.com/v1_1/appsmithautomationcloud/image/upload?upload_preset=fbbhg4xu",
-        "CloudinaryUploadApi",
+        dataManager.dsValues[dataManager.defaultEnviorment].multipartAPI,
+        "MultipartAPI",
         30000,
         "POST",
       );
@@ -145,7 +146,7 @@ describe(
             myVar1: [],
             myVar2: {},
             upload: async () => {
-                await CloudinaryUploadApi.run().then(()=> showAlert('Image uploaded to Cloudinary successfully', 'success')).catch(err => showAlert(err.message, 'error'));
+                await MultipartAPI.run().then(()=> showAlert('Image uploaded to multipart successfully', 'success')).catch(err => showAlert(err.message, 'error'));
                 await resetWidget('FilePicker1', true);
             }
         }`,
@@ -161,15 +162,9 @@ describe(
       propPane.EnterJSContext("onFilesSelected", `{{JSObject1.upload()}}`);
 
       EditorNavigation.SelectEntityByName("Image1", EntityType.Widget);
-      propPane.UpdatePropertyFieldValue(
-        "Image",
-        "{{CloudinaryUploadApi.data.url}}",
-      );
+      propPane.UpdatePropertyFieldValue("Image", "{{MultipartAPI.data.url}}");
 
-      EditorNavigation.SelectEntityByName(
-        "CloudinaryUploadApi",
-        EntityType.Api,
-      );
+      EditorNavigation.SelectEntityByName("MultipartAPI", EntityType.Api);
 
       apiPage.ToggleOnPageLoadRun(false); //Bug 12476
       EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
@@ -177,9 +172,7 @@ describe(
       agHelper.ClickButton("Select Files");
       agHelper.UploadFile(imageNameToUpload);
       assertHelper.AssertNetworkExecutionSuccess("@postExecute"); //validating Cloudinary api call
-      agHelper.ValidateToastMessage(
-        "Image uploaded to Cloudinary successfully",
-      );
+      agHelper.ValidateToastMessage("Image uploaded to multipart successfully");
       agHelper.Sleep();
       cy.xpath(apiPage._imageSrc)
         .find("img")
@@ -192,31 +185,5 @@ describe(
       agHelper.AssertElementVisibility(locators._buttonByText("Select Files")); //verifying if reset!
       deployMode.NavigateBacktoEditor();
     });
-
-    it("8. Checks MultiPart form data for a Array Type upload results in API error", () => {
-      const imageNameToUpload = "AAAFlowerVase.jpeg";
-      EditorNavigation.SelectEntityByName(
-        "CloudinaryUploadApi",
-        EntityType.Api,
-      );
-      apiPage.EnterBodyFormData(
-        "MULTIPART_FORM_DATA",
-        "file",
-        "{{FilePicker1.files[0]}}",
-        "Array",
-        true,
-      );
-      EditorNavigation.SelectEntityByName("FilePicker1", EntityType.Widget);
-      agHelper.ClickButton("Select Files");
-      agHelper.UploadFile(imageNameToUpload);
-      assertHelper.AssertNetworkExecutionSuccess("@postExecute", false);
-
-      deployMode.DeployApp(locators._buttonByText("Select Files"));
-      agHelper.ClickButton("Select Files");
-      agHelper.UploadFile(imageNameToUpload);
-      assertHelper.AssertNetworkExecutionSuccess("@postExecute", false);
-      agHelper.ValidateToastMessage("CloudinaryUploadApi failed to execute");
-      agHelper.AssertElementVisibility(locators._buttonByText("Select Files")); //verifying if reset in case of failure!
-    });
   },
 );
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 91db07482fb4..27933ddf85e2 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/Datasources/ConnectionErrors_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/Datasources/ConnectionErrors_Spec.ts
@@ -51,10 +51,7 @@ describe(
           dataManager.dsValues[dataManager.defaultEnviorment].postgres_username,
         );
         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:");
+        agHelper.ValidateToastMessage("Missing password for authentication.");
         agHelper.GetNClick(locators._visibleTextSpan("Read only"));
         propPane.AssertPropertiesDropDownValues("SSL mode", [
           "Default",
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 dfa1c2c48f6e..94cf82fc284e 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/Mongo_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/Mongo_Spec.ts
@@ -41,6 +41,10 @@ describe(
       assertHelper.AssertNetworkStatus("@getDatasourceStructure"); //Making sure table dropdown is populated
       agHelper.GetNClick(dataSources._selectTableDropdown, 0, true);
       agHelper.GetNClickByContains(dataSources._dropdownOption, "pokemon");
+
+      agHelper.GetNClick(dataSources._selectTableDropdown, 1, true);
+      agHelper.GetNClickByContains(dataSources._dropdownOption, "img");
+
       GenerateCRUDNValidateDeployPage(
         "http://www.serebii.net/pokemongo/pokemon/150.png",
         "150",
@@ -103,30 +107,68 @@ describe(
       assertHelper.AssertNetworkStatus("@postExecute", 200);
       agHelper.ClickButton("Got it");
       assertHelper.AssertNetworkStatus("@updateLayout", 200);
+
       deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.TABLE));
 
       //Validating loaded table
       agHelper.AssertElementExist(dataSources._selectedRow);
-      table.ReadTableRowColumnData(0, 0, "v2", 2000).then(($cellData) => {
-        expect($cellData).to.eq(col1Text);
-      });
-      table.ReadTableRowColumnData(0, 3, "v2", 200).then(($cellData) => {
-        expect($cellData).to.eq(col2Text);
-      });
-      table.ReadTableRowColumnData(0, 6, "v2", 200).then(($cellData) => {
-        expect($cellData).to.eq(col3Text);
-      });
 
-      //Validating loaded JSON form
-      cy.xpath(locators._buttonByText("Update")).then((selector) => {
-        cy.wrap(selector)
-          .invoke("attr", "class")
-          .then((classes) => {
-            //cy.log("classes are:" + classes);
-            expect(classes).not.contain("bp3-disabled");
+      findTheDataRow(col1Text).then((rowIndex: number) => {
+        cy.log(`This is the rowIndex of ${col1Text} : ${rowIndex}`);
+        table
+          .ReadTableRowColumnData(rowIndex, 0, "v2", 2000)
+          .then(($cellData) => {
+            expect($cellData).to.eq(col1Text);
           });
+        table
+          .ReadTableRowColumnData(rowIndex, 3, "v2", 200)
+          .then(($cellData) => {
+            expect($cellData).to.eq(col2Text);
+          });
+        table
+          .ReadTableRowColumnData(rowIndex, 6, "v2", 200)
+          .then(($cellData) => {
+            expect($cellData).to.eq(col3Text);
+          });
+
+        //Validating loaded JSON form
+        cy.xpath(locators._buttonByText("Update")).then((selector) => {
+          cy.wrap(selector)
+            .invoke("attr", "class")
+            .then((classes) => {
+              //cy.log("classes are:" + classes);
+              expect(classes).not.contain("bp3-disabled");
+            });
+        });
+        dataSources.AssertJSONFormHeader(0, idIndex, "Id", "", true);
       });
-      dataSources.AssertJSONFormHeader(0, idIndex, "Id", "", true);
+    }
+
+    function findTheDataRow(col1Text: string) {
+      if (col1Text.length === 0) {
+        return cy.wrap(0);
+      }
+
+      return agHelper
+        .GetElement(table._tableColumnDataWithText(0, col1Text, "v2"))
+        .closest(".tr")
+        .then(($p1) => {
+          return cy
+            .wrap($p1)
+            .parent()
+            .children()
+            .then(($children) => {
+              let index = 0;
+              $children.each((i, el) => {
+                // Iterate through the children
+                if (Cypress.$(el).is($p1)) {
+                  // Check if the current child is p1
+                  index = i; // Assign the index when found
+                }
+              });
+              return index;
+            });
+        });
     }
   },
 );
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 aee98caa858b..3271e32094da 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/MySQL2_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/MySQL2_Spec.ts
@@ -82,10 +82,11 @@ describe(
       dataSources.RunQueryNVerifyResponseViews(10);
       dataSources.AssertQueryTableResponse(5, "2112");
       dataSources.AssertQueryTableResponse(6, "Mike's Liquors");
-      agHelper.ActionContextMenuWithInPane({
-        action: "Delete",
-        entityType: entityItems.Query,
-      });
+      // Commenting this deletion of query to make the generate crud work on the new page instead of the current page
+      // agHelper.ActionContextMenuWithInPane({
+      //   action: "Delete",
+      //   entityType: entityItems.Query,
+      // });
     });
 
     it("3. Verify Generate CRUD for the new table & Verify Deploy mode for table - Stores", () => {
@@ -129,13 +130,13 @@ describe(
         updateNVerify(6, 4, newStoreSecret as string);
       });
 
-      table.SelectTableRow(17, 0, true, "v2");
-      dataSources.AssertJSONFormHeader(17, 0, "store_id");
-      generateStoresSecretInfo(17);
+      table.SelectTableRow(12, 0, true, "v2");
+      dataSources.AssertJSONFormHeader(12, 0, "store_id");
+      generateStoresSecretInfo(12);
       cy.get("@secretInfo").then(($secretInfo) => {
         newStoreSecret = $secretInfo;
         cy.log("newStoreSecret is : " + newStoreSecret);
-        updateNVerify(17, 4, newStoreSecret as string);
+        updateNVerify(12, 4, newStoreSecret as string);
       });
 
       //Hidden field bug - to add here aft secret codes are updated for some fields!
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 a77af1001a64..201b69d0e61b 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/JsFunctionExecution/JSFunctionExecution_spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/JsFunctionExecution/JSFunctionExecution_spec.ts
@@ -126,7 +126,7 @@ describe("JS Function Execution", { tags: ["@tag.JS"] }, function () {
     //It should open only in case of execution error.
     debuggerHelper.AssertClosed();
     //Verify there is no error shown in the response tab.
-    debuggerHelper.ClickDebuggerIcon();
+    debuggerHelper.OpenDebugger();
     debuggerHelper.ClickResponseTab();
     jsEditor.AssertParseError(false);
     agHelper.ActionContextMenuWithInPane({
@@ -400,7 +400,6 @@ describe("JS Function Execution", { tags: ["@tag.JS"] }, function () {
         jsEditor.EnableDisableAsyncFuncSettings(
           functionSetting.name,
           functionSetting.onPageLoad,
-          functionSetting.confirmBeforeExecute,
         );
       },
     );
@@ -496,12 +495,12 @@ return "yes";`;
     // Switch to settings tab
     agHelper.GetNClick(jsEditor._settingsTab);
     // Enable all settings
-    jsEditor.EnableDisableAsyncFuncSettings("asyncToSync", true, false);
+    jsEditor.EnableDisableAsyncFuncSettings("asyncToSync", true);
 
     // Modify js object
     jsEditor.EditJSObj(syncJSCode, false);
     agHelper.RefreshPage();
-    jsEditor.VerifyAsyncFuncSettings("asyncToSync", true, false);
+    jsEditor.VerifyAsyncFuncSettings("asyncToSync", true);
     agHelper.ActionContextMenuWithInPane({
       action: "Delete",
       entityType: entityItems.JSObject,
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 dd100ab787c7..b89bc975b8bf 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/APIOnLoad_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/APIOnLoad_Spec.ts
@@ -2,6 +2,7 @@ import {
   agHelper,
   apiPage,
   assertHelper,
+  debuggerHelper,
   entityExplorer,
   entityItems,
   propPane,
@@ -58,7 +59,12 @@ describe(
         `{{PageLoadApi2.data.data}}`,
       );
       agHelper.RefreshPage();
-      agHelper.ValidateToastMessage(`The action "PageLoadApi2" has failed.`);
+      debuggerHelper.AssertDebugError(
+        'The action "PageLoadApi2" has failed.',
+        "",
+        true,
+        false,
+      );
     });
 
     after(() => {
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 fbf4f7531519..c4653d3f430e 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/ExecuteAction_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/ExecuteAction_Spec.ts
@@ -1,5 +1,6 @@
 import {
   agHelper,
+  assertHelper,
   deployMode,
   homePage,
   locators,
@@ -17,6 +18,8 @@ describe(
       agHelper.AssertElementVisibility(locators._widgetInCanvas("textwidget"));
       deployMode.DeployApp();
 
+      assertHelper.AssertNetworkStatus("@postExecute", 200, true);
+
       agHelper.GetNAssertContains(
         locators._widgetInDeployed("textwidget"),
         "User count :5",
@@ -37,6 +40,9 @@ describe(
 
       agHelper.GetNClickByContains(locators._deployedPage, "Page2");
 
+      assertHelper.AssertNetworkStatus("@getConsolidatedData", 200, true);
+      assertHelper.AssertNetworkStatus("@postExecute", 200, true);
+
       agHelper.GetNAssertContains(
         locators._widgetInDeployed("textwidget"),
         "User count :10",
@@ -55,6 +61,9 @@ describe(
 
       agHelper.GetNClickByContains(locators._deployedPage, "Page1");
 
+      assertHelper.AssertNetworkStatus("@getConsolidatedData", 200, true);
+      assertHelper.AssertNetworkStatus("@postExecute", 200, true);
+
       agHelper.GetNAssertContains(
         locators._widgetInDeployed("textwidget"),
         "User count :5",
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 6d246804da3b..300d27e05787 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/JSOnLoad2_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/JSOnLoad2_Spec.ts
@@ -91,7 +91,7 @@ describe(
       EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
       agHelper.RefreshPage();
 
-      debuggerHelper.ClickDebuggerIcon();
+      debuggerHelper.OpenDebugger();
       debuggerHelper.ClickLogsTab();
       debuggerHelper.DebuggerLogsFilter("JSObject1.astros");
       debuggerHelper.DoesConsoleLogExist("JS Function executed successfully");
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 bd1f3d80f405..bb8ad38cb77b 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
@@ -8,7 +8,6 @@ import {
   locators,
   table,
 } from "../../../../support/Objects/ObjectsCore";
-import { featureFlagIntercept } from "../../../../support/Objects/FeatureFlags";
 import EditorNavigation, {
   AppSidebar,
   AppSidebarButton,
@@ -76,38 +75,7 @@ describe("Binary Datatype tests", { tags: ["@tag.Datasource"] }, function () {
     table.WaitForTableEmpty(); //asserting table is empty before inserting!
   });
 
-  //Timing out a lot in CI, hence skipped, Insert verified also in next case
-  // it.skip("3. Inserting record - binarytype", () => {
-  //   imageNameToUpload = "Datatypes/Bridge.jpg";
-  //   // entityExplorer.SelectEntityByName("Page1");
-  //   // deployMode.DeployApp();
-  //   // table.WaitForTableEmpty(); //asserting table is empty before inserting!
-  //   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, 10000); //for the update row to appear at last
-  //   table.WaitUntilTableLoad();
-  //   agHelper.Sleep(3000); //some more time for all rows with images to be populated
-  //   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(($cellData) => {
-  //     expect($cellData).to.eq("Bridge.jpg");
-  //   });
-  //   table.AssertTableRowImageColumnIsLoaded(0, 2).then(($oldimage) => {
-  //     table.AssertTableRowImageColumnIsLoaded(0, 3).then(($newimage) => {
-  //       expect($oldimage).to.eq($newimage);
-  //     });
-  //   });
-  // });
-
-  it("4. Inserting another record - binarytype", () => {
+  it("3. Inserting another record - binarytype", () => {
     imageNameToUpload = "Datatypes/Georgia.jpeg";
 
     agHelper.ClickButton("Run InsertQuery");
@@ -121,21 +89,21 @@ describe("Binary Datatype tests", { tags: ["@tag.Datasource"] }, function () {
     agHelper.AssertElementVisibility(locators._buttonByText("Run InsertQuery"));
     agHelper.AssertElementAbsence(locators._btnSpinner, 20000); //for the update row to appear at last
     table.WaitUntilTableLoad();
-    agHelper.Sleep(2000); //some more time for all rows with images to be populated
-    table.ReadTableRowColumnData(1, 0).then(($cellData) => {
-      expect($cellData).to.eq("2"); //asserting serial column is inserting fine in sequence
+    const rowIndex = 0;
+    table.ReadTableRowColumnData(rowIndex, 0).then(($cellData) => {
+      expect($cellData).to.eq("1"); //asserting serial column is inserting fine in sequence
     });
-    table.ReadTableRowColumnData(1, 1, "v1", 200).then(($cellData) => {
+    table.ReadTableRowColumnData(rowIndex, 1, "v1", 200).then(($cellData) => {
       expect($cellData).to.eq("Georgia.jpeg");
     });
-    table.AssertTableRowImageColumnIsLoaded(1, 2).then(($oldimage) => {
-      table.AssertTableRowImageColumnIsLoaded(1, 3).then(($newimage) => {
+    table.AssertTableRowImageColumnIsLoaded(rowIndex, 2).then(($oldimage) => {
+      table.AssertTableRowImageColumnIsLoaded(rowIndex, 3).then(($newimage) => {
         expect($oldimage).to.eq($newimage);
       });
     });
   });
 
-  it("5. Inserting another record - binarytype", () => {
+  it("4. Inserting another record - binarytype", () => {
     imageNameToUpload = "Datatypes/Maine.jpeg";
 
     agHelper.ClickButton("Run InsertQuery");
@@ -149,21 +117,21 @@ describe("Binary Datatype tests", { tags: ["@tag.Datasource"] }, function () {
     agHelper.AssertElementVisibility(locators._buttonByText("Run InsertQuery"));
     agHelper.AssertElementAbsence(locators._btnSpinner, 20000); //for the update row to appear at last
     table.WaitUntilTableLoad();
-    agHelper.Sleep(2000); //some more time for all rows with images to be populated
-    table.ReadTableRowColumnData(2, 0).then(($cellData) => {
-      expect($cellData).to.eq("3"); //asserting serial column is inserting fine in sequence
+    const rowIndex = 1;
+    table.ReadTableRowColumnData(rowIndex, 0).then(($cellData) => {
+      expect($cellData).to.eq("2"); //asserting serial column is inserting fine in sequence
     });
-    table.ReadTableRowColumnData(2, 1, "v1", 200).then(($cellData) => {
+    table.ReadTableRowColumnData(rowIndex, 1, "v1", 200).then(($cellData) => {
       expect($cellData).to.eq("Maine.jpeg");
     });
-    table.AssertTableRowImageColumnIsLoaded(2, 2).then(($oldimage) => {
-      table.AssertTableRowImageColumnIsLoaded(2, 3).then(($newimage) => {
+    table.AssertTableRowImageColumnIsLoaded(rowIndex, 2).then(($oldimage) => {
+      table.AssertTableRowImageColumnIsLoaded(rowIndex, 3).then(($newimage) => {
         expect($oldimage).to.eq($newimage);
       });
     });
   });
 
-  it("6. Updating record - binarytype", () => {
+  it("5. Updating record - binarytype", () => {
     imageNameToUpload = "Datatypes/NewJersey.jpeg";
 
     table.SelectTableRow(1);
@@ -178,45 +146,38 @@ describe("Binary Datatype tests", { tags: ["@tag.Datasource"] }, function () {
     agHelper.AssertElementVisibility(locators._buttonByText("Run UpdateQuery"));
     agHelper.AssertElementAbsence(locators._btnSpinner, 20000); //for the update row to appear at last
     table.WaitUntilTableLoad();
-    agHelper.Sleep(14000); //some more time for rows to rearrange!
-    table.ReadTableRowColumnData(2, 0, "v1", 2000).then(($cellData) => {
+    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(2, 1, "v1", 200).then(($cellData) => {
+    table.ReadTableRowColumnData(rowIndex, 1, "v1", 200).then(($cellData) => {
       expect($cellData).to.eq("NewJersey.jpeg");
     });
-    table.AssertTableRowImageColumnIsLoaded(2, 2).then(($oldimage) => {
-      table.AssertTableRowImageColumnIsLoaded(2, 3).then(($newimage) => {
+    table.AssertTableRowImageColumnIsLoaded(rowIndex, 2).then(($oldimage) => {
+      table.AssertTableRowImageColumnIsLoaded(rowIndex, 3).then(($newimage) => {
         expect($oldimage).to.not.eq($newimage);
       });
     });
   });
 
-  it("7. Deleting records - binarytype", () => {
-    //entityExplorer.SelectEntityByName("Page1");//commenting 2 lines since case 6th is skipped!
-    //deployMode.DeployApp();
+  it("6. Deleting records - binarytype", () => {
     table.WaitUntilTableLoad();
     table.SelectTableRow(1);
     agHelper.ClickButton("DeleteQuery", 1);
     assertHelper.AssertNetworkStatus("@postExecute", 200);
     assertHelper.AssertNetworkStatus("@postExecute", 200);
-    agHelper.AssertElementAbsence(locators._btnSpinner, 20000); //Allowing time for delete to be success
-    agHelper.Sleep(6000); //Allwowing time for delete to be success
-    table.ReadTableRowColumnData(1, 0).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");
+    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"));
-    agHelper.Sleep(2000);
     table.WaitForTableEmpty();
   });
 
-  it("8. Inserting another record (to check serial column) - binarytype", () => {
+  it("7. Inserting another record (to check serial column) - binarytype", () => {
     imageNameToUpload = "Datatypes/Massachusetts.jpeg";
 
     agHelper.ClickButton("Run InsertQuery");
@@ -230,9 +191,8 @@ describe("Binary Datatype tests", { tags: ["@tag.Datasource"] }, function () {
     agHelper.AssertElementAbsence(locators._toastMsg); //Assert that Insert did not fail
     agHelper.AssertElementVisibility(locators._buttonByText("Run InsertQuery"));
     table.WaitUntilTableLoad();
-    agHelper.Sleep(2000); //for all rows with images to be populated
     table.ReadTableRowColumnData(0, 0, "v1", 2000).then(($cellData) => {
-      expect($cellData).to.eq("4"); //asserting serial column is inserting fine in sequence
+      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");
@@ -244,7 +204,7 @@ describe("Binary Datatype tests", { tags: ["@tag.Datasource"] }, function () {
     });
   });
 
-  it("9. Validating Binary (bytea) - escape, hex, base64 functions", () => {
+  it("8. Validating Binary (bytea) - escape, hex, base64 functions", () => {
     deployMode.NavigateBacktoEditor();
     table.WaitUntilTableLoad();
     PageLeftPane.switchSegment(PagePaneSegment.Queries);
@@ -291,7 +251,7 @@ describe("Binary Datatype tests", { tags: ["@tag.Datasource"] }, function () {
     });
   });
 
-  it("10. Validating Binary (bytea) - escape, hex, base64 functions, conts", () => {
+  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);
@@ -375,8 +335,6 @@ describe("Binary Datatype tests", { tags: ["@tag.Datasource"] }, function () {
     });
     AppSidebar.navigate(AppSidebarButton.Editor);
   });
-
-  //Since query delete & Postgress DS delete is covered in other specs, commenting below code
   // after(
   //   "Validate Drop of the Newly Created - binarytype - Table & Verify Deletion of all created queries",
   //   () => {
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 8a3eb744ef75..5f24c8213b29 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/EmptyDataSource_spec.js
+++ b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/EmptyDataSource_spec.js
@@ -23,7 +23,7 @@ describe(
       dataSources.RunQuery({ toValidateResponse: false });
       cy.wait(500);
       cy.get("[data-testid=t--query-error]").contains(
-        "[Missing username for authentication., Missing hostname.]",
+        "[Missing username for authentication., Missing hostname., Missing password for authentication.]",
       );
       agHelper.ActionContextMenuWithInPane({
         action: "Delete",
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 345f3982e4cf..792f633cd865 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/GoogleSheets_spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/GoogleSheets_spec.ts
@@ -20,9 +20,10 @@ describe(
       dataSources.CreatePlugIn("Google Sheets");
       VerifyFunctionDropdown([
         "Read / Write / Delete | Selected google sheets",
-        "Read / Write / Delete | All google sheets",
-        "Read / Write | All google sheets",
-        "Read | All google sheets",
+        // Hiding below methods as they are not authorized at this state
+        // "Read / Write / Delete | All google sheets",
+        // "Read / Write | All google sheets",
+        // "Read | All google sheets",
       ]);
       dataSources.SaveDSFromDialog(false);
     });
@@ -31,8 +32,6 @@ describe(
       agHelper.GetNClick(dataSources._gsScopeDropdown);
       cy.get(dataSources._gsScopeOptions).then(function ($ele) {
         expect($ele.eq(0).text()).to.be.oneOf(scopeOptions);
-        expect($ele.eq(1).text()).to.be.oneOf(scopeOptions);
-        expect($ele.eq(2).text()).to.be.oneOf(scopeOptions);
       });
       agHelper.GetNClick(dataSources._gsScopeDropdown);
     }
diff --git a/app/client/cypress/e2e/Sanity/Datasources/GraphQL_spec.ts b/app/client/cypress/e2e/Sanity/Datasources/GraphQL_spec.ts
index 68b07e359a8e..22f5f17454cd 100644
--- a/app/client/cypress/e2e/Sanity/Datasources/GraphQL_spec.ts
+++ b/app/client/cypress/e2e/Sanity/Datasources/GraphQL_spec.ts
@@ -279,7 +279,7 @@ describe(
       });
 
       apiPage.SelectPaneTab("Authentication");
-      agHelper.ClickButton("Save as datasource");
+      agHelper.GetNClick(locators._saveDatasource);
 
       agHelper.AssertText(
         locators._inputFieldByName("URL") + "//" + locators._inputField,
@@ -296,16 +296,14 @@ describe(
       // });
       dataSources.SaveDatasource();
       agHelper.ValidateToastMessage("datasource created");
-      agHelper.AssertElementVisibility(
-        locators._buttonByText("Edit datasource"),
-      );
+      agHelper.AssertElementVisibility(locators._saveDatasource);
       apiPage.SelectPaneTab("Body");
       dataSources.UpdateGraphqlQueryAndVariable({
         query: GRAPHQL_QUERY,
         variable: GRAPHQL_VARIABLES,
       });
       apiPage.RunAPI();
-      agHelper.ClickButton("Edit datasource");
+      agHelper.GetNClick(locators._saveDatasource);
       dataSources.AssertDataSourceInfo([
         dataManager.dsValues[
           dataManager.defaultEnviorment
diff --git a/app/client/cypress/e2e/Sanity/Datasources/MockDBs_Spec.ts b/app/client/cypress/e2e/Sanity/Datasources/MockDBs_Spec.ts
index e2cfb5c47e50..33f132d7aa93 100644
--- a/app/client/cypress/e2e/Sanity/Datasources/MockDBs_Spec.ts
+++ b/app/client/cypress/e2e/Sanity/Datasources/MockDBs_Spec.ts
@@ -74,49 +74,7 @@ describe(
 
         assertHelper.AssertNetworkStatus("@trigger");
         dataSources.ValidateNSelectDropdown("Command", "Find document(s)");
-        agHelper.Sleep(2000); //for movies collection to load & populate in dropdown
-        dataSources.ValidateNSelectDropdown("Collection", "movies");
-        dataSources.RunQueryNVerifyResponseViews(1, false);
-        AppSidebar.navigate(AppSidebarButton.Data);
-        dataSources
-          .getDatasourceListItemDescription(mockDBName)
-          .then(($queryCount) =>
-            expect($queryCount).to.eq("1 queries in this app"),
-          );
-
-        entityExplorer.CreateNewDsQuery(mockDBName);
-        dataSources.ValidateNSelectDropdown("Command", "Find document(s)");
-        dataSources.ValidateNSelectDropdown("Collection", "movies");
-        dataSources.RunQueryNVerifyResponseViews(1, false);
-        AppSidebar.navigate(AppSidebarButton.Data);
-        dataSources
-          .getDatasourceListItemDescription(mockDBName)
-          .then(($queryCount) =>
-            expect($queryCount).to.eq("2 queries in this app"),
-          );
       });
     });
-
-    afterEach(() => {
-      AppSidebar.navigate(AppSidebarButton.Editor);
-      PageLeftPane.switchSegment(PagePaneSegment.Queries);
-      entityExplorer.ActionContextMenuByEntityName({
-        entityNameinLeftSidebar: "Query1",
-        action: "Delete",
-        entityType: entityItems.Query,
-      });
-      entityExplorer.ActionContextMenuByEntityName({
-        entityNameinLeftSidebar: "Query2",
-        action: "Delete",
-        entityType: entityItems.Query,
-      });
-      AppSidebar.navigate(AppSidebarButton.Data);
-      dataSources
-        .getDatasourceListItemDescription(dsName)
-        .then(($queryCount) =>
-          expect($queryCount).to.eq("No queries in this app"),
-        );
-      dataSources.DeleteDatasourceFromWithinDS(dsName);
-    });
   },
 );
diff --git a/app/client/cypress/e2e/Sanity/Datasources/MySQLNoiseTest_spec.js b/app/client/cypress/e2e/Sanity/Datasources/MySQLNoiseTest_spec.js
index f1a4d43fb661..ecbc34e02481 100644
--- a/app/client/cypress/e2e/Sanity/Datasources/MySQLNoiseTest_spec.js
+++ b/app/client/cypress/e2e/Sanity/Datasources/MySQLNoiseTest_spec.js
@@ -4,7 +4,11 @@ import {
 } from "../../../support/Pages/EditorNavigation";
 
 const datasourceEditor = require("../../../locators/DatasourcesEditor.json");
-import { agHelper, dataSources } from "../../../support/Objects/ObjectsCore";
+import {
+  agHelper,
+  dataSources,
+  debuggerHelper,
+} from "../../../support/Objects/ObjectsCore";
 const commonlocators = require("../../../locators/commonlocators.json");
 
 describe(
@@ -60,9 +64,15 @@ describe(
         force: true,
       });
       cy.wait(2000);
-      cy.get(commonlocators.toastmsg).contains(
-        "NoiseTestQuery failed to execute",
+
+      debuggerHelper.OpenDebugger();
+      debuggerHelper.ClickLogsTab();
+      debuggerHelper.DoesConsoleLogExist(
+        "Execution failed with status PE-STC-5000",
+        true,
+        "NoiseTestQuery",
       );
+
       cy.wait("@postExecute").then(({ response }) => {
         expect(response.body.data.statusCode).to.eq("200 OK");
       });
diff --git a/app/client/cypress/locators/ApiEditor.js b/app/client/cypress/locators/ApiEditor.js
index 1e852c6ad114..9340b355d441 100644
--- a/app/client/cypress/locators/ApiEditor.js
+++ b/app/client/cypress/locators/ApiEditor.js
@@ -34,4 +34,5 @@ export default {
   slashCommandButton: ".commands-button",
   apiResponseObject: ".object-key",
   apiDebuggerLink: ".debugger-entity-link",
+  apiResponseTabsList : ".ads-v2-tabs__list"
 };
diff --git a/app/client/cypress/locators/ThemeLocators.json b/app/client/cypress/locators/ThemeLocators.json
index 6bf517400240..4f7b655bc925 100644
--- a/app/client/cypress/locators/ThemeLocators.json
+++ b/app/client/cypress/locators/ThemeLocators.json
@@ -9,5 +9,7 @@
   "greenColor": "[style='background-color: rgb(21, 128, 61);']",
   "fontsSelected": ".leading-normal",
   "currentTheme": ".cursor-pointer:contains('Applied theme')",
-  "purpleColor": "[style='background-color: rgb(107,114,128);']"
-}
+  "purpleColor": "[style='background-color: rgb(107,114,128);']",
+  "featuredThemeSection": "[data-testid='t--featured-themes']",
+  "fontOption": ".rc-virtual-list .rc-select-item-option"
+}
\ No newline at end of file
diff --git a/app/client/cypress/locators/WidgetLocators.ts b/app/client/cypress/locators/WidgetLocators.ts
index 8e2d368244c1..3f8418749874 100644
--- a/app/client/cypress/locators/WidgetLocators.ts
+++ b/app/client/cypress/locators/WidgetLocators.ts
@@ -175,3 +175,9 @@ export const buttongroupwidgetlocators = {
     `//*[contains(@class,'bp3-menu-item')]//*[text()='${text}']`,
   button: "//*[contains(@class,'t--widget-buttongroupwidget')]//button",
 };
+
+export const multiSelectWidgetLocators = {
+  multiSelectWidgetTrigger: ".t--widget-multiselectwidgetv2 .rc-select-selector",
+  multiSelectWidgetSelectedOptionContent: ".rc-select-selection-item > .rc-select-selection-item-content",
+  multiSelectWidgetDropdownOptionCheckbox: ".multi-select-dropdown .rc-select-item-option-selected .bp3-control-indicator"
+};
\ No newline at end of file
diff --git a/app/client/cypress/support/Objects/CommonLocators.ts b/app/client/cypress/support/Objects/CommonLocators.ts
index dd3b8744564d..3db2224e7c1f 100644
--- a/app/client/cypress/support/Objects/CommonLocators.ts
+++ b/app/client/cypress/support/Objects/CommonLocators.ts
@@ -334,4 +334,9 @@ export class CommonLocators {
   _menuItem = ".bp3-menu-item";
   _slashCommandHintText = ".slash-command-hint-text";
   _selectionItem = ".rc-select-selection-item";
+  errorPageTitle = ".t--error-page-title";
+  errorPageDescription = ".t--error-page-description";
+  _selectClearButton_testId = "selectbutton.btn.cancel";
+  _selectClearButton_dataTestId = `[data-testid="${this._selectClearButton_testId}"]`;
+  _saveDatasource = `[data-testid='t--store-as-datasource']`;
 }
diff --git a/app/client/cypress/support/Objects/DataManager.ts b/app/client/cypress/support/Objects/DataManager.ts
index 515b3f050327..a54e1162eb30 100644
--- a/app/client/cypress/support/Objects/DataManager.ts
+++ b/app/client/cypress/support/Objects/DataManager.ts
@@ -80,6 +80,8 @@ export class DataManager {
         "http://host.docker.internal:5001/v1/mock-api-object?records=10",
       echoApiUrl: "http://host.docker.internal:5001/v1/mock-api/echo",
       randomCatfactUrl: "http://host.docker.internal:5001/v1/catfact/random",
+      multipartAPI:
+        "http://host.docker.internal:5001/v1/mock-api/echo-multipart",
       randomTrumpApi:
         "http://host.docker.internal:5001/v1/whatdoestrumpthink/random",
       mockHttpCodeUrl: "http://host.docker.internal:5001/v1/mock-http-codes/",
@@ -179,6 +181,8 @@ export class DataManager {
       mockApiUrl: "http://host.docker.internal:5001/v1/mock-api?records=10",
       echoApiUrl: "http://host.docker.internal:5001/v1/mock-api/echo",
       randomCatfactUrl: "http://host.docker.internal:5001/v1/catfact/random",
+      multipartAPI:
+        "http://host.docker.internal:5001/v1/mock-api/echo-multipart",
       mockHttpCodeUrl: "http://host.docker.internal:5001/v1/mock-http-codes/",
       AirtableBaseForME: "appubHrVbovcudwN6",
       AirtableTableForME: "tblsFCQSskVFf7xNd",
diff --git a/app/client/cypress/support/Pages/AggregateHelper.ts b/app/client/cypress/support/Pages/AggregateHelper.ts
index 4ddff74eb6cd..82fe2481fbdd 100644
--- a/app/client/cypress/support/Pages/AggregateHelper.ts
+++ b/app/client/cypress/support/Pages/AggregateHelper.ts
@@ -1552,6 +1552,25 @@ export class AggregateHelper {
     ) as Cypress.Chainable<boolean>;
   }
 
+  /**
+   * Checks if the specified instance of the element is present with number and visible on the page.
+   *
+   * @param {ElementType} selector - The element selector.
+   * @param {number} [eq=0] - The index of the element to check (default is 0).
+   * @returns {Cypress.Chainable<boolean>} - Returns a boolean wrapped in a Cypress Chainable indicating visibility.
+   */
+  IsElementVisibleWithEq(selector: ElementType, eq: number = 0) {
+    return this.GetElement(selector)
+      .eq(eq)
+      .then(($element) => {
+        // Check if the element is present and visible
+        const isVisible =
+          Cypress.$($element).length > 0 && Cypress.$($element).is(":visible");
+        console.log(`Element visibility: ${isVisible}`);
+        return isVisible;
+      }) as Cypress.Chainable<boolean>;
+  }
+
   public FailIfErrorToast(error: string) {
     cy.get("body").then(($ele) => {
       if ($ele.find(this.locator._toastMsg).length > 0) {
diff --git a/app/client/cypress/support/Pages/ApiPage.ts b/app/client/cypress/support/Pages/ApiPage.ts
index 793a6d03c102..8804ae793dde 100644
--- a/app/client/cypress/support/Pages/ApiPage.ts
+++ b/app/client/cypress/support/Pages/ApiPage.ts
@@ -303,7 +303,7 @@ export class ApiPage {
       | "RAW",
   ) {
     this.agHelper.GetNClick(this._bodyTypeSelect);
-    cy.xpath(this._bodyTypeToSelect(subTabName)).should("be.visible").click();
+    this.agHelper.GetNClick(this._bodyTypeToSelect(subTabName));
   }
 
   AssertRightPaneSelectedTab(tabName: RightPaneTabs) {
diff --git a/app/client/cypress/support/Pages/DebuggerHelper.ts b/app/client/cypress/support/Pages/DebuggerHelper.ts
index 2dabfb707112..979b8f2d842b 100644
--- a/app/client/cypress/support/Pages/DebuggerHelper.ts
+++ b/app/client/cypress/support/Pages/DebuggerHelper.ts
@@ -34,6 +34,7 @@ export class DebuggerHelper {
       [PageType.JsEditor]: ".t--js-editor-bottom-pane-container",
       [PageType.DataSources]: ".t--datasource-bottom-pane-container",
     },
+    _ideBottomViewContainer: ".t--ide-bottom-view",
     _debuggerList: ".debugger-list",
     _debuggerFilter: "input[data-testid=t--debugger-search]",
     _debuggerSelectedTab: ".ads-v2-tabs__list-tab",
@@ -49,17 +50,16 @@ export class DebuggerHelper {
     _downStreamLogMessage: ".t--debugger-log-downstream-message",
   };
 
-  ClickDebuggerIcon(
-    index?: number,
-    force?: boolean,
-    waitTimeInterval?: number,
-  ) {
-    this.agHelper.GetNClick(
-      this.locators._debuggerIcon,
-      index,
-      force,
-      waitTimeInterval,
-    );
+  OpenDebugger() {
+    // Open opens if it is not open yet
+    cy.get("body").then(($body) => {
+      if ($body.find(this.locators._ideBottomViewContainer).length === 0) {
+        this.agHelper.GetNClick(this.locators._debuggerIcon, 0, false);
+      } else {
+        this.agHelper.GetNClick(this.commonLocators._errorTab, 0, true, 0);
+      }
+    });
+    this.AssertOpen();
   }
 
   ClickDebuggerToggle(expand = true, index = 0) {
@@ -93,7 +93,7 @@ export class DebuggerHelper {
     this.agHelper.GetNClick(this.locators._closeButton);
   }
 
-  AssertOpen(pageType: PageType) {
+  AssertOpen(pageType?: PageType) {
     switch (pageType) {
       case PageType.Canvas:
         this.agHelper.AssertElementExist(this.locators._tabsContainer);
@@ -106,6 +106,10 @@ export class DebuggerHelper {
           this.locators._bottomPaneContainer[pageType],
         );
         break;
+      default:
+        this.agHelper.AssertElementVisibility(
+          this.locators._ideBottomViewContainer,
+        );
     }
   }
 
@@ -118,12 +122,19 @@ export class DebuggerHelper {
     this.agHelper.AssertSelectedTab(this.locators._debuggerSelectedTab, "true");
   }
 
-  DoesConsoleLogExist(text: string, exists = true) {
+  DoesConsoleLogExist(text: string, exists = true, entityName?: string) {
     this.agHelper.GetNAssertContains(
       this.locators._logMessage,
       text,
       exists ? "exist" : "not.exist",
     );
+    if (entityName) {
+      this.agHelper
+        .GetElement(this.locators._logMessage)
+        .contains(text)
+        .closest(".error")
+        .contains(this.locators._logEntityLink, entityName);
+    }
   }
 
   DebuggerLogsFilter(text: string) {
@@ -187,9 +198,10 @@ export class DebuggerHelper {
     message: string,
     shouldOpenDebugger = true,
     shouldToggleDebugger = true,
+    errorLabelIndex = 0,
   ) {
     if (shouldOpenDebugger) {
-      this.ClickDebuggerIcon();
+      this.OpenDebugger();
     }
     this.agHelper.GetNClick(this.commonLocators._errorTab, 0, true, 0);
 
@@ -198,7 +210,7 @@ export class DebuggerHelper {
     }
 
     this.agHelper
-      .GetText(this.locators._debuggerLabel, "text", 0)
+      .GetText(this.locators._debuggerLabel, "text", errorLabelIndex)
       .then(($text) => {
         expect($text).to.eq(label);
       });
@@ -222,7 +234,7 @@ export class DebuggerHelper {
 
   AssertDownStreamLogError(message: string, shouldOpenDebugger = true) {
     if (shouldOpenDebugger) {
-      this.ClickDebuggerIcon();
+      this.OpenDebugger();
     }
 
     this.agHelper.GetNClick(this.commonLocators._responseTab, 0, true, 0);
diff --git a/app/client/cypress/support/Pages/GitSync.ts b/app/client/cypress/support/Pages/GitSync.ts
index 0bf9ffeb4cb7..2fbf3b139a64 100644
--- a/app/client/cypress/support/Pages/GitSync.ts
+++ b/app/client/cypress/support/Pages/GitSync.ts
@@ -65,6 +65,7 @@ export class GitSync {
     "[data-testid='t--git-protected-branches-select']";
   public _branchProtectionUpdateBtn =
     "[data-testid='t--git-protected-branches-update-btn']";
+  public _autocommitStatusbar = "[data-testid='t--autocommit-statusbar']";
   public _disconnectGitBtn = "[data-testid='t--git-disconnect-btn']";
   public _mergeLoader = "[data-testid='t--git-merge-loader']";
 
diff --git a/app/client/cypress/support/Pages/HomePage.ts b/app/client/cypress/support/Pages/HomePage.ts
index 0d7569aa63d7..b482db49d58b 100644
--- a/app/client/cypress/support/Pages/HomePage.ts
+++ b/app/client/cypress/support/Pages/HomePage.ts
@@ -306,6 +306,7 @@ export class HomePage {
     this.agHelper.GetNClick(this._newButtonCreateApplication, 0, true);
     this.AssertApplicationCreated();
     if (skipSignposting) {
+      this.agHelper.WaitUntilEleDisappear(this.locator._btnSpinner);
       AppSidebar.assertVisible();
       this.agHelper.AssertElementVisibility(PageLeftPane.locators.selector);
       this.onboarding.skipSignposting();
diff --git a/app/client/cypress/support/Pages/Table.ts b/app/client/cypress/support/Pages/Table.ts
index c82f7e9a0548..2f90efb052c7 100644
--- a/app/client/cypress/support/Pages/Table.ts
+++ b/app/client/cypress/support/Pages/Table.ts
@@ -59,6 +59,15 @@ export class Table {
   _tableRow = (rowNum: number, colNum: number, version: "v1" | "v2") =>
     this._tableWidgetVersion(version) +
     ` .tbody .td[data-rowindex=${rowNum}][data-colindex=${colNum}]`;
+  _tableColumnDataWithText = (
+    colNum: number,
+    columnText: string,
+    version: "v1" | "v2",
+  ) =>
+    this._tableWidgetVersion(version) +
+    ` .tbody .td[data-colindex=${colNum}]` +
+    this._tableRowColumnDataVersion(version) +
+    ` div:contains("${columnText}")`;
   _editCellIconDiv = ".t--editable-cell-icon";
   _editCellEditor = ".t--inlined-cell-editor";
   _editCellEditorInput = this._editCellEditor + " input";
diff --git a/app/client/package.json b/app/client/package.json
index 40afddb093fa..592cf597a377 100644
--- a/app/client/package.json
+++ b/app/client/package.json
@@ -120,7 +120,7 @@
     "craco-babel-loader": "^1.0.4",
     "cssnano": "^6.0.1",
     "cypress-log-to-output": "^1.1.2",
-    "cypress-repeat-updated": "^1.0.1",
+    "cypress-repeat-pro": "^1.0.1",
     "d3-geo": "^3.1.0",
     "dayjs": "^1.10.6",
     "deep-diff": "^1.0.2",
@@ -269,6 +269,7 @@
     "@types/codemirror": "^0.0.96",
     "@types/deep-diff": "^1.0.0",
     "@types/dom-mediacapture-record": "^1.0.11",
+    "@types/dom-view-transitions": "^1.0.5",
     "@types/downloadjs": "^1.4.2",
     "@types/jest": "^27.4.1",
     "@types/js-beautify": "^1.13.2",
diff --git a/app/client/packages/design-system/widgets/src/components/ComboBox/index.ts b/app/client/packages/design-system/widgets/src/components/ComboBox/index.ts
new file mode 100644
index 000000000000..3bd16e178a03
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/ComboBox/index.ts
@@ -0,0 +1 @@
+export * from "./src";
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
new file mode 100644
index 000000000000..3e97b4720730
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/ComboBox/src/ComboBox.tsx
@@ -0,0 +1,83 @@
+import { Button, Icon, Label, Popover, Text } from "@appsmith/wds";
+import { getTypographyClassName } from "@appsmith/wds-theming";
+import clsx from "clsx";
+import React from "react";
+import {
+  FieldError,
+  ComboBox as HeadlessCombobox,
+  Input,
+  ListBox,
+} from "react-aria-components";
+import { ListBoxItem } from "./ListBoxItem";
+import styles from "./styles.module.css";
+import type { ComboBoxProps } from "./types";
+
+export const ComboBox = (props: ComboBoxProps) => {
+  const {
+    contextualHelp,
+    description,
+    errorMessage,
+    isLoading,
+    isRequired,
+    items,
+    label,
+    placeholder,
+    size = "medium",
+    ...rest
+  } = 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 (
+    <HeadlessCombobox
+      aria-label={Boolean(label) ? undefined : "ComboBox"}
+      className={styles.formField}
+      data-size={size}
+      isRequired={isRequired}
+      {...rest}
+    >
+      {({ isInvalid }) => (
+        <>
+          <Label
+            contextualHelp={contextualHelp}
+            isRequired={isRequired}
+            text={label}
+          />
+
+          {/* TODO: Use proper headless Input once Valera is back */}
+          <div className={styles.inputWrapper}>
+            <Input className={styles.input} placeholder={placeholder} />
+            <Button icon="chevron-down" isLoading={isLoading} size={size} />
+          </div>
+
+          <FieldError
+            className={clsx(
+              styles.errorText,
+              getTypographyClassName("footnote"),
+            )}
+          >
+            {errorMessage}
+          </FieldError>
+          {Boolean(description) && !Boolean(isInvalid) && (
+            <Text className={styles.description} lineClamp={2} size="footnote">
+              {description}
+            </Text>
+          )}
+          <Popover UNSTABLE_portalContainer={root}>
+            <ListBox className={styles.listBox} items={items} shouldFocusWrap>
+              {(item) => (
+                <ListBoxItem key={item.id} textValue={item.label}>
+                  {item.icon && <Icon name={item.icon} />}
+                  {item.label}
+                </ListBoxItem>
+              )}
+            </ListBox>
+          </Popover>
+        </>
+      )}
+    </HeadlessCombobox>
+  );
+};
diff --git a/app/client/packages/design-system/widgets/src/components/ComboBox/src/ListBoxItem.tsx b/app/client/packages/design-system/widgets/src/components/ComboBox/src/ListBoxItem.tsx
new file mode 100644
index 000000000000..663456933b35
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/ComboBox/src/ListBoxItem.tsx
@@ -0,0 +1,15 @@
+import React from "react";
+import { ListBoxItem as HeadlessListBoxItem } from "react-aria-components";
+import clsx from "clsx";
+import { getTypographyClassName } from "@appsmith/wds-theming";
+import { listItemStyles } from "@appsmith/wds";
+import type { ListBoxItemProps } from "react-aria-components";
+
+export const ListBoxItem = (props: ListBoxItemProps) => {
+  return (
+    <HeadlessListBoxItem
+      {...props}
+      className={clsx(listItemStyles.item, getTypographyClassName("body"))}
+    />
+  );
+};
diff --git a/app/client/packages/design-system/widgets/src/components/ComboBox/src/index.ts b/app/client/packages/design-system/widgets/src/components/ComboBox/src/index.ts
new file mode 100644
index 000000000000..ec43be29e5e1
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/ComboBox/src/index.ts
@@ -0,0 +1 @@
+export * from "./ComboBox";
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
new file mode 100644
index 000000000000..097d68b00369
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/ComboBox/src/styles.module.css
@@ -0,0 +1,89 @@
+.formField {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+}
+
+.inputWrapper {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+
+.input {
+  display: flex;
+  flex: 1;
+  position: relative;
+  padding: 0;
+  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-2));
+  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-2);
+}
+
+.necessityIndicator {
+  color: var(--color-fg-negative);
+  margin-inline-start: var(--inner-spacing-1);
+}
+
+.errorText {
+  margin-block-start: var(--inner-spacing-3);
+  color: var(--color-fg-negative);
+}
+
+.description {
+  margin-block-start: var(--inner-spacing-3);
+  color: var(--color-fg-neutral);
+}
+
+.fieldValue {
+  text-align: left;
+  flex: 1;
+}
+
+.fieldValue [data-icon] {
+  display: none;
+}
+
+.listBox {
+  min-inline-size: var(--trigger-width);
+}
+
+/** 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-2) + var(--inner-spacing-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
new file mode 100644
index 000000000000..ff643008a9ed
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/ComboBox/src/types.ts
@@ -0,0 +1,35 @@
+import type { Key } from "@react-types/shared";
+import type {
+  ComboBoxProps as SpectrumComboBoxProps,
+  ValidationResult,
+} from "react-aria-components";
+import type { IconProps, SIZES } from "@appsmith/wds";
+
+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);
+  /** size of the select
+   *
+   * @default medium
+   */
+  size?: Omit<keyof typeof SIZES, "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
new file mode 100644
index 000000000000..b08d1836ba16
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/ComboBox/stories/ComboBox.stories.tsx
@@ -0,0 +1,86 @@
+import { Button, ComboBox, Flex, SIZES } from "@appsmith/wds";
+import type { Meta, StoryObj } from "@storybook/react";
+import React from "react";
+import { items, itemsWithIcons } 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",
+};
+
+export default meta;
+type Story = StoryObj<typeof ComboBox>;
+
+export const Main: Story = {
+  args: {
+    items: items,
+  },
+  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) => !["large"].includes(size))
+        .map((size) => (
+          <ComboBox items={items} key={size} placeholder={size} size={size} />
+        ))}
+    </Flex>
+  ),
+};
+
+export const Loading: Story = {
+  args: {
+    placeholder: "Loading",
+    isLoading: true,
+    items: items,
+  },
+};
+
+export const Validation: Story = {
+  render: () => (
+    <form
+      onSubmit={(e) => {
+        e.preventDefault();
+        alert("Form submitted");
+      }}
+    >
+      <Flex direction="column" gap="spacing-2" width="sizing-60">
+        <ComboBox
+          description="description"
+          isRequired
+          items={items}
+          label="Validation"
+        />
+        <Button type="submit">Submit</Button>
+      </Flex>
+    </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
new file mode 100644
index 000000000000..7319bf939cb0
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/ComboBox/stories/items.ts
@@ -0,0 +1,28 @@
+import type { ComboBoxItem } from "../src/types";
+
+export const items: ComboBoxItem[] = [
+  { id: 1, label: "Aerospace" },
+  {
+    id: 2,
+    label: "Mechanical",
+  },
+  { id: 3, label: "Civil" },
+  { id: 4, label: "Biomedical" },
+  { id: 5, label: "Nuclear" },
+  { id: 6, label: "Industrial" },
+  { id: 7, label: "Chemical" },
+  { id: 8, label: "Agricultural" },
+  { id: 9, label: "Electrical" },
+];
+
+export const itemsWithIcons: ComboBoxItem[] = [
+  { id: 1, label: "Aerospace", icon: "galaxy" },
+  {
+    id: 2,
+    label: "Mechanical",
+    icon: "automatic-gearbox",
+  },
+  { id: 3, label: "Civil", icon: "circuit-ground" },
+  { id: 4, label: "Biomedical", icon: "biohazard" },
+  { id: 5, label: "Nuclear", icon: "atom" },
+];
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 50171e79909f..4a7b3c7342c0 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,19 +1,19 @@
-import React, { useRef } from "react";
-import clsx from "clsx";
+import { Icon, Label, Popover, Spinner, Text } from "@appsmith/wds";
 import { getTypographyClassName } from "@appsmith/wds-theming";
+import clsx from "clsx";
+import React, { useRef } from "react";
 import {
   Button,
-  ListBox,
+  FieldError,
   Select as HeadlessSelect,
+  ListBox,
   SelectValue,
-  FieldError,
 } from "react-aria-components";
-import { Text, Icon, Spinner, Popover, Label } from "@appsmith/wds";
 import { ListBoxItem } from "./ListBoxItem";
 import styles from "./styles.module.css";
 import type { SelectProps } from "./types";
 
-export const Select = <T extends object>(props: SelectProps<T>) => {
+export const Select = (props: SelectProps) => {
   const {
     contextualHelp,
     description,
@@ -53,7 +53,15 @@ export const Select = <T extends object>(props: SelectProps<T>) => {
                 styles.fieldValue,
                 getTypographyClassName("body"),
               )}
-            />
+            >
+              {({ defaultChildren, isPlaceholder }) => {
+                if (isPlaceholder) {
+                  return props.placeholder;
+                }
+
+                return defaultChildren;
+              }}
+            </SelectValue>
             {!Boolean(isLoading) && <Icon name="chevron-down" />}
             {Boolean(isLoading) && <Spinner />}
           </Button>
diff --git a/app/client/packages/design-system/widgets/src/components/Select/src/index.ts b/app/client/packages/design-system/widgets/src/components/Select/src/index.ts
index b6e8a07c267f..b252bd3f677f 100644
--- a/app/client/packages/design-system/widgets/src/components/Select/src/index.ts
+++ b/app/client/packages/design-system/widgets/src/components/Select/src/index.ts
@@ -1 +1,2 @@
 export * from "./Select";
+export type { SelectProps } from "./types";
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
index 75f563e2eb37..10412f1d14a5 100644
--- 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
@@ -8,6 +8,7 @@
   display: flex;
   position: relative;
   padding: 0;
+  height: var(--sizing-9);
   border: none;
   align-items: center;
   border-radius: var(--border-radius-elevation-3);
@@ -43,7 +44,7 @@
 
 .textField [data-icon] {
   position: absolute;
-  right: var(--inner-spacing-2);
+  right: var(--inner-spacing-1);
 }
 
 .necessityIndicator {
@@ -66,6 +67,10 @@
   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 c3220aa5b057..4e88e56cac31 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
@@ -5,10 +5,10 @@ import type {
 } from "react-aria-components";
 import type { IconProps, SIZES } from "@appsmith/wds";
 
-export interface SelectProps<T extends object>
-  extends Omit<SpectrumSelectProps<T>, "slot"> {
+export interface SelectProps
+  extends Omit<SpectrumSelectProps<SelectItem>, "slot"> {
   /** Item objects in the collection. */
-  items: Iterable<SelectItem>;
+  items: SelectItem[];
   /** The content to display as the label. */
   label?: string;
   /** The content to display as the description. */
diff --git a/app/client/packages/design-system/widgets/src/index.ts b/app/client/packages/design-system/widgets/src/index.ts
index deb079b73425..44d2c44100cd 100644
--- a/app/client/packages/design-system/widgets/src/index.ts
+++ b/app/client/packages/design-system/widgets/src/index.ts
@@ -3,6 +3,7 @@ export * from "./components/Icon";
 export * from "./components/Button";
 export * from "./components/IconButton";
 export * from "./components/Checkbox";
+export * from "./components/ComboBox";
 export * from "./components/Text";
 export * from "./components/ToggleGroup";
 export * from "./components/Tooltip";
diff --git a/app/client/packages/eslint-plugin/package.json b/app/client/packages/eslint-plugin/package.json
index 46f1726ebec2..389406b120b1 100644
--- a/app/client/packages/eslint-plugin/package.json
+++ b/app/client/packages/eslint-plugin/package.json
@@ -11,4 +11,4 @@
     "postinstall": "yarn build",
     "test:unit": "yarn g:jest"
   }
-}
\ 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
new file mode 100644
index 000000000000..97516278935e
--- /dev/null
+++ b/app/client/packages/icons/src/components/Icons/ComboboxSelectIcon.tsx
@@ -0,0 +1,2 @@
+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>;
diff --git a/app/client/packages/icons/src/components/Thumbnails/ComboboxSelectThumbnail.tsx b/app/client/packages/icons/src/components/Thumbnails/ComboboxSelectThumbnail.tsx
new file mode 100644
index 000000000000..fbf23f8b14d4
--- /dev/null
+++ b/app/client/packages/icons/src/components/Thumbnails/ComboboxSelectThumbnail.tsx
@@ -0,0 +1,2 @@
+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>;
diff --git a/app/client/packages/icons/src/icons/Icons/ComboboxSelect.svg b/app/client/packages/icons/src/icons/Icons/ComboboxSelect.svg
new file mode 100644
index 000000000000..3c6cf838139c
--- /dev/null
+++ b/app/client/packages/icons/src/icons/Icons/ComboboxSelect.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="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
diff --git a/app/client/packages/icons/src/icons/Thumbnails/ComboboxSelect.svg b/app/client/packages/icons/src/icons/Thumbnails/ComboboxSelect.svg
new file mode 100644
index 000000000000..b67b64f9d2af
--- /dev/null
+++ b/app/client/packages/icons/src/icons/Thumbnails/ComboboxSelect.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" 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>
\ 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 dba7f48ff6b1..cba21a55375a 100644
--- a/app/client/packages/icons/src/index.ts
+++ b/app/client/packages/icons/src/index.ts
@@ -1,6 +1,7 @@
 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 { EmailInputThumbnail } from "./components/Thumbnails/EmailInputThumbnail";
 export { HeadingThumbnail } from "./components/Thumbnails/HeadingThumbnail";
@@ -27,6 +28,7 @@ export { ZoneThumbnail } from "./components/Thumbnails/ZoneThumbnail";
 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 { EmailInputIcon } from "./components/Icons/EmailInputIcon";
 export { HeadingIcon } from "./components/Icons/HeadingIcon";
diff --git a/app/client/packages/icons/src/stories/Icons.mdx b/app/client/packages/icons/src/stories/Icons.mdx
index dba05e9f1ddc..4641a0ee4927 100644
--- a/app/client/packages/icons/src/stories/Icons.mdx
+++ b/app/client/packages/icons/src/stories/Icons.mdx
@@ -3,6 +3,7 @@ import { Flex } from "@appsmith/wds";
 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 { EmailInputIcon } from "../components/Icons/EmailInputIcon";
 import { HeadingIcon } from "../components/Icons/HeadingIcon";
@@ -38,6 +39,7 @@ export const Icons = () => {
       <ButtonIcon />
       <CheckboxGroupIcon />
       <CheckboxIcon />
+      <ComboboxSelectIcon />
       <CurrencyInputIcon />
       <EmailInputIcon />
       <HeadingIcon />
diff --git a/app/client/packages/icons/src/stories/Thumbnails.mdx b/app/client/packages/icons/src/stories/Thumbnails.mdx
index e3a7a1f92380..d05e30565d97 100644
--- a/app/client/packages/icons/src/stories/Thumbnails.mdx
+++ b/app/client/packages/icons/src/stories/Thumbnails.mdx
@@ -3,6 +3,7 @@ import { Flex } from "@appsmith/wds";
 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 { EmailInputThumbnail } from "../components/Thumbnails/EmailInputThumbnail";
 import { HeadingThumbnail } from "../components/Thumbnails/HeadingThumbnail";
@@ -39,6 +40,7 @@ export const Icons = () => {
       <ButtonThumbnail />
       <CheckboxGroupThumbnail />
       <CheckboxThumbnail />
+      <ComboboxSelectThumbnail />
       <CurrencyInputThumbnail />
       <EmailInputThumbnail />
       <HeadingThumbnail />
diff --git a/app/client/src/Datasource/components/ReconnectDatasourceForm.tsx b/app/client/src/Datasource/components/ReconnectDatasourceForm.tsx
new file mode 100644
index 000000000000..fa047882d8d0
--- /dev/null
+++ b/app/client/src/Datasource/components/ReconnectDatasourceForm.tsx
@@ -0,0 +1,25 @@
+import React from "react";
+import DatasourceEditor from "pages/Editor/DataSourceEditor";
+
+interface ReconnectDatasourceFormProps {
+  applicationId: string | null;
+  datasourceId: string | null;
+  pageId: string | null;
+}
+
+function ReconnectDatasourceForm(props: ReconnectDatasourceFormProps) {
+  const { applicationId, datasourceId, pageId } = props;
+
+  return (
+    <DatasourceEditor
+      applicationId={applicationId}
+      datasourceId={datasourceId}
+      fromImporting
+      // isInsideReconnectModal: indicates that the datasource form is rendering inside reconnect modal
+      isInsideReconnectModal
+      pageId={pageId}
+    />
+  );
+}
+
+export default ReconnectDatasourceForm;
diff --git a/app/client/src/IDE/Components/BottomView.tsx b/app/client/src/IDE/Components/BottomView.tsx
index 022a4fe89adc..89470b86130d 100644
--- a/app/client/src/IDE/Components/BottomView.tsx
+++ b/app/client/src/IDE/Components/BottomView.tsx
@@ -6,6 +6,7 @@ import Resizer, {
 import { CodeEditorWithGutterStyles } from "pages/Editor/JSEditor/styledComponents";
 import { ViewDisplayMode, ViewHideBehaviour } from "IDE/Interfaces/View";
 import { Button } from "@appsmith/ads";
+import classNames from "classnames";
 
 const VIEW_MIN_HEIGHT = 38;
 
@@ -112,6 +113,7 @@ const ViewHide = (props: ViewHideProps) => {
 
 const BottomView = (props: Props) => {
   const panelRef = useRef<HTMLDivElement>(null);
+  const { className = "" } = props;
 
   // Handle the height of the view when toggling the hidden state
   useEffect(() => {
@@ -126,7 +128,10 @@ const BottomView = (props: Props) => {
 
   return (
     <Container
-      className={`select-text ${props.className || ""}`}
+      className={classNames("select-text", {
+        [className]: true,
+        "t--ide-bottom-view": !props.hidden,
+      })}
       displayMode={props.displayMode || ViewDisplayMode.BLOCK}
       ref={panelRef}
     >
diff --git a/app/client/src/IDE/Structure/Header.tsx b/app/client/src/IDE/Structure/Header.tsx
index 53de646437b7..14e8917a9567 100644
--- a/app/client/src/IDE/Structure/Header.tsx
+++ b/app/client/src/IDE/Structure/Header.tsx
@@ -1,6 +1,7 @@
 import React from "react";
 import { Divider, Flex } from "@appsmith/ads";
 import { AppsmithLink } from "pages/Editor/AppsmithLink";
+import { IDE_HEADER_HEIGHT } from "./constants";
 
 interface ChildrenProps {
   children: React.ReactNode | React.ReactNode[];
@@ -59,7 +60,7 @@ const Header = (props: ChildrenProps) => {
       alignItems="center"
       border="1px solid var(--ads-v2-color-border)"
       className="t--editor-header"
-      height="40px"
+      height={IDE_HEADER_HEIGHT + "px"}
       overflow="hidden"
       width="100%"
     >
diff --git a/app/client/src/IDE/Structure/constants.ts b/app/client/src/IDE/Structure/constants.ts
new file mode 100644
index 000000000000..2690fc4609df
--- /dev/null
+++ b/app/client/src/IDE/Structure/constants.ts
@@ -0,0 +1 @@
+export const IDE_HEADER_HEIGHT = 40;
diff --git a/app/client/src/IDE/index.ts b/app/client/src/IDE/index.ts
index 0b765da22cea..8a12a855b8ec 100644
--- a/app/client/src/IDE/index.ts
+++ b/app/client/src/IDE/index.ts
@@ -9,6 +9,7 @@
  * These are composable components that you can use to spread the content of the header
  * It is possible to use the IDE Header without using these subsections
  */
+export { IDE_HEADER_HEIGHT } from "./Structure/constants";
 export { default as IDEHeader } from "./Structure/Header";
 
 /* ====================================================
diff --git a/app/client/src/PluginActionEditor/PluginActionContext.tsx b/app/client/src/PluginActionEditor/PluginActionContext.tsx
new file mode 100644
index 000000000000..0b99f9dc363d
--- /dev/null
+++ b/app/client/src/PluginActionEditor/PluginActionContext.tsx
@@ -0,0 +1,62 @@
+import React, {
+  type ReactNode,
+  createContext,
+  useContext,
+  useMemo,
+} from "react";
+import type { Action } from "entities/Action";
+import type { Plugin } from "api/PluginApi";
+import type { Datasource } from "entities/Datasource";
+
+interface PluginActionContextType {
+  action: Action;
+  editorConfig: unknown[];
+  settingsConfig: unknown[];
+  plugin: Plugin;
+  datasource?: Datasource;
+}
+
+// No need to export this context to use it. Use the hook defined below instead
+const PluginActionContext = createContext<PluginActionContextType | null>(null);
+
+interface ChildrenProps {
+  children: ReactNode[];
+}
+
+export const PluginActionContextProvider = (
+  props: ChildrenProps & PluginActionContextType,
+) => {
+  const { action, children, datasource, editorConfig, plugin, settingsConfig } =
+    props;
+
+  // using useMemo to avoid unnecessary renders
+  const contextValue = useMemo(
+    () => ({
+      action,
+      datasource,
+      editorConfig,
+      plugin,
+      settingsConfig,
+    }),
+    [action, datasource, editorConfig, plugin, settingsConfig],
+  );
+
+  return (
+    <PluginActionContext.Provider value={contextValue}>
+      {children}
+    </PluginActionContext.Provider>
+  );
+};
+
+// By using this hook, you are guaranteed that the states are correctly
+// typed and set.
+// Without this, consumers of the context would need to keep doing a null check
+export const usePluginActionContext = () => {
+  const context = useContext(PluginActionContext);
+  if (!context) {
+    throw new Error(
+      "usePluginActionContext must be used within usePluginActionContextProvider",
+    );
+  }
+  return context;
+};
diff --git a/app/client/src/PluginActionEditor/PluginActionEditor.tsx b/app/client/src/PluginActionEditor/PluginActionEditor.tsx
new file mode 100644
index 000000000000..d8e480403064
--- /dev/null
+++ b/app/client/src/PluginActionEditor/PluginActionEditor.tsx
@@ -0,0 +1,89 @@
+import React from "react";
+import { useLocation } from "react-router";
+import { identifyEntityFromPath } from "../navigation/FocusEntity";
+import { useSelector } from "react-redux";
+import {
+  getActionByBaseId,
+  getDatasource,
+  getEditorConfig,
+  getPlugin,
+  getPluginSettingConfigs,
+} from "ee/selectors/entitiesSelector";
+import { PluginActionContextProvider } from "./PluginActionContext";
+import { get } from "lodash";
+import EntityNotFoundPane from "pages/Editor/EntityNotFoundPane";
+import { getIsEditorInitialized } from "selectors/editorSelectors";
+import Spinner from "components/editorComponents/Spinner";
+import CenteredWrapper from "components/designSystems/appsmith/CenteredWrapper";
+import { Text } from "@appsmith/ads";
+
+interface ChildrenProps {
+  children: React.ReactNode[];
+}
+
+const PluginActionEditor = (props: ChildrenProps) => {
+  const { pathname } = useLocation();
+
+  const isEditorInitialized = useSelector(getIsEditorInitialized);
+
+  const entity = identifyEntityFromPath(pathname);
+  const action = useSelector((state) => getActionByBaseId(state, entity.id));
+
+  const pluginId = get(action, "pluginId", "");
+  const plugin = useSelector((state) => getPlugin(state, pluginId));
+
+  const datasourceId = get(action, "datasource.id", "");
+  const datasource = useSelector((state) => getDatasource(state, datasourceId));
+
+  const settingsConfig = useSelector((state) =>
+    getPluginSettingConfigs(state, pluginId),
+  );
+
+  const editorConfig = useSelector((state) => getEditorConfig(state, pluginId));
+
+  if (!isEditorInitialized) {
+    return (
+      <CenteredWrapper>
+        <Spinner size={30} />
+      </CenteredWrapper>
+    );
+  }
+
+  if (!action) {
+    return <EntityNotFoundPane />;
+  }
+
+  if (!plugin) {
+    return (
+      <CenteredWrapper>
+        <Text color="var(--ads-v2-color-fg-error)" kind="heading-m">
+          Plugin not installed!
+        </Text>
+      </CenteredWrapper>
+    );
+  }
+
+  if (!settingsConfig || !editorConfig) {
+    return (
+      <CenteredWrapper>
+        <Text color="var(--ads-v2-color-fg-error)" kind="heading-m">
+          Editor config not found!
+        </Text>
+      </CenteredWrapper>
+    );
+  }
+
+  return (
+    <PluginActionContextProvider
+      action={action}
+      datasource={datasource}
+      editorConfig={editorConfig}
+      plugin={plugin}
+      settingsConfig={settingsConfig}
+    >
+      {props.children}
+    </PluginActionContextProvider>
+  );
+};
+
+export default PluginActionEditor;
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/PluginActionForm.tsx b/app/client/src/PluginActionEditor/components/PluginActionForm/PluginActionForm.tsx
new file mode 100644
index 000000000000..17db33e698a3
--- /dev/null
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/PluginActionForm.tsx
@@ -0,0 +1,7 @@
+import React from "react";
+
+const PluginActionForm = () => {
+  return <div />;
+};
+
+export default PluginActionForm;
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/index.ts b/app/client/src/PluginActionEditor/components/PluginActionForm/index.ts
new file mode 100644
index 000000000000..bb106d466ee2
--- /dev/null
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/index.ts
@@ -0,0 +1 @@
+export { default } from "./PluginActionForm";
diff --git a/app/client/src/PluginActionEditor/components/PluginActionResponsePane.tsx b/app/client/src/PluginActionEditor/components/PluginActionResponsePane.tsx
new file mode 100644
index 000000000000..5a0be861970c
--- /dev/null
+++ b/app/client/src/PluginActionEditor/components/PluginActionResponsePane.tsx
@@ -0,0 +1,7 @@
+import React from "react";
+
+const PluginActionResponsePane = () => {
+  return <div />;
+};
+
+export default PluginActionResponsePane;
diff --git a/app/client/src/PluginActionEditor/components/PluginActionToolbar.tsx b/app/client/src/PluginActionEditor/components/PluginActionToolbar.tsx
new file mode 100644
index 000000000000..64542de3c66f
--- /dev/null
+++ b/app/client/src/PluginActionEditor/components/PluginActionToolbar.tsx
@@ -0,0 +1,7 @@
+import React from "react";
+
+const PluginActionToolbar = () => {
+  return <div />;
+};
+
+export default PluginActionToolbar;
diff --git a/app/client/src/PluginActionEditor/index.ts b/app/client/src/PluginActionEditor/index.ts
new file mode 100644
index 000000000000..0a58d00bdaae
--- /dev/null
+++ b/app/client/src/PluginActionEditor/index.ts
@@ -0,0 +1,8 @@
+export { default as PluginActionEditor } from "./PluginActionEditor";
+export {
+  PluginActionContextProvider,
+  usePluginActionContext,
+} from "./PluginActionContext";
+export { default as PluginActionToolbar } from "./components/PluginActionToolbar";
+export { default as PluginActionForm } from "./components/PluginActionForm";
+export { default as PluginActionResponsePane } from "./components/PluginActionResponsePane";
diff --git a/app/client/src/actions/jsActionActions.ts b/app/client/src/actions/jsActionActions.ts
index 00a11cd6189e..19caef697dd7 100644
--- a/app/client/src/actions/jsActionActions.ts
+++ b/app/client/src/actions/jsActionActions.ts
@@ -8,6 +8,7 @@ import type { JSCollection } from "entities/JSCollection";
 import type { CreateJSCollectionRequest } from "ee/api/JSActionAPI";
 import type { EventLocation } from "ee/utils/analyticsUtilTypes";
 import type { ApiResponse } from "api/ApiResponses";
+import type { ErrorActionPayload } from "../sagas/ErrorSagas";
 
 export interface FetchJSCollectionsPayload {
   applicationId: string;
@@ -62,10 +63,12 @@ export const copyJSCollectionSuccess = (payload: JSCollection) => {
   };
 };
 
-export const copyJSCollectionError = (payload: {
-  id: string;
-  destinationPageId: string;
-}) => {
+export const copyJSCollectionError = (
+  payload: {
+    id: string;
+    destinationPageId: string;
+  } & ErrorActionPayload,
+) => {
   return {
     type: ReduxActionErrorTypes.COPY_JS_ACTION_ERROR,
     payload,
@@ -90,10 +93,12 @@ export const moveJSCollectionSuccess = (payload: JSCollection) => {
   };
 };
 
-export const moveJSCollectionError = (payload: {
-  id: string;
-  originalPageId: string;
-}) => {
+export const moveJSCollectionError = (
+  payload: {
+    id: string;
+    originalPageId: string;
+  } & ErrorActionPayload,
+) => {
   return {
     type: ReduxActionErrorTypes.MOVE_JS_ACTION_ERROR,
     payload,
diff --git a/app/client/src/actions/pageActions.tsx b/app/client/src/actions/pageActions.tsx
index 003d0aa20a64..f4e1a78b71ae 100644
--- a/app/client/src/actions/pageActions.tsx
+++ b/app/client/src/actions/pageActions.tsx
@@ -72,6 +72,10 @@ export interface FetchPublishedPageActionPayload {
   pageWithMigratedDsl?: FetchPageResponse;
 }
 
+export interface FetchPublishedPageResourcesPayload {
+  pageId: string;
+}
+
 export const fetchPublishedPageAction = (
   pageId: string,
   bustCache = false,
@@ -290,6 +294,17 @@ 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> => ({
+  type: ReduxActionTypes.FETCH_PUBLISHED_PAGE_RESOURCES_INIT,
+  payload: {
+    pageId,
+  },
+});
+
 // update a page
 
 export interface UpdatePageActionPayload {
diff --git a/app/client/src/actions/pluginActionActions.ts b/app/client/src/actions/pluginActionActions.ts
index 611beaaa4d01..81a0edf9d06e 100644
--- a/app/client/src/actions/pluginActionActions.ts
+++ b/app/client/src/actions/pluginActionActions.ts
@@ -15,6 +15,7 @@ import type { ModalInfo } from "reducers/uiReducers/modalActionReducer";
 import type { OtlpSpan } from "UITelemetry/generateTraces";
 import type { ApiResponse } from "api/ApiResponses";
 import type { JSCollection } from "entities/JSCollection";
+import type { ErrorActionPayload } from "sagas/ErrorSagas";
 
 export const createActionRequest = (payload: Partial<Action>) => {
   return {
@@ -205,10 +206,12 @@ export const moveActionSuccess = (payload: Action) => {
   };
 };
 
-export const moveActionError = (payload: {
-  id: string;
-  originalPageId: string;
-}) => {
+export const moveActionError = (
+  payload: {
+    id: string;
+    originalPageId: string;
+  } & ErrorActionPayload,
+) => {
   return {
     type: ReduxActionErrorTypes.MOVE_ACTION_ERROR,
     payload,
@@ -233,10 +236,12 @@ export const copyActionSuccess = (payload: Action) => {
   };
 };
 
-export const copyActionError = (payload: {
-  id: string;
-  destinationPageId: string;
-}) => {
+export const copyActionError = (
+  payload: {
+    id: string;
+    destinationPageId: string;
+  } & ErrorActionPayload,
+) => {
   return {
     type: ReduxActionErrorTypes.COPY_ACTION_ERROR,
     payload,
diff --git a/app/client/src/ce/constants/ReduxActionConstants.tsx b/app/client/src/ce/constants/ReduxActionConstants.tsx
index e3c5510381f8..0fc6287c4c4e 100644
--- a/app/client/src/ce/constants/ReduxActionConstants.tsx
+++ b/app/client/src/ce/constants/ReduxActionConstants.tsx
@@ -368,7 +368,6 @@ const UserAuthActionTypes = {
   SAAS_GET_OAUTH_ACCESS_TOKEN: "SAAS_GET_OAUTH_ACCESS_TOKEN",
   GET_OAUTH_ACCESS_TOKEN: "GET_OAUTH_ACCESS_TOKEN",
   GET_OAUTH_ACCESS_TOKEN_SUCCESS: "GET_OAUTH_ACCESS_TOKEN_SUCCESS",
-  GET_OAUTH_ACCESS_TOKEN_ERROR: "GET_OAUTH_ACCESS_TOKEN_ERROR",
 };
 const UserAuthActionErrorTypes = {
   CREATE_USER_ERROR: "CREATE_USER_ERROR",
@@ -379,6 +378,7 @@ const UserAuthActionErrorTypes = {
   LOGOUT_USER_ERROR: "LOGOUT_USER_ERROR",
   VERIFY_INVITE_ERROR: "VERIFY_INVITE_ERROR",
   INVITED_USER_SIGNUP_ERROR: "INVITED_USER_SIGNUP_ERROR",
+  GET_OAUTH_ACCESS_TOKEN_ERROR: "GET_OAUTH_ACCESS_TOKEN_ERROR",
 };
 
 const UserProfileActionTypes = {
@@ -980,6 +980,7 @@ const AppViewActionTypes = {
   FETCH_JS_ACTIONS_VIEW_MODE_SUCCESS: "FETCH_JS_ACTIONS_VIEW_MODE_SUCCESS",
   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",
 };
 
 const AppViewActionErrorTypes = {
@@ -988,6 +989,7 @@ const AppViewActionErrorTypes = {
   PUBLISH_APPLICATION_ERROR: "PUBLISH_APPLICATION_ERROR",
   FETCH_ACTIONS_VIEW_MODE_ERROR: "FETCH_ACTION_VIEW_MODE_ERROR",
   FETCH_JS_ACTIONS_VIEW_MODE_ERROR: "FETCH_JS_ACTIONS_VIEW_MODE_ERROR",
+  FETCH_PUBLISHED_PAGE_RESOURCES_ERROR: "FETCH_PUBLISHED_PAGE_RESOURCES_ERROR",
 };
 
 const WorkspaceActionTypes = {
@@ -1334,6 +1336,20 @@ export const ReduxActionErrorTypes = {
   ...WorkspaceActionErrorTypes,
 };
 
+export const toastMessageErrorTypes = {
+  ...AdminSettingsActionErrorTypes,
+  ...ApplicationActionErrorTypes,
+  ...AppViewActionErrorTypes,
+  ...DatasourceEditorActionErrorTypes,
+  ...GitActionErrorTypes,
+  ...ImportExportActionErrorTypes,
+  ...PlatformActionErrorTypes,
+  ...TenantActionErrorTypes,
+  ...UserAuthActionErrorTypes,
+  ...UserProfileActionErrorTypes,
+  ...WorkspaceActionErrorTypes,
+};
+
 export type ReduxActionErrorType =
   (typeof ReduxActionErrorTypes)[keyof typeof ReduxActionErrorTypes];
 
diff --git a/app/client/src/ce/constants/messages.ts b/app/client/src/ce/constants/messages.ts
index 7de903836a11..8407a185902a 100644
--- a/app/client/src/ce/constants/messages.ts
+++ b/app/client/src/ce/constants/messages.ts
@@ -364,8 +364,8 @@ export const DATASOURCE_UPDATE = (dsName: string) =>
   `${dsName} datasource updated successfully`;
 export const DATASOURCE_VALID = (dsName: string) =>
   `${dsName} datasource is valid`;
-export const EDIT_DATASOURCE = () => "Edit datasource";
-export const SAVE_DATASOURCE = () => "Save as datasource";
+export const EDIT_DATASOURCE = () => "Edit";
+export const SAVE_DATASOURCE = () => "Save";
 export const SAVE_DATASOURCE_MESSAGE = () =>
   "Save the URL as a datasource to access authentication settings";
 export const EDIT_DATASOURCE_MESSAGE = () =>
diff --git a/app/client/src/ce/entities/FeatureFlag.ts b/app/client/src/ce/entities/FeatureFlag.ts
index 6deb49556d88..69ac4b7e9c60 100644
--- a/app/client/src/ce/entities/FeatureFlag.ts
+++ b/app/client/src/ce/entities/FeatureFlag.ts
@@ -45,6 +45,7 @@ export const FEATURE_FLAG = {
     "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_ide_animations_enabled: "release_ide_animations_enabled",
 } as const;
 
 export type FeatureFlag = keyof typeof FEATURE_FLAG;
@@ -82,6 +83,7 @@ export const DEFAULT_FEATURE_FLAG_VALUE: FeatureFlags = {
   ab_learnability_discoverability_collapse_all_except_data_enabled: true,
   release_layout_conversion_enabled: false,
   release_anvil_toggle_enabled: false,
+  release_ide_animations_enabled: false,
 };
 
 export const AB_TESTING_EVENT_KEYS = {
diff --git a/app/client/src/ce/pages/Editor/AppPluginActionEditor/AppPluginActionEditor.tsx b/app/client/src/ce/pages/Editor/AppPluginActionEditor/AppPluginActionEditor.tsx
new file mode 100644
index 000000000000..6ed514390c08
--- /dev/null
+++ b/app/client/src/ce/pages/Editor/AppPluginActionEditor/AppPluginActionEditor.tsx
@@ -0,0 +1,19 @@
+import React from "react";
+import {
+  PluginActionEditor,
+  PluginActionToolbar,
+  PluginActionForm,
+  PluginActionResponsePane,
+} from "PluginActionEditor";
+
+const AppPluginActionEditor = () => {
+  return (
+    <PluginActionEditor>
+      <PluginActionToolbar />
+      <PluginActionForm />
+      <PluginActionResponsePane />
+    </PluginActionEditor>
+  );
+};
+
+export default AppPluginActionEditor;
diff --git a/app/client/src/ce/pages/Editor/Explorer/helpers.tsx b/app/client/src/ce/pages/Editor/Explorer/helpers.tsx
index 587f89bf6365..0a1baac42ea8 100644
--- a/app/client/src/ce/pages/Editor/Explorer/helpers.tsx
+++ b/app/client/src/ce/pages/Editor/Explorer/helpers.tsx
@@ -7,7 +7,9 @@ import {
   DATA_SOURCES_EDITOR_ID_PATH,
   matchBuilderPath,
   matchViewerPath,
-  BUILDER_VIEWER_PATH_PREFIX,
+  VIEWER_PATH,
+  VIEWER_CUSTOM_PATH,
+  VIEWER_PATH_DEPRECATED,
 } from "constants/routes";
 
 import {
@@ -80,11 +82,7 @@ export const getActionIdFromURL = () => {
 };
 
 export function getAppViewerPageIdFromPath(path: string): string | null {
-  const regexes = [
-    `${BUILDER_VIEWER_PATH_PREFIX}:applicationSlug/:pageSlug(.*\\-):basePageId`, // VIEWER_PATH
-    `${BUILDER_VIEWER_PATH_PREFIX}:customSlug(.*\\-):basePageId`, // VIEWER_CUSTOM_PATH
-    `/applications/:baseApplicationId/pages/:basePageId`, // VIEWER_PATH_DEPRECATED
-  ];
+  const regexes = [VIEWER_PATH, VIEWER_CUSTOM_PATH, VIEWER_PATH_DEPRECATED];
   for (const regex of regexes) {
     const match = matchPath<{ basePageId: string }>(path, { path: regex });
     if (match?.params.basePageId) {
diff --git a/app/client/src/ce/plugins/Linting/utils/getEntityUniqueIdForLogs.ts b/app/client/src/ce/plugins/Linting/utils/getEntityUniqueIdForLogs.ts
index 414cb362e702..619de80cc864 100644
--- a/app/client/src/ce/plugins/Linting/utils/getEntityUniqueIdForLogs.ts
+++ b/app/client/src/ce/plugins/Linting/utils/getEntityUniqueIdForLogs.ts
@@ -1,4 +1,4 @@
-import type { JSActionEntity } from "ee/entities/DataTree/types";
+import type { JSActionEntity, WidgetEntity } from "ee/entities/DataTree/types";
 import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";
 import type { DataTreeEntity } from "entities/DataTree/dataTreeTypes";
 
@@ -9,6 +9,9 @@ const entityUniqueIdGetterMap: Record<
   [ENTITY_TYPE.JSACTION]: (entity) => {
     return (entity as JSActionEntity).actionId;
   },
+  [ENTITY_TYPE.WIDGET]: (entity) => {
+    return (entity as WidgetEntity).widgetId;
+  },
 };
 
 export default function getEntityUniqueIdForLogs(entity: DataTreeEntity) {
diff --git a/app/client/src/ce/plugins/Linting/utils/isLintErrorLoggingEnabledForEntity.ts b/app/client/src/ce/plugins/Linting/utils/isLintErrorLoggingEnabledForEntity.ts
index c5bad4b96ffc..15b205c76980 100644
--- a/app/client/src/ce/plugins/Linting/utils/isLintErrorLoggingEnabledForEntity.ts
+++ b/app/client/src/ce/plugins/Linting/utils/isLintErrorLoggingEnabledForEntity.ts
@@ -1,8 +1,16 @@
-import { isJSAction } from "ee/workers/Evaluation/evaluationUtils";
+import { isJSAction, isWidget } from "ee/workers/Evaluation/evaluationUtils";
 import type { DataTreeEntity } from "entities/DataTree/dataTreeTypes";
+import type { DataTreeEntityConfig } from "ee/entities/DataTree/types";
 
 export default function isLintErrorLoggingEnabledForEntity(
   entity: DataTreeEntity,
+  propertyPath: string,
+  config: DataTreeEntityConfig,
 ) {
-  return isJSAction(entity);
+  if (isJSAction(entity)) {
+    return true;
+  }
+  if (isWidget(entity)) {
+    return !(propertyPath in config.reactivePaths);
+  }
 }
diff --git a/app/client/src/ce/sagas/ApplicationSagas.tsx b/app/client/src/ce/sagas/ApplicationSagas.tsx
index e529199407b1..562c139376ef 100644
--- a/app/client/src/ce/sagas/ApplicationSagas.tsx
+++ b/app/client/src/ce/sagas/ApplicationSagas.tsx
@@ -234,11 +234,7 @@ export function* fetchAppAndPagesSaga(
 ) {
   try {
     const { pages, ...payload } = action.payload;
-    const request = {
-      applicationId: payload.applicationId,
-      pageId: payload.pageId,
-      mode: payload.mode,
-    };
+    const request = { ...payload };
     if (request.pageId && request.applicationId) {
       delete request.applicationId;
     }
diff --git a/app/client/src/ce/sagas/JSActionSagas.ts b/app/client/src/ce/sagas/JSActionSagas.ts
index a152a8acd29c..7c72f18b67c3 100644
--- a/app/client/src/ce/sagas/JSActionSagas.ts
+++ b/app/client/src/ce/sagas/JSActionSagas.ts
@@ -192,10 +192,15 @@ export function* copyJSCollectionSaga(
     }
   } catch (e) {
     const actionName = actionObject ? actionObject.name : "";
-    toast.show(createMessage(ERROR_JS_ACTION_COPY_FAIL, actionName), {
-      kind: "error",
-    });
-    yield put(copyJSCollectionError(action.payload));
+    yield put(
+      copyJSCollectionError({
+        ...action.payload,
+        show: true,
+        error: {
+          message: createMessage(ERROR_JS_ACTION_COPY_FAIL, actionName),
+        },
+      }),
+    );
   }
 }
 
@@ -265,13 +270,14 @@ export function* moveJSCollectionSaga(
     // @ts-expect-error: response.data is of type unknown
     yield put(moveJSCollectionSuccess(response.data));
   } catch (e) {
-    toast.show(createMessage(ERROR_JS_ACTION_MOVE_FAIL, actionObject.name), {
-      kind: "error",
-    });
     yield put(
       moveJSCollectionError({
         id: action.payload.id,
         originalPageId: actionObject.pageId,
+        show: true,
+        error: {
+          message: createMessage(ERROR_JS_ACTION_MOVE_FAIL, actionObject.name),
+        },
       }),
     );
   }
@@ -375,15 +381,15 @@ export function* saveJSObjectName(
       payload: {
         actionId: action.payload.id,
         oldName: collection.config.name,
+        show: true,
+        error: {
+          message: createMessage(
+            ERROR_JS_COLLECTION_RENAME_FAIL,
+            action.payload.name,
+          ),
+        },
       },
     });
-    toast.show(
-      createMessage(ERROR_JS_COLLECTION_RENAME_FAIL, action.payload.name),
-      {
-        kind: "error",
-      },
-    );
-    log.error(e);
   }
 }
 
diff --git a/app/client/src/ce/sagas/PageSagas.tsx b/app/client/src/ce/sagas/PageSagas.tsx
index c58237cc0156..decc911734cb 100644
--- a/app/client/src/ce/sagas/PageSagas.tsx
+++ b/app/client/src/ce/sagas/PageSagas.tsx
@@ -10,6 +10,7 @@ import type {
   DeletePageActionPayload,
   FetchPageActionPayload,
   FetchPublishedPageActionPayload,
+  FetchPublishedPageResourcesPayload,
   GenerateTemplatePageActionPayload,
   SetPageOrderActionPayload,
   SetupPageActionPayload,
@@ -87,6 +88,7 @@ import {
   fetchActionsForPage,
   fetchActionsForPageError,
   fetchActionsForPageSuccess,
+  fetchActionsForView,
   setActionsToExecuteOnPageLoad,
   setJSActionsToExecuteOnPageLoad,
 } from "actions/pluginActionActions";
@@ -113,6 +115,7 @@ import {
 import WidgetFactory from "WidgetProvider/factory";
 import { builderURL } from "ee/RouteBuilder";
 import { failFastApiCalls, waitForWidgetConfigBuild } from "sagas/InitSagas";
+import { type InitConsolidatedApi } from "sagas/InitSagas";
 import { resizePublishedMainCanvasToLowestWidget } from "sagas/WidgetOperationUtils";
 import {
   checkAndLogErrorsIfCyclicDependency,
@@ -146,6 +149,7 @@ import type { LayoutSystemTypes } from "layoutSystems/types";
 import { getIsAnvilLayout } from "layoutSystems/anvil/integrations/selectors";
 import { convertToBasePageIdSelector } from "selectors/pageListSelectors";
 import type { Page } from "entities/Page";
+import ConsolidatedPageLoadApi from "api/ConsolidatedPageLoadApi";
 
 export const checkIfMigrationIsNeeded = (
   fetchPageResponse?: FetchPageResponse,
@@ -378,6 +382,43 @@ export function* fetchPublishedPageSaga(
   }
 }
 
+export function* fetchPublishedPageResourcesSaga(
+  action: ReduxAction<FetchPublishedPageResourcesPayload>,
+) {
+  try {
+    const { pageId } = action.payload;
+
+    const params = { defaultPageId: pageId };
+    const initConsolidatedApiResponse: ApiResponse<InitConsolidatedApi> =
+      yield ConsolidatedPageLoadApi.getConsolidatedPageLoadDataView(params);
+
+    const isValidResponse: boolean = yield validateResponse(
+      initConsolidatedApiResponse,
+    );
+    const response: InitConsolidatedApi | undefined =
+      initConsolidatedApiResponse.data;
+
+    if (isValidResponse) {
+      // We need to recall consolidated view API in order to fetch actions when page is switched
+      // As in the first call only actions of the current page are fetched
+      // 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 put(fetchActionsForView({ applicationId: "", publishedActions }));
+      yield put(fetchAllPageEntityCompletion([executePageLoadActions()]));
+    }
+  } catch (error) {
+    yield put({
+      type: ReduxActionErrorTypes.FETCH_PUBLISHED_PAGE_RESOURCES_ERROR,
+      payload: {
+        error,
+      },
+    });
+  }
+}
+
 export function* fetchAllPublishedPagesSaga() {
   try {
     const pageIdentities: { pageId: string; basePageId: string }[] =
diff --git a/app/client/src/ce/utils/workflowHelpers.ts b/app/client/src/ce/utils/workflowHelpers.ts
index b7f05145a5e5..63cdcdf4d149 100644
--- a/app/client/src/ce/utils/workflowHelpers.ts
+++ b/app/client/src/ce/utils/workflowHelpers.ts
@@ -1,3 +1,10 @@
 export const useWorkflowOptions = () => {
   return [];
 };
+
+// We don't want to show the create new JS object option if the user is in the workflow editor
+// this is done since worflows runner doesn't support multiple JS objects
+// TODO: Remove this once workflows can support multiple JS objects
+export const checkIfJSObjectCreationAllowed = () => {
+  return false;
+};
diff --git a/app/client/src/components/AnimatedGridLayout/components/LayoutArea/LayoutArea.tsx b/app/client/src/components/AnimatedGridLayout/components/LayoutArea/LayoutArea.tsx
index bbf8d0da44ed..f646eef03023 100644
--- a/app/client/src/components/AnimatedGridLayout/components/LayoutArea/LayoutArea.tsx
+++ b/app/client/src/components/AnimatedGridLayout/components/LayoutArea/LayoutArea.tsx
@@ -41,7 +41,7 @@ export function LayoutArea(props: LayoutAreaProps) {
     >
       <div
         style={{
-          minWidth: dimensions?.width || "100%",
+          width: dimensions?.width || "100%",
           height: "100%",
           position: "absolute",
           overflow: "auto",
diff --git a/app/client/src/components/AnimatedGridLayout/constants.ts b/app/client/src/components/AnimatedGridLayout/constants.ts
index 2bd8945a4203..550f99633848 100644
--- a/app/client/src/components/AnimatedGridLayout/constants.ts
+++ b/app/client/src/components/AnimatedGridLayout/constants.ts
@@ -1,9 +1,11 @@
-import { easings } from "@react-spring/web";
 import type { AnimatedGridUnit } from "./types";
 
 /** Default rows config. */
 export const DEFAULT_ROWS: AnimatedGridUnit[] = ["1fr"];
 
 export const SPRING_ANIMATION_CONFIG = {
-  easing: easings.easeInCirc,
+  duration: 375,
+  friction: 32,
+  mass: 1,
+  tension: 205,
 };
diff --git a/app/client/src/components/BottomBar/components.ts b/app/client/src/components/BottomBar/components.ts
index 26d1bc71505e..476e00d1cb2c 100644
--- a/app/client/src/components/BottomBar/components.ts
+++ b/app/client/src/components/BottomBar/components.ts
@@ -1,9 +1,10 @@
 import styled from "styled-components";
 import { Layers } from "constants/Layers";
+import { BOTTOM_BAR_HEIGHT } from "./constants";
 
 export const Container = styled.div`
   width: 100%;
-  height: ${(props) => props.theme.bottomBarHeight};
+  height: ${BOTTOM_BAR_HEIGHT}px;
   display: flex;
   position: fixed;
   justify-content: space-between;
diff --git a/app/client/src/components/BottomBar/constants.ts b/app/client/src/components/BottomBar/constants.ts
new file mode 100644
index 000000000000..9a46200fb9dd
--- /dev/null
+++ b/app/client/src/components/BottomBar/constants.ts
@@ -0,0 +1 @@
+export const BOTTOM_BAR_HEIGHT = 37;
diff --git a/app/client/src/components/BottomBar/index.tsx b/app/client/src/components/BottomBar/index.tsx
index 1c358dc6ec87..c40dbca3fc34 100644
--- a/app/client/src/components/BottomBar/index.tsx
+++ b/app/client/src/components/BottomBar/index.tsx
@@ -7,14 +7,18 @@ import { Button } from "@appsmith/ads";
 import SwitchEnvironment from "ee/components/SwitchEnvironment";
 import { Container, Wrapper } from "./components";
 import { useSelector } from "react-redux";
-import { getCurrentApplicationId } from "selectors/editorSelectors";
+import {
+  getCurrentApplicationId,
+  previewModeSelector,
+} from "selectors/editorSelectors";
 import { useDispatch } from "react-redux";
 import { softRefreshActions } from "actions/pluginActionActions";
 import { START_SWITCH_ENVIRONMENT } from "ee/constants/messages";
 import { getIsAnvilEnabledInCurrentApplication } from "layoutSystems/anvil/integrations/selectors";
 
-export default function BottomBar({ viewMode }: { viewMode: boolean }) {
+export default function BottomBar() {
   const appId = useSelector(getCurrentApplicationId) || "";
+  const isPreviewMode = useSelector(previewModeSelector);
   const dispatch = useDispatch();
   // We check if the current application is an Anvil application.
   // If it is an Anvil application, we remove the Git features from the bottomBar
@@ -28,17 +32,17 @@ export default function BottomBar({ viewMode }: { viewMode: boolean }) {
   return (
     <Container>
       <Wrapper>
-        {!viewMode && (
+        {!isPreviewMode && (
           <SwitchEnvironment
             editorId={appId}
             onChangeEnv={onChangeEnv}
             startSwitchEnvMessage={START_SWITCH_ENVIRONMENT}
-            viewMode={viewMode}
+            viewMode={isPreviewMode}
           />
         )}
-        {!viewMode && !isAnvilEnabled && <QuickGitActions />}
+        {!isPreviewMode && !isAnvilEnabled && <QuickGitActions />}
       </Wrapper>
-      {!viewMode && (
+      {!isPreviewMode && (
         <Wrapper>
           <ManualUpgrades showTooltip>
             <Button
diff --git a/app/client/src/components/common/Card.tsx b/app/client/src/components/common/Card.tsx
index 8d7b30336be2..cb77fd8d7ed2 100644
--- a/app/client/src/components/common/Card.tsx
+++ b/app/client/src/components/common/Card.tsx
@@ -260,6 +260,7 @@ const CardFooter = styled.div`
   display: flex;
   align-items: center;
   margin: 4px 0 0 0;
+  justify-content: space-between;
   width: ${(props) => props.theme.card.minWidth}px;
 
   @media screen and (min-width: 1500px) {
diff --git a/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionTree.tsx b/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionTree.tsx
index f169877253a3..05a96157ad86 100644
--- a/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionTree.tsx
+++ b/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionTree.tsx
@@ -1,7 +1,6 @@
 import styled from "styled-components";
 import TreeStructure from "components/utils/TreeStructure";
 import { Text, Icon, Button, Tooltip } from "@appsmith/ads";
-import { klona } from "klona/lite";
 import React, { useCallback, useEffect } from "react";
 import { ActionCreatorContext } from "../..";
 import { AppsmithFunction } from "../../constants";
@@ -13,6 +12,7 @@ import AnalyticsUtil from "ee/utils/AnalyticsUtil";
 import { getActionTypeLabel } from "../ActionBlockTree/utils";
 import classNames from "classnames";
 import type { AdditionalDynamicDataTree } from "utils/autocomplete/customTreeTypeDefCreator";
+import { klonaLiteWithTelemetry } from "utils/helpers";
 
 const CallbackBlockContainer = styled.div<{
   isSelected: boolean;
@@ -108,7 +108,12 @@ export default function ActionTree(props: {
       selectBlock(`${id}_success_${blocks.length - 1}`);
       return;
     }
-    const newActionBlock = klona(actionBlock);
+
+    const newActionBlock = klonaLiteWithTelemetry(
+      actionBlock,
+      "ActionTree.handleAddSuccessBlock",
+    );
+
     newActionBlock.success.blocks.push({
       ...EMPTY_ACTION_BLOCK,
       type: lastAction?.type || "then",
@@ -127,7 +132,11 @@ export default function ActionTree(props: {
       selectBlock(`${id}_failure_${blocks.length - 1}`);
       return;
     }
-    const newActionBlock = klona(actionBlock);
+    const newActionBlock = klonaLiteWithTelemetry(
+      actionBlock,
+      "ActionTree.handleAddErrorBlock",
+    );
+
     newActionBlock.error.blocks.push({
       ...EMPTY_ACTION_BLOCK,
       type: lastAction?.type || "catch",
@@ -272,7 +281,11 @@ export default function ActionTree(props: {
                           childActionBlock: TActionBlock,
                           del?: boolean,
                         ) => {
-                          const newActionBlock = klona(actionBlock);
+                          const newActionBlock = klonaLiteWithTelemetry(
+                            actionBlock,
+                            "ActionTree.onChange",
+                          );
+
                           const blocks =
                             blockType === "failure"
                               ? newActionBlock.error.blocks
diff --git a/app/client/src/components/editorComponents/Debugger/LogItem.tsx b/app/client/src/components/editorComponents/Debugger/LogItem.tsx
index 90d76e7a955a..b8c06c080536 100644
--- a/app/client/src/components/editorComponents/Debugger/LogItem.tsx
+++ b/app/client/src/components/editorComponents/Debugger/LogItem.tsx
@@ -267,9 +267,7 @@ function LogItem(props: LogItemProps) {
           size="md"
         />
         <span className={`debugger-time ${props.severity}`}>
-          {props.severity === Severity.ERROR
-            ? moment(parseInt(props.timestamp)).format("HH:mm:ss")
-            : props.timestamp}
+          {moment(parseInt(props.timestamp)).format("HH:mm:ss")}
         </span>
 
         <Button
diff --git a/app/client/src/components/editorComponents/GlobalSearch/GlobalSearchHooks.test.ts b/app/client/src/components/editorComponents/GlobalSearch/GlobalSearchHooks.test.ts
index a5f28a5458c1..c3f7760d3089 100644
--- a/app/client/src/components/editorComponents/GlobalSearch/GlobalSearchHooks.test.ts
+++ b/app/client/src/components/editorComponents/GlobalSearch/GlobalSearchHooks.test.ts
@@ -295,4 +295,58 @@ describe("getFilteredAndSortedFileOperations", () => {
       }),
     );
   });
+
+  it("should not show new js object option if disableJSObjectCreation is true", () => {
+    const fileOptions = useFilteredAndSortedFileOperations({
+      query: "new js",
+      allDatasources: [],
+      recentlyUsedDSMap: {},
+      canCreateActions: true,
+      canCreateDatasource: true,
+      disableJSObjectCreation: true,
+    });
+
+    expect(fileOptions.length).toEqual(1);
+    expect(fileOptions[0]).toEqual(
+      expect.objectContaining({
+        title: "New datasource",
+      }),
+    );
+  });
+
+  it("should show new js object option if disableJSObjectCreation is false", () => {
+    const fileOptions = useFilteredAndSortedFileOperations({
+      query: "new js",
+      allDatasources: [],
+      recentlyUsedDSMap: {},
+      canCreateActions: true,
+      canCreateDatasource: true,
+      disableJSObjectCreation: false,
+    });
+
+    expect(fileOptions.length).toEqual(2);
+    expect(fileOptions[0]).toEqual(
+      expect.objectContaining({
+        title: "New JS Object",
+      }),
+    );
+  });
+
+  it("should show new js object option if disableJSObjectCreation is not set", () => {
+    const fileOptions = useFilteredAndSortedFileOperations({
+      query: "new js",
+      allDatasources: [],
+      recentlyUsedDSMap: {},
+      canCreateActions: true,
+      canCreateDatasource: true,
+      disableJSObjectCreation: false,
+    });
+
+    expect(fileOptions.length).toEqual(2);
+    expect(fileOptions[0]).toEqual(
+      expect.objectContaining({
+        title: "New JS Object",
+      }),
+    );
+  });
 });
diff --git a/app/client/src/components/editorComponents/GlobalSearch/GlobalSearchHooks.tsx b/app/client/src/components/editorComponents/GlobalSearch/GlobalSearchHooks.tsx
index 883bc58b866d..6a97013bca2e 100644
--- a/app/client/src/components/editorComponents/GlobalSearch/GlobalSearchHooks.tsx
+++ b/app/client/src/components/editorComponents/GlobalSearch/GlobalSearchHooks.tsx
@@ -38,7 +38,10 @@ import type { Plugin } from "api/PluginApi";
 import { useModuleOptions } from "ee/utils/moduleInstanceHelpers";
 import type { ActionParentEntityTypeInterface } from "ee/entities/Engine/actionHelpers";
 import { createNewQueryBasedOnParentEntity } from "ee/actions/helpers";
-import { useWorkflowOptions } from "ee/utils/workflowHelpers";
+import {
+  checkIfJSObjectCreationAllowed,
+  useWorkflowOptions,
+} from "ee/utils/workflowHelpers";
 
 export interface FilterFileOperationsProps {
   canCreateActions: boolean;
@@ -58,6 +61,11 @@ export const useFilteredFileOperations = ({
   const moduleOptions = useModuleOptions();
   const workflowOptions = useWorkflowOptions();
 
+  // We don't want to show the create new JS object option if the user is in the workflow editor
+  // this is done since worflows runner doesn't support multiple JS objects
+  // TODO: Remove this once workflows can support multiple JS objects
+  const disableJSObjectCreation = checkIfJSObjectCreationAllowed();
+
   // helper map for sorting based on recent usage
   const recentlyUsedDSMap = useRecentlyUsedDSMap();
 
@@ -90,6 +98,8 @@ export const useFilteredFileOperations = ({
     plugins,
     recentlyUsedDSMap,
     query,
+    // TODO: Remove this once workflows can support multiple JS objects
+    disableJSObjectCreation,
   });
 };
 
@@ -97,6 +107,7 @@ export const useFilteredAndSortedFileOperations = ({
   allDatasources = [],
   canCreateActions = true,
   canCreateDatasource = true,
+  disableJSObjectCreation = false,
   moduleOptions = [],
   plugins = [],
   query,
@@ -111,6 +122,7 @@ export const useFilteredAndSortedFileOperations = ({
   query: string;
   recentlyUsedDSMap?: Record<string, number>;
   workflowOptions?: ActionOperation[];
+  disableJSObjectCreation?: boolean;
 }) => {
   const fileOperations: ActionOperation[] = [];
 
@@ -127,8 +139,11 @@ export const useFilteredAndSortedFileOperations = ({
    */
   const actionOps = updateActionOperations(plugins, actionOperations);
 
-  // Add JS Object operation
-  fileOperations.push(actionOps[2]);
+  // TODO: Remove this check once workflows can support multiple JS objects
+  if (!disableJSObjectCreation) {
+    // Add JS Object operation
+    fileOperations.push(actionOps[2]);
+  }
 
   // Add Module operations
   if (moduleOptions.length > 0) {
diff --git a/app/client/src/components/editorComponents/PropertyPaneSidebar.tsx b/app/client/src/components/editorComponents/PropertyPaneSidebar.tsx
index 0e7e00aa4e1c..25e926a108b0 100644
--- a/app/client/src/components/editorComponents/PropertyPaneSidebar.tsx
+++ b/app/client/src/components/editorComponents/PropertyPaneSidebar.tsx
@@ -1,51 +1,28 @@
-import classNames from "classnames";
+import React, {
+  memo,
+  useCallback,
+  useContext,
+  useEffect,
+  useMemo,
+  useRef,
+} from "react";
 import * as Sentry from "@sentry/react";
 import { useSelector } from "react-redux";
-import React, { memo, useContext, useEffect, useMemo, useRef } from "react";
-
 import { getSelectedWidgets } from "selectors/ui";
-import { tailwindLayers } from "constants/Layers";
 import WidgetPropertyPane from "pages/Editor/PropertyPane";
 import CanvasPropertyPane from "pages/Editor/CanvasPropertyPane";
-import useHorizontalResize from "utils/hooks/useHorizontalResize";
-import { getIsDraggingForSelection } from "selectors/canvasSelectors";
 import MultiSelectPropertyPane from "pages/Editor/MultiSelectPropertyPane";
 import { getIsDraggingOrResizing } from "selectors/widgetSelectors";
 import { selectedWidgetsPresentInCanvas } from "selectors/propertyPaneSelectors";
-import styled from "styled-components";
 import WalkthroughContext from "components/featureWalkthrough/walkthroughContext";
 import { MAIN_CONTAINER_WIDGET_ID } from "constants/WidgetConstants";
 
 export const PROPERTY_PANE_ID = "t--property-pane-sidebar";
 
-const StyledResizer = styled.div<{ resizing: boolean }>`
-  ${(props) =>
-    props.resizing &&
-    `
-  & > div {
-    background-color: var(--ads-v2-color-outline);
-  }
-  `}
-  :hover {
-    & > div {
-      background-color: var(--ads-v2-color-bg-emphasis);
-    }
-  }
-`;
-
-interface Props {
-  width: number;
-  onDragEnd?: () => void;
-  onWidthChange: (width: number) => void;
-}
-
-export const PropertyPaneSidebar = memo((props: Props) => {
+export const PropertyPaneSidebar = memo(() => {
   const sidebarRef = useRef<HTMLDivElement>(null);
   const prevSelectedWidgetId = useRef<string | undefined>();
 
-  const { onMouseDown, onMouseUp, onTouchStart, resizing } =
-    useHorizontalResize(sidebarRef, props.onWidthChange, props.onDragEnd, true);
-
   const selectedWidgetIds = useSelector(getSelectedWidgets);
   const isDraggingOrResizing = useSelector(getIsDraggingOrResizing);
   const { isOpened: isWalkthroughOpened, popFeature } =
@@ -58,17 +35,10 @@ export const PropertyPaneSidebar = memo((props: Props) => {
       selectedWidgetIds[0] !== prevSelectedWidgetId.current) ||
     selectedWidgetIds[0] === MAIN_CONTAINER_WIDGET_ID;
 
-  // This is to keep the theming properties from changing,
-  // while dragging a widget when no other widgets were selected
-  const keepThemeWhileDragging =
-    prevSelectedWidgetId.current === undefined && shouldNotRenderPane;
-
   const selectedWidgetsLength = useSelector(
     (state) => selectedWidgetsPresentInCanvas(state).length,
   );
 
-  const isDraggingForSelection = useSelector(getIsDraggingForSelection);
-
   prevSelectedWidgetId.current =
     selectedWidgetIds.length === 1 ? selectedWidgetIds[0] : undefined;
 
@@ -91,27 +61,24 @@ export const PropertyPaneSidebar = memo((props: Props) => {
       default:
         return <CanvasPropertyPane />;
     }
-  }, [
-    selectedWidgetsLength,
-    isDraggingForSelection,
-    shouldNotRenderPane,
-    keepThemeWhileDragging,
-  ]);
+  }, [selectedWidgetsLength, shouldNotRenderPane]);
 
-  const closeWalkthrough = () => {
+  const closeWalkthrough = useCallback(() => {
     if (popFeature) {
       popFeature("PROPERTY_PANE");
       sidebarRef.current?.removeEventListener("click", closeWalkthrough);
     }
-  };
+  }, [popFeature]);
 
   useEffect(() => {
-    if (isWalkthroughOpened)
-      sidebarRef.current?.addEventListener("click", closeWalkthrough);
+    const currentSidebar = sidebarRef.current;
+    if (isWalkthroughOpened) {
+      currentSidebar?.addEventListener("click", closeWalkthrough);
+    }
     return () => {
-      sidebarRef.current?.removeEventListener("click", closeWalkthrough);
+      currentSidebar?.removeEventListener("click", closeWalkthrough);
     };
-  }, [isWalkthroughOpened]);
+  }, [closeWalkthrough, isWalkthroughOpened]);
 
   return (
     <div className="relative h-full">
@@ -122,28 +89,7 @@ export const PropertyPaneSidebar = memo((props: Props) => {
         id={PROPERTY_PANE_ID}
         ref={sidebarRef}
       >
-        {/* RESIZER */}
-        <StyledResizer
-          className={`absolute top-0 left-0 w-2 h-full -ml-1 group cursor-ew-resize ${tailwindLayers.resizer}`}
-          onMouseDown={onMouseDown}
-          onTouchEnd={onMouseUp}
-          onTouchStart={onTouchStart}
-          resizing={resizing}
-        >
-          <div
-            className={classNames({
-              "w-1 h-full bg-transparent transform transition flex items-center":
-                true,
-            })}
-          />
-        </StyledResizer>
-        <div
-          className={classNames({
-            "h-full p-0 overflow-y-auto min-w-72 max-w-104": true,
-            "transition-all duration-400": !resizing,
-          })}
-          style={{ width: props.width }}
-        >
+        <div className={"h-full p-0 overflow-y-auto min-w-72 max-w-104 w-full"}>
           {propertyPane}
         </div>
       </div>
diff --git a/app/client/src/components/editorComponents/StoreAsDatasource.tsx b/app/client/src/components/editorComponents/StoreAsDatasource.tsx
index 84c2f5111afb..b605ca26eb38 100644
--- a/app/client/src/components/editorComponents/StoreAsDatasource.tsx
+++ b/app/client/src/components/editorComponents/StoreAsDatasource.tsx
@@ -60,11 +60,12 @@ 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 ? "cloud" : "pencil-line"}
+      startIcon={props.shouldSave ? "database-2-line" : "pencil-line"}
     >
       {props.shouldSave
         ? createMessage(SAVE_DATASOURCE)
diff --git a/app/client/src/components/formControls/DynamicInputTextControl.tsx b/app/client/src/components/formControls/DynamicInputTextControl.tsx
index 874a8c9e9e32..752dbede4233 100644
--- a/app/client/src/components/formControls/DynamicInputTextControl.tsx
+++ b/app/client/src/components/formControls/DynamicInputTextControl.tsx
@@ -84,7 +84,10 @@ export function InputText(props: {
     }
   }
   return (
-    <div className={`t--${props?.name}`} style={customStyle}>
+    <div
+      className={`t--${props?.name} uqi-dynamic-input-text`}
+      style={customStyle}
+    >
       {/* <div style={customStyle}> */}
       <StyledDynamicTextField
         dataTreePath={dataTreePath}
diff --git a/app/client/src/components/formControls/DynamicTextFieldControl.tsx b/app/client/src/components/formControls/DynamicTextFieldControl.tsx
index de390e699e62..4bb9c594814f 100644
--- a/app/client/src/components/formControls/DynamicTextFieldControl.tsx
+++ b/app/client/src/components/formControls/DynamicTextFieldControl.tsx
@@ -65,7 +65,7 @@ class DynamicTextControl extends BaseControl<
 
     return (
       <Wrapper
-        className={`t--${configProperty}`}
+        className={`t--${configProperty} dynamic-text-field-control`}
         fullWidth={isActionRedesignEnabled}
       >
         <DynamicTextField
diff --git a/app/client/src/components/formControls/FieldArrayControl.tsx b/app/client/src/components/formControls/FieldArrayControl.tsx
index e2e6ed4fa95c..33cdd33725ae 100644
--- a/app/client/src/components/formControls/FieldArrayControl.tsx
+++ b/app/client/src/components/formControls/FieldArrayControl.tsx
@@ -100,6 +100,7 @@ function NestedComponents(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/formControls/FilePickerControl.test.tsx b/app/client/src/components/formControls/FilePickerControl.test.tsx
new file mode 100644
index 000000000000..373d1c318290
--- /dev/null
+++ b/app/client/src/components/formControls/FilePickerControl.test.tsx
@@ -0,0 +1,85 @@
+import React from "react";
+import "@testing-library/jest-dom/extend-expect";
+import { act, render, screen, waitFor } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { Provider } from "react-redux";
+import { combineReducers, createStore } from "redux";
+import { ThemeProvider } from "styled-components";
+import { reducer as formReducer } from "redux-form";
+import { theme } from "constants/DefaultTheme"; // Adjust the path as necessary
+import { BrowserRouter as Router } from "react-router-dom";
+import FilePickerControl, { RenderFilePicker } from "./FilePickerControl"; // Adjust the path as necessary
+import { Field, reduxForm } from "redux-form";
+
+const rootReducer = combineReducers({
+  form: formReducer,
+});
+
+const mockStore = createStore(rootReducer);
+
+const mockInput = {
+  value: {},
+  onChange: jest.fn(),
+};
+
+const mockProps = {
+  input: mockInput,
+  meta: {},
+  disabled: false,
+  onChange: jest.fn(),
+};
+
+const TestForm = reduxForm({ form: "testForm" })(() => (
+  <Field component={RenderFilePicker} name="filePicker" {...mockProps} />
+));
+
+const renderComponent = () =>
+  render(
+    <Provider store={mockStore}>
+      <Router>
+        <ThemeProvider theme={theme}>
+          <TestForm />
+        </ThemeProvider>
+      </Router>
+    </Provider>
+  );
+
+describe("FilePickerControl Component", () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  test("renders the component", () => {
+    renderComponent();
+    expect(screen.getByText("Select")).toBeInTheDocument();
+  });
+
+  test("selects a file and triggers onChange", async () => {
+    renderComponent();
+
+    const file = new File(["file contents"], "example.txt", {
+      type: "text/plain",
+    });
+
+    userEvent.click(screen.getByText("Select"));
+    userEvent.click(screen.getByText("Browse"));
+
+    const fileInput = document.querySelector('input[type="file"]') as HTMLInputElement;
+
+    await act(async () => {
+      if (fileInput) {
+        console.log('File input found, uploading file...');
+        await userEvent.upload(fileInput, file);
+        console.log('File uploaded.');
+      } else {
+        throw new Error("File input not found");
+      }
+    });
+
+    await waitFor(() => {
+      console.log('Waiting for file name to appear...');
+      expect(screen.getByText("example.txt")).toBeInTheDocument();
+    });
+
+  });
+});
diff --git a/app/client/src/components/formControls/FilePickerControl.tsx b/app/client/src/components/formControls/FilePickerControl.tsx
index f37ac80ce1b9..36e64aab4fd7 100644
--- a/app/client/src/components/formControls/FilePickerControl.tsx
+++ b/app/client/src/components/formControls/FilePickerControl.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import { useState } from "react";
+import { useState, useEffect, useCallback } from "react";
 import styled from "styled-components";
 import type { ControlProps } from "./BaseControl";
 import BaseControl from "./BaseControl";
@@ -8,7 +8,6 @@ import type { SetProgress } from "@appsmith/ads-old";
 import { FilePickerV2, FileType } from "@appsmith/ads-old";
 import type { WrappedFieldInputProps, WrappedFieldMetaProps } from "redux-form";
 import { Field } from "redux-form";
-import { useEffect, useCallback } from "react";
 import { replayHighlightClass } from "globalStyles/portals";
 import { Button, Modal, ModalBody, ModalContent } from "@appsmith/ads";
 
@@ -48,7 +47,7 @@ type RenderFilePickerProps = FilePickerControlProps & {
   onChange: (event: any) => void;
 };
 
-function RenderFilePicker(props: RenderFilePickerProps) {
+export function RenderFilePicker(props: RenderFilePickerProps) {
   const [isOpen, setIsOpen] = useState(false);
   const [appFileToBeUploaded, setAppFileToBeUploaded] = useState<{
     file: File;
@@ -84,6 +83,9 @@ function RenderFilePicker(props: RenderFilePickerProps) {
         });
       };
     }
+    else{
+      props.input?.onChange("");
+    }
   }, [appFileToBeUploaded]);
 
   return (
diff --git a/app/client/src/components/formControls/SortingControl.tsx b/app/client/src/components/formControls/SortingControl.tsx
index 5f92252b9056..2e1a239f02c7 100644
--- a/app/client/src/components/formControls/SortingControl.tsx
+++ b/app/client/src/components/formControls/SortingControl.tsx
@@ -1,9 +1,12 @@
-import React, { useEffect, useRef } from "react";
+import React, { useEffect, useMemo, useRef } from "react";
 import { useSelector } from "react-redux";
 import FormControl from "pages/Editor/FormControl";
-import { Classes } from "@appsmith/ads-old";
 import styled from "styled-components";
-import { FieldArray, getFormValues } from "redux-form";
+import {
+  FieldArray,
+  getFormValues,
+  type WrappedFieldArrayProps,
+} from "redux-form";
 import type { ControlProps } from "./BaseControl";
 import { getBindingOrConfigPathsForSortingControl } from "entities/Action/actionProperties";
 import { SortingSubComponent } from "./utils";
@@ -26,9 +29,6 @@ const columnFieldConfig: any = {
   initialValue: "",
   inputType: "TEXT",
   placeholderText: "Column name",
-  customStyles: {
-    // width: "280px",
-  },
 };
 
 // Form config for the order field
@@ -52,60 +52,42 @@ const orderFieldConfig: any = {
   ],
 };
 
-// main container for the fsorting component
-const SortingContainer = styled.div`
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
+const SortingContainer = styled.div<{ isBreakpointSmall: boolean }>`
+  display: grid;
+  grid-template-columns: ${({ isBreakpointSmall }) =>
+    isBreakpointSmall ? "1fr 50px" : "1fr 50px"};
+  gap: 5px;
+  align-items: center;
 `;
 
-// container for the two sorting dropdown
-const SortingDropdownContainer = styled.div<{ size: string }>`
-  display: flex;
-  flex-direction: row;
-  width: min-content;
-  justify-content: space-between;
-  margin-bottom: 5px;
+const SortingFields = styled.div<{ isBreakpointSmall: boolean }>`
+  display: grid;
+  grid-template-columns: ${({ isBreakpointSmall }) =>
+    isBreakpointSmall ? "1fr" : "1fr 180px"};
+  grid-template-rows: ${({ isBreakpointSmall }) =>
+    isBreakpointSmall ? "1fr 1fr" : "1fr"};
   gap: 5px;
-  align-items: center;
-  > div {
-    width: 250px;
-  }
-  ${(props) =>
-    props.size === "small" &&
-    `
-  // Hide the dropdown labels to decrease the width
-  // The design system component has inline style hence the !important
-  .t--form-control-DROP_DOWN .${Classes.TEXT} {
-    display: none !important;
-  }
-  // Show the icons hidden initially
-  .t--form-control-DROP_DOWN .remixicon-icon {
-    display: initial;
-  }
-  `}
 `;
+
 const ButtonWrapper = styled.div`
   display: flex;
   flex-direction: row;
 `;
-// container for the column dropdown section
-const ColumnDropdownContainer = styled.div``;
 
-// Component for the icons
-const CenteredButton = styled(Button)``;
+export type SortingControlProps = ControlProps;
 
-// TODO: Fix this the next time the file is edited
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function SortingComponent(props: any) {
-  // TODO: Fix this the next time the file is edited
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const formValues: any = useSelector((state) =>
+export type SortingComponentProps = WrappedFieldArrayProps &
+  Pick<SortingControlProps, "configProperty" | "formName">;
+
+function SortingComponent(props: SortingComponentProps) {
+  const { configProperty, fields, formName } = props;
+
+  const formValues = useSelector((state) =>
     getFormValues(props.formName)(state),
   );
 
   const onDeletePressed = (index: number) => {
-    props.fields.remove(index);
+    fields.remove(index);
   };
 
   const targetRef = useRef<HTMLDivElement>(null);
@@ -113,105 +95,100 @@ function SortingComponent(props: any) {
   const isBreakpointSmall = size === "small";
 
   useEffect(() => {
-    // this path represents the path to the sortBy object, wherever the location is in the actionConfiguration object
-    let sortingObjectPath;
     // if the path ends with .data which we expect it to.
-    if (props.configProperty.endsWith(".data")) {
+    if (configProperty.endsWith(".data")) {
       // we remove the .data and get the path of the sort object
       // NOTE: 5 is used because (.data) = 5
-      sortingObjectPath = props.configProperty.substring(
+      const sortingObjectPath = configProperty.substring(
         0,
-        props.configProperty.length - 5,
+        configProperty.length - 5,
       );
-    }
-    // sortDataValue is the path to the value (.data included) itself in the sort object
-    const sortDataValue = get(formValues, props.configProperty);
-    // sort object value is the path to the sort object itself.
-    const sortObjectValue = get(formValues, sortingObjectPath);
-
-    // The reason we are making this check is to prevent new fields from being pushed when the form control is visited
-    // for some reason the fields object is initially undefined in first render, before being initialized with the correct values after.
-    // so we check to see if the sortObjectValue exist first (if the value has been initalized).
-    if (!sortObjectValue) {
-      return;
-    }
 
-    // then we check if the redux fields have any items in it,
-    // and we also check if the value exists in the redux state as an array and if that value has no items in it.
-    // if they are both empty we want to push a new field.
-    // We also want to check if the value is undefined, this means that the sort data value is non existent, if it is, we want to push a new field.
-    if (
-      (props.fields.length < 1 &&
-        isArray(sortDataValue) &&
-        sortDataValue.length < 1) ||
-      (props.fields.length < 1 && !sortDataValue)
-    ) {
-      props.fields.push({
-        column: "",
-        order: OrderDropDownValues.ASCENDING,
-      });
-    } else {
-      onDeletePressed(props.index);
+      // sortDataValue is the path to the value (.data included) itself in the sort object
+      const sortDataValue = get(formValues, configProperty);
+      // sort object value is the path to the sort object itself.
+      const sortObjectValue = get(formValues, sortingObjectPath);
+
+      // The reason we are making this check is to prevent new fields from being pushed when the form control is visited
+      // for some reason the fields object is initially undefined in first render, before being initialized with the correct values after.
+      // so we check to see if the sortObjectValue exist first (if the value has been initalized).
+      if (sortObjectValue) {
+        // then we check if the redux fields have any items in it,
+        // and we also check if the value exists in the redux state as an array and if that value has no items in it.
+        // if they are both empty we want to push a new field.
+        // We also want to check if the value is undefined, this means that the sort data value is non existent, if it is, we want to push a new field.
+        if (
+          (fields.length < 1 &&
+            isArray(sortDataValue) &&
+            sortDataValue.length < 1) ||
+          (fields.length < 1 && !sortDataValue)
+        ) {
+          fields.push({
+            column: "",
+            order: OrderDropDownValues.ASCENDING,
+          });
+        }
+      }
     }
-  }, [props.fields.length]);
+  }, [fields.length]);
 
   return (
-    <SortingContainer className={`t--${props?.configProperty}`} ref={targetRef}>
-      {props.fields &&
-        props.fields.length > 0 &&
-        // TODO: Fix this the next time the file is edited
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        props.fields.map((field: any, index: number) => {
+    <SortingContainer
+      className={`t--${props?.configProperty}`}
+      isBreakpointSmall={isBreakpointSmall}
+      ref={targetRef}
+    >
+      {fields &&
+        fields.length > 0 &&
+        fields.map((field, index: number) => {
           const columnPath = getBindingOrConfigPathsForSortingControl(
             SortingSubComponent.Column,
             field,
-            undefined,
           );
-          const OrderPath = getBindingOrConfigPathsForSortingControl(
+
+          const orderPath = getBindingOrConfigPathsForSortingControl(
             SortingSubComponent.Order,
             field,
-            undefined,
           );
+
           return (
-            <SortingDropdownContainer key={index} size={size}>
-              <ColumnDropdownContainer>
+            <React.Fragment key={index}>
+              <SortingFields isBreakpointSmall={isBreakpointSmall}>
                 <FormControl
                   config={{
                     ...columnFieldConfig,
                     customStyles: {
-                      width: "250px",
+                      width: "100%",
                     },
-                    configProperty: `${columnPath}`,
+                    configProperty: columnPath,
                     nestedFormControl: true,
                   }}
-                  formName={props.formName}
+                  formName={formName}
                 />
-              </ColumnDropdownContainer>
-              <FormControl
-                config={{
-                  ...orderFieldConfig,
-                  configProperty: `${OrderPath}`,
-                  nestedFormControl: true,
-                  customStyles: {
-                    width: isBreakpointSmall ? "65px" : "250px",
-                  },
-                  optionWidth: isBreakpointSmall ? "250px" : undefined,
-                }}
-                formName={props.formName}
-              />
-              {/* Component to render the delete icon */}
-              <CenteredButton
+                <FormControl
+                  config={{
+                    ...orderFieldConfig,
+                    customStyles: {
+                      maxWidth: "180px",
+                    },
+                    configProperty: orderPath,
+                    nestedFormControl: true,
+                  }}
+                  formName={formName}
+                />
+              </SortingFields>
+              <Button
                 data-testid={`t--sorting-delete-[${index}]`}
                 isIconButton
                 kind="tertiary"
-                onClick={(e: React.MouseEvent) => {
-                  e.stopPropagation();
+                onClick={() => {
                   onDeletePressed(index);
                 }}
                 size="md"
                 startIcon="close-line"
+                value={index}
               />
-            </SortingDropdownContainer>
+            </React.Fragment>
           );
         })}
       <ButtonWrapper>
@@ -219,7 +196,7 @@ function SortingComponent(props: any) {
           data-testid={`t--sorting-add-field`}
           kind="tertiary"
           onClick={() =>
-            props.fields.push({
+            fields.push({
               column: "",
               order: OrderDropDownValues.ASCENDING,
             })
@@ -240,18 +217,18 @@ export default function SortingControl(props: SortingControlProps) {
     formName, // Name of the form, used by redux-form lib to store the data in redux store
   } = props;
 
+  const fieldArrayProps = useMemo(
+    () => ({ configProperty, formName }),
+    [configProperty, formName],
+  );
+
   return (
     <FieldArray
       component={SortingComponent}
-      key={`${configProperty}`}
-      name={`${configProperty}`}
-      props={{
-        configProperty,
-        formName,
-      }}
+      key={configProperty}
+      name={configProperty}
+      props={fieldArrayProps}
       rerenderOnEveryChange={false}
     />
   );
 }
-
-export type SortingControlProps = ControlProps;
diff --git a/app/client/src/components/formControls/utils.ts b/app/client/src/components/formControls/utils.ts
index 465337ec03ff..5f214ca09198 100644
--- a/app/client/src/components/formControls/utils.ts
+++ b/app/client/src/components/formControls/utils.ts
@@ -17,6 +17,7 @@ import { getType, Types } from "utils/TypeHelpers";
 import { FIELD_REQUIRED_ERROR, createMessage } from "ee/constants/messages";
 import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
 import { InputTypes } from "components/constants";
+import { startAndEndSpanForFn } from "UITelemetry/generateTraces";
 
 // This function checks if the form is dirty
 // We needed this in the cases where datasources are created from APIs and the initial value
@@ -682,7 +683,15 @@ export const updateEvaluatedSectionConfig = (
 
   // leaving the commented code as a reminder of the above observation.
   // const updatedSection = { ...section };
-  const updatedSection = klona(section);
+
+  const updatedSection = startAndEndSpanForFn(
+    "klona",
+    {
+      codeSegment: "utils.updateEvaluatedSectionConfig",
+    },
+    () => klona(section),
+  );
+
   let evaluatedConfig: FormConfigEvalObject = {};
   if (
     conditionalOutput.hasOwnProperty("evaluateFormConfig") &&
diff --git a/app/client/src/components/propertyControls/ColorPickerComponentV2.tsx b/app/client/src/components/propertyControls/ColorPickerComponentV2.tsx
index 0c6ee7626076..455f193fe060 100644
--- a/app/client/src/components/propertyControls/ColorPickerComponentV2.tsx
+++ b/app/client/src/components/propertyControls/ColorPickerComponentV2.tsx
@@ -367,12 +367,11 @@ const ColorPickerComponent = React.forwardRef(
       defaultFullColorPickerValue,
     );
 
-    const debouncedOnChange = React.useCallback(
-      debounce((color: string, isUpdatedViaKeyboard: boolean) => {
+    const debouncedOnChange = useMemo(() => {
+      return debounce((color: string, isUpdatedViaKeyboard: boolean) => {
         props.changeColor(color, isUpdatedViaKeyboard);
-      }, DEBOUNCE_TIMER),
-      [],
-    );
+      }, DEBOUNCE_TIMER);
+    }, [props]);
 
     useEffect(() => {
       setIsOpen(isOpenProp);
@@ -545,13 +544,17 @@ const ColorPickerComponent = React.forwardRef(
       };
     }, [handleKeydown]);
 
-    const handleChangeColor = (event: React.ChangeEvent<HTMLInputElement>) => {
-      const value = event.target.value;
-      if (isValidColor(value)) {
-        debouncedOnChange(value, true);
-      }
-      setColor(value);
-    };
+    const handleChangeColor = useCallback(
+      (event: React.ChangeEvent<HTMLInputElement>) => {
+        const value = event.target.value || "";
+
+        if (isValidColor(value)) {
+          debouncedOnChange(value, true);
+        }
+        setColor(value);
+      },
+      [debouncedOnChange],
+    );
 
     // if props.color changes and state color is different,
     // sets the state color to props color
diff --git a/app/client/src/components/propertyControls/FieldConfigurationControl.tsx b/app/client/src/components/propertyControls/FieldConfigurationControl.tsx
index 89791db0fc5d..84386a3694cb 100644
--- a/app/client/src/components/propertyControls/FieldConfigurationControl.tsx
+++ b/app/client/src/components/propertyControls/FieldConfigurationControl.tsx
@@ -1,6 +1,5 @@
 import React from "react";
 import log from "loglevel";
-import { klona } from "klona";
 import { isEmpty, isString, maxBy, set, sortBy } from "lodash";
 
 import type { ControlProps } from "./BaseControl";
@@ -26,6 +25,8 @@ import {
   extraSpace,
 } from "widgets/JSONFormWidget/constants";
 
+import { klonaRegularWithTelemetry } from "utils/helpers";
+
 type DroppableItem = BaseItemProps & {
   index: number;
   isCustomField: boolean;
@@ -165,8 +166,12 @@ class FieldConfigurationControl extends BaseControl<ControlProps, State> {
        * the new added paths gets into the dynamicBindingPathList until
        * the updateProperty function is fixed.
        */
+
       const updatedSchema = {
-        schema: klona(widgetProperties.schema),
+        schema: klonaRegularWithTelemetry(
+          widgetProperties.schema,
+          "FieldConfigurationControl.addNewField",
+        ),
       };
       set(updatedSchema, path, schemaItem);
 
@@ -187,7 +192,10 @@ class FieldConfigurationControl extends BaseControl<ControlProps, State> {
 
   updateItems = (items: DroppableItem[]) => {
     const { propertyName, propertyValue } = this.props;
-    const clonedSchema: Schema = klona(propertyValue);
+    const clonedSchema: Schema = klonaRegularWithTelemetry(
+      propertyValue,
+      "FieldConfigurationControl.updateItems",
+    );
 
     items.forEach((item, index) => {
       clonedSchema[item.id].position = index;
diff --git a/app/client/src/components/propertyControls/KeyValueComponent.tsx b/app/client/src/components/propertyControls/KeyValueComponent.tsx
index 0ec815db0ece..a2f3add9a92a 100644
--- a/app/client/src/components/propertyControls/KeyValueComponent.tsx
+++ b/app/client/src/components/propertyControls/KeyValueComponent.tsx
@@ -214,6 +214,8 @@ export function KeyValueComponent(props: KeyValueComponentProps) {
             />
             <StyledBox />
             <Button
+              // At least one pair must be present
+              isDisabled={renderPairs.length <= 1}
               isIconButton
               kind="tertiary"
               onClick={(e: React.MouseEvent) => {
diff --git a/app/client/src/constants/PropertyControlConstants.tsx b/app/client/src/constants/PropertyControlConstants.tsx
index d6955b7754c8..874b8aa8aeec 100644
--- a/app/client/src/constants/PropertyControlConstants.tsx
+++ b/app/client/src/constants/PropertyControlConstants.tsx
@@ -55,15 +55,18 @@ export interface PanelConfig {
 }
 
 export interface PropertyPaneControlConfig {
+  // unique id to identify the property. It is added automatically with generateReactKey()
   id?: string;
+  // label is used to display the name of the property
   label: string;
+  // unique name of the property
   propertyName: string;
   // Serves in the tooltip
   helpText?: string;
-  //Dynamic text serves below the property pane inputs
-  // TODO: Fix this the next time the file is edited
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  helperText?: ((props: any) => React.ReactNode) | React.ReactNode;
+  // Dynamic text serves below the property pane inputs
+  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
   isJSConvertible?: boolean;
   customJSControl?: string;
   controlType: ControlType;
@@ -80,6 +83,7 @@ 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
   updateHook?: (
     // TODO: Fix this the next time the file is edited
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -101,10 +105,12 @@ export interface PropertyPaneControlConfig {
   // 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
   dependencies?: string[];
   dynamicDependencies?: (widget: WidgetProps) => string[];
   evaluatedDependencies?: string[]; // dependencies to be picked from the __evaluated__ object
   expected?: CodeEditorExpected;
+  // Used to get value of the property from stylesheet config. Used in app theming v1 ( Not needed in anvil )
   getStylesheetValue?: (
     // 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/ee/pages/Editor/AppPluginActionEditor/AppPluginActionEditor.tsx b/app/client/src/ee/pages/Editor/AppPluginActionEditor/AppPluginActionEditor.tsx
new file mode 100644
index 000000000000..2d974cc98581
--- /dev/null
+++ b/app/client/src/ee/pages/Editor/AppPluginActionEditor/AppPluginActionEditor.tsx
@@ -0,0 +1,3 @@
+import { default as CE_AppPluginActionEditor } from "ce/pages/Editor/AppPluginActionEditor/AppPluginActionEditor";
+
+export default CE_AppPluginActionEditor;
diff --git a/app/client/src/ee/sagas/PageSagas.tsx b/app/client/src/ee/sagas/PageSagas.tsx
index 2f52077ca52a..1661b83810a2 100644
--- a/app/client/src/ee/sagas/PageSagas.tsx
+++ b/app/client/src/ee/sagas/PageSagas.tsx
@@ -21,6 +21,7 @@ import {
   refreshTheApp,
   setupPageSaga,
   setupPublishedPageSaga,
+  fetchPublishedPageResourcesSaga,
 } from "ce/sagas/PageSagas";
 import {
   all,
@@ -72,5 +73,9 @@ export default function* pageSagas() {
       ReduxActionTypes.SETUP_PUBLISHED_PAGE_INIT,
       setupPublishedPageSaga,
     ),
+    takeLatest(
+      ReduxActionTypes.FETCH_PUBLISHED_PAGE_RESOURCES_INIT,
+      fetchPublishedPageResourcesSaga,
+    ),
   ]);
 }
diff --git a/app/client/src/entities/AppTheming/index.ts b/app/client/src/entities/AppTheming/index.ts
index 74f785366ab4..b5ce82c73ef3 100644
--- a/app/client/src/entities/AppTheming/index.ts
+++ b/app/client/src/entities/AppTheming/index.ts
@@ -67,7 +67,7 @@ export interface AppThemeProperties {
   colors: {
     primaryColor: string;
     backgroundColor: string;
-    [key: string]: string;
+    [key: Exclude<string, number>]: string;
   };
   borderRadius: {
     [key: string]: string;
diff --git a/app/client/src/entities/DependencyMap/DependencyMapUtils.ts b/app/client/src/entities/DependencyMap/DependencyMapUtils.ts
index 648814575d54..ddcb0e20735f 100644
--- a/app/client/src/entities/DependencyMap/DependencyMapUtils.ts
+++ b/app/client/src/entities/DependencyMap/DependencyMapUtils.ts
@@ -37,7 +37,7 @@ export class DependencyMapUtils {
       return { success: false, cyclicNode: node, error };
     }
   }
-
+  // this function links childNode to its parent as a dependency for the entire dependencyGraph
   static makeParentsDependOnChildren(dependencyMap: DependencyMap) {
     const dependencies = dependencyMap.rawDependencies;
     for (const [node, deps] of dependencies.entries()) {
@@ -49,6 +49,25 @@ export class DependencyMapUtils {
     return dependencyMap;
   }
 
+  // this function links childNode to its parent as a dependency for only affectedNodes in the graph
+  static linkAffectedChildNodesToParent(
+    dependencyMap: DependencyMap,
+    affectedSet: Set<string>,
+  ) {
+    const dependencies = dependencyMap.rawDependencies;
+    for (const [node, deps] of dependencies.entries()) {
+      if (affectedSet.has(node)) {
+        DependencyMapUtils.makeParentsDependOnChild(dependencyMap, node);
+      }
+      deps.forEach((dep) => {
+        if (affectedSet.has(dep)) {
+          DependencyMapUtils.makeParentsDependOnChild(dependencyMap, dep);
+        }
+      });
+    }
+    return dependencyMap;
+  }
+
   static makeParentsDependOnChild = (
     dependencyMap: DependencyMap,
     child: string,
diff --git a/app/client/src/entities/DependencyMap/__tests__/index.test.ts b/app/client/src/entities/DependencyMap/__tests__/index.test.ts
index a528236f6a1d..9dadc17ed0e7 100644
--- a/app/client/src/entities/DependencyMap/__tests__/index.test.ts
+++ b/app/client/src/entities/DependencyMap/__tests__/index.test.ts
@@ -2708,6 +2708,70 @@ describe("Tests for DependencyMapUtils", () => {
       "Api1",
     ]);
   }
+  describe("linkAffectedChildNodesToParent", () => {
+    const createSomeDependencyMap = () => {
+      const dependencyMap = new DependencyMap();
+      dependencyMap.addNodes({
+        tableWidget: true,
+        apiData: true,
+        "tableWidget.tableData": true,
+        "apiData.data": true,
+        "apiData.allData": true,
+        "apiData.allData.paginatedData": true,
+      });
+      dependencyMap.addDependency("tableWidget", ["tableWidget.tableData"]);
+      return dependencyMap;
+    };
+
+    test("should link child node to its parentNode as a dependant", () => {
+      const dependencyMap = createSomeDependencyMap();
+      dependencyMap.addDependency("tableWidget.tableData", ["apiData.data"]);
+      // although "apiData.data" was attached as a dependency to "tableWidget.tableData", it's parent "apiData" also needs to be linked to "apiData.data"
+      expect(dependencyMap.rawDependencies.get("apiData")).toEqual(undefined);
+      const affectedNodes = new Set(["apiData.data"]);
+      DependencyMapUtils.linkAffectedChildNodesToParent(
+        dependencyMap,
+        affectedNodes,
+      );
+      // after linkAffectedChildNodesToParent execution "apiData" does get linked to "apiData.data"
+      expect(dependencyMap.rawDependencies.get("apiData")).toEqual(
+        new Set(["apiData.data"]),
+      );
+    });
+    test("should not link child node to its parentNode as a dependant when the child node is not affected ", () => {
+      const dependencyMap = createSomeDependencyMap();
+      dependencyMap.addDependency("tableWidget.tableData", ["apiData.data"]);
+      // although "apiData.data" was attached as a dependency to "tableWidget.tableData", it's parent "apiData" also needs to be linked to "apiData.data"
+      expect(dependencyMap.rawDependencies.get("apiData")).toEqual(undefined);
+      const emptyAffectedNodes = new Set([]);
+      DependencyMapUtils.linkAffectedChildNodesToParent(
+        dependencyMap,
+        emptyAffectedNodes,
+      );
+      expect(dependencyMap.rawDependencies.get("apiData")).toEqual(undefined);
+    });
+
+    test("should link child node to its grand parent node as a dependant", () => {
+      const dependencyMap = createSomeDependencyMap();
+      dependencyMap.addDependency("tableWidget.tableData", [
+        "apiData.allData.paginatedData",
+      ]);
+      expect(dependencyMap.rawDependencies.get("apiData")).toEqual(undefined);
+      const affectedNodes = new Set(["apiData.allData.paginatedData"]);
+
+      DependencyMapUtils.linkAffectedChildNodesToParent(
+        dependencyMap,
+        affectedNodes,
+      );
+      // after linkAffectedChildNodesToParent execution "apiData.allData.paginatedData" get linked to "apiData.data" and its parent "apiData.data" gets linked to "apiData"
+      expect(dependencyMap.getDirectDependencies("apiData")).toEqual([
+        "apiData.allData",
+      ]);
+      expect(dependencyMap.getDirectDependencies("apiData.allData")).toEqual([
+        "apiData.allData.paginatedData",
+      ]);
+    });
+  });
   describe("makeParentsDependOnChild", () => {
     const createSomeDependencyMap = () => {
       const dependencyMap = new DependencyMap();
diff --git a/app/client/src/layoutSystems/anvil/integrations/sagas/anvilWidgetAdditionSagas/helpers.ts b/app/client/src/layoutSystems/anvil/integrations/sagas/anvilWidgetAdditionSagas/helpers.ts
index 12cbe8e3ab74..b02a03b79f28 100644
--- a/app/client/src/layoutSystems/anvil/integrations/sagas/anvilWidgetAdditionSagas/helpers.ts
+++ b/app/client/src/layoutSystems/anvil/integrations/sagas/anvilWidgetAdditionSagas/helpers.ts
@@ -43,7 +43,6 @@ export function getWidgetSessionValues(
   }
 
   for (const key in configMap) {
-    if (configMap[key] === undefined) continue;
     let sessionStorageKey = `${widgetType}.${key}`;
 
     if (type === "ZONE_WIDGET") {
diff --git a/app/client/src/layoutSystems/anvil/integrations/sagas/pasteSagas/index.ts b/app/client/src/layoutSystems/anvil/integrations/sagas/pasteSagas/index.ts
index 99c347e049ed..8464a30f2ea2 100644
--- a/app/client/src/layoutSystems/anvil/integrations/sagas/pasteSagas/index.ts
+++ b/app/client/src/layoutSystems/anvil/integrations/sagas/pasteSagas/index.ts
@@ -158,6 +158,7 @@ export function* pasteWidgetSagas() {
       payload: {
         action: ReduxActionTypes.PASTE_COPIED_WIDGET_INIT,
         error,
+        logToDebugger: true,
       },
     });
   }
diff --git a/app/client/src/layoutSystems/common/modalOverlay/ModalOverlayLayer.tsx b/app/client/src/layoutSystems/common/modalOverlay/ModalOverlayLayer.tsx
index 8e46be528b3f..6fd20b5b49ab 100644
--- a/app/client/src/layoutSystems/common/modalOverlay/ModalOverlayLayer.tsx
+++ b/app/client/src/layoutSystems/common/modalOverlay/ModalOverlayLayer.tsx
@@ -4,12 +4,12 @@ import React, { useEffect, useState } from "react";
 import type { ReactNode } from "react";
 import styled from "styled-components";
 import { Layers } from "constants/Layers";
-import { theme } from "constants/DefaultTheme";
 import { useDispatch, useSelector } from "react-redux";
 import { getAppViewHeaderHeight } from "selectors/appViewSelectors";
 import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 import { useMaxModalWidth } from "widgets/ModalWidget/component/useModalWidth";
 import { useAppViewerSidebarProperties } from "utils/hooks/useAppViewerSidebarProperties";
+
 const Container = styled.div<{
   width?: number;
   height?: number;
@@ -22,7 +22,6 @@ const Container = styled.div<{
   minSize?: number;
   isEditMode?: boolean;
   headerHeight?: number;
-  smallHeaderHeight?: string;
   leftSidebarWidth?: string;
 }>`
   &&& {
@@ -152,7 +151,6 @@ export function ModalOverlayLayer(props: BaseWidgetProps) {
           maxWidth={maxModalWidth}
           minSize={props.minSize}
           right={props.bottom}
-          smallHeaderHeight={theme.smallHeaderHeight}
           top={props.top}
           width={props.width}
           zIndex={
diff --git a/app/client/src/pages/AdminSettings/components.tsx b/app/client/src/pages/AdminSettings/components.tsx
index db9385eb434b..d2ef42475856 100644
--- a/app/client/src/pages/AdminSettings/components.tsx
+++ b/app/client/src/pages/AdminSettings/components.tsx
@@ -1,6 +1,7 @@
 import styled from "styled-components";
 import { Classes } from "@blueprintjs/core";
 import { Link, Text } from "@appsmith/ads";
+import { IDE_HEADER_HEIGHT } from "IDE";
 
 export const Wrapper = styled.div`
   flex-basis: calc(100% - ${(props) => props.theme.homePage.leftPane.width}px);
@@ -37,7 +38,7 @@ export const BottomSpace = styled.div`
 export const ContentWrapper = styled.div``;
 
 export const LoaderContainer = styled.div`
-  height: ${(props) => `calc(100vh - ${props.theme.smallHeaderHeight})`};
+  height: calc(100vh - ${IDE_HEADER_HEIGHT}px);
   display: flex;
   justify-content: center;
   width: 100%;
diff --git a/app/client/src/pages/AppViewer/Navigation/Sidebar.tsx b/app/client/src/pages/AppViewer/Navigation/Sidebar.tsx
index d02634db11c3..72cdbbf677ca 100644
--- a/app/client/src/pages/AppViewer/Navigation/Sidebar.tsx
+++ b/app/client/src/pages/AppViewer/Navigation/Sidebar.tsx
@@ -30,11 +30,12 @@ import {
   StyledMenuContainer,
   StyledSidebar,
 } from "./Sidebar.styled";
-import { getCurrentThemeDetails } from "selectors/themeSelectors";
 import { getIsAppSettingsPaneWithNavigationTabOpen } from "selectors/appSettingsPaneSelectors";
 import NavigationLogo from "ee/pages/AppViewer/NavigationLogo";
 import MenuItemContainer from "./components/MenuItemContainer";
 import BackToAppsButton from "./components/BackToAppsButton";
+import { IDE_HEADER_HEIGHT } from "IDE";
+import { BOTTOM_BAR_HEIGHT } from "components/BottomBar/constants";
 
 interface SidebarProps {
   currentApplicationDetails?: ApplicationPayload;
@@ -80,7 +81,6 @@ export function Sidebar(props: SidebarProps) {
   const isPinned = useSelector(getAppSidebarPinned);
   const [isOpen, setIsOpen] = useState(true);
   const { x } = useMouse();
-  const theme = useSelector(getCurrentThemeDetails);
   const isPreviewMode = useSelector(combinedPreviewModeSelector);
   const isAppSettingsPaneWithNavigationTabOpen = useSelector(
     getIsAppSettingsPaneWithNavigationTabOpen,
@@ -127,10 +127,10 @@ export function Sidebar(props: SidebarProps) {
     const suffix = ")";
 
     if (isPreviewMode) {
-      prefix += `${theme.smallHeaderHeight} - ${theme.bottomBarHeight}`;
+      prefix += `${IDE_HEADER_HEIGHT}px - ${BOTTOM_BAR_HEIGHT}px`;
     } else if (isAppSettingsPaneWithNavigationTabOpen) {
       // We deduct 64px as well since it is the margin coming from "m-8" class from tailwind
-      prefix += `${theme.smallHeaderHeight} - ${theme.bottomBarHeight} - 64px`;
+      prefix += `${IDE_HEADER_HEIGHT}px - ${BOTTOM_BAR_HEIGHT}px - 64px`;
     } else {
       prefix += "0px";
     }
diff --git a/app/client/src/pages/AppViewer/index.tsx b/app/client/src/pages/AppViewer/index.tsx
index 5fab3e349ef5..8ac8d38e651f 100644
--- a/app/client/src/pages/AppViewer/index.tsx
+++ b/app/client/src/pages/AppViewer/index.tsx
@@ -28,7 +28,10 @@ import { useSelector } from "react-redux";
 import BrandingBadge from "./BrandingBadge";
 import { setAppViewHeaderHeight } from "actions/appViewActions";
 import { CANVAS_SELECTOR } from "constants/WidgetConstants";
-import { setupPublishedPage } from "actions/pageActions";
+import {
+  setupPublishedPage,
+  fetchPublishedPageResourcesAction,
+} from "actions/pageActions";
 import usePrevious from "utils/hooks/usePrevious";
 import { getIsBranchUpdated } from "../utils";
 import { APP_MODE } from "entities/App";
@@ -168,6 +171,9 @@ function AppViewer(props: Props) {
         )?.pageId;
         if (pageId) {
           dispatch(setupPublishedPage(pageId, true));
+
+          // Used for fetching page resources
+          dispatch(fetchPublishedPageResourcesAction(basePageId));
         }
       }
     }
diff --git a/app/client/src/pages/Editor/APIEditor/index.tsx b/app/client/src/pages/Editor/APIEditor/index.tsx
index d7affd3e552f..5241a672b2bf 100644
--- a/app/client/src/pages/Editor/APIEditor/index.tsx
+++ b/app/client/src/pages/Editor/APIEditor/index.tsx
@@ -38,6 +38,7 @@ 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>;
 
@@ -177,6 +178,14 @@ function ApiEditorWrapper(props: ApiEditorWrapperProps) {
     return <ConvertEntityNotification icon={icon} name={action?.name || ""} />;
   }, [action?.name, isConverting]);
 
+  const isActionRedesignEnabled = useFeatureFlag(
+    FEATURE_FLAG.release_actions_redesign_enabled,
+  );
+
+  if (isActionRedesignEnabled) {
+    return <AppPluginActionEditor />;
+  }
+
   return (
     <ApiEditorContextProvider
       actionRightPaneBackLink={actionRightPaneBackLink}
diff --git a/app/client/src/pages/Editor/ActionForm/Section/styles.module.css b/app/client/src/pages/Editor/ActionForm/Section/styles.module.css
index beac00d105fd..e3d2a2d2f309 100644
--- a/app/client/src/pages/Editor/ActionForm/Section/styles.module.css
+++ b/app/client/src/pages/Editor/ActionForm/Section/styles.module.css
@@ -5,7 +5,6 @@
   width: 100%;
   max-width: 800px;
   justify-content: center;
-  container: uqi-section / inline-size;
 
   &[data-standalone="false"] {
     padding-block: var(--ads-v2-spaces-6);
diff --git a/app/client/src/pages/Editor/ActionForm/Zone/styles.module.css b/app/client/src/pages/Editor/ActionForm/Zone/styles.module.css
index 6b04213740de..721ced408468 100644
--- a/app/client/src/pages/Editor/ActionForm/Zone/styles.module.css
+++ b/app/client/src/pages/Editor/ActionForm/Zone/styles.module.css
@@ -5,7 +5,7 @@
   box-sizing: border-box;
 
   &[data-layout="double_column"] {
-    grid-template-columns: repeat(2, minmax(260px, 1fr));
+    grid-template-columns: repeat(auto-fill, minmax(260px, 1fr));
   }
 
   &[data-layout="single_column"] {
@@ -47,11 +47,20 @@
       }
     }
   }
-  /* Removable section ends here */
-}
+  /* DynamicInputTextControl min height and width removed */
+  & :global(.uqi-dynamic-input-text) {
+    width: unset !important;
+    min-height: unset !important;
+  }
 
-@container uqi-section (max-width: 531px) {
-  .zone[data-layout="double_column"] {
-    grid-template-columns: 1fr;
+  /* Remove when code editor min width is resolved in DynamicTextFeildControl */
+  & :global(.dynamic-text-field-control) {
+    min-width: 260px;
+  }
+
+  /* reset ads select min width */
+  & :global(.ads-v2-select > .rc-select-selector) {
+    min-width: unset;
   }
+  /* Removable section ends here */
 }
diff --git a/app/client/src/pages/Editor/AppPluginActionEditor/index.ts b/app/client/src/pages/Editor/AppPluginActionEditor/index.ts
new file mode 100644
index 000000000000..8413ee6ce3fa
--- /dev/null
+++ b/app/client/src/pages/Editor/AppPluginActionEditor/index.ts
@@ -0,0 +1 @@
+export { default as AppPluginActionEditor } from "ee/pages/Editor/AppPluginActionEditor/AppPluginActionEditor";
diff --git a/app/client/src/pages/Editor/Canvas.tsx b/app/client/src/pages/Editor/Canvas.tsx
index d65b7920d463..5d310f366b66 100644
--- a/app/client/src/pages/Editor/Canvas.tsx
+++ b/app/client/src/pages/Editor/Canvas.tsx
@@ -94,7 +94,7 @@ const Canvas = (props: CanvasProps) => {
         <Wrapper
           $enableMainCanvasResizer={!!props.enableMainCanvasResizer}
           background={isAnvilLayout ? "" : backgroundForCanvas}
-          className={`relative t--canvas-artboard ${paddingBottomClass} transition-all duration-400  ${marginHorizontalClass} ${getViewportClassName(
+          className={`relative t--canvas-artboard ${paddingBottomClass} ${marginHorizontalClass} ${getViewportClassName(
             canvasWidth,
           )}`}
           data-testid={"t--canvas-artboard"}
diff --git a/app/client/src/pages/Editor/EditorName/components.ts b/app/client/src/pages/Editor/EditorName/components.ts
index 8152ecf304d0..b9fb3c7177da 100644
--- a/app/client/src/pages/Editor/EditorName/components.ts
+++ b/app/client/src/pages/Editor/EditorName/components.ts
@@ -2,6 +2,7 @@ import styled from "styled-components";
 import { Classes } from "@blueprintjs/core";
 import { getTypographyByKey } from "@appsmith/ads-old";
 import { Icon } from "@appsmith/ads";
+import { IDE_HEADER_HEIGHT } from "IDE";
 
 export const Container = styled.div`
   display: flex;
@@ -10,7 +11,7 @@ export const Container = styled.div`
     background-color: var(--ads-v2-color-bg-subtle);
   }
   & .${Classes.EDITABLE_TEXT} {
-    height: ${(props) => props.theme.smallHeaderHeight} !important;
+    height: ${IDE_HEADER_HEIGHT} !important;
     display: block;
     cursor: pointer;
   }
@@ -21,9 +22,9 @@ export const Container = styled.div`
   &&&& .${Classes.EDITABLE_TEXT_CONTENT}, &&&& .${Classes.EDITABLE_TEXT_INPUT} {
     display: block;
     ${getTypographyByKey("h5")};
-    line-height: ${(props) => props.theme.smallHeaderHeight} !important;
+    line-height: ${IDE_HEADER_HEIGHT} !important;
     padding: 0 ${(props) => props.theme.spaces[2]}px;
-    height: ${(props) => props.theme.smallHeaderHeight} !important;
+    height: ${IDE_HEADER_HEIGHT} !important;
   }
   &&&& .${Classes.EDITABLE_TEXT_INPUT} {
     margin-right: 20px;
diff --git a/app/client/src/pages/Editor/Explorer/Entity/EntityProperties.tsx b/app/client/src/pages/Editor/Explorer/Entity/EntityProperties.tsx
index 228470a69d92..8a5619f47c2a 100644
--- a/app/client/src/pages/Editor/Explorer/Entity/EntityProperties.tsx
+++ b/app/client/src/pages/Editor/Explorer/Entity/EntityProperties.tsx
@@ -16,11 +16,11 @@ import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";
 import {
   APP_SIDEBAR_WIDTH,
   DEFAULT_EXPLORER_PANE_WIDTH,
-} from "../../../../constants/AppConstants";
+} from "constants/AppConstants";
+import { BOTTOM_BAR_HEIGHT } from "components/BottomBar/constants";
 
 const BindingContainerMaxHeight = 300;
 const EntityHeight = 36;
-const BottomBarHeight = 34;
 
 const EntityInfoContainer = styled.div`
   min-width: 220px;
@@ -108,7 +108,7 @@ export function EntityProperties() {
       let bottom;
       if (
         top + BindingContainerMaxHeight >
-        window.innerHeight - BottomBarHeight
+        window.innerHeight - BOTTOM_BAR_HEIGHT
       ) {
         bottom = window.innerHeight - rect?.bottom - EntityHeight;
       }
diff --git a/app/client/src/pages/Editor/Explorer/Files/index.tsx b/app/client/src/pages/Editor/Explorer/Files/index.tsx
index 60c8d524b1c9..0cf1d60055cd 100644
--- a/app/client/src/pages/Editor/Explorer/Files/index.tsx
+++ b/app/client/src/pages/Editor/Explorer/Files/index.tsx
@@ -67,7 +67,7 @@ function Files() {
 
   const onCreate = useCallback(() => {
     openMenu(true);
-  }, [dispatch, openMenu]);
+  }, [openMenu]);
 
   const activeActionBaseId = useActiveActionBaseId();
 
@@ -141,7 +141,7 @@ function Files() {
           );
         }
       }),
-    [files, activeActionBaseId, parentEntityId],
+    [files, activeActionBaseId, parentEntityId, parentEntityType],
   );
 
   const handleClick = useCallback(
@@ -161,7 +161,7 @@ function Files() {
         item.redirect(parentEntityId, DatasourceCreateEntryPoints.SUBMENU);
       }
     },
-    [parentEntityId, dispatch],
+    [dispatch, parentEntityId, parentEntityType],
   );
 
   return (
diff --git a/app/client/src/pages/Editor/IDE/EditorPane/Editor.tsx b/app/client/src/pages/Editor/IDE/EditorPane/Editor.tsx
index e3390b6a1ad5..3cd8bc20150f 100644
--- a/app/client/src/pages/Editor/IDE/EditorPane/Editor.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorPane/Editor.tsx
@@ -11,6 +11,14 @@ import { QueryEditor } from "./Query";
 import EditorTabs from "../EditorTabs";
 import { useCurrentEditorState } from "../hooks";
 import { EditorEntityTab } from "ee/entities/IDE/constants";
+import styled from "styled-components";
+
+const Container = styled(Flex)`
+  // Animating using https://developer.mozilla.org/en-US/docs/Web/API/View_Transitions_API
+  & {
+    view-transition-name: editor-pane;
+  }
+`;
 
 const Editor = () => {
   const { path } = useRouteMatch();
@@ -19,7 +27,7 @@ const Editor = () => {
     return null;
   }
   return (
-    <Flex
+    <Container
       className="relative"
       flex={1}
       flexDirection="column"
@@ -37,7 +45,7 @@ const Editor = () => {
           path={querySegmentRoutes.map((route) => `${path}${route}`)}
         />
       </Switch>
-    </Flex>
+    </Container>
   );
 };
 
diff --git a/app/client/src/pages/Editor/IDE/EditorPane/index.tsx b/app/client/src/pages/Editor/IDE/EditorPane/index.tsx
index 5f8d7d8cdcac..03e4755aa992 100644
--- a/app/client/src/pages/Editor/IDE/EditorPane/index.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorPane/index.tsx
@@ -1,6 +1,5 @@
 import React from "react";
 import { Flex } from "@appsmith/ads";
-import { useEditorPaneWidth } from "../hooks";
 import EditorPaneExplorer from "./Explorer";
 import Editor from "./Editor";
 import { useSelector } from "react-redux";
@@ -9,7 +8,6 @@ import { EditorViewMode } from "ee/entities/IDE/constants";
 import EntityProperties from "pages/Editor/Explorer/Entity/EntityProperties";
 
 const EditorPane = () => {
-  const width = useEditorPaneWidth();
   const ideViewMode = useSelector(getIDEViewMode);
 
   return (
@@ -26,7 +24,7 @@ const EditorPane = () => {
       // @ts-expect-error Fix this the next time the file is edited
       gap="spacing-2"
       height="100%"
-      width={width}
+      width={"100%"}
     >
       {/** Entity Properties component is necessary to render
        the Bindings popover in the context menu.
diff --git a/app/client/src/pages/Editor/IDE/EditorTabs/ScreenModeToggle.tsx b/app/client/src/pages/Editor/IDE/EditorTabs/ScreenModeToggle.tsx
index 7d89cc652fba..70cf5f767362 100644
--- a/app/client/src/pages/Editor/IDE/EditorTabs/ScreenModeToggle.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorTabs/ScreenModeToggle.tsx
@@ -11,24 +11,48 @@ import {
   createMessage,
 } from "ee/constants/messages";
 import { setIdeEditorViewMode } from "actions/ideActions";
+import type { AppState } from "ee/reducers";
+import { selectFeatureFlagCheck } from "ee/selectors/featureFlagsSelectors";
+import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
 
 export const ScreenModeToggle = () => {
   const dispatch = useDispatch();
   const ideViewMode = useSelector(getIDEViewMode);
+  const isAnimatedIDEEnabled = useSelector((state: AppState) => {
+    return selectFeatureFlagCheck(
+      state,
+      FEATURE_FLAG.release_ide_animations_enabled,
+    );
+  });
 
   const switchToFullScreen = useCallback(() => {
     AnalyticsUtil.logEvent("EDITOR_MODE_CHANGE", {
       to: EditorViewMode.FullScreen,
     });
-    dispatch(setIdeEditorViewMode(EditorViewMode.FullScreen));
-  }, [dispatch]);
+
+    // Animating using https://developer.mozilla.org/en-US/docs/Web/API/View_Transitions_API
+    // this has limited availability right now
+    if ("startViewTransition" in document && isAnimatedIDEEnabled) {
+      document.startViewTransition(() => {
+        dispatch(setIdeEditorViewMode(EditorViewMode.FullScreen));
+      });
+    } else {
+      dispatch(setIdeEditorViewMode(EditorViewMode.FullScreen));
+    }
+  }, [dispatch, isAnimatedIDEEnabled]);
 
   const switchToSplitScreen = useCallback(() => {
     AnalyticsUtil.logEvent("EDITOR_MODE_CHANGE", {
       to: EditorViewMode.SplitScreen,
     });
-    dispatch(setIdeEditorViewMode(EditorViewMode.SplitScreen));
-  }, [dispatch]);
+    if ("startViewTransition" in document && isAnimatedIDEEnabled) {
+      document.startViewTransition(() => {
+        dispatch(setIdeEditorViewMode(EditorViewMode.SplitScreen));
+      });
+    } else {
+      dispatch(setIdeEditorViewMode(EditorViewMode.SplitScreen));
+    }
+  }, [dispatch, isAnimatedIDEEnabled]);
 
   if (ideViewMode === EditorViewMode.SplitScreen) {
     return (
diff --git a/app/client/src/pages/Editor/IDE/Layout/AnimatedLayout.tsx b/app/client/src/pages/Editor/IDE/Layout/AnimatedLayout.tsx
new file mode 100644
index 000000000000..69222745fa90
--- /dev/null
+++ b/app/client/src/pages/Editor/IDE/Layout/AnimatedLayout.tsx
@@ -0,0 +1,51 @@
+import React from "react";
+import { useGridLayoutTemplate } from "./hooks/useGridLayoutTemplate";
+import EditorWrapperContainer from "pages/Editor/commons/EditorWrapperContainer";
+import { AnimatedGridLayout, LayoutArea } from "components/AnimatedGridLayout";
+import { useSelector } from "react-redux";
+import BottomBar from "components/BottomBar";
+import Sidebar from "../Sidebar";
+import LeftPane from "../LeftPane";
+import MainPane from "../MainPane";
+import RightPane from "../RightPane";
+import { Areas } from "./constants";
+import ProtectedCallout from "../ProtectedCallout";
+import { protectedModeSelector } from "selectors/gitSyncSelectors";
+
+function AnimatedLayout() {
+  const isProtectedMode = useSelector(protectedModeSelector);
+  const { areas, columns, rows } = useGridLayoutTemplate();
+  if (columns.length === 0) {
+    return null;
+  }
+  return (
+    <>
+      {isProtectedMode && <ProtectedCallout />}
+      <EditorWrapperContainer>
+        <AnimatedGridLayout
+          areas={areas}
+          columns={columns}
+          height="100%"
+          rows={rows}
+          width="100vw"
+        >
+          <LayoutArea name={Areas.Sidebar}>
+            <Sidebar />
+          </LayoutArea>
+          <LayoutArea name={Areas.Explorer}>
+            <LeftPane />
+          </LayoutArea>
+          <LayoutArea name={Areas.WidgetEditor}>
+            <MainPane id="app-body" />
+          </LayoutArea>
+          <LayoutArea name={Areas.PropertyPane}>
+            <RightPane />
+          </LayoutArea>
+        </AnimatedGridLayout>
+      </EditorWrapperContainer>
+      <BottomBar />
+    </>
+  );
+}
+
+export { AnimatedLayout };
diff --git a/app/client/src/pages/Editor/IDE/Layout/UnanimatedLayout.tsx b/app/client/src/pages/Editor/IDE/Layout/UnanimatedLayout.tsx
new file mode 100644
index 000000000000..78d5f079ca6a
--- /dev/null
+++ b/app/client/src/pages/Editor/IDE/Layout/UnanimatedLayout.tsx
@@ -0,0 +1,67 @@
+import React from "react";
+import { useSelector } from "react-redux";
+
+import BottomBar from "components/BottomBar";
+import EditorWrapperContainer from "../../commons/EditorWrapperContainer";
+import Sidebar from "pages/Editor/IDE/Sidebar";
+import LeftPane from "../LeftPane";
+import MainPane from "../MainPane";
+import RightPane from "../RightPane";
+import { protectedModeSelector } from "selectors/gitSyncSelectors";
+import ProtectedCallout from "../ProtectedCallout";
+import { useGridLayoutTemplate } from "./hooks/useGridLayoutTemplate";
+import styled from "styled-components";
+import { Areas } from "./constants";
+
+const GridContainer = styled.div`
+  display: grid;
+  width: 100vw;
+  height: 100%;
+`;
+
+const LayoutContainer = styled.div<{ name: string }>`
+  position: relative;
+  grid-area: ${(props) => props.name};
+`;
+
+function UnanimatedLayout() {
+  const isProtectedMode = useSelector(protectedModeSelector);
+  const { areas, columns } = useGridLayoutTemplate();
+
+  const isSidebarVisible = columns[0] !== "0px";
+
+  return (
+    <>
+      {isProtectedMode && <ProtectedCallout />}
+      <EditorWrapperContainer>
+        <GridContainer
+          style={{
+            gridTemplateRows: "100%",
+            gridTemplateAreas: areas
+              .map((area) => `"${area.join(" ")}"`)
+              .join("\n"),
+            gridTemplateColumns: columns.join(" "),
+          }}
+        >
+          <LayoutContainer name={Areas.Sidebar}>
+            {isSidebarVisible ? <Sidebar /> : <div />}
+          </LayoutContainer>
+          <LayoutContainer name={Areas.Explorer}>
+            <LeftPane />
+          </LayoutContainer>
+          <LayoutContainer name={Areas.WidgetEditor}>
+            <MainPane id="app-body" />
+          </LayoutContainer>
+          <LayoutContainer name={Areas.PropertyPane}>
+            <RightPane />
+          </LayoutContainer>
+        </GridContainer>
+      </EditorWrapperContainer>
+      <BottomBar />
+    </>
+  );
+}
+
+const MemoUanimatedLayout = React.memo(UnanimatedLayout);
+
+export { MemoUanimatedLayout as UnanimatedLayout };
diff --git a/app/client/src/pages/Editor/IDE/Layout/constants.ts b/app/client/src/pages/Editor/IDE/Layout/constants.ts
new file mode 100644
index 000000000000..64e4e5e52c87
--- /dev/null
+++ b/app/client/src/pages/Editor/IDE/Layout/constants.ts
@@ -0,0 +1,15 @@
+import { APP_SIDEBAR_WIDTH } from "constants/AppConstants";
+import type { AnimatedGridUnit } from "components/AnimatedGridLayout";
+
+export const Areas = {
+  Sidebar: "Sidebar",
+  Explorer: "Explorer",
+  CodeEditor: "CodeEditor",
+  WidgetEditor: "WidgetEditor",
+  PropertyPane: "PropertyPane",
+  BottomBar: "BottomBar",
+} as const;
+
+export type Area = keyof typeof Areas;
+
+export const SIDEBAR_WIDTH = (APP_SIDEBAR_WIDTH + "px") as AnimatedGridUnit;
diff --git a/app/client/src/pages/Editor/IDE/Layout/hooks/useEditorStateLeftPaneWidth.ts b/app/client/src/pages/Editor/IDE/Layout/hooks/useEditorStateLeftPaneWidth.ts
new file mode 100644
index 000000000000..54880d9be17e
--- /dev/null
+++ b/app/client/src/pages/Editor/IDE/Layout/hooks/useEditorStateLeftPaneWidth.ts
@@ -0,0 +1,49 @@
+import useWindowDimensions from "utils/hooks/useWindowDimensions";
+import { useEffect, useState } from "react";
+import {
+  APP_SIDEBAR_WIDTH,
+  DEFAULT_EXPLORER_PANE_WIDTH,
+  SPLIT_SCREEN_RATIO,
+} from "constants/AppConstants";
+import { useSelector } from "react-redux";
+import { getIDEViewMode } from "selectors/ideSelectors";
+import { getPropertyPaneWidth } from "selectors/propertyPaneSelectors";
+import { EditorEntityTab, EditorViewMode } from "ee/entities/IDE/constants";
+import { useCurrentEditorState } from "../../hooks";
+import { previewModeSelector } from "selectors/editorSelectors";
+import { protectedModeSelector } from "selectors/gitSyncSelectors";
+
+export const useEditorStateLeftPaneWidth = (): number => {
+  const [windowWidth] = useWindowDimensions();
+  const [width, setWidth] = useState(windowWidth - APP_SIDEBAR_WIDTH);
+  const editorMode = useSelector(getIDEViewMode);
+  const { segment } = useCurrentEditorState();
+  const propertyPaneWidth = useSelector(getPropertyPaneWidth);
+  const isPreviewMode = useSelector(previewModeSelector);
+  const isProtectedMode = useSelector(protectedModeSelector);
+  useEffect(
+    function updateWidth() {
+      if (isPreviewMode || isProtectedMode) {
+        setWidth(0);
+      } else if (segment !== EditorEntityTab.UI) {
+        if (editorMode === EditorViewMode.SplitScreen) {
+          setWidth(windowWidth * SPLIT_SCREEN_RATIO);
+        } else {
+          setWidth(windowWidth - APP_SIDEBAR_WIDTH);
+        }
+      } else {
+        setWidth(DEFAULT_EXPLORER_PANE_WIDTH);
+      }
+    },
+    [
+      editorMode,
+      segment,
+      propertyPaneWidth,
+      windowWidth,
+      isPreviewMode,
+      isProtectedMode,
+    ],
+  );
+
+  return width;
+};
diff --git a/app/client/src/pages/Editor/IDE/Layout/hooks/useGridLayoutTemplate.ts b/app/client/src/pages/Editor/IDE/Layout/hooks/useGridLayoutTemplate.ts
new file mode 100644
index 000000000000..f4a759568207
--- /dev/null
+++ b/app/client/src/pages/Editor/IDE/Layout/hooks/useGridLayoutTemplate.ts
@@ -0,0 +1,164 @@
+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 { getPropertyPaneWidth } from "selectors/propertyPaneSelectors";
+import { previewModeSelector } from "selectors/editorSelectors";
+import { getIDEViewMode } from "selectors/ideSelectors";
+import { protectedModeSelector } from "selectors/gitSyncSelectors";
+import {
+  EditorEntityTab,
+  EditorState,
+  EditorViewMode,
+} from "ee/entities/IDE/constants";
+import {
+  APP_SETTINGS_PANE_WIDTH,
+  APP_SIDEBAR_WIDTH,
+} from "constants/AppConstants";
+import { useEditorStateLeftPaneWidth } from "./useEditorStateLeftPaneWidth";
+import { type Area, Areas, SIDEBAR_WIDTH } from "../constants";
+
+interface ReturnValue {
+  areas: Area[][];
+  rows: AnimatedGridUnit[];
+  columns: AnimatedGridUnit[];
+}
+
+function useGridLayoutTemplate(): ReturnValue {
+  const areas = React.useMemo(function initialiseAreas() {
+    return [
+      [Areas.Sidebar, Areas.Explorer, Areas.WidgetEditor, Areas.PropertyPane],
+    ];
+  }, []);
+  const [columns, setColumns] = React.useState<AnimatedGridUnit[]>([]);
+  const [rows] = React.useState<AnimatedGridUnit[]>(["1fr"]);
+
+  const [windowWidth] = useWindowDimensions();
+  const editorStateLeftPaneWidth = useEditorStateLeftPaneWidth();
+  const PropertyPaneWidth = useSelector(getPropertyPaneWidth);
+  const { segment } = useCurrentEditorState();
+  const appState = useCurrentAppState();
+  const isPreviewMode = useSelector(previewModeSelector);
+  const editorMode = useSelector(getIDEViewMode);
+  const isProtectedMode = useSelector(protectedModeSelector);
+
+  React.useEffect(
+    function updateIDEColumns() {
+      switch (appState) {
+        case EditorState.DATA:
+          if (isPreviewMode || isProtectedMode) {
+            setColumns([
+              "0px",
+              "0px",
+              (windowWidth + "px") as AnimatedGridUnit,
+              "0px",
+            ]);
+          } else {
+            setColumns([
+              SIDEBAR_WIDTH,
+              "300px",
+              (windowWidth - 300 - 50 + "px") as AnimatedGridUnit,
+              "0px",
+            ]);
+          }
+
+          break;
+        case EditorState.SETTINGS:
+          if (isPreviewMode || isProtectedMode) {
+            setColumns([
+              "0px",
+              "0px",
+              (windowWidth + "px") as AnimatedGridUnit,
+              "0px",
+            ]);
+          } else {
+            setColumns([
+              SIDEBAR_WIDTH,
+              (APP_SETTINGS_PANE_WIDTH + "px") as AnimatedGridUnit,
+              (windowWidth -
+                APP_SIDEBAR_WIDTH -
+                APP_SETTINGS_PANE_WIDTH +
+                "px") as AnimatedGridUnit,
+              "0px",
+            ]);
+          }
+          break;
+        case EditorState.LIBRARIES:
+          if (isPreviewMode || isProtectedMode) {
+            setColumns([
+              "0px",
+              "0px",
+              (windowWidth + "px") as AnimatedGridUnit,
+              "0px",
+            ]);
+          } else {
+            setColumns([
+              SIDEBAR_WIDTH,
+              "255px",
+              (windowWidth -
+                APP_SIDEBAR_WIDTH -
+                255 +
+                "px") as AnimatedGridUnit,
+              "0px",
+            ]);
+          }
+          break;
+        case EditorState.EDITOR:
+          if (isPreviewMode || isProtectedMode) {
+            setColumns([
+              "0px",
+              (editorStateLeftPaneWidth + "px") as AnimatedGridUnit,
+              (windowWidth + "px") as AnimatedGridUnit,
+              "0px",
+            ]);
+          } else if (segment !== EditorEntityTab.UI) {
+            if (editorMode === EditorViewMode.SplitScreen) {
+              setColumns([
+                SIDEBAR_WIDTH,
+                (editorStateLeftPaneWidth + "px") as AnimatedGridUnit,
+                (windowWidth -
+                  APP_SIDEBAR_WIDTH -
+                  editorStateLeftPaneWidth +
+                  "px") as AnimatedGridUnit,
+                "0px",
+              ]);
+            } else {
+              setColumns([
+                SIDEBAR_WIDTH,
+                (editorStateLeftPaneWidth + "px") as AnimatedGridUnit,
+                "0px",
+                "0px",
+              ]);
+            }
+          } else {
+            setColumns([
+              SIDEBAR_WIDTH,
+              (editorStateLeftPaneWidth + "px") as AnimatedGridUnit,
+              (windowWidth -
+                APP_SIDEBAR_WIDTH -
+                editorStateLeftPaneWidth -
+                PropertyPaneWidth +
+                1 +
+                "px") as AnimatedGridUnit,
+              (PropertyPaneWidth + 1 + "px") as AnimatedGridUnit,
+            ]);
+          }
+      }
+    },
+    [
+      appState,
+      isPreviewMode,
+      isProtectedMode,
+      editorStateLeftPaneWidth,
+      PropertyPaneWidth,
+      segment,
+      editorMode,
+      windowWidth,
+    ],
+  );
+
+  return { areas, columns, rows };
+}
+
+export { useGridLayoutTemplate };
diff --git a/app/client/src/pages/Editor/IDE/Layout/index.ts b/app/client/src/pages/Editor/IDE/Layout/index.ts
new file mode 100644
index 000000000000..c00321e5f895
--- /dev/null
+++ b/app/client/src/pages/Editor/IDE/Layout/index.ts
@@ -0,0 +1,2 @@
+export { AnimatedLayout } from "./AnimatedLayout";
+export { UnanimatedLayout } from "./UnanimatedLayout";
diff --git a/app/client/src/pages/Editor/IDE/LeftPane/DataSidePane.tsx b/app/client/src/pages/Editor/IDE/LeftPane/DataSidePane.tsx
index 5dfef259d90a..df6e97862314 100644
--- a/app/client/src/pages/Editor/IDE/LeftPane/DataSidePane.tsx
+++ b/app/client/src/pages/Editor/IDE/LeftPane/DataSidePane.tsx
@@ -98,7 +98,7 @@ const DataSidePane = (props: DataSidePaneProps) => {
       borderRight="1px solid var(--ads-v2-color-border)"
       flexDirection="column"
       height="100%"
-      width="300px"
+      width="100%"
     >
       <PaneHeader
         rightIcon={
diff --git a/app/client/src/pages/Editor/IDE/LeftPane/LibrarySidePane.tsx b/app/client/src/pages/Editor/IDE/LeftPane/LibrarySidePane.tsx
index 55724e8700cf..d3341bff7852 100644
--- a/app/client/src/pages/Editor/IDE/LeftPane/LibrarySidePane.tsx
+++ b/app/client/src/pages/Editor/IDE/LeftPane/LibrarySidePane.tsx
@@ -6,7 +6,6 @@ import { selectLibrariesForExplorer } from "ee/selectors/entitiesSelector";
 import { animated, useTransition } from "react-spring";
 import { LibraryEntity } from "pages/Editor/Explorer/Libraries";
 import { Flex } from "@appsmith/ads";
-import { DEFAULT_EXPLORER_PANE_WIDTH } from "constants/AppConstants";
 
 const LibrarySidePane = () => {
   const libraries = useSelector(selectLibrariesForExplorer);
@@ -21,7 +20,7 @@ const LibrarySidePane = () => {
       borderRight="1px solid var(--ads-v2-color-border)"
       flexDirection="column"
       height="100%"
-      width={DEFAULT_EXPLORER_PANE_WIDTH + "px"}
+      width={"100%"}
     >
       <PaneHeader
         rightIcon={<AddLibraryPopover />}
diff --git a/app/client/src/pages/Editor/IDE/LeftPane/index.tsx b/app/client/src/pages/Editor/IDE/LeftPane/index.tsx
index 1883cfb69d79..6066bdd7bf63 100644
--- a/app/client/src/pages/Editor/IDE/LeftPane/index.tsx
+++ b/app/client/src/pages/Editor/IDE/LeftPane/index.tsx
@@ -20,6 +20,7 @@ export const LeftPaneContainer = styled.div<{ showRightBorder?: boolean }>`
   border-right: ${({ showRightBorder = true }) =>
     showRightBorder ? "1px solid var(--ads-v2-color-border)" : "none"};
   background: var(--ads-v2-color-bg);
+  overflow: hidden;
 `;
 
 const LeftPane = () => {
diff --git a/app/client/src/pages/Editor/IDE/MainPane/index.tsx b/app/client/src/pages/Editor/IDE/MainPane/index.tsx
index 0576ff10f556..eb151f55f1be 100644
--- a/app/client/src/pages/Editor/IDE/MainPane/index.tsx
+++ b/app/client/src/pages/Editor/IDE/MainPane/index.tsx
@@ -12,7 +12,7 @@ export const MainPane = (props: { id: string }) => {
 
   return (
     <div
-      className="relative flex flex-col flex-1 overflow-auto z-2"
+      className="relative flex flex-col flex-1 overflow-auto z-2 h-full"
       data-testid="t--ide-main-pane"
       id={props.id}
     >
diff --git a/app/client/src/pages/Editor/IDE/ProtectedCallout.test.tsx b/app/client/src/pages/Editor/IDE/ProtectedCallout.test.tsx
index 5dcc2ddb8a20..935776a01fa4 100644
--- a/app/client/src/pages/Editor/IDE/ProtectedCallout.test.tsx
+++ b/app/client/src/pages/Editor/IDE/ProtectedCallout.test.tsx
@@ -7,12 +7,15 @@ import IDE from ".";
 import { BrowserRouter } from "react-router-dom";
 import "@testing-library/jest-dom";
 import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
+import store from "store";
 
 // TODO: Fix this the next time the file is edited
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const getMockStore = (override: Record<string, any> = {}): any => {
+  const initialState = store.getState();
   const slice = {
     ui: {
+      ...initialState.ui,
       applications: {
         currentApplication: {
           gitApplicationMetadata: {
@@ -32,6 +35,7 @@ const getMockStore = (override: Record<string, any> = {}): any => {
   const mockStore = configureStore([]);
   const newSlice = merge(slice, override);
   return mockStore({
+    ...initialState,
     ...newSlice,
   });
 };
diff --git a/app/client/src/pages/Editor/IDE/ProtectedCallout.tsx b/app/client/src/pages/Editor/IDE/ProtectedCallout.tsx
index b890e22ba5cd..89974ea0a8c4 100644
--- a/app/client/src/pages/Editor/IDE/ProtectedCallout.tsx
+++ b/app/client/src/pages/Editor/IDE/ProtectedCallout.tsx
@@ -19,8 +19,10 @@ import {
   createMessage,
 } from "ee/constants/messages";
 
+export const PROTECTED_CALLOUT_HEIGHT = 70;
+
 const StyledCallout = styled(Callout)`
-  height: 70px;
+  height: ${PROTECTED_CALLOUT_HEIGHT}px;
   overflow-y: hidden;
 `;
 
diff --git a/app/client/src/pages/Editor/IDE/hooks.ts b/app/client/src/pages/Editor/IDE/hooks.ts
index c451965f3441..6c8e0e7fecfa 100644
--- a/app/client/src/pages/Editor/IDE/hooks.ts
+++ b/app/client/src/pages/Editor/IDE/hooks.ts
@@ -4,13 +4,10 @@ import {
   EditorEntityTab,
   EditorEntityTabState,
   EditorState,
-  EditorViewMode,
 } from "ee/entities/IDE/constants";
 import { useLocation } from "react-router";
 import { FocusEntity, identifyEntityFromPath } from "navigation/FocusEntity";
 import { useDispatch, useSelector } from "react-redux";
-import { getIDEViewMode } from "selectors/ideSelectors";
-import { getPropertyPaneWidth } from "selectors/propertyPaneSelectors";
 import history, { NavigationMethod } from "utils/history";
 import {
   builderURL,
@@ -20,11 +17,6 @@ import {
 } from "ee/RouteBuilder";
 import { getCurrentFocusInfo } from "selectors/focusHistorySelectors";
 import { getCurrentGitBranch } from "selectors/gitSyncSelectors";
-import {
-  APP_SIDEBAR_WIDTH,
-  DEFAULT_EXPLORER_PANE_WIDTH,
-  SPLIT_SCREEN_RATIO,
-} from "constants/AppConstants";
 import { getIsAltFocusWidget, getWidgetSelectionBlock } from "selectors/ui";
 import { altFocusWidget, setWidgetSelectionBlock } from "actions/widgetActions";
 import { useJSAdd } from "ee/pages/Editor/IDE/EditorPane/JS/hooks";
@@ -36,7 +28,6 @@ import { closeJSActionTab } from "actions/jsActionActions";
 import { closeQueryActionTab } from "actions/pluginActionActions";
 import { getCurrentBasePageId } from "selectors/editorSelectors";
 import { getCurrentEntityInfo } from "../utils";
-import useWindowDimensions from "../../../utils/hooks/useWindowDimensions";
 
 export const useCurrentAppState = () => {
   const [appState, setAppState] = useState(EditorState.EDITOR);
@@ -75,32 +66,6 @@ export const useCurrentEditorState = () => {
   };
 };
 
-export const useEditorPaneWidth = (): string => {
-  const [windowWidth] = useWindowDimensions();
-  const [width, setWidth] = useState(windowWidth - APP_SIDEBAR_WIDTH + "px");
-  const editorMode = useSelector(getIDEViewMode);
-  const { segment } = useCurrentEditorState();
-  const propertyPaneWidth = useSelector(getPropertyPaneWidth);
-  useEffect(() => {
-    if (editorMode === EditorViewMode.SplitScreen) {
-      if (segment !== EditorEntityTab.UI) {
-        // 1px is propertypane border width
-        setWidth(windowWidth * SPLIT_SCREEN_RATIO + "px");
-      } else {
-        setWidth(DEFAULT_EXPLORER_PANE_WIDTH + "px");
-      }
-    } else {
-      if (segment !== EditorEntityTab.UI) {
-        setWidth(windowWidth - APP_SIDEBAR_WIDTH + "px");
-      } else {
-        setWidth(DEFAULT_EXPLORER_PANE_WIDTH + "px");
-      }
-    }
-  }, [editorMode, segment, propertyPaneWidth, windowWidth]);
-
-  return width;
-};
-
 export const useSegmentNavigation = (): {
   onSegmentChange: (value: string) => void;
 } => {
diff --git a/app/client/src/pages/Editor/IDE/index.tsx b/app/client/src/pages/Editor/IDE/index.tsx
index adb67c53b869..c45236bed249 100644
--- a/app/client/src/pages/Editor/IDE/index.tsx
+++ b/app/client/src/pages/Editor/IDE/index.tsx
@@ -1,61 +1,28 @@
 import React from "react";
+import { selectFeatureFlagCheck } from "ee/selectors/featureFlagsSelectors";
+import { AnimatedLayout, UnanimatedLayout } from "./Layout";
 import { useSelector } from "react-redux";
+import type { AppState } from "ee/reducers";
+import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
 
-import BottomBar from "components/BottomBar";
-import {
-  combinedPreviewModeSelector,
-  previewModeSelector,
-} from "selectors/editorSelectors";
-import EditorWrapperContainer from "../commons/EditorWrapperContainer";
-import Sidebar from "pages/Editor/IDE/Sidebar";
-import LeftPane from "./LeftPane";
-import MainPane from "./MainPane";
-import RightPane from "./RightPane";
-import classNames from "classnames";
-import { tailwindLayers } from "constants/Layers";
-import { protectedModeSelector } from "selectors/gitSyncSelectors";
-import ProtectedCallout from "./ProtectedCallout";
+const checkAnimatedIDEFlagValue = (state: AppState) => {
+  return selectFeatureFlagCheck(
+    state,
+    FEATURE_FLAG.release_ide_animations_enabled,
+  );
+};
 
 /**
  * OldName: MainContainer
  */
 function IDE() {
-  const isPreviewMode = useSelector(previewModeSelector);
-  const isCombinedPreviewMode = useSelector(combinedPreviewModeSelector);
-  const isProtectedMode = useSelector(protectedModeSelector);
-
-  return (
-    <>
-      {isProtectedMode && <ProtectedCallout />}
-      <EditorWrapperContainer>
-        <div
-          className={classNames({
-            [`transition-transform transform duration-400 flex h-full ${tailwindLayers.entityExplorer}`]:
-              true,
-            relative: !isCombinedPreviewMode,
-            "-translate-x-full fixed": isCombinedPreviewMode,
-          })}
-        >
-          <Sidebar />
-          <LeftPane />
-        </div>
-        <MainPane id="app-body" />
-        <div
-          className={classNames({
-            [`transition-transform transform duration-400 h-full ${tailwindLayers.propertyPane}`]:
-              true,
-            relative: !isCombinedPreviewMode,
-            "translate-x-full fixed right-0": isCombinedPreviewMode,
-          })}
-        >
-          <RightPane />
-        </div>
-      </EditorWrapperContainer>
-      <BottomBar viewMode={isPreviewMode} />
-    </>
-  );
+  const isAnimatedIDEEnabled = useSelector(checkAnimatedIDEFlagValue);
+  if (isAnimatedIDEEnabled) {
+    return <AnimatedLayout />;
+  }
+  return <UnanimatedLayout />;
 }
 
-IDE.displayName = "AppsmithIDE";
+IDE.displayName = "AppIDE";
 
 export default React.memo(IDE);
diff --git a/app/client/src/pages/Editor/JSEditor/styledComponents.ts b/app/client/src/pages/Editor/JSEditor/styledComponents.ts
index 7281f698a0b0..d0ac8808b8fa 100644
--- a/app/client/src/pages/Editor/JSEditor/styledComponents.ts
+++ b/app/client/src/pages/Editor/JSEditor/styledComponents.ts
@@ -6,6 +6,7 @@ import {
   RUN_GUTTER_ID,
 } from "./constants";
 import { thinScrollbar } from "constants/DefaultTheme";
+import { IDE_HEADER_HEIGHT } from "IDE";
 
 export const CodeEditorWithGutterStyles = css`
   .${RUN_GUTTER_ID} {
@@ -31,7 +32,7 @@ export const CodeEditorWithGutterStyles = css`
 `;
 
 export const FormWrapper = styled.div`
-  height: ${({ theme }) => `calc(100vh - ${theme.smallHeaderHeight})`};
+  height: calc(100vh - ${IDE_HEADER_HEIGHT}px);
   overflow: hidden;
   .${JS_OBJECT_HOTKEYS_CLASSNAME} {
     width: 100%;
diff --git a/app/client/src/pages/Editor/PropertyPane/PropertyControl.tsx b/app/client/src/pages/Editor/PropertyPane/PropertyControl.tsx
index 16904c1043a2..facfb8577b6f 100644
--- a/app/client/src/pages/Editor/PropertyPane/PropertyControl.tsx
+++ b/app/client/src/pages/Editor/PropertyPane/PropertyControl.tsx
@@ -975,7 +975,7 @@ const PropertyControl = memo((props: Props) => {
                 }
               >
                 <PropertyHelpLabel
-                  className="w-full"
+                  className="fit-content"
                   label={label}
                   theme={props.theme}
                   tooltip={helpText}
diff --git a/app/client/src/pages/Editor/PropertyPane/PropertyPaneTitle.tsx b/app/client/src/pages/Editor/PropertyPane/PropertyPaneTitle.tsx
index ef599656e27c..53e855f44e39 100644
--- a/app/client/src/pages/Editor/PropertyPane/PropertyPaneTitle.tsx
+++ b/app/client/src/pages/Editor/PropertyPane/PropertyPaneTitle.tsx
@@ -19,7 +19,10 @@ import useInteractionAnalyticsEvent from "utils/hooks/useInteractionAnalyticsEve
 
 import type { WidgetType } from "constants/WidgetConstants";
 import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
-import { getIsCurrentWidgetRecentlyAdded } from "selectors/propertyPaneSelectors";
+import {
+  getIsCurrentWidgetRecentlyAdded,
+  getPropertyPaneWidth,
+} from "selectors/propertyPaneSelectors";
 
 interface PropertyPaneTitleProps {
   title: string;
@@ -63,6 +66,7 @@ const PropertyPaneTitle = memo(function PropertyPaneTitle(
   const isCurrentWidgetRecentlyAdded = useSelector(
     getIsCurrentWidgetRecentlyAdded,
   );
+  const width = useSelector(getPropertyPaneWidth);
 
   const { dispatchInteractionAnalyticsEvent, eventEmitterRef } =
     useInteractionAnalyticsEvent<HTMLDivElement>();
@@ -160,8 +164,9 @@ const PropertyPaneTitle = memo(function PropertyPaneTitle(
 
   return props.widgetId || props.isPanelTitle ? (
     <div
-      className="flex items-center w-full px-4 py-3 space-x-1 fixed bg-white z-3"
+      className="flex items-center px-4 py-3 space-x-1 fixed bg-white z-3"
       ref={eventEmitterRef}
+      style={{ width: width + "px" }}
     >
       {/* BACK BUTTON */}
       {props.isPanelTitle && (
diff --git a/app/client/src/pages/Editor/QueryEditor/index.tsx b/app/client/src/pages/Editor/QueryEditor/index.tsx
index c6135365eca6..58cfb59d5ceb 100644
--- a/app/client/src/pages/Editor/QueryEditor/index.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/index.tsx
@@ -41,6 +41,7 @@ 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";
 
 type QueryEditorProps = RouteComponentProps<QueryEditorRouteParams>;
 
@@ -188,6 +189,14 @@ function QueryEditor(props: QueryEditorProps) {
     );
   }, [action?.name, isConverting]);
 
+  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/ThemePropertyPane/ThemeCard.tsx b/app/client/src/pages/Editor/ThemePropertyPane/ThemeCard.tsx
index 223ca194663d..fcdc40d0c1ae 100644
--- a/app/client/src/pages/Editor/ThemePropertyPane/ThemeCard.tsx
+++ b/app/client/src/pages/Editor/ThemePropertyPane/ThemeCard.tsx
@@ -177,6 +177,7 @@ export function ThemeCard(props: ThemeCard) {
             "overflow-hidden": !selectable,
             "hover:shadow-xl cursor-pointer": selectable,
           })}
+          data-testid={`t--theme-card-${theme.name}`}
           onClick={changeSelectedTheme}
         >
           <MainContainer backgroundColor={backgroundColor}>
diff --git a/app/client/src/pages/Editor/ThemePropertyPane/ThemeEditor.tsx b/app/client/src/pages/Editor/ThemePropertyPane/ThemeEditor.tsx
index 1e63890a7302..f6b708d09c24 100644
--- a/app/client/src/pages/Editor/ThemePropertyPane/ThemeEditor.tsx
+++ b/app/client/src/pages/Editor/ThemePropertyPane/ThemeEditor.tsx
@@ -76,7 +76,7 @@ function ThemeEditor() {
 
       dispatch(updateSelectedAppThemeAction({ applicationId, theme }));
     },
-    [updateSelectedAppThemeAction],
+    [applicationId, dispatch],
   );
 
   /**
@@ -91,7 +91,7 @@ function ThemeEditor() {
         AppThemingMode.APP_THEME_SELECTION,
       ]),
     );
-  }, [setAppThemingModeStackAction]);
+  }, [dispatch, themingStack]);
 
   /**
    * resets theme
diff --git a/app/client/src/pages/Editor/ThemePropertyPane/ThemeSelector.tsx b/app/client/src/pages/Editor/ThemePropertyPane/ThemeSelector.tsx
index d192ffef1881..3a74543d5f41 100644
--- a/app/client/src/pages/Editor/ThemePropertyPane/ThemeSelector.tsx
+++ b/app/client/src/pages/Editor/ThemePropertyPane/ThemeSelector.tsx
@@ -76,7 +76,10 @@ function ThemeSelector() {
           ))}
         </section>
       )}
-      <section className="relative p-4 space-y-3">
+      <section
+        className="relative p-4 space-y-3"
+        data-testid="t--featured-themes"
+      >
         <Title className="text-sm font-medium">Featured themes</Title>
         {systemThemes.map((theme) => (
           <ThemeCard
diff --git a/app/client/src/pages/Editor/ThemePropertyPane/controls/ThemeColorControl.tsx b/app/client/src/pages/Editor/ThemePropertyPane/controls/ThemeColorControl.tsx
index c8814af64ba8..15f3b8813ac3 100644
--- a/app/client/src/pages/Editor/ThemePropertyPane/controls/ThemeColorControl.tsx
+++ b/app/client/src/pages/Editor/ThemePropertyPane/controls/ThemeColorControl.tsx
@@ -1,11 +1,12 @@
 import { startCase } from "lodash";
-import React, { useState } from "react";
+import React, { useCallback, useState } from "react";
 import styled from "styled-components";
 
 import type { AppTheme } from "entities/AppTheming";
 import { Tooltip } from "@appsmith/ads";
 import ColorPickerComponent from "components/propertyControls/ColorPickerComponentV2";
 import { capitalizeFirstLetter } from "utils/helpers";
+import { objectKeys } from "@appsmith/utils";
 
 interface ThemeColorControlProps {
   theme: AppTheme;
@@ -33,50 +34,61 @@ function ThemeColorControl(props: ThemeColorControlProps) {
   const [selectedColor, setSelectedColor] = useState<string>("primaryColor");
   const [isFullColorPicker, setFullColorPicker] = React.useState(false);
 
+  const onColorClick = useCallback(
+    (e: React.MouseEvent<HTMLDivElement>) => {
+      const colorName = e.currentTarget.getAttribute("data-color-name");
+      if (!colorName) return;
+
+      setAutoFocus(selectedColor === colorName ? !autoFocus : true);
+      setSelectedColor(colorName);
+    },
+    [autoFocus, selectedColor],
+  );
+
+  const onChangeColor = useCallback(
+    (color: string) => {
+      updateTheme({
+        ...theme,
+        properties: {
+          ...theme.properties,
+          colors: {
+            ...theme.properties.colors,
+            [selectedColor]: color,
+          },
+        },
+      });
+    },
+    [selectedColor, theme, updateTheme],
+  );
+
   return (
     <div className="space-y-2">
       <div className="flex space-x-2">
-        {Object.keys(theme.properties.colors).map(
-          (colorName: string, index: number) => {
-            return (
-              <Tooltip
-                content={capitalizeFirstLetter(startCase(colorName))}
-                key={index}
-              >
-                <ColorBox
-                  background={userDefinedColors[colorName]}
-                  className={selectedColor === colorName ? "selected" : ""}
-                  data-testid={`theme-${colorName}`}
-                  onClick={() => {
-                    setAutoFocus(
-                      selectedColor === colorName ? !autoFocus : true,
-                    );
-                    setSelectedColor(colorName);
-                  }}
-                />
-              </Tooltip>
-            );
-          },
-        )}
+        {objectKeys(theme.properties.colors).map((colorName, index) => {
+          return (
+            <Tooltip
+              content={capitalizeFirstLetter(startCase(colorName as string))}
+              key={index}
+            >
+              <ColorBox
+                background={userDefinedColors[colorName]}
+                className={selectedColor === colorName ? "selected" : ""}
+                data-color-name={colorName}
+                data-testid={`theme-${colorName}`}
+                onClick={onColorClick}
+              />
+            </Tooltip>
+          );
+        })}
       </div>
       {selectedColor && (
         <div className="pt-1 space-y-1">
           <h3>{capitalizeFirstLetter(startCase(selectedColor))}</h3>
           <ColorPickerComponent
             autoFocus={autoFocus}
-            changeColor={(color: string) => {
-              updateTheme({
-                ...theme,
-                properties: {
-                  ...theme.properties,
-                  colors: {
-                    ...theme.properties.colors,
-                    [selectedColor]: color,
-                  },
-                },
-              });
-            }}
+            changeColor={onChangeColor}
             color={userDefinedColors[selectedColor]}
+            data-color={selectedColor}
             isFullColorPicker={isFullColorPicker}
             isOpen={autoFocus}
             key={selectedColor}
diff --git a/app/client/src/pages/Editor/WidgetsEditor/WidgetEditorContainer.tsx b/app/client/src/pages/Editor/WidgetsEditor/WidgetEditorContainer.tsx
index d3c7ec608190..4e0a40ea6986 100644
--- a/app/client/src/pages/Editor/WidgetsEditor/WidgetEditorContainer.tsx
+++ b/app/client/src/pages/Editor/WidgetsEditor/WidgetEditorContainer.tsx
@@ -7,6 +7,13 @@ import { useSelector } from "react-redux";
 import { getIsAppSettingsPaneWithNavigationTabOpen } from "selectors/appSettingsPaneSelectors";
 import { EditorState } from "ee/entities/IDE/constants";
 import { RenderModes } from "constants/WidgetConstants";
+import styled from "styled-components";
+import { IDE_HEADER_HEIGHT } from "IDE";
+import { BOTTOM_BAR_HEIGHT } from "components/BottomBar/constants";
+
+const Container = styled.div`
+  height: calc(100vh - ${IDE_HEADER_HEIGHT} - ${BOTTOM_BAR_HEIGHT});
+`;
 
 /**
  * WidgetEditorContainer
@@ -21,7 +28,7 @@ export const WidgetEditorContainer = (props: { children: ReactNode }) => {
     appState === EditorState.SETTINGS && isNavigationSelectedInSettings;
   return (
     <EditorContextProvider renderMode={RenderModes.CANVAS}>
-      <div className="relative flex flex-row h-full w-full overflow-hidden">
+      <Container className="relative flex flex-row h-full w-full overflow-hidden">
         <div
           className={classNames({
             "relative flex flex-col w-full overflow-hidden": true,
@@ -31,7 +38,7 @@ export const WidgetEditorContainer = (props: { children: ReactNode }) => {
         >
           {props.children}
         </div>
-      </div>
+      </Container>
     </EditorContextProvider>
   );
 };
diff --git a/app/client/src/pages/Editor/WidgetsEditor/components/PropertyPaneWrapper.tsx b/app/client/src/pages/Editor/WidgetsEditor/components/PropertyPaneWrapper.tsx
index 64b5a3f1bad0..4c75e5619285 100644
--- a/app/client/src/pages/Editor/WidgetsEditor/components/PropertyPaneWrapper.tsx
+++ b/app/client/src/pages/Editor/WidgetsEditor/components/PropertyPaneWrapper.tsx
@@ -1,8 +1,5 @@
-import { setPropertyPaneWidthAction } from "actions/propertyPaneActions";
+import React from "react";
 import PropertyPaneSidebar from "components/editorComponents/PropertyPaneSidebar";
-import React, { useCallback } from "react";
-import { useDispatch, useSelector } from "react-redux";
-import { getPropertyPaneWidth } from "selectors/propertyPaneSelectors";
 import { CreateNewQueryModal } from "pages/Editor/IDE/RightPane/components/CreateNewQueryModal";
 
 /**
@@ -12,32 +9,9 @@ import { CreateNewQueryModal } from "pages/Editor/IDE/RightPane/components/Creat
  * It is used to handle the width of the property pane sidebar.
  */
 function PropertyPaneWrapper() {
-  const dispatch = useDispatch();
-  const propertyPaneWidth = useSelector(getPropertyPaneWidth);
-
-  /**
-   * on property pane sidebar drag end
-   *
-   * @return void
-   */
-  const onRightSidebarDragEnd = useCallback(() => {
-    dispatch(setPropertyPaneWidthAction(propertyPaneWidth));
-  }, [propertyPaneWidth]);
-
-  /**
-   * on property pane sidebar width change
-   */
-  const onRightSidebarWidthChange = useCallback((newWidth) => {
-    dispatch(setPropertyPaneWidthAction(newWidth));
-  }, []);
-
   return (
     <>
-      <PropertyPaneSidebar
-        onDragEnd={onRightSidebarDragEnd}
-        onWidthChange={onRightSidebarWidthChange}
-        width={propertyPaneWidth}
-      />
+      <PropertyPaneSidebar />
       <CreateNewQueryModal />
     </>
   );
diff --git a/app/client/src/pages/Editor/commons/EditorHeaderComponents.tsx b/app/client/src/pages/Editor/commons/EditorHeaderComponents.tsx
index ba8f67913cd8..cdaaa0859f32 100644
--- a/app/client/src/pages/Editor/commons/EditorHeaderComponents.tsx
+++ b/app/client/src/pages/Editor/commons/EditorHeaderComponents.tsx
@@ -1,6 +1,7 @@
 import styled from "styled-components";
 import { Profile } from "pages/common/ProfileImage";
 import { getTypographyByKey } from "@appsmith/ads-old";
+import { IDE_HEADER_HEIGHT } from "IDE";
 
 export const HeaderWrapper = styled.div`
   width: 100%;
@@ -10,7 +11,7 @@ export const HeaderWrapper = styled.div`
   flex-direction: row;
   box-shadow: none;
   border-bottom: 1px solid var(--ads-v2-color-border);
-  height: ${(props) => props.theme.smallHeaderHeight};
+  height: ${IDE_HEADER_HEIGHT}px;
   & .editable-application-name {
     ${getTypographyByKey("h4")}
     color: ${(props) => props.theme.colors.header.appName};
diff --git a/app/client/src/pages/Editor/commons/EditorSettingsPaneContainer.tsx b/app/client/src/pages/Editor/commons/EditorSettingsPaneContainer.tsx
index 80fea699a8e0..bd3950310873 100644
--- a/app/client/src/pages/Editor/commons/EditorSettingsPaneContainer.tsx
+++ b/app/client/src/pages/Editor/commons/EditorSettingsPaneContainer.tsx
@@ -1,4 +1,3 @@
-import { APP_SETTINGS_PANE_WIDTH } from "constants/AppConstants";
 import React from "react";
 import styled from "styled-components";
 import PaneHeader from "../IDE/LeftPane/PaneHeader";
@@ -10,7 +9,7 @@ type EditorSettingsPaneContainerProps = React.PropsWithChildren<{
 const SettingsPageWrapper = styled.div`
   display: flex;
   flex-direction: column;
-  width: ${APP_SETTINGS_PANE_WIDTH}px;
+  width: 100%;
 
   &:nth-child(2) {
     height: 100%;
diff --git a/app/client/src/pages/Editor/commons/EditorWrapperContainer.tsx b/app/client/src/pages/Editor/commons/EditorWrapperContainer.tsx
index 9bbd48c2e067..f9ba9ab873e2 100644
--- a/app/client/src/pages/Editor/commons/EditorWrapperContainer.tsx
+++ b/app/client/src/pages/Editor/commons/EditorWrapperContainer.tsx
@@ -4,6 +4,9 @@ import classNames from "classnames";
 import { useSelector } from "react-redux";
 import { combinedPreviewModeSelector } from "../../../selectors/editorSelectors";
 import { protectedModeSelector } from "selectors/gitSyncSelectors";
+import { IDE_HEADER_HEIGHT } from "../../../IDE";
+import { BOTTOM_BAR_HEIGHT } from "../../../components/BottomBar/constants";
+import { PROTECTED_CALLOUT_HEIGHT } from "../IDE/ProtectedCallout";
 
 interface EditorWrapperContainerProps {
   children: React.ReactNode;
@@ -14,9 +17,9 @@ const Wrapper = styled.div<{
 }>`
   display: flex;
   height: calc(
-    100vh - ${(props) => props.theme.smallHeaderHeight} -
-      ${(props) => props.theme.bottomBarHeight} -
-      ${(props) => (props.isProtectedMode ? "70px" : "0px")}
+    100vh - ${IDE_HEADER_HEIGHT}px - ${BOTTOM_BAR_HEIGHT}px -
+      ${(props) =>
+        props.isProtectedMode ? PROTECTED_CALLOUT_HEIGHT + "px" : "0px"}
   );
   background-color: ${(props) => props.theme.appBackground};
 `;
diff --git a/app/client/src/pages/Editor/commons/Omnibar.tsx b/app/client/src/pages/Editor/commons/Omnibar.tsx
index 291286023bf3..0c2fa611f3fb 100644
--- a/app/client/src/pages/Editor/commons/Omnibar.tsx
+++ b/app/client/src/pages/Editor/commons/Omnibar.tsx
@@ -3,13 +3,14 @@ import styled from "styled-components";
 import { snipingModeSelector } from "selectors/editorSelectors";
 import { retryPromise } from "utils/AppsmithUtils";
 import { useSelector } from "react-redux";
+import { IDE_HEADER_HEIGHT } from "IDE";
 
 const BindingBanner = styled.div`
   position: fixed;
   width: 199px;
   height: 36px;
   left: 50%;
-  top: ${(props) => props.theme.smallHeaderHeight};
+  top: ${IDE_HEADER_HEIGHT}px;
   transform: translate(-50%, 0);
   text-align: center;
   background: var(--ads-v2-color-fg-information);
diff --git a/app/client/src/pages/Editor/gitSync/QuickGitActions/AutocommitStatusbar.tsx b/app/client/src/pages/Editor/gitSync/QuickGitActions/AutocommitStatusbar.tsx
index be8245bdc679..169f7cb4929f 100644
--- a/app/client/src/pages/Editor/gitSync/QuickGitActions/AutocommitStatusbar.tsx
+++ b/app/client/src/pages/Editor/gitSync/QuickGitActions/AutocommitStatusbar.tsx
@@ -57,7 +57,7 @@ export default function AutocommitStatusbar({
     }
   });
   return (
-    <StatusbarWrapper>
+    <StatusbarWrapper data-testid="t--autocommit-statusbar">
       <Statusbar
         active={false}
         message={createMessage(AUTOCOMMIT_IN_PROGRESS_MESSAGE)}
diff --git a/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx b/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx
index 8045363c0c87..5836324abb38 100644
--- a/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx
+++ b/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx
@@ -39,7 +39,6 @@ import {
   setWorkspaceIdForImport,
 } from "ee/actions/applicationActions";
 import type { Datasource } from "entities/Datasource";
-import DatasourceForm from "../DataSourceEditor";
 import AnalyticsUtil from "ee/utils/AnalyticsUtil";
 import { useQuery } from "../utils";
 import ListItemWrapper from "./components/DatasourceListItem";
@@ -76,6 +75,7 @@ import { getApplicationsOfWorkspace } from "ee/selectors/selectedWorkspaceSelect
 import useReconnectModalData from "ee/pages/Editor/gitSync/useReconnectModalData";
 import { resetImportData } from "ee/actions/workspaceActions";
 import { getLoadingTokenForDatasourceId } from "selectors/datasourceSelectors";
+import ReconnectDatasourceForm from "Datasource/components/ReconnectDatasourceForm";
 
 const Section = styled.div`
   display: flex;
@@ -609,12 +609,9 @@ function ReconnectDatasourceModal() {
 
               <DBFormWrapper>
                 {shouldShowDBForm && (
-                  <DatasourceForm
+                  <ReconnectDatasourceForm
                     applicationId={editorId}
                     datasourceId={selectedDatasourceId}
-                    fromImporting
-                    // isInsideReconnectModal: indicates that the datasource form is rendering inside reconnect modal
-                    isInsideReconnectModal
                     pageId={parentEntityId}
                   />
                 )}
diff --git a/app/client/src/pages/Editor/gitSync/components/GitErrorPopup.tsx b/app/client/src/pages/Editor/gitSync/components/GitErrorPopup.tsx
index 181714cb73b3..f86b4f4ee7c8 100644
--- a/app/client/src/pages/Editor/gitSync/components/GitErrorPopup.tsx
+++ b/app/client/src/pages/Editor/gitSync/components/GitErrorPopup.tsx
@@ -17,6 +17,7 @@ import { Colors } from "constants/Colors";
 import ConflictInfo from "../components/ConflictInfo";
 import { getCurrentAppGitMetaData } from "ee/selectors/applicationSelectors";
 import { Button } from "@appsmith/ads";
+import { BOTTOM_BAR_HEIGHT } from "../../../../components/BottomBar/constants";
 
 const StyledGitErrorPopup = styled.div`
   & {
@@ -31,7 +32,7 @@ const StyledGitErrorPopup = styled.div`
       .${Classes.OVERLAY_CONTENT} {
         overflow: hidden;
         bottom: ${(props) =>
-          `calc(${props.theme.bottomBarHeight} + ${props.theme.spaces[3]}px)`};
+          `calc(${BOTTOM_BAR_HEIGHT}px + ${props.theme.spaces[3]}px)`};
         left: ${(props) => props.theme.spaces[3]}px;
         background-color: ${Colors.WHITE};
       }
diff --git a/app/client/src/pages/Editor/index.tsx b/app/client/src/pages/Editor/index.tsx
index 8e02269316fc..bd9230a97b60 100644
--- a/app/client/src/pages/Editor/index.tsx
+++ b/app/client/src/pages/Editor/index.tsx
@@ -50,6 +50,7 @@ import { PartialExportModal } from "components/editorComponents/PartialImportExp
 import { PartialImportModal } from "components/editorComponents/PartialImportExport/PartialImportModal";
 import type { Page } from "entities/Page";
 import { AppCURLImportModal } from "ee/pages/Editor/CurlImport";
+import { IDE_HEADER_HEIGHT } from "IDE";
 
 interface EditorProps {
   currentApplicationId?: string;
@@ -77,6 +78,8 @@ interface EditorProps {
 type Props = EditorProps & RouteComponentProps<BuilderRouteParams>;
 
 class Editor extends Component<Props> {
+  prevPageId: string | null = null;
+
   componentDidMount() {
     const { basePageId } = this.props.match.params || {};
     urlBuilder.setCurrentBasePageId(basePageId);
@@ -110,7 +113,24 @@ class Editor extends Component<Props> {
 
   componentDidUpdate(prevProps: Props) {
     const { baseApplicationId, basePageId } = this.props.match.params || {};
-    const { basePageId: prevPageBaseId } = prevProps.match.params || {};
+    const { basePageId: prevBasePageId } = prevProps.match.params || {};
+
+    const pageId = this.props.pages.find(
+      (page) => page.basePageId === basePageId,
+    )?.pageId;
+
+    const prevPageId = prevProps.pages.find(
+      (page) => page.basePageId === prevBasePageId,
+    )?.pageId;
+    // caching value for prevPageId as it is required in future lifecycles
+    if (prevPageId) {
+      this.prevPageId = prevPageId;
+    }
+
+    const isPageIdUpdated = pageId !== this.prevPageId;
+    const isBasePageIdUpdated = basePageId !== prevBasePageId;
+    const isPageUpdated = isPageIdUpdated || isBasePageIdUpdated;
+
     const isBranchUpdated = getIsBranchUpdated(
       this.props.location,
       prevProps.location,
@@ -125,8 +145,6 @@ class Editor extends Component<Props> {
       GIT_BRANCH_QUERY_KEY,
     );
 
-    const isPageIdUpdated = basePageId !== prevPageBaseId;
-
     // to prevent re-init during connect
     if (prevBranch && isBranchUpdated && basePageId) {
       this.props.initEditor({
@@ -141,20 +159,10 @@ class Editor extends Component<Props> {
        * If we don't check for `prevPageId`: fetch page is re triggered
        * when redirected to the default page
        */
-      if (
-        prevPageBaseId &&
-        basePageId &&
-        isPageIdUpdated &&
-        this.props.pages.length
-      ) {
-        const pageId = this.props.pages.find(
-          (page) => page.basePageId === basePageId,
-        )?.pageId;
-        if (pageId) {
-          this.props.updateCurrentPage(pageId);
-          this.props.setupPage(pageId);
-          urlBuilder.setCurrentBasePageId(basePageId);
-        }
+      if (pageId && this.prevPageId && isPageUpdated) {
+        this.props.updateCurrentPage(pageId);
+        this.props.setupPage(pageId);
+        urlBuilder.setCurrentBasePageId(basePageId);
       }
     }
   }
@@ -168,7 +176,7 @@ class Editor extends Component<Props> {
     if (!this.props.isEditorInitialized || this.props.loadingGuidedTour) {
       return (
         <CenteredWrapper
-          style={{ height: `calc(100vh - ${theme.smallHeaderHeight})` }}
+          style={{ height: `calc(100vh - ${IDE_HEADER_HEIGHT}px)` }}
         >
           <Spinner size="lg" />
         </CenteredWrapper>
diff --git a/app/client/src/reducers/entityReducers/canvasWidgetsReducer.ts b/app/client/src/reducers/entityReducers/canvasWidgetsReducer.ts
index b4cfabe4a3c1..197d45f8ac33 100644
--- a/app/client/src/reducers/entityReducers/canvasWidgetsReducer.ts
+++ b/app/client/src/reducers/entityReducers/canvasWidgetsReducer.ts
@@ -11,6 +11,7 @@ import {
 } from "utils/WidgetSizeUtils";
 import { klona } from "klona";
 import type { UpdateCanvasPayload } from "actions/pageActions";
+import type { SetWidgetDynamicPropertyPayload } from "../../actions/controlActions";
 
 /* This type is an object whose keys are widgetIds and values are arrays with property paths
 and property values
@@ -138,6 +139,25 @@ const canvasWidgetsReducer = createImmerReducer(initialState, {
   [ReduxActionTypes.RESET_EDITOR_REQUEST]: () => {
     return klona(initialState);
   },
+  [ReduxActionTypes.SET_WIDGET_DYNAMIC_PROPERTY]: (
+    state: CanvasWidgetsReduxState,
+    action: ReduxAction<SetWidgetDynamicPropertyPayload>,
+  ) => {
+    const { isDynamic, propertyPath, widgetId } = action.payload;
+    const widget = state[widgetId];
+
+    // When options JS mode is disabled, reset the optionLabel and optionValue to standard values
+    if (
+      widget.type === "WDS_SELECT_WIDGET" &&
+      propertyPath === "options" &&
+      !isDynamic
+    ) {
+      set(state, `${widgetId}.optionLabel`, "label");
+      set(state, `${widgetId}.optionValue`, "value");
+    }
+
+    return state;
+  },
 });
 
 export interface CanvasWidgetsReduxState {
diff --git a/app/client/src/reducers/entityReducers/datasourceReducer.ts b/app/client/src/reducers/entityReducers/datasourceReducer.ts
index 58aff62daa23..3b02050ae77d 100644
--- a/app/client/src/reducers/entityReducers/datasourceReducer.ts
+++ b/app/client/src/reducers/entityReducers/datasourceReducer.ts
@@ -370,7 +370,7 @@ const datasourceReducer = createReducer(initialState, {
       loadingTokenForDatasourceId: null,
     };
   },
-  [ReduxActionTypes.GET_OAUTH_ACCESS_TOKEN_ERROR]: (
+  [ReduxActionErrorTypes.GET_OAUTH_ACCESS_TOKEN_ERROR]: (
     state: DatasourceDataState,
   ) => {
     return {
diff --git a/app/client/src/reducers/entityReducers/metaReducer/metaReducerUtils.ts b/app/client/src/reducers/entityReducers/metaReducer/metaReducerUtils.ts
index 88b45c3d643d..9102cf9bd55c 100644
--- a/app/client/src/reducers/entityReducers/metaReducer/metaReducerUtils.ts
+++ b/app/client/src/reducers/entityReducers/metaReducer/metaReducerUtils.ts
@@ -3,12 +3,12 @@ import type {
   WidgetEntityConfig,
   PropertyOverrideDependency,
 } from "ee/entities/DataTree/types";
-import { klona } from "klona";
 import type { MetaState, WidgetMetaState } from ".";
 import type { ReduxAction } from "ee/constants/ReduxActionConstants";
 import type { EvalMetaUpdates } from "ee/workers/common/DataTreeEvaluator/types";
 import produce from "immer";
 import { set, unset } from "lodash";
+import { klonaRegularWithTelemetry } from "utils/helpers";
 
 export function getMetaWidgetResetObj(
   evaluatedWidget: WidgetEntity | undefined,
@@ -28,7 +28,11 @@ export function getMetaWidgetResetObj(
         dependency.DEFAULT && evaluatedWidget[dependency.DEFAULT];
       if (defaultPropertyValue !== undefined) {
         // cloning data to avoid mutation
-        resetMetaObj[propertyName] = klona(defaultPropertyValue);
+
+        resetMetaObj[propertyName] = klonaRegularWithTelemetry(
+          defaultPropertyValue,
+          "metaReducerUtils.getMetaWidgetResetObj",
+        );
       }
     });
   }
@@ -48,7 +52,10 @@ export function setMetaValuesOnResetFromEval(
 
   if (!evalMetaUpdates.length) return state;
 
-  const newMetaState = klona(state);
+  const newMetaState = klonaRegularWithTelemetry(
+    state,
+    "metaReducerUtils.setMetaValuesOnResetFromEval",
+  );
 
   evalMetaUpdates.forEach(({ metaPropertyPath, value, widgetId }) => {
     if (value === undefined) {
diff --git a/app/client/src/reducers/uiReducers/appViewReducer.tsx b/app/client/src/reducers/uiReducers/appViewReducer.tsx
index 893d18219d85..1d3671392f24 100644
--- a/app/client/src/reducers/uiReducers/appViewReducer.tsx
+++ b/app/client/src/reducers/uiReducers/appViewReducer.tsx
@@ -31,6 +31,11 @@ const appViewReducer = createReducer(initialState, {
   ) => {
     return { ...state, isFetchingPage: false };
   },
+  [ReduxActionErrorTypes.FETCH_PUBLISHED_PAGE_RESOURCES_ERROR]: (
+    state: AppViewReduxState,
+  ) => {
+    return { ...state, isFetchingPage: false };
+  },
   [ReduxActionTypes.FETCH_PUBLISHED_PAGE_SUCCESS]: (
     state: AppViewReduxState,
   ) => {
diff --git a/app/client/src/sagas/ActionExecution/PluginActionSaga.ts b/app/client/src/sagas/ActionExecution/PluginActionSaga.ts
index 2759ec738962..85effcfbec3b 100644
--- a/app/client/src/sagas/ActionExecution/PluginActionSaga.ts
+++ b/app/client/src/sagas/ActionExecution/PluginActionSaga.ts
@@ -9,9 +9,9 @@ import {
 } from "redux-saga/effects";
 import * as Sentry from "@sentry/react";
 import type { updateActionDataPayloadType } from "actions/pluginActionActions";
-import { executePageLoadActions } from "actions/pluginActionActions";
 import {
   clearActionResponse,
+  executePageLoadActions,
   executePluginActionError,
   executePluginActionRequest,
   executePluginActionSuccess,
@@ -72,8 +72,7 @@ import {
 } from "sagas/ErrorSagas";
 import AnalyticsUtil from "ee/utils/AnalyticsUtil";
 import type { Action } from "entities/Action";
-import { ActionExecutionContext } from "entities/Action";
-import { PluginType } from "entities/Action";
+import { ActionExecutionContext, PluginType } from "entities/Action";
 import LOG_TYPE from "entities/AppsmithConsole/logtype";
 import {
   ACTION_EXECUTION_CANCELLED,
@@ -1267,9 +1266,8 @@ function* executePageLoadActionsSaga(
     checkAndLogErrorsIfCyclicDependency(layoutOnLoadActionErrors);
   } catch (e) {
     log.error(e);
-
-    toast.show(createMessage(ERROR_FAIL_ON_PAGE_LOAD_ACTIONS), {
-      kind: "error",
+    AppsmithConsole.error({
+      text: createMessage(ERROR_FAIL_ON_PAGE_LOAD_ACTIONS),
     });
   }
   endSpan(span);
diff --git a/app/client/src/sagas/ActionExecution/PostMessageSaga.ts b/app/client/src/sagas/ActionExecution/PostMessageSaga.ts
index d4adb14be729..d9ff09eb85be 100644
--- a/app/client/src/sagas/ActionExecution/PostMessageSaga.ts
+++ b/app/client/src/sagas/ActionExecution/PostMessageSaga.ts
@@ -1,6 +1,6 @@
 import { call, spawn } from "redux-saga/effects";
 import {
-  logActionExecutionError,
+  showToastOnExecutionError,
   TriggerFailureError,
 } from "sagas/ActionExecution/errorUtils";
 import { isEmpty } from "lodash";
@@ -35,6 +35,6 @@ export function* executePostMessage(
       }
     }
   } catch (error) {
-    yield call(logActionExecutionError, (error as Error).message, true);
+    yield call(showToastOnExecutionError, (error as Error).message);
   }
 }
diff --git a/app/client/src/sagas/ActionExecution/errorUtils.ts b/app/client/src/sagas/ActionExecution/errorUtils.ts
index 4b142364a63e..ff3ae8dacc6e 100644
--- a/app/client/src/sagas/ActionExecution/errorUtils.ts
+++ b/app/client/src/sagas/ActionExecution/errorUtils.ts
@@ -5,15 +5,14 @@ import {
 import type { ApiResponse } from "api/ApiResponses";
 import { isString } from "lodash";
 import type { Types } from "utils/TypeHelpers";
-import type { ActionTriggerKeys } from "ee/workers/Evaluation/fns/index";
-import { getActionTriggerFunctionNames } from "ee/workers/Evaluation/fns/index";
-import { getAppMode } from "ee/selectors/applicationSelectors";
+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 store from "store";
 import showToast from "sagas/ToastSagas";
-import { call } from "redux-saga/effects";
+import { call, put } from "redux-saga/effects";
 
 /*
  * The base trigger error that also logs the errors in the debugger.
@@ -55,39 +54,11 @@ export class ActionValidationError extends TriggerFailureError {
   }
 }
 
-export function* logActionExecutionError(
+export function* showToastOnExecutionError(
   errorMessage: string,
-  isExecuteJSFunc = true,
+  showCTA = true,
 ) {
-  //Commenting as per decision taken for the error hanlding epic to not show the trigger errors in the debugger.
-  // if (triggerPropertyName) {
-  //   AppsmithConsole.addErrors([
-  //     {
-  //       payload: {
-  //         id: `${source?.id}-${triggerPropertyName}`,
-  //         logType: LOG_TYPE.TRIGGER_EVAL_ERROR,
-  //         text: createMessage(DEBUGGER_TRIGGER_ERROR, triggerPropertyName),
-  //         source: {
-  //           type: ENTITY_TYPE.WIDGET,
-  //           id: source?.id ?? "",
-  //           name: source?.name ?? "",
-  //           propertyPath: triggerPropertyName,
-  //         },
-  //         messages: [
-  //           {
-  //             type: errorType,
-  //             message: { name: "TriggerExecutionError", message: errorMessage },
-  //           },
-  //         ],
-  //       },
-  //     },
-  //   ]);
-  // }
-
   function onDebugClick() {
-    const appMode = getAppMode(store.getState());
-    if (appMode === "PUBLISHED") return null;
-
     AnalyticsUtil.logEvent("OPEN_DEBUGGER", {
       source: "TOAST",
     });
@@ -95,16 +66,24 @@ export function* logActionExecutionError(
     store.dispatch(setDebuggerSelectedTab(DEBUGGER_TAB_KEYS.ERROR_TAB));
   }
 
-  if (isExecuteJSFunc)
-    // This is the toast that is rendered when any unhandled error occurs in JS object.
-    yield call(showToast, errorMessage, {
-      kind: "error",
-      action: {
+  const action = showCTA
+    ? {
         text: "debug",
         effect: () => onDebugClick(),
         className: "t--toast-debug-button",
-      },
-    });
+      }
+    : undefined;
+
+  // This is the toast that is rendered when any unhandled error occurs in JS object.
+  yield call(showToast, errorMessage, {
+    kind: "error",
+    action,
+  });
+}
+
+export function* showDebuggerOnExecutionError() {
+  yield put(showDebugger(true));
+  yield put(setDebuggerSelectedTab(DEBUGGER_TAB_KEYS.ERROR_TAB));
 }
 
 /*
diff --git a/app/client/src/sagas/ActionExecution/geolocationSaga.test.ts b/app/client/src/sagas/ActionExecution/geolocationSaga.test.ts
index bd846d2b0a74..33c58d8c880b 100644
--- a/app/client/src/sagas/ActionExecution/geolocationSaga.test.ts
+++ b/app/client/src/sagas/ActionExecution/geolocationSaga.test.ts
@@ -5,14 +5,14 @@ import {
   getUserLocation,
 } from "./geolocationSaga";
 import { setUserCurrentGeoLocation } from "actions/browserRequestActions";
-import { logActionExecutionError } from "./errorUtils";
+import { showToastOnExecutionError } from "./errorUtils";
 
 const mockFn = jest.fn();
 
 jest.mock("./errorUtils.ts", () => ({
   // TODO: Fix this the next time the file is edited
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  logActionExecutionError: (payload: any) => mockFn(payload),
+  showToastOnExecutionError: (payload: any) => mockFn(payload),
 }));
 
 describe("getCurrentLocationSaga", () => {
@@ -86,7 +86,7 @@ describe("getCurrentLocationSaga", () => {
 
     expect(iter.next().value).toHaveProperty(
       "payload.fn",
-      logActionExecutionError,
+      showToastOnExecutionError,
     );
     expect(iter.next().done).toBe(true);
   });
diff --git a/app/client/src/sagas/ActionExecution/geolocationSaga.ts b/app/client/src/sagas/ActionExecution/geolocationSaga.ts
index a47e59cf06d0..e0e6bc7db5c5 100644
--- a/app/client/src/sagas/ActionExecution/geolocationSaga.ts
+++ b/app/client/src/sagas/ActionExecution/geolocationSaga.ts
@@ -1,7 +1,7 @@
 import type { EventType } from "constants/AppsmithActionConstants/ActionConstants";
 import type { TriggerMeta } from "ee/sagas/ActionExecution/ActionExecutionSagas";
 import { call, put, spawn, take } from "redux-saga/effects";
-import { logActionExecutionError } from "sagas/ActionExecution/errorUtils";
+import { showToastOnExecutionError } from "sagas/ActionExecution/errorUtils";
 import { setUserCurrentGeoLocation } from "actions/browserRequestActions";
 import type { Channel } from "redux-saga";
 import { channel } from "redux-saga";
@@ -107,7 +107,7 @@ function* errorCallbackHandler(triggerMeta: TriggerMeta, listenerId?: string) {
         { error: sanitizeGeolocationError(error) },
         listenerId,
       );
-    yield call(logActionExecutionError, error.message, true);
+    yield call(showToastOnExecutionError, error.message);
   }
 }
 
@@ -122,7 +122,7 @@ export function* getCurrentLocationSaga(action: TGetGeoLocationDescription) {
     yield put(setUserCurrentGeoLocation(currentLocation));
     return currentLocation;
   } catch (error) {
-    yield call(logActionExecutionError, (error as Error).message, true);
+    yield call(showToastOnExecutionError, (error as Error).message);
     if (error instanceof GeolocationPositionError) {
       const sanitizedError = sanitizeGeolocationError(error);
       throw new GeoLocationError(sanitizedError.message, [sanitizedError]);
@@ -141,9 +141,8 @@ export function* watchCurrentLocation(
     // When a watch is already active, we will not start a new watch.
     // at a given point in time, only one watch is active
     yield call(
-      logActionExecutionError,
+      showToastOnExecutionError,
       "A watchLocation is already active. Clear it before before starting a new one",
-      true,
     );
 
     return;
@@ -171,7 +170,7 @@ export function* watchCurrentLocation(
 
 export function* stopWatchCurrentLocation() {
   if (watchId === undefined) {
-    yield call(logActionExecutionError, "No location watch active", true);
+    yield call(showToastOnExecutionError, "No location watch active");
     return;
   }
   navigator.geolocation.clearWatch(watchId);
diff --git a/app/client/src/sagas/ActionSagas.ts b/app/client/src/sagas/ActionSagas.ts
index 1e4ebe6f6878..94f7cfe44d63 100644
--- a/app/client/src/sagas/ActionSagas.ts
+++ b/app/client/src/sagas/ActionSagas.ts
@@ -106,7 +106,6 @@ import {
   createNewQueryAction,
 } from "actions/apiPaneActions";
 import type { Plugin } from "api/PluginApi";
-import * as log from "loglevel";
 import { shouldBeDefined } from "utils/helpers";
 import {
   apiEditorIdURL,
@@ -704,13 +703,14 @@ function* moveActionSaga(
     // @ts-expect-error: response is of type unknown
     yield put(moveActionSuccess(response.data));
   } catch (e) {
-    toast.show(createMessage(ERROR_ACTION_MOVE_FAIL, actionObject.name), {
-      kind: "error",
-    });
     yield put(
       moveActionError({
         id: action.payload.id,
         originalPageId: action.payload.originalPageId,
+        show: true,
+        error: {
+          message: createMessage(ERROR_ACTION_MOVE_FAIL, actionObject.name),
+        },
       }),
     );
   }
@@ -795,12 +795,21 @@ function* copyActionSaga(
 
     // @ts-expect-error: type mismatch Action vs ActionCreateUpdateResponse
     yield put(copyActionSuccess(payload));
-  } catch (e) {
+  } catch (e: unknown) {
     const actionName = actionObject ? actionObject.name : "";
-    toast.show(createMessage(ERROR_ACTION_COPY_FAIL, actionName), {
-      kind: "error",
-    });
-    yield put(copyActionError(action.payload));
+    const errorMessage =
+      e instanceof Error
+        ? e.message
+        : createMessage(ERROR_ACTION_COPY_FAIL, actionName);
+    yield put(
+      copyActionError({
+        ...action.payload,
+        show: true,
+        error: {
+          message: errorMessage,
+        },
+      }),
+    );
   }
 }
 
@@ -899,12 +908,9 @@ function* saveActionName(action: ReduxAction<{ id: string; name: string }>) {
       payload: {
         actionId: action.payload.id,
         oldName: api.config.name,
+        message: createMessage(ERROR_ACTION_RENAME_FAIL, action.payload.name),
       },
     });
-    toast.show(createMessage(ERROR_ACTION_RENAME_FAIL, action.payload.name), {
-      kind: "error",
-    });
-    log.error(e);
   }
 }
 
diff --git a/app/client/src/sagas/ApiPaneSagas.ts b/app/client/src/sagas/ApiPaneSagas.ts
index a0e973df3296..d14c54f947d9 100644
--- a/app/client/src/sagas/ApiPaneSagas.ts
+++ b/app/client/src/sagas/ApiPaneSagas.ts
@@ -4,7 +4,6 @@
 import get from "lodash/get";
 import omit from "lodash/omit";
 import { all, call, put, select, take, takeEvery } from "redux-saga/effects";
-import * as Sentry from "@sentry/react";
 import type {
   ReduxAction,
   ReduxActionWithMeta,
@@ -68,8 +67,6 @@ import { getCurrentBasePageId } from "selectors/editorSelectors";
 import { validateResponse } from "./ErrorSagas";
 import type { CreateDatasourceSuccessAction } from "actions/datasourceActions";
 import { removeTempDatasource } from "actions/datasourceActions";
-import { klona } from "klona/lite";
-import { toast } from "@appsmith/ads";
 import type { AutoGeneratedHeader } from "pages/Editor/APIEditor/helpers";
 import { deriveAutoGeneratedHeaderState } from "pages/Editor/APIEditor/helpers";
 import { TEMP_DATASOURCE_ID } from "constants/Datasource";
@@ -85,6 +82,7 @@ import { DEFAULT_CREATE_APPSMITH_AI_CONFIG } from "constants/ApiEditorConstants/
 import { checkAndGetPluginFormConfigsSaga } from "./PluginSagas";
 import { convertToBasePageIdSelector } from "selectors/pageListSelectors";
 import type { ApplicationPayload } from "entities/Application";
+import { klonaLiteWithTelemetry } from "utils/helpers";
 
 function* syncApiParamsSaga(
   actionPayload: ReduxActionWithMeta<string, { field: string }>,
@@ -157,7 +155,10 @@ function* handleUpdateBodyContentType(
   );
 
   // get headers
-  const headers = klona(values?.actionConfiguration?.headers);
+  const headers = klonaLiteWithTelemetry(
+    values?.actionConfiguration?.headers,
+    "ApiPaneSagas.handleUpdateBodyContentType.headers",
+  );
 
   // set autoGeneratedHeaders
   const autoGeneratedHeaders: AutoGeneratedHeader[] = [];
@@ -223,7 +224,11 @@ function* handleUpdateBodyContentType(
   });
 
   // help to prevent cyclic dependency error in case the bodyFormData is empty.
-  const bodyFormData = klona(values?.actionConfiguration?.bodyFormData);
+
+  const bodyFormData = klonaLiteWithTelemetry(
+    values?.actionConfiguration?.bodyFormData,
+    "ApiPaneSagas.handleUpdateBodyContentType.bodyFormData",
+  );
 
   if (
     displayFormatValue === POST_BODY_FORMAT_OPTIONS.FORM_URLENCODED ||
@@ -737,6 +742,7 @@ function* handleApiNameChangeSaga(
 ) {
   yield put(change(API_EDITOR_FORM_NAME, "name", action.payload.name));
 }
+
 function* handleApiNameChangeSuccessSaga(
   action: ReduxAction<{ actionId: string }>,
 ) {
@@ -744,19 +750,15 @@ function* handleApiNameChangeSuccessSaga(
   const actionObj: Action | undefined = yield select(getAction, actionId);
   yield take(ReduxActionTypes.FETCH_ACTIONS_FOR_PAGE_SUCCESS);
   if (!actionObj) {
-    // Error case, log to sentry
-    toast.show(createMessage(ERROR_ACTION_RENAME_FAIL, ""), {
-      kind: "error",
-    });
-
-    Sentry.captureException(
-      new Error(createMessage(ERROR_ACTION_RENAME_FAIL, "")),
-      {
-        extra: {
-          actionId: actionId,
-        },
+    yield put({
+      type: ReduxActionErrorTypes.SAVE_ACTION_NAME_ERROR,
+      payload: {
+        actionId,
+        show: true,
+        error: { message: createMessage(ERROR_ACTION_RENAME_FAIL, "") },
+        logToSentry: true,
       },
-    );
+    });
     return;
   }
   if (actionObj.pluginType === PluginType.API) {
diff --git a/app/client/src/sagas/CanvasSagas/DraggingCanvasSagas.ts b/app/client/src/sagas/CanvasSagas/DraggingCanvasSagas.ts
index d93af9d4c735..9f3f3bb0dcf9 100644
--- a/app/client/src/sagas/CanvasSagas/DraggingCanvasSagas.ts
+++ b/app/client/src/sagas/CanvasSagas/DraggingCanvasSagas.ts
@@ -199,6 +199,7 @@ export function* addWidgetAndMoveWidgetsSaga(
       payload: {
         action: ReduxActionTypes.WIDGETS_ADD_CHILD_AND_MOVE,
         error,
+        logToDebugger: true,
       },
     });
   }
@@ -424,6 +425,7 @@ function* moveWidgetsSaga(
       payload: {
         action: ReduxActionTypes.WIDGETS_MOVE,
         error,
+        logToDebugger: true,
       },
     });
   }
diff --git a/app/client/src/sagas/DatasourcesSagas.ts b/app/client/src/sagas/DatasourcesSagas.ts
index 74eeff3d84d8..8d9b77bf4e32 100644
--- a/app/client/src/sagas/DatasourcesSagas.ts
+++ b/app/client/src/sagas/DatasourcesSagas.ts
@@ -127,7 +127,11 @@ import { isDynamicValue } from "utils/DynamicBindingUtils";
 import { getQueryParams } from "utils/URLUtils";
 import type { GenerateCRUDEnabledPluginMap, Plugin } from "api/PluginApi";
 import { getIsGeneratePageInitiator } from "utils/GenerateCrudUtil";
-import { shouldBeDefined, trimQueryString } from "utils/helpers";
+import {
+  klonaLiteWithTelemetry,
+  shouldBeDefined,
+  trimQueryString,
+} from "utils/helpers";
 import { updateReplayEntity } from "actions/pageActions";
 import OAuthApi from "api/OAuthApi";
 import type { AppState } from "ee/reducers";
@@ -161,7 +165,6 @@ import {
   isGoogleSheetPluginDS,
 } from "utils/editorContextUtils";
 import { getDefaultEnvId } from "ee/api/ApiUtils";
-import { klona } from "klona/lite";
 import {
   getCurrentEditingEnvironmentId,
   getCurrentEnvironmentDetails,
@@ -468,12 +471,9 @@ export function* deleteDatasourceSaga(
       yield select(getDatasource, actionPayload.payload.id),
       `Datasource not found for id - ${actionPayload.payload.id}`,
     );
-    toast.show((error as Error).message, {
-      kind: "error",
-    });
     yield put({
       type: ReduxActionErrorTypes.DELETE_DATASOURCE_ERROR,
-      payload: { error, id: actionPayload.payload.id, show: false },
+      payload: { error, id: actionPayload.payload.id, show: true },
     });
     AppsmithConsole.error({
       text: (error as Error).message,
@@ -733,12 +733,15 @@ function* getOAuthAccessTokenSaga(
   if (!appsmithToken) {
     // Error out because auth token should been here
     log.error(OAUTH_APPSMITH_TOKEN_NOT_FOUND);
-    toast.show(OAUTH_AUTHORIZATION_APPSMITH_ERROR, {
-      kind: "error",
-    });
     yield put({
-      type: ReduxActionTypes.GET_OAUTH_ACCESS_TOKEN_ERROR,
-      payload: { datasourceId: datasourceId },
+      type: ReduxActionErrorTypes.GET_OAUTH_ACCESS_TOKEN_ERROR,
+      show: true,
+      payload: {
+        datasourceId: datasourceId,
+        error: {
+          message: OAUTH_AUTHORIZATION_APPSMITH_ERROR,
+        },
+      },
     });
     return;
   }
@@ -797,11 +800,14 @@ function* getOAuthAccessTokenSaga(
     }
   } catch (e) {
     yield put({
-      type: ReduxActionTypes.GET_OAUTH_ACCESS_TOKEN_ERROR,
-      payload: { datasourceId: datasourceId },
-    });
-    toast.show(OAUTH_AUTHORIZATION_FAILED, {
-      kind: "error",
+      type: ReduxActionErrorTypes.GET_OAUTH_ACCESS_TOKEN_ERROR,
+      payload: {
+        datasourceId: datasourceId,
+        show: true,
+        error: {
+          message: OAUTH_AUTHORIZATION_FAILED,
+        },
+      },
     });
     log.error(e);
   }
@@ -910,25 +916,20 @@ function* testDatasourceSaga(actionPayload: ReduxAction<Datasource>) {
       }
       if (responseData.invalids && responseData.invalids.length) {
         AnalyticsUtil.logEvent("TEST_DATA_SOURCE_FAILED", {
-          datasoureId: datasource?.id,
+          datasourceId: datasource?.id,
           environmentId: currentEnvironment,
           environmentName: currentEnvDetails.name,
           pluginName: plugin?.name,
           errorMessages: responseData.invalids,
           messages: responseData.messages,
         });
-        responseData.invalids.forEach((message: string) => {
-          toast.show(message, {
-            kind: "error",
-          });
-        });
         yield put({
           type: ReduxActionErrorTypes.TEST_DATASOURCE_ERROR,
           payload: {
-            show: false,
             id: datasource.id,
             environmentId: currentEnvironment,
-            messages: messages,
+            show: true,
+            error: { message: responseData.invalids.join("\n") },
           },
         });
         AppsmithConsole.error({
@@ -1780,7 +1781,11 @@ function* filePickerActionCallbackSaga(
       getDatasource,
       datasourceId,
     );
-    const datasource: Datasource = klona(datasourceFromState);
+    const datasource: Datasource = klonaLiteWithTelemetry(
+      datasourceFromState,
+      "DatasourcesSagas.filePickerActionCallbackSaga",
+    );
+
     const plugin: Plugin = yield select(getPlugin, datasource?.pluginId);
     const applicationId: string = yield select(getCurrentApplicationId);
     const pageId: string = yield select(getCurrentPageId);
@@ -2100,10 +2105,12 @@ function* updateDatasourceAuthStateSaga(
   } catch (error) {
     yield put({
       type: ReduxActionErrorTypes.UPDATE_DATASOURCE_ERROR,
-      payload: { error },
-    });
-    toast.show(OAUTH_AUTHORIZATION_FAILED, {
-      kind: "error",
+      payload: {
+        error: {
+          message: OAUTH_AUTHORIZATION_FAILED,
+        },
+        show: true,
+      },
     });
   }
 }
diff --git a/app/client/src/sagas/DebuggerSagas.ts b/app/client/src/sagas/DebuggerSagas.ts
index 0901a485a322..517456e726ba 100644
--- a/app/client/src/sagas/DebuggerSagas.ts
+++ b/app/client/src/sagas/DebuggerSagas.ts
@@ -1,6 +1,6 @@
-import type {
-  DeleteErrorLogPayload,
-  LogDebuggerErrorAnalyticsPayload,
+import {
+  type DeleteErrorLogPayload,
+  type LogDebuggerErrorAnalyticsPayload,
 } from "actions/debuggerActions";
 import {
   addErrorLogs,
diff --git a/app/client/src/sagas/ErrorSagas.tsx b/app/client/src/sagas/ErrorSagas.tsx
index 8703a2cf439d..559c0b9d6e9b 100644
--- a/app/client/src/sagas/ErrorSagas.tsx
+++ b/app/client/src/sagas/ErrorSagas.tsx
@@ -1,5 +1,8 @@
 import { get } from "lodash";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import {
+  type ReduxAction,
+  toastMessageErrorTypes,
+} from "ee/constants/ReduxActionConstants";
 import {
   ReduxActionTypes,
   ReduxActionErrorTypes,
@@ -30,6 +33,14 @@ import { axiosConnectionAbortedCode } from "ee/api/ApiUtils";
 import { getLoginUrl } from "ee/utils/adminSettingsHelpers";
 import type { PluginErrorDetails } from "api/ActionAPI";
 import showToast from "sagas/ToastSagas";
+import AppsmithConsole from "../utils/AppsmithConsole";
+import type { SourceEntity } from "../entities/AppsmithConsole";
+import { getAppMode } from "ee/selectors/applicationSelectors";
+import { APP_MODE } from "../entities/App";
+
+const shouldShowToast = (action: string) => {
+  return action in toastMessageErrorTypes;
+};
 
 /**
  * making with error message with action name
@@ -101,7 +112,16 @@ export function* validateResponse(
   }
 
   if (!response.responseMeta && response.status) {
-    throw Error(getErrorMessage(response.status, response.resourceType));
+    yield put({
+      type: ReduxActionErrorTypes.API_ERROR,
+      payload: {
+        error: new Error(
+          getErrorMessage(response.status, response.resourceType),
+        ),
+        logToSentry,
+        show,
+      },
+    });
   }
 
   if (response.responseMeta.success) {
@@ -190,8 +210,9 @@ const getErrorMessageFromActionType = (
 enum ErrorEffectTypes {
   SHOW_ALERT = "SHOW_ALERT",
   SAFE_CRASH = "SAFE_CRASH",
-  LOG_ERROR = "LOG_ERROR",
+  LOG_TO_CONSOLE = "LOG_TO_CONSOLE",
   LOG_TO_SENTRY = "LOG_TO_SENTRY",
+  LOG_TO_DEBUGGER = "LOG_TO_DEBUGGER",
 }
 
 export interface ErrorActionPayload {
@@ -199,18 +220,33 @@ export interface ErrorActionPayload {
   show?: boolean;
   crash?: boolean;
   logToSentry?: boolean;
+  logToDebugger?: boolean;
+  sourceEntity?: SourceEntity;
 }
 
 export function* errorSaga(errorAction: ReduxAction<ErrorActionPayload>) {
-  const effects = [ErrorEffectTypes.LOG_ERROR];
+  const effects = [ErrorEffectTypes.LOG_TO_CONSOLE];
   const { payload, type } = errorAction;
-  const { error, logToSentry, show = true } = payload || {};
-  const message = getErrorMessageFromActionType(type, error);
-
-  if (show) {
+  const { error, logToDebugger, logToSentry, show, sourceEntity } =
+    payload || {};
+  const appMode: APP_MODE = yield select(getAppMode);
+
+  // "show" means show a toast. We check if the error has been asked to not been shown
+  // By checking undefined, undecided actions still pass through this check
+  if (show === undefined) {
+    // We want to show toasts for certain actions only so we avoid issues or if it is outside edit mode
+    if (shouldShowToast(type) || appMode !== APP_MODE.EDIT) {
+      effects.push(ErrorEffectTypes.SHOW_ALERT);
+    }
+    // If true is passed, show the error no matter what
+  } else if (show) {
     effects.push(ErrorEffectTypes.SHOW_ALERT);
   }
 
+  if (logToDebugger) {
+    effects.push(ErrorEffectTypes.LOG_TO_DEBUGGER);
+  }
+
   if (error && error.crash) {
     effects.push(ErrorEffectTypes.LOG_TO_SENTRY);
     effects.push(ErrorEffectTypes.SAFE_CRASH);
@@ -220,19 +256,26 @@ export function* errorSaga(errorAction: ReduxAction<ErrorActionPayload>) {
     effects.push(ErrorEffectTypes.LOG_TO_SENTRY);
   }
 
+  const message = getErrorMessageFromActionType(type, error);
+
   for (const effect of effects) {
     switch (effect) {
-      case ErrorEffectTypes.LOG_ERROR: {
+      case ErrorEffectTypes.LOG_TO_CONSOLE: {
         logErrorSaga(errorAction);
         break;
       }
+      case ErrorEffectTypes.LOG_TO_DEBUGGER: {
+        AppsmithConsole.error({
+          text: message,
+          source: sourceEntity,
+        });
+        break;
+      }
       case ErrorEffectTypes.SHOW_ALERT: {
         // This is the toast that is rendered when any page load API fails.
         yield call(showToast, message, { kind: "error" });
 
-        // TODO: Fix this the next time the file is edited
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        if ((window as any).Cypress) {
+        if ("Cypress" in window) {
           if (message === "" || message === null) {
             yield put(
               safeCrashApp({
diff --git a/app/client/src/sagas/EvaluationsSaga.ts b/app/client/src/sagas/EvaluationsSaga.ts
index 51c595413211..707642636c44 100644
--- a/app/client/src/sagas/EvaluationsSaga.ts
+++ b/app/client/src/sagas/EvaluationsSaga.ts
@@ -48,7 +48,7 @@ import {
 } from "actions/evaluationActions";
 import ConfigTreeActions from "utils/configTree";
 import {
-  dynamicTriggerErrorHandler,
+  showExecutionErrors,
   handleJSFunctionExecutionErrorLog,
   logJSVarCreatedEvent,
   logSuccessfulBindings,
@@ -341,16 +341,15 @@ export function* evaluateAndExecuteDynamicTrigger(
       triggerMeta,
     },
   );
-  // TODO: Fix this the next time the file is edited
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const { errors = [] } = response as any;
+  const { errors = [] } = response;
 
   const transformedErrors: EvaluationError[] = yield call(
     transformTriggerEvalErrors,
     errors,
   );
-
-  yield call(dynamicTriggerErrorHandler, transformedErrors);
+  if (transformedErrors.length) {
+    yield fork(showExecutionErrors, transformedErrors);
+  }
   yield fork(logDynamicTriggerExecution, {
     dynamicTrigger,
     errors: transformedErrors,
diff --git a/app/client/src/sagas/FormEvaluationSaga.ts b/app/client/src/sagas/FormEvaluationSaga.ts
index 599a070bc4bb..888031e5f33f 100644
--- a/app/client/src/sagas/FormEvaluationSaga.ts
+++ b/app/client/src/sagas/FormEvaluationSaga.ts
@@ -21,7 +21,6 @@ import { getDataTreeActionConfigPath } from "entities/Action/actionProperties";
 import { getDataTree } from "selectors/dataTreeSelectors";
 import { getDynamicBindings, isDynamicValue } from "utils/DynamicBindingUtils";
 import get from "lodash/get";
-import { klona } from "klona/lite";
 import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import {
   extractFetchDynamicValueFormConfigs,
@@ -31,6 +30,7 @@ import type { DatasourceConfiguration } from "entities/Datasource";
 import { buffers } from "redux-saga";
 import type { Plugin } from "api/PluginApi";
 import { doesPluginRequireDatasource } from "ee/entities/Engine/actionHelpers";
+import { klonaLiteWithTelemetry } from "utils/helpers";
 
 export interface FormEvalActionPayload {
   formId: string;
@@ -68,10 +68,14 @@ function* setFormEvaluationSagaAsync(
       const fetchDynamicValueFormConfigs = extractFetchDynamicValueFormConfigs(
         workerResponse[action?.payload?.formId],
       );
+
       yield put({
         type: ReduxActionTypes.INIT_TRIGGER_VALUES,
         payload: {
-          [action?.payload?.formId]: klona(fetchDynamicValueFormConfigs),
+          [action?.payload?.formId]: klonaLiteWithTelemetry(
+            fetchDynamicValueFormConfigs,
+            "FormEvaluationSaga.setFormEvaluationSagaAsync",
+          ),
         },
       });
     }
diff --git a/app/client/src/sagas/JSLibrarySaga.ts b/app/client/src/sagas/JSLibrarySaga.ts
index 9e09b5e1b7e8..fa81ce1d750e 100644
--- a/app/client/src/sagas/JSLibrarySaga.ts
+++ b/app/client/src/sagas/JSLibrarySaga.ts
@@ -55,14 +55,15 @@ function* handleInstallationFailure(
     text: `Failed to install library script at ${url}`,
   });
 
-  toast.show(message || `Failed to install library script at ${url}`, {
-    kind: "error",
-  });
   const applicationid: ReturnType<typeof getCurrentApplicationId> =
     yield select(getCurrentApplicationId);
   yield put({
     type: ReduxActionErrorTypes.INSTALL_LIBRARY_FAILED,
-    payload: { url, show: false },
+    payload: {
+      url,
+      show: true,
+      message: message || `Failed to install library script at ${url}`,
+    },
   });
   AnalyticsUtil.logEvent("INSTALL_LIBRARY", {
     url,
@@ -247,7 +248,16 @@ function* uninstallLibrarySaga(action: ReduxAction<JSLibrary>) {
     if (!isValidResponse) {
       yield put({
         type: ReduxActionErrorTypes.UNINSTALL_LIBRARY_FAILED,
-        payload: accessor,
+        payload: {
+          show: true,
+          accessor,
+          error: {
+            message: createMessage(
+              customJSLibraryMessages.UNINSTALL_FAILED,
+              name,
+            ),
+          },
+        },
       });
       AnalyticsUtil.logEvent("UNINSTALL_LIBRARY", {
         url: action.payload.url,
@@ -270,12 +280,19 @@ function* uninstallLibrarySaga(action: ReduxAction<JSLibrary>) {
       accessor,
     );
     if (!success) {
-      toast.show(
-        createMessage(customJSLibraryMessages.UNINSTALL_FAILED, name),
-        {
-          kind: "error",
+      yield put({
+        type: ReduxActionErrorTypes.UNINSTALL_LIBRARY_FAILED,
+        payload: {
+          accessor,
+          show: true,
+          error: {
+            message: createMessage(
+              customJSLibraryMessages.UNINSTALL_FAILED,
+              name,
+            ),
+          },
         },
-      );
+      });
     }
 
     try {
@@ -297,8 +314,18 @@ function* uninstallLibrarySaga(action: ReduxAction<JSLibrary>) {
       success: true,
     });
   } catch (e) {
-    toast.show(createMessage(customJSLibraryMessages.UNINSTALL_FAILED, name), {
-      kind: "error",
+    yield put({
+      type: ReduxActionErrorTypes.UNINSTALL_LIBRARY_FAILED,
+      payload: {
+        accessor,
+        show: true,
+        error: {
+          message: createMessage(
+            customJSLibraryMessages.UNINSTALL_FAILED,
+            name,
+          ),
+        },
+      },
     });
     AnalyticsUtil.logEvent("UNINSTALL_LIBRARY", {
       url: action.payload.url,
diff --git a/app/client/src/sagas/JSPaneSagas.ts b/app/client/src/sagas/JSPaneSagas.ts
index 7193e993306a..aa8b04827159 100644
--- a/app/client/src/sagas/JSPaneSagas.ts
+++ b/app/client/src/sagas/JSPaneSagas.ts
@@ -86,7 +86,6 @@ import { UserCancelledActionExecutionError } from "sagas/ActionExecution/errorUt
 import type { EventLocation } from "ee/utils/analyticsUtilTypes";
 import AnalyticsUtil from "ee/utils/AnalyticsUtil";
 import { checkAndLogErrorsIfCyclicDependency } from "./helper";
-import { toast } from "@appsmith/ads";
 import { DEBUGGER_TAB_KEYS } from "components/editorComponents/Debugger/helpers";
 import {
   getJSActionPathNameToDisplay,
@@ -371,11 +370,16 @@ function* handleJSObjectNameChangeSuccessSaga(
   );
   yield take(ReduxActionTypes.FETCH_JS_ACTIONS_FOR_PAGE_SUCCESS);
   if (!actionObj) {
-    // Error case, log to sentry
-    toast.show(createMessage(ERROR_JS_COLLECTION_RENAME_FAIL, ""), {
-      kind: "error",
+    yield put({
+      type: ReduxActionErrorTypes.SAVE_JS_COLLECTION_NAME_ERROR,
+      payload: {
+        actionId,
+        show: true,
+        error: {
+          message: createMessage(ERROR_JS_COLLECTION_RENAME_FAIL, ""),
+        },
+      },
     });
-
     return;
   }
 
diff --git a/app/client/src/sagas/LintingSagas.ts b/app/client/src/sagas/LintingSagas.ts
index 6e2d4fafd784..b1217aa520c1 100644
--- a/app/client/src/sagas/LintingSagas.ts
+++ b/app/client/src/sagas/LintingSagas.ts
@@ -103,6 +103,7 @@ export function* lintTreeSaga(payload: LintTreeSagaRequestData) {
   yield call(logLatestLintPropertyErrors, {
     errors,
     dataTree: unevalTree,
+    configTree,
   });
 }
 
diff --git a/app/client/src/sagas/ModalSagas.ts b/app/client/src/sagas/ModalSagas.ts
index b57cb919c620..22b0132e3b41 100644
--- a/app/client/src/sagas/ModalSagas.ts
+++ b/app/client/src/sagas/ModalSagas.ts
@@ -311,6 +311,7 @@ export function* resizeModalSaga(resizeAction: ReduxAction<ModalWidgetResize>) {
       payload: {
         action: WidgetReduxActionTypes.WIDGET_RESIZE,
         error,
+        logToDebugger: true,
       },
     });
   }
diff --git a/app/client/src/sagas/OneClickBindingSaga.ts b/app/client/src/sagas/OneClickBindingSaga.ts
index 7f3a6ee236b5..635f83ccad83 100644
--- a/app/client/src/sagas/OneClickBindingSaga.ts
+++ b/app/client/src/sagas/OneClickBindingSaga.ts
@@ -374,16 +374,15 @@ function* BindWidgetToDatasource(
       isMock: datasource.isMock,
       formType: otherFields?.formType,
     });
-    // TODO: Fix this the next time the file is edited
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  } catch (e: any) {
-    toast.show(e.message, {
-      hideProgressBar: false,
-      kind: "error",
-    });
-
+  } catch (e: unknown) {
     yield put({
       type: ReduxActionTypes.BIND_WIDGET_TO_DATASOURCE_ERROR,
+      payload: {
+        show: true,
+        error: {
+          message: e instanceof Error ? e.message : "Failed to Bind to widget",
+        },
+      },
     });
   }
 
diff --git a/app/client/src/sagas/PartialImportExportSagas/PartialExportSagas.ts b/app/client/src/sagas/PartialImportExportSagas/PartialExportSagas.ts
index 7caf770bcb35..1a7ff51f0d99 100644
--- a/app/client/src/sagas/PartialImportExportSagas/PartialExportSagas.ts
+++ b/app/client/src/sagas/PartialImportExportSagas/PartialExportSagas.ts
@@ -8,7 +8,6 @@ import {
   ReduxActionTypes,
 } from "ee/constants/ReduxActionConstants";
 import { getCurrentApplication } from "ee/selectors/applicationSelectors";
-import { toast } from "@appsmith/ads";
 import { getFlexLayersForSelectedWidgets } from "layoutSystems/autolayout/utils/AutoLayoutUtils";
 import type { FlexLayer } from "layoutSystems/autolayout/utils/types";
 import type { FlattenedWidgetProps } from "reducers/entityReducers/canvasWidgetsReducer";
@@ -76,13 +75,13 @@ export function* partialExportSaga(action: ReduxAction<PartialExportParams>) {
       });
     }
   } catch (e) {
-    toast.show(createMessage(ERROR_IN_EXPORTING_APP), {
-      kind: "error",
-    });
     yield put({
       type: ReduxActionErrorTypes.PARTIAL_EXPORT_ERROR,
       payload: {
-        error: "Error exporting application",
+        show: true,
+        error: {
+          message: createMessage(ERROR_IN_EXPORTING_APP),
+        },
       },
     });
   }
diff --git a/app/client/src/sagas/PostEvaluationSagas.ts b/app/client/src/sagas/PostEvaluationSagas.ts
index a20413dbee96..91300bca6b32 100644
--- a/app/client/src/sagas/PostEvaluationSagas.ts
+++ b/app/client/src/sagas/PostEvaluationSagas.ts
@@ -35,12 +35,12 @@ import { isWidgetPropertyNamePath } from "utils/widgetEvalUtils";
 import type { ActionEntityConfig } from "ee/entities/DataTree/types";
 import type { SuccessfulBindings } from "utils/SuccessfulBindingsMap";
 import SuccessfulBindingMap from "utils/SuccessfulBindingsMap";
-import { logActionExecutionError } from "./ActionExecution/errorUtils";
 import { getCurrentWorkspaceId } from "ee/selectors/selectedWorkspaceSelectors";
 import { getInstanceId } from "ee/selectors/tenantSelectors";
 import type { EvalTreeResponseData } from "workers/Evaluation/types";
 import { endSpan, startRootSpan } from "UITelemetry/generateTraces";
 import { getCollectionNameToDisplay } from "ee/utils/actionExecutionUtils";
+import { showToastOnExecutionError } from "./ActionExecution/errorUtils";
 
 let successfulBindingsMap: SuccessfulBindingMap | undefined;
 
@@ -57,14 +57,24 @@ export function* logJSVarCreatedEvent(
   });
 }
 
-// TODO: Fix this the next time the file is edited
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function* dynamicTriggerErrorHandler(errors: any[]) {
-  if (errors.length > 0) {
-    for (const error of errors) {
-      const errorMessage =
-        error.errorMessage.message.message || error.errorMessage.message;
-      yield call(logActionExecutionError, errorMessage, true);
+export function* showExecutionErrors(errors: EvaluationError[]) {
+  const appMode: APP_MODE = yield select(getAppMode);
+  for (const error of errors) {
+    const errorMessage = get(
+      error,
+      "errorMessage.message.message",
+      error.errorMessage.message,
+    );
+    yield call(
+      showToastOnExecutionError,
+      errorMessage,
+      appMode === APP_MODE.EDIT,
+    );
+    // Add it to the logs tab when in edit mode
+    if (appMode === APP_MODE.EDIT) {
+      AppsmithConsole.error({
+        text: errorMessage,
+      });
     }
   }
 }
diff --git a/app/client/src/sagas/PostLintingSagas.ts b/app/client/src/sagas/PostLintingSagas.ts
index 5d35b0bc517d..280da72e2432 100644
--- a/app/client/src/sagas/PostLintingSagas.ts
+++ b/app/client/src/sagas/PostLintingSagas.ts
@@ -1,6 +1,6 @@
 import { Severity } from "entities/AppsmithConsole";
 import LOG_TYPE from "entities/AppsmithConsole/logtype";
-import type { DataTree } from "entities/DataTree/dataTreeTypes";
+import type { ConfigTree, DataTree } from "entities/DataTree/dataTreeTypes";
 import { isEmpty } from "lodash";
 import AppsmithConsole from "utils/AppsmithConsole";
 import { getEntityNameAndPropertyPath } from "ee/workers/Evaluation/evaluationUtils";
@@ -11,11 +11,13 @@ import type { ENTITY_TYPE } from "ee/entities/AppsmithConsole/utils";
 
 // We currently only log lint errors in JSObjects
 export function* logLatestLintPropertyErrors({
+  configTree,
   dataTree,
   errors,
 }: {
-  errors: LintErrorsStore;
+  configTree: ConfigTree;
   dataTree: DataTree;
+  errors: LintErrorsStore;
 }) {
   const errorsToAdd = [];
   const errorsToRemove = [];
@@ -23,8 +25,10 @@ export function* logLatestLintPropertyErrors({
   for (const path of Object.keys(errors)) {
     const { entityName, propertyPath } = getEntityNameAndPropertyPath(path);
     const entity = dataTree[entityName];
+    const config = configTree[entityName];
     // only log lint errors in JSObjects
-    if (!isLintErrorLoggingEnabledForEntity(entity)) continue;
+    if (!isLintErrorLoggingEnabledForEntity(entity, propertyPath, config))
+      continue;
     // only log lint errors (not warnings)
     const lintErrorsInPath = errors[path].filter(
       (error) => error.severity === Severity.ERROR,
diff --git a/app/client/src/sagas/QueryPaneSagas.ts b/app/client/src/sagas/QueryPaneSagas.ts
index 898557807384..61e712e534e5 100644
--- a/app/client/src/sagas/QueryPaneSagas.ts
+++ b/app/client/src/sagas/QueryPaneSagas.ts
@@ -7,7 +7,6 @@ import {
   takeEvery,
   fork,
 } from "redux-saga/effects";
-import * as Sentry from "@sentry/react";
 import type { ApplicationPayload } from "entities/Application";
 import type {
   ReduxAction,
@@ -70,7 +69,6 @@ import { fetchDynamicValuesSaga } from "./FormEvaluationSaga";
 import type { FormEvalOutput } from "reducers/evaluationReducers/formEvaluationReducer";
 import { validateResponse } from "./ErrorSagas";
 import { getIsGeneratePageInitiator } from "utils/GenerateCrudUtil";
-import { toast } from "@appsmith/ads";
 import type { CreateDatasourceSuccessAction } from "actions/datasourceActions";
 import { createDefaultActionPayloadWithPluginDefaults } from "./ActionSagas";
 import { DB_NOT_SUPPORTED } from "ee/utils/Environments";
@@ -494,18 +492,16 @@ function* handleNameChangeSuccessSaga(
   yield take(ReduxActionTypes.FETCH_ACTIONS_FOR_PAGE_SUCCESS);
   if (!actionObj) {
     // Error case, log to sentry
-    toast.show(createMessage(ERROR_ACTION_RENAME_FAIL, ""), {
-      kind: "error",
-    });
-
-    Sentry.captureException(
-      new Error(createMessage(ERROR_ACTION_RENAME_FAIL, "")),
-      {
-        extra: {
-          actionId: actionId,
+    yield put({
+      type: ReduxActionErrorTypes.SAVE_ACTION_NAME_ERROR,
+      payload: {
+        show: true,
+        error: {
+          message: createMessage(ERROR_ACTION_RENAME_FAIL, ""),
         },
+        logToSentry: true,
       },
-    );
+    });
     return;
   }
   if (actionObj.pluginType === PluginType.DB) {
diff --git a/app/client/src/sagas/WidgetAdditionSagas.ts b/app/client/src/sagas/WidgetAdditionSagas.ts
index 61518df9004a..cf0bb6ba4da3 100644
--- a/app/client/src/sagas/WidgetAdditionSagas.ts
+++ b/app/client/src/sagas/WidgetAdditionSagas.ts
@@ -434,6 +434,7 @@ export function* addChildSaga(
       payload: {
         action: WidgetReduxActionTypes.WIDGET_ADD_CHILD,
         error,
+        logToDebugger: true,
       },
     });
   }
@@ -533,6 +534,7 @@ function* addUIEntitySaga(addEntityAction: ReduxAction<WidgetAddChild>) {
       payload: {
         action: WidgetReduxActionTypes.WIDGET_ADD_CHILD,
         error,
+        logToDebugger: true,
       },
     });
   }
diff --git a/app/client/src/sagas/WidgetDeletionSaga.test.ts b/app/client/src/sagas/WidgetDeletionSaga.test.ts
new file mode 100644
index 000000000000..f2d4eaa7df70
--- /dev/null
+++ b/app/client/src/sagas/WidgetDeletionSaga.test.ts
@@ -0,0 +1,52 @@
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
+import { keyBy } from "lodash";
+import { runSaga } from "redux-saga";
+import store, { testStore } from "store";
+import { ListV2Factory } from "test/factories/Widgets/ListV2Factory";
+import { deleteSaga } from "./WidgetDeletionSagas";
+
+test("deleteSaga should dispatch DELETE_META_WIDGETS when widget has meta widgets", async () => {
+  const listWidget = ListV2Factory.build();
+  const defaultState = store.getState();
+  const mockStore = testStore({
+    ...defaultState,
+    entities: {
+      ...defaultState.entities,
+      canvasWidgets: keyBy([listWidget], "widgetId"),
+    },
+    ui: {
+      ...defaultState.ui,
+      widgetDragResize: {
+        ...defaultState.ui.widgetDragResize,
+        lastSelectedWidget: listWidget.widgetId,
+      },
+    },
+  });
+  const dispatched: unknown[] = [];
+
+  const deleteAction = {
+    type: "DELETE_WIDGET",
+    payload: {
+      widgetId: undefined,
+      parentId: undefined,
+      disallowUndo: false,
+      isShortcut: false,
+    },
+  };
+
+  await runSaga(
+    {
+      dispatch: (action) => dispatched.push(action),
+      getState: () => mockStore.getState(),
+    },
+    deleteSaga,
+    deleteAction,
+  ).toPromise();
+
+  expect(dispatched).toContainEqual({
+    type: ReduxActionTypes.DELETE_META_WIDGETS,
+    payload: {
+      creatorIds: [listWidget.widgetId],
+    },
+  });
+});
diff --git a/app/client/src/sagas/WidgetDeletionSagas.ts b/app/client/src/sagas/WidgetDeletionSagas.ts
index 84720338d4fe..518d122bc88f 100644
--- a/app/client/src/sagas/WidgetDeletionSagas.ts
+++ b/app/client/src/sagas/WidgetDeletionSagas.ts
@@ -1,10 +1,10 @@
+import { generateAutoHeightLayoutTreeAction } from "actions/autoHeightActions";
 import type {
   MultipleWidgetDeletePayload,
   WidgetDelete,
 } from "actions/pageActions";
 import { closePropertyPane, closeTableFilterPane } from "actions/widgetActions";
 import { selectWidgetInitAction } from "actions/widgetSelectionActions";
-import type { ApplicationPayload } from "entities/Application";
 import type { ReduxAction } from "ee/constants/ReduxActionConstants";
 import {
   ReduxActionErrorTypes,
@@ -12,21 +12,41 @@ import {
   WidgetReduxActionTypes,
 } from "ee/constants/ReduxActionConstants";
 import { ENTITY_TYPE } from "ee/entities/AppsmithConsole/utils";
+import { widgetURL } from "ee/RouteBuilder";
+import { getCurrentApplication } from "ee/selectors/applicationSelectors";
+import AnalyticsUtil from "ee/utils/AnalyticsUtil";
+import type { ApplicationPayload } from "entities/Application";
 import LOG_TYPE from "entities/AppsmithConsole/logtype";
+import { getIsAnvilLayout } from "layoutSystems/anvil/integrations/selectors";
+import { updateAndSaveAnvilLayout } from "layoutSystems/anvil/utils/anvilChecksUtils";
+import { updateAnvilParentPostWidgetDeletion } from "layoutSystems/anvil/utils/layouts/update/deletionUtils";
+import { LayoutSystemTypes } from "layoutSystems/types";
 import { flattenDeep, omit, orderBy } from "lodash";
 import type {
   CanvasWidgetsReduxState,
   FlattenedWidgetProps,
 } from "reducers/entityReducers/canvasWidgetsReducer";
 import { all, call, put, select, takeEvery } from "redux-saga/effects";
+import { SelectionRequestType } from "sagas/WidgetSelectUtils";
 import {
   getCanvasWidth,
   getIsAutoLayoutMobileBreakPoint,
 } from "selectors/editorSelectors";
+import { getLayoutSystemType } from "selectors/layoutSystemSelectors";
 import { getSelectedWidgets } from "selectors/ui";
-import AnalyticsUtil from "ee/utils/AnalyticsUtil";
 import AppsmithConsole from "utils/AppsmithConsole";
+import { showUndoRedoToast } from "utils/replayHelpers";
+import WidgetFactory from "WidgetProvider/factory";
 import type { WidgetProps } from "widgets/BaseWidget";
+import type { DraggedWidget } from "../layoutSystems/anvil/utils/anvilTypes";
+import { severTiesFromParents } from "../layoutSystems/anvil/utils/layouts/update/moveUtils";
+import {
+  isRedundantZoneWidget,
+  isZoneWidget,
+} from "../layoutSystems/anvil/utils/layouts/update/zoneUtils";
+import { widgetChildren } from "../layoutSystems/anvil/utils/layouts/widgetUtils";
+import { updateFlexLayersOnDelete } from "../layoutSystems/autolayout/utils/AutoLayoutUtils";
+import FocusRetention from "./FocusRetentionSaga";
 import {
   getSelectedWidget,
   getWidget,
@@ -38,26 +58,6 @@ import {
   getAllWidgetsInTree,
   updateListWidgetPropertiesOnChildDelete,
 } from "./WidgetOperationUtils";
-import { showUndoRedoToast } from "utils/replayHelpers";
-import WidgetFactory from "WidgetProvider/factory";
-import { generateAutoHeightLayoutTreeAction } from "actions/autoHeightActions";
-import { SelectionRequestType } from "sagas/WidgetSelectUtils";
-import { updateFlexLayersOnDelete } from "../layoutSystems/autolayout/utils/AutoLayoutUtils";
-import { LayoutSystemTypes } from "layoutSystems/types";
-import { getLayoutSystemType } from "selectors/layoutSystemSelectors";
-import { updateAnvilParentPostWidgetDeletion } from "layoutSystems/anvil/utils/layouts/update/deletionUtils";
-import { getCurrentApplication } from "ee/selectors/applicationSelectors";
-import FocusRetention from "./FocusRetentionSaga";
-import { widgetURL } from "ee/RouteBuilder";
-import { updateAndSaveAnvilLayout } from "layoutSystems/anvil/utils/anvilChecksUtils";
-import { getIsAnvilLayout } from "layoutSystems/anvil/integrations/selectors";
-import type { DraggedWidget } from "../layoutSystems/anvil/utils/anvilTypes";
-import { severTiesFromParents } from "../layoutSystems/anvil/utils/layouts/update/moveUtils";
-import {
-  isZoneWidget,
-  isRedundantZoneWidget,
-} from "../layoutSystems/anvil/utils/layouts/update/zoneUtils";
-import { widgetChildren } from "../layoutSystems/anvil/utils/layouts/widgetUtils";
 
 const WidgetTypes = WidgetFactory.widgetTypes;
 
@@ -225,7 +225,7 @@ function* getUpdatedDslAfterDeletingWidget(widgetId: string, parentId: string) {
   }
 }
 
-function* deleteSaga(deleteAction: ReduxAction<WidgetDelete>) {
+export function* deleteSaga(deleteAction: ReduxAction<WidgetDelete>) {
   try {
     let { parentId, widgetId } = deleteAction.payload;
 
@@ -253,6 +253,24 @@ function* deleteSaga(deleteAction: ReduxAction<WidgetDelete>) {
         parentId,
       );
 
+      /**
+       * This change ensures that meta widgets are deleted before the main widget.
+       * By handling meta widget deletion within the deleteWidget saga, we prevent
+       * lint evaluation from detecting orphaned meta widgets, which previously
+       * caused errors in the in-app debugger. This resolves the issue of transient
+       * errors appearing after widget deletion.
+       *
+       * For more details, refer to the PR: https://github.com/appsmithorg/appsmith/pull/35820
+       */
+      if (widget.hasMetaWidgets) {
+        yield put({
+          type: ReduxActionTypes.DELETE_META_WIDGETS,
+          payload: {
+            creatorIds: [widgetId],
+          },
+        });
+      }
+
       if (updatedObj) {
         const { finalWidgets, otherWidgetsToDelete, widgetName } = updatedObj;
         const layoutSystemType: LayoutSystemTypes =
@@ -322,6 +340,7 @@ function* deleteSaga(deleteAction: ReduxAction<WidgetDelete>) {
       payload: {
         action: WidgetReduxActionTypes.WIDGET_DELETE,
         error,
+        logToDebugger: true,
       },
     });
   }
@@ -463,6 +482,7 @@ function* deleteAllSelectedWidgetsSaga(
       payload: {
         action: WidgetReduxActionTypes.WIDGET_DELETE,
         error,
+        logToDebugger: true,
       },
     });
   }
diff --git a/app/client/src/sagas/WidgetOperationSagas.tsx b/app/client/src/sagas/WidgetOperationSagas.tsx
index 9c2f356da041..7f770a80fde9 100644
--- a/app/client/src/sagas/WidgetOperationSagas.tsx
+++ b/app/client/src/sagas/WidgetOperationSagas.tsx
@@ -281,6 +281,7 @@ export function* resizeSaga(resizeAction: ReduxAction<WidgetResize>) {
       payload: {
         action: WidgetReduxActionTypes.WIDGET_RESIZE,
         error,
+        logToDebugger: true,
       },
     });
   }
@@ -1644,6 +1645,7 @@ function* pasteWidgetSaga(action: ReduxAction<PasteWidgetReduxAction>) {
       payload: {
         action: ReduxActionTypes.PASTE_COPIED_WIDGET_INIT,
         error,
+        logToDebugger: true,
       },
     });
   }
diff --git a/app/client/src/sagas/helper.ts b/app/client/src/sagas/helper.ts
index 0bd53b77e519..5a47b63e95c1 100644
--- a/app/client/src/sagas/helper.ts
+++ b/app/client/src/sagas/helper.ts
@@ -20,8 +20,8 @@ import set from "lodash/set";
 import log from "loglevel";
 import { isPlainObject, isString } from "lodash";
 import { DATA_BIND_REGEX_GLOBAL } from "constants/BindingsConstants";
-import { klona } from "klona/lite";
 import { apiFailureResponseInterceptor } from "ee/api/ApiUtils";
+import { klonaLiteWithTelemetry } from "utils/helpers";
 
 // function to extract all objects that have dynamic values
 export const extractFetchDynamicValueFormConfigs = (
@@ -141,7 +141,11 @@ export const enhanceRequestPayloadWithEventData = (
   try {
     switch (type) {
       case ReduxActionTypes.COPY_ACTION_INIT:
-        const actionObject = klona(payload) as Action;
+        const actionObject = klonaLiteWithTelemetry(
+          payload,
+          "helpers.enhanceRequestPayloadWithEventData",
+        ) as Action;
+
         const path = `${RequestPayloadAnalyticsPath}.originalActionId`;
         const originalActionId = get(actionObject, path, actionObject.id);
         if (originalActionId !== undefined)
diff --git a/app/client/src/utils/AppsmithConsole.ts b/app/client/src/utils/AppsmithConsole.ts
index c2205aa9164f..de694497084f 100644
--- a/app/client/src/utils/AppsmithConsole.ts
+++ b/app/client/src/utils/AppsmithConsole.ts
@@ -7,7 +7,6 @@ import {
 import type { ReduxAction } from "ee/constants/ReduxActionConstants";
 import type { LogActionPayload, Log } from "entities/AppsmithConsole";
 import { Severity, LOG_CATEGORY } from "entities/AppsmithConsole";
-import moment from "moment";
 import store from "store";
 import { isEmpty } from "lodash";
 
@@ -29,7 +28,7 @@ function log(ev: Log) {
 }
 
 function getTimeStamp() {
-  return moment().format("HH:mm:ss");
+  return Date.now().toString();
 }
 
 function addLogs(logs: Log[]) {
@@ -90,7 +89,7 @@ function addErrors(errors: ErrorObject[]) {
   const refinedErrors = errors.map((error) => ({
     ...error.payload,
     severity: error.severity ?? Severity.ERROR,
-    timestamp: Date.now().toString(),
+    timestamp: getTimeStamp(),
     occurrenceCount: 1,
     category: error.category ?? LOG_CATEGORY.PLATFORM_GENERATED,
     isExpanded: false,
diff --git a/app/client/src/utils/bootIntercom.ts b/app/client/src/utils/bootIntercom.ts
index 34e65c6d2515..e742f1d39b31 100644
--- a/app/client/src/utils/bootIntercom.ts
+++ b/app/client/src/utils/bootIntercom.ts
@@ -1,4 +1,4 @@
-import type { User } from "constants/userConstants";
+import { ANONYMOUS_USERNAME, type User } from "constants/userConstants";
 import { getAppsmithConfigs } from "ee/configs";
 import { sha256 } from "js-sha256";
 import { getLicenseKey } from "ee/utils/licenseHelpers";
@@ -7,9 +7,12 @@ const { appVersion, cloudHosting, intercomAppID } = getAppsmithConfigs();
 
 export default function bootIntercom(user?: User) {
   if (intercomAppID && window.Intercom) {
-    let { email, username } = user || {};
-    let name;
-    if (!cloudHosting) {
+    let name: string | undefined = user?.name;
+    let email: string | undefined = user?.email;
+    let username =
+      user?.username === ANONYMOUS_USERNAME ? undefined : user?.username;
+    if (!cloudHosting && username) {
+      // We are hiding their information when self-hosted
       username = sha256(username || "");
       // keep email undefined so that users are prompted to enter it when they reach out on intercom
       email = undefined;
diff --git a/app/client/src/utils/helpers.tsx b/app/client/src/utils/helpers.tsx
index c4de91a35bfa..d713294a3102 100644
--- a/app/client/src/utils/helpers.tsx
+++ b/app/client/src/utils/helpers.tsx
@@ -38,7 +38,12 @@ import { getContainerIdForCanvas } from "sagas/WidgetOperationUtils";
 import scrollIntoView from "scroll-into-view-if-needed";
 import validateColor from "validate-color";
 import { CANVAS_VIEWPORT } from "constants/componentClassNameConstants";
-import { klona as clone } from "klona/full";
+import { klona as klonaFull } from "klona/full";
+import { klona as klonaRegular } from "klona";
+import { klona as klonaLite } from "klona/lite";
+import { klona as klonaJson } from "klona/json";
+
+import { startAndEndSpanForFn } from "UITelemetry/generateTraces";
 
 export const snapToGrid = (
   columnWidth: number,
@@ -818,6 +823,34 @@ export function isValidColor(color: string) {
   return color?.includes("url") || validateColor(color) || isEmptyOrNill(color);
 }
 
+function klonaWithTelemetryWrapper<T>(
+  value: T,
+  codeSegment: string,
+  variant: string,
+  klonaFn: (input: T) => T,
+): T {
+  return startAndEndSpanForFn(
+    "klona",
+    {
+      codeSegment,
+      variant,
+    },
+    () => klonaFn(value),
+  );
+}
+export function klonaFullWithTelemetry<T>(value: T, codeSegment: string): T {
+  return klonaWithTelemetryWrapper(value, codeSegment, "full", klonaFull);
+}
+export function klonaRegularWithTelemetry<T>(value: T, codeSegment: string): T {
+  return klonaWithTelemetryWrapper(value, codeSegment, "regular", klonaRegular);
+}
+export function klonaLiteWithTelemetry<T>(value: T, codeSegment: string): T {
+  return klonaWithTelemetryWrapper(value, codeSegment, "lite", klonaLite);
+}
+export function klonaJsonWithTelemetry<T>(value: T, codeSegment: string): T {
+  return klonaWithTelemetryWrapper(value, codeSegment, "json", klonaJson);
+}
+
 /*
  *  Function to merge property pane config of a widget
  *
@@ -828,7 +861,10 @@ export const mergeWidgetConfig = (target: any, source: any) => {
   // TODO: Fix this the next time the file is edited
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const sectionMap: Record<string, any> = {};
-  const mergedConfig = clone(target);
+  const mergedConfig = klonaFullWithTelemetry(
+    target,
+    "helpers.mergeWidgetConfig",
+  );
 
   mergedConfig.forEach((section: { sectionName: string }) => {
     sectionMap[section.sectionName] = section;
diff --git a/app/client/src/widgets/ButtonGroupWidget/widget/index.tsx b/app/client/src/widgets/ButtonGroupWidget/widget/index.tsx
index 1fe781553449..55c27df4cf63 100644
--- a/app/client/src/widgets/ButtonGroupWidget/widget/index.tsx
+++ b/app/client/src/widgets/ButtonGroupWidget/widget/index.tsx
@@ -18,12 +18,12 @@ import type {
   AutocompletionDefinitions,
 } from "WidgetProvider/constants";
 import { FILL_WIDGET_MIN_WIDTH } from "constants/minWidthConstants";
-import { klona as clone } from "klona/full";
 import { ResponsiveBehavior } from "layoutSystems/common/utils/constants";
 import { BlueprintOperationTypes } from "WidgetProvider/constants";
 import IconSVG from "../icon.svg";
 import ThumbnailSVG from "../thumbnail.svg";
 import { WIDGET_TAGS, layoutConfigurations } from "constants/WidgetConstants";
+import { klonaFullWithTelemetry } from "utils/helpers";
 
 class ButtonGroupWidget extends BaseWidget<
   ButtonGroupWidgetProps,
@@ -133,7 +133,11 @@ class ButtonGroupWidget extends BaseWidget<
           {
             type: BlueprintOperationTypes.MODIFY_PROPS,
             fn: (widget: WidgetProps & { children?: WidgetProps[] }) => {
-              const groupButtons = clone(widget.groupButtons);
+              const groupButtons = klonaFullWithTelemetry(
+                widget.groupButtons,
+                "ButtonGroupWidget.groupButtons",
+              );
+
               // TODO: Fix this the next time the file is edited
               // eslint-disable-next-line @typescript-eslint/no-explicit-any
               const dynamicBindingPathList: any[] = get(
diff --git a/app/client/src/widgets/FilePickerWidgetV2/widget/index.tsx b/app/client/src/widgets/FilePickerWidgetV2/widget/index.tsx
index 9b8d7aa59778..975372cd2508 100644
--- a/app/client/src/widgets/FilePickerWidgetV2/widget/index.tsx
+++ b/app/client/src/widgets/FilePickerWidgetV2/widget/index.tsx
@@ -6,7 +6,6 @@ import { FILE_SIZE_LIMIT_FOR_BLOBS } from "constants/WidgetConstants";
 import { ValidationTypes } from "constants/WidgetValidation";
 import type { SetterConfig, Stylesheet } from "entities/AppTheming";
 import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
-import { klona } from "klona";
 import _, { findIndex } from "lodash";
 import log from "loglevel";
 
@@ -31,6 +30,7 @@ import { ResponsiveBehavior } from "layoutSystems/common/utils/constants";
 import IconSVG from "../icon.svg";
 import ThumbnailSVG from "../thumbnail.svg";
 import { WIDGET_TAGS } from "constants/WidgetConstants";
+import { klonaRegularWithTelemetry } from "utils/helpers";
 
 const CSV_ARRAY_LABEL = "Array of Objects (CSV, XLS(X), JSON, TSV)";
 
@@ -614,8 +614,12 @@ class FilePickerWidget extends BaseWidget<
 
     uppy.on("files-added", (files: UppyFile[]) => {
       // Deep cloning the selectedFiles
+
       const selectedFiles = this.props.selectedFiles
-        ? klona(this.props.selectedFiles)
+        ? (klonaRegularWithTelemetry(
+            this.props.selectedFiles,
+            "initializeUppyEventListeners.selectedFiles",
+          ) as Array<unknown>)
         : [];
 
       const fileCount = this.props.selectedFiles?.length || 0;
diff --git a/app/client/src/widgets/JSONFormWidget/component/Field.tsx b/app/client/src/widgets/JSONFormWidget/component/Field.tsx
index 6718ab45e3ca..bd01ccef20c8 100644
--- a/app/client/src/widgets/JSONFormWidget/component/Field.tsx
+++ b/app/client/src/widgets/JSONFormWidget/component/Field.tsx
@@ -3,12 +3,12 @@ import React, { useEffect, useRef } from "react";
 import styled from "styled-components";
 import type { ControllerProps } from "react-hook-form";
 import { useFormContext } from "react-hook-form";
-import { klona } from "klona";
 
 import type { FieldLabelProps } from "./FieldLabel";
 import FieldLabel from "./FieldLabel";
 import useUpdateAccessor from "../fields/useObserveAccessor";
 import { FIELD_MARGIN_BOTTOM } from "./styleConstants";
+import { klonaRegularWithTelemetry } from "utils/helpers";
 
 type FieldProps<TValue> = React.PropsWithChildren<
   {
@@ -61,7 +61,7 @@ function Field<TValue>({
 
       // Follow the comment in Form component above reset(convertedFormData);
       setTimeout(() => {
-        setValue(name, klona(defaultValue));
+        setValue(name, klonaRegularWithTelemetry(defaultValue, "Field"));
       }, 0);
     }
   }, [defaultValue, setValue]);
diff --git a/app/client/src/widgets/JSONFormWidget/component/Form.tsx b/app/client/src/widgets/JSONFormWidget/component/Form.tsx
index a3cb9b9be40f..39922b05958a 100644
--- a/app/client/src/widgets/JSONFormWidget/component/Form.tsx
+++ b/app/client/src/widgets/JSONFormWidget/component/Form.tsx
@@ -5,7 +5,6 @@ import styled from "styled-components";
 import { debounce, isEmpty } from "lodash";
 import { FormProvider, useForm } from "react-hook-form";
 import { Text } from "@blueprintjs/core";
-import { klona } from "klona";
 
 import useFixedFooter from "./useFixedFooter";
 import type { ButtonStyleProps } from "widgets/ButtonWidget/component";
@@ -15,6 +14,7 @@ import { FORM_PADDING_Y, FORM_PADDING_X } from "./styleConstants";
 import type { Schema } from "../constants";
 import { ROOT_SCHEMA_KEY } from "../constants";
 import { convertSchemaItemToFormData, schemaItemDefaultValue } from "../helper";
+import { klonaRegularWithTelemetry } from "utils/helpers";
 
 // TODO: Fix this the next time the file is edited
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -243,7 +243,11 @@ function Form<TValues = any>(
 
     const subscription = watch((values) => {
       if (!equal(valuesRef.current, values)) {
-        const clonedValue = klona(values);
+        const clonedValue = klonaRegularWithTelemetry(
+          values,
+          "Form.subscription",
+        );
+
         valuesRef.current = clonedValue;
         debouncedUpdateFormData(clonedValue as TValues);
       }
diff --git a/app/client/src/widgets/JSONFormWidget/fields/ArrayField.tsx b/app/client/src/widgets/JSONFormWidget/fields/ArrayField.tsx
index 2d9cc17508df..6e008805b793 100644
--- a/app/client/src/widgets/JSONFormWidget/fields/ArrayField.tsx
+++ b/app/client/src/widgets/JSONFormWidget/fields/ArrayField.tsx
@@ -10,7 +10,6 @@ import type { ControllerRenderProps } from "react-hook-form";
 import { useFormContext } from "react-hook-form";
 import { get, set } from "lodash";
 import { Icon } from "@blueprintjs/core";
-import { klona } from "klona";
 import log from "loglevel";
 
 import Accordion from "../component/Accordion";
@@ -32,6 +31,7 @@ import { Colors } from "constants/Colors";
 import { FIELD_MARGIN_BOTTOM } from "../component/styleConstants";
 import { generateReactKey } from "utils/generators";
 import { schemaItemDefaultValue } from "../helper";
+import { klonaRegularWithTelemetry } from "utils/helpers";
 
 type ArrayComponentProps = FieldComponentBaseProps & {
   backgroundColor?: string;
@@ -192,7 +192,8 @@ function ArrayField({
   const { setMetaInternalFieldState } = useContext(FormContext);
 
   const add = () => {
-    let values = klona(getValues(name));
+    let values = klonaRegularWithTelemetry(getValues(name), "ArrayField.add");
+
     if (values && values.length) {
       values.push({});
     } else {
@@ -203,7 +204,11 @@ function ArrayField({
 
   const remove = useCallback(
     (removedKey: string) => {
-      const values = klona(getValues(name));
+      const values = klonaRegularWithTelemetry(
+        getValues(name),
+        "ArrayField.remove",
+      );
+
       if (values === undefined) {
         return;
       }
@@ -219,7 +224,10 @@ function ArrayField({
       // cachedDefaultValue[index] in the FieldRenderer
       if (removedIndex < cachedDefaultValue.length) {
         setCachedDefaultValue((prevDefaultValue) => {
-          const clonedValue = klona(prevDefaultValue);
+          const clonedValue = klonaRegularWithTelemetry(
+            prevDefaultValue,
+            "ArrayField.remove.setCachedDefaultValue",
+          );
 
           clonedValue.splice(removedIndex, 1);
 
@@ -229,10 +237,11 @@ function ArrayField({
 
       // Manually remove from the values and re-insert to maintain the position of the
       // values
-      const newValues = klona(
+      const newValues = klonaRegularWithTelemetry(
         // TODO: Fix this the next time the file is edited
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         values.filter((_val: any, index: number) => index !== removedIndex),
+        "ArrayField.remove.newValues",
       );
 
       removedKeys.current = [removedKey];
@@ -270,8 +279,19 @@ function ArrayField({
   }, [valueLength]);
 
   useDeepEffect(() => {
-    setValue(name, klona(defaultValue));
-    setCachedDefaultValue(klona(defaultValue));
+    setValue(
+      name,
+      klonaRegularWithTelemetry(
+        defaultValue,
+        "ArrayField.useDeepEffect.setValue",
+      ),
+    );
+    setCachedDefaultValue(
+      klonaRegularWithTelemetry(
+        defaultValue,
+        "ArrayField.useDeepEffect.setCachedDefaultValue",
+      ),
+    );
   }, [defaultValue]);
 
   /**
@@ -282,7 +302,11 @@ function ArrayField({
    */
   useDeepEffect(() => {
     setMetaInternalFieldState((prevState) => {
-      const metaInternalFieldState = klona(prevState.metaInternalFieldState);
+      const metaInternalFieldState = klonaRegularWithTelemetry(
+        prevState.metaInternalFieldState,
+        "ArrayField.useDeepEffect.setMetaInternalFieldState",
+      );
+
       const currMetaInternalFieldState: FieldState<{ isValid: true }> = get(
         metaInternalFieldState,
         name,
@@ -399,5 +423,4 @@ function ArrayField({
 
 const MemoizedArrayField: FieldComponent = React.memo(ArrayField);
 MemoizedArrayField.componentDefaultValues = COMPONENT_DEFAULT_VALUES;
-
 export default MemoizedArrayField;
diff --git a/app/client/src/widgets/JSONFormWidget/fields/useRegisterFieldValidity.test.tsx b/app/client/src/widgets/JSONFormWidget/fields/useRegisterFieldValidity.test.tsx
index fe4e132855e9..29e26a100b3d 100644
--- a/app/client/src/widgets/JSONFormWidget/fields/useRegisterFieldValidity.test.tsx
+++ b/app/client/src/widgets/JSONFormWidget/fields/useRegisterFieldValidity.test.tsx
@@ -193,6 +193,56 @@ describe("useRegisterFieldInvalid - setMetaInternalFieldState", () => {
     expect(mockSetError).not.toBeCalled();
   });
 
+  it("calls setError when isValid is false and error is not present", () => {
+    const mocksetMetaInternalFieldState = jest.fn();
+    const mockClearErrors = jest.fn();
+    const mockSetError = jest.fn();
+
+    function Wrapper({ children }: { children: React.ReactNode }) {
+      const methods = useForm();
+
+      return (
+        <FormContextProvider
+          executeAction={jest.fn}
+          renderMode="CANVAS"
+          setMetaInternalFieldState={mocksetMetaInternalFieldState}
+          updateFormData={jest.fn}
+          updateWidgetMetaProperty={jest.fn}
+          updateWidgetProperty={jest.fn}
+        >
+          <FormProvider
+            {...methods}
+            clearErrors={mockClearErrors}
+            setError={mockSetError}
+          >
+            {children}
+          </FormProvider>
+        </FormContextProvider>
+      );
+    }
+
+    const fieldName = "testField";
+
+    act(() => {
+      renderHook(
+        () =>
+          useRegisterFieldValidity({
+            isValid: false,
+            fieldName,
+            fieldType: FieldType.TEXT_INPUT,
+          }),
+        {
+          wrapper: Wrapper,
+        },
+      );
+    });
+
+    jest.runAllTimers();
+
+    expect(mockSetError).toBeCalledTimes(1);
+    expect(mockClearErrors).not.toBeCalledWith(fieldName);
+  });
+
   it("updates fieldState and error state with the updated isValid value", () => {
     const mocksetMetaInternalFieldState = jest.fn();
     // TODO: Fix this the next time the file is edited
diff --git a/app/client/src/widgets/JSONFormWidget/fields/useRegisterFieldValidity.ts b/app/client/src/widgets/JSONFormWidget/fields/useRegisterFieldValidity.ts
index 58c2811ebd0c..5aba5277246c 100644
--- a/app/client/src/widgets/JSONFormWidget/fields/useRegisterFieldValidity.ts
+++ b/app/client/src/widgets/JSONFormWidget/fields/useRegisterFieldValidity.ts
@@ -3,11 +3,11 @@ import { set } from "lodash";
 import type { ControllerProps } from "react-hook-form";
 import { useFormContext } from "react-hook-form";
 import { useContext, useEffect } from "react";
-import { klona } from "klona";
 
 import FormContext from "../FormContext";
 import type { FieldType } from "../constants";
 import { startAndEndSpanForFn } from "UITelemetry/generateTraces";
+import { klonaRegularWithTelemetry } from "utils/helpers";
 
 export interface UseRegisterFieldValidityProps {
   isValid: boolean;
@@ -42,12 +42,14 @@ function useRegisterFieldValidity({
             });
           }
         } else {
-          startAndEndSpanForFn("JSONFormWidget.setError", {}, () => {
-            setError(fieldName, {
-              type: fieldType,
-              message: "Invalid field",
+          if (!error) {
+            startAndEndSpanForFn("JSONFormWidget.setError", {}, () => {
+              setError(fieldName, {
+                type: fieldType,
+                message: "Invalid field",
+              });
             });
-          });
+          }
         }
       } catch (e) {
         Sentry.captureException(e);
@@ -57,7 +59,11 @@ function useRegisterFieldValidity({
 
   useEffect(() => {
     setMetaInternalFieldState((prevState) => {
-      const metaInternalFieldState = klona(prevState.metaInternalFieldState);
+      const metaInternalFieldState = klonaRegularWithTelemetry(
+        prevState.metaInternalFieldState,
+        "useRegisterFieldValidity.setMetaInternalFieldState",
+      );
+
       set(metaInternalFieldState, `${fieldName}.isValid`, isValid);
 
       return {
diff --git a/app/client/src/widgets/JSONFormWidget/fields/useUpdateInternalMetaState.ts b/app/client/src/widgets/JSONFormWidget/fields/useUpdateInternalMetaState.ts
index 3f7b2ded78df..1e354b40e597 100644
--- a/app/client/src/widgets/JSONFormWidget/fields/useUpdateInternalMetaState.ts
+++ b/app/client/src/widgets/JSONFormWidget/fields/useUpdateInternalMetaState.ts
@@ -1,9 +1,9 @@
 import { debounce, set } from "lodash";
 import { useMemo, useContext, useCallback } from "react";
-import { klona } from "klona";
 
 import type { DebouncedExecuteActionPayload } from "widgets/MetaHOC";
 import FormContext from "../FormContext";
+import { klonaRegularWithTelemetry } from "utils/helpers";
 
 export interface UseUpdateInternalMetaStateProps {
   propertyName?: string;
@@ -23,9 +23,11 @@ function useUpdateInternalMetaState({
     ) => {
       if (propertyName) {
         setMetaInternalFieldState((prevState) => {
-          const metaInternalFieldState = klona(
+          const metaInternalFieldState = klonaRegularWithTelemetry(
             prevState.metaInternalFieldState,
+            "useUpdateInternalMetaState.metaInternalFieldState",
           );
+
           set(metaInternalFieldState, propertyName, propertyValue);
 
           return {
diff --git a/app/client/src/widgets/JSONFormWidget/schemaParser.ts b/app/client/src/widgets/JSONFormWidget/schemaParser.ts
index 53bd5d95557d..9bb68222fafb 100644
--- a/app/client/src/widgets/JSONFormWidget/schemaParser.ts
+++ b/app/client/src/widgets/JSONFormWidget/schemaParser.ts
@@ -7,7 +7,6 @@ import {
   sortBy,
   startCase,
 } from "lodash";
-import { klona } from "klona";
 
 import { sanitizeKey } from "widgets/WidgetUtils";
 import type {
@@ -28,6 +27,7 @@ import {
   ROOT_SCHEMA_KEY,
 } from "./constants";
 import { getFieldStylesheet } from "./helper";
+import { klonaRegularWithTelemetry } from "utils/helpers";
 
 type Obj = Record<string, unknown>;
 
@@ -138,7 +138,11 @@ export const getSourceDataPathFromSchemaItemPath = (
   schemaItemPath: string,
 ) => {
   const keys = schemaItemPath.split("."); //schema.__root_schema__.children.name -> ["schema", ROOT_SCHEMA_KEY, "children", "name"]
-  let clonedSchema = klona(schema);
+  let clonedSchema = klonaRegularWithTelemetry(
+    schema,
+    "schemaParser.getSourceDataPathFromSchemaItemPath",
+  );
+
   let sourceDataPath = "sourceData";
   let schemaItem: SchemaItem;
   let skipIteration = false;
@@ -660,7 +664,10 @@ class SchemaParser {
     widgetName,
     ...rest
   }: Omit<ParserOptions, "identifier">): Schema => {
-    const schema = klona(prevSchema);
+    const schema = klonaRegularWithTelemetry(
+      prevSchema,
+      "schemaParser.convertArrayToSchema",
+    );
 
     if (!Array.isArray(currSourceData)) {
       return schema;
@@ -729,7 +736,11 @@ class SchemaParser {
     sourceDataPath,
     ...rest
   }: Omit<ParserOptions, "identifier">): Schema => {
-    const schema = klona(prevSchema);
+    const schema = klonaRegularWithTelemetry(
+      prevSchema,
+      "schemaParser.convertObjectToSchema",
+    );
+
     const origIdentifierToIdentifierMap =
       mapOriginalIdentifierToSanitizedIdentifier(schema);
 
@@ -762,7 +773,11 @@ class SchemaParser {
 
     modifiedKeys.forEach((modifiedKey) => {
       const identifier = origIdentifierToIdentifierMap[modifiedKey];
-      const prevSchemaItem = klona(schema[identifier]);
+      const prevSchemaItem = klonaRegularWithTelemetry(
+        schema[identifier],
+        "schemaParser.convertObjectToSchema.modifiedKeys",
+      );
+
       const currData = currSourceData[modifiedKey];
       const prevData = prevSchemaItem.sourceData;
       const currDataType = dataTypeFor(currData);
diff --git a/app/client/src/widgets/JSONFormWidget/schemaTestData.ts b/app/client/src/widgets/JSONFormWidget/schemaTestData.ts
index d06e910b4d33..9c7457643013 100644
--- a/app/client/src/widgets/JSONFormWidget/schemaTestData.ts
+++ b/app/client/src/widgets/JSONFormWidget/schemaTestData.ts
@@ -1,4 +1,3 @@
-import { klona } from "klona";
 import { isEmpty, startCase } from "lodash";
 import { isDynamicValue } from "utils/DynamicBindingUtils";
 import type { FieldThemeStylesheet, SchemaItem } from "./constants";
@@ -8,6 +7,7 @@ import {
   FieldType,
   ROOT_SCHEMA_KEY,
 } from "./constants";
+import { klonaRegularWithTelemetry } from "utils/helpers";
 
 export const schemaItemStyles = {
   accentColor:
@@ -42,8 +42,10 @@ export const schemaItemFactory = (item: any): SchemaItem => {
 
 export const replaceBindingWithValue = (schemaItem: SchemaItem) => {
   if (isEmpty(schemaItem)) return {} as SchemaItem;
-
-  const updatedSchemaItem = klona(schemaItem);
+  const updatedSchemaItem = klonaRegularWithTelemetry(
+    schemaItem,
+    "schemaTestData.replaceBindingWithValue",
+  );
 
   Object.keys(updatedSchemaItem).forEach((k) => {
     const key = k as keyof SchemaItem;
diff --git a/app/client/src/widgets/JSONFormWidget/widget/index.tsx b/app/client/src/widgets/JSONFormWidget/widget/index.tsx
index 2eadbfe4122a..4310c6cf9e6e 100644
--- a/app/client/src/widgets/JSONFormWidget/widget/index.tsx
+++ b/app/client/src/widgets/JSONFormWidget/widget/index.tsx
@@ -1,7 +1,6 @@
 import React from "react";
 import equal from "fast-deep-equal/es6";
 import { debounce, difference, isEmpty, merge, noop } from "lodash";
-import { klona } from "klona";
 
 import type { WidgetProps, WidgetState } from "widgets/BaseWidget";
 import BaseWidget from "widgets/BaseWidget";
@@ -69,6 +68,7 @@ import {
 } from "../constants/messages";
 import { createMessage } from "ee/constants/messages";
 import { endSpan, startRootSpan } from "UITelemetry/generateTraces";
+import { klonaRegularWithTelemetry } from "utils/helpers";
 
 const SUBMIT_BUTTON_DEFAULT_STYLES = {
   buttonVariant: ButtonVariantTypes.PRIMARY,
@@ -660,7 +660,10 @@ class JSONFormWidget extends BaseWidget<
   ) => {
     const span = startRootSpan("JSONFormWidget.parseAndSaveFieldState");
     const fieldState = generateFieldState(schema, metaInternalFieldState);
-    const action = klona(afterUpdateAction);
+    const action = klonaRegularWithTelemetry(
+      afterUpdateAction,
+      "JSONFormWidget.parseAndSaveFieldState",
+    );
 
     const actionPayload =
       action && this.applyGlobalContextToAction(action, { fieldState });
@@ -723,7 +726,11 @@ class JSONFormWidget extends BaseWidget<
     actionPayload: ExecuteTriggerPayload,
     context: Record<string, unknown> = {},
   ) => {
-    const payload = klona(actionPayload);
+    const payload = klonaRegularWithTelemetry(
+      actionPayload,
+      "JSONFormWidget.applyGlobalContextToAction",
+    );
+
     const { globalContext } = payload;
 
     /**
diff --git a/app/client/src/widgets/JSONFormWidget/widget/propertyConfig/helper.ts b/app/client/src/widgets/JSONFormWidget/widget/propertyConfig/helper.ts
index 5305f543719d..4d4383ec16d0 100644
--- a/app/client/src/widgets/JSONFormWidget/widget/propertyConfig/helper.ts
+++ b/app/client/src/widgets/JSONFormWidget/widget/propertyConfig/helper.ts
@@ -1,4 +1,3 @@
-import { klona } from "klona";
 import { get, set } from "lodash";
 
 import SchemaParser from "widgets/JSONFormWidget/schemaParser";
@@ -18,6 +17,7 @@ import type {
   Stylesheet,
 } from "entities/AppTheming";
 import { processSchemaItemAutocomplete } from "components/propertyControls/JSONFormComputeControl";
+import { klonaRegularWithTelemetry } from "utils/helpers";
 
 export type HiddenFnParams = [JSONFormWidgetProps, string];
 
@@ -54,7 +54,10 @@ export const fieldTypeUpdateHook = (
    * the new added paths gets into the dynamicBindingPathList until
    * the updateProperty function is fixed.
    */
-  const updatedSchema = { schema: klona(schema) };
+
+  const updatedSchema = {
+    schema: klonaRegularWithTelemetry(schema, "helper.fieldTypeUpdateHook"),
+  };
   set(updatedSchema, schemaItemPath, schemaItemWithAutoFillState);
 
   return [{ propertyPath: "schema", propertyValue: updatedSchema.schema }];
diff --git a/app/client/src/widgets/ListWidget/widget/index.tsx b/app/client/src/widgets/ListWidget/widget/index.tsx
index 5a66e4ea24ef..54218e7c338c 100644
--- a/app/client/src/widgets/ListWidget/widget/index.tsx
+++ b/app/client/src/widgets/ListWidget/widget/index.tsx
@@ -24,7 +24,6 @@ import { ValidationTypes } from "constants/WidgetValidation";
 import { FILL_WIDGET_MIN_WIDTH } from "constants/minWidthConstants";
 import type { SetterConfig, Stylesheet } from "entities/AppTheming";
 import equal from "fast-deep-equal/es6";
-import { klona } from "klona/lite";
 import { renderAppsmithCanvas } from "layoutSystems/CanvasFactory";
 import {
   Positioning,
@@ -56,7 +55,7 @@ import {
 } from "utils/DynamicBindingUtils";
 import type { ExtraDef } from "utils/autocomplete/defCreatorUtils";
 import { generateTypeDef } from "utils/autocomplete/defCreatorUtils";
-import { removeFalsyEntries } from "utils/helpers";
+import { klonaLiteWithTelemetry, removeFalsyEntries } from "utils/helpers";
 import type { WidgetProps, WidgetState } from "widgets/BaseWidget";
 import BaseWidget from "widgets/BaseWidget";
 import { DefaultAutocompleteDefinitions } from "widgets/WidgetUtils";
@@ -1298,7 +1297,12 @@ class ListWidget extends BaseWidget<ListWidgetProps<WidgetProps>, WidgetState> {
       this.props.listData
     ) {
       const { page } = this.state;
-      const children = removeFalsyEntries(klona(this.props.childWidgets));
+      const children = removeFalsyEntries(
+        klonaLiteWithTelemetry(
+          this.props.childWidgets,
+          "ListWidget.renderChildren",
+        ),
+      );
       const childCanvas = children[0];
       const { perPage } = this.shouldPaginate();
 
@@ -1352,7 +1356,10 @@ class ListWidget extends BaseWidget<ListWidgetProps<WidgetProps>, WidgetState> {
       const canvasChildrenList = [];
       if (listData.length > 0) {
         for (let i = 0; i < listData.length; i++) {
-          canvasChildrenList[i] = klona(template);
+          canvasChildrenList[i] = klonaLiteWithTelemetry(
+            template,
+            "ListWidget.renderChildren",
+          );
         }
         canvasChildren = this.updateGridChildrenProps(canvasChildrenList);
       } else {
diff --git a/app/client/src/widgets/ListWidgetV2/MetaWidgetGenerator.ts b/app/client/src/widgets/ListWidgetV2/MetaWidgetGenerator.ts
index 90a961165892..bdba16255dc7 100644
--- a/app/client/src/widgets/ListWidgetV2/MetaWidgetGenerator.ts
+++ b/app/client/src/widgets/ListWidgetV2/MetaWidgetGenerator.ts
@@ -1,5 +1,4 @@
 import hash from "object-hash";
-import { klona } from "klona";
 import { difference, omit, set, get, isEmpty, isString, isNil } from "lodash";
 import type { VirtualizerOptions } from "@tanstack/virtual-core";
 import {
@@ -35,6 +34,7 @@ import {
   getDynamicBindings,
 } from "utils/DynamicBindingUtils";
 import WidgetFactory from "WidgetProvider/factory";
+import { klonaRegularWithTelemetry } from "utils/helpers";
 
 type TemplateWidgets =
   ListWidgetProps<WidgetProps>["flattenedChildCanvasWidgets"];
@@ -334,7 +334,11 @@ class MetaWidgetGenerator {
     }
 
     // Maybe don't deep-clone for perf?
-    const prevOptions = klona(this.prevOptions);
+    const prevOptions = klonaRegularWithTelemetry(
+      this.prevOptions,
+      "MetaWidgetGenerator.withOptions",
+    );
+
     this.prevOptions = options;
 
     this._didUpdate(options, prevOptions);
@@ -541,8 +545,11 @@ class MetaWidgetGenerator {
       return { metaWidgetId: undefined, metaWidgetName: undefined };
 
     const key = options ? options.key : this.getPrimaryKey(rowIndex);
+    const metaWidget = klonaRegularWithTelemetry(
+      templateWidget,
+      "MetaWidgetGenerator.generateMetaWidgetRecursively",
+    ) as MetaWidget;
 
-    const metaWidget = klona(templateWidget) as MetaWidget;
     const metaCacheProps = this.getRowTemplateCache(
       key,
       templateWidgetId,
@@ -1494,9 +1501,17 @@ class MetaWidgetGenerator {
   ) => {
     const { metaWidget, originalMetaWidgetId, templateWidgetId } = options;
     const viewIndex = this.getViewIndex(rowIndex);
-    const referenceCache = klona(this.getWidgetReferenceCache());
+    const referenceCache = klonaRegularWithTelemetry(
+      this.getWidgetReferenceCache(),
+      "MetaWidgetGenerator.updateSiblings.getWidgetReferenceCache",
+    );
+
     const currentCache = referenceCache?.[templateWidgetId];
-    const siblings = klona(currentCache?.siblings || new Set<string>());
+    const siblings = klonaRegularWithTelemetry(
+      currentCache?.siblings || new Set<string>(),
+      "MetaWidgetGenerator.updateSiblings.siblings",
+    );
+
     const isCandidateListWidget =
       this.nestedViewIndex === 0 || !this.nestedViewIndex;
     const isCandidateWidget = isCandidateListWidget && viewIndex === 0;
diff --git a/app/client/src/widgets/ListWidgetV2/widget/index.tsx b/app/client/src/widgets/ListWidgetV2/widget/index.tsx
index e203207ae898..fea41b411139 100644
--- a/app/client/src/widgets/ListWidgetV2/widget/index.tsx
+++ b/app/client/src/widgets/ListWidgetV2/widget/index.tsx
@@ -4,7 +4,6 @@ import memoize from "micro-memoize";
 import type { RefObject } from "react";
 import React, { createRef } from "react";
 import { floor, isEmpty, isNil, isString } from "lodash";
-import { klona } from "klona";
 import hash from "object-hash";
 import type { WidgetOperation, WidgetProps } from "widgets/BaseWidget";
 import BaseWidget from "widgets/BaseWidget";
@@ -54,6 +53,7 @@ import defaultProps from "./defaultProps";
 import IconSVG from "../icon.svg";
 import ThumbnailSVG from "../thumbnail.svg";
 import { renderAppsmithCanvas } from "layoutSystems/CanvasFactory";
+import { klonaRegularWithTelemetry } from "utils/helpers";
 
 const getCurrentItemsViewBindingTemplate = () => ({
   prefix: "{{[",
@@ -643,7 +643,11 @@ class ListWidget extends BaseWidget<
     }
 
     if (!isEqual(this.prevMetaMainCanvasWidget, mainCanvasWidget)) {
-      this.prevMetaMainCanvasWidget = klona(mainCanvasWidget);
+      this.prevMetaMainCanvasWidget = klonaRegularWithTelemetry(
+        mainCanvasWidget,
+        "ListWidgetV2.generateMainMetaCanvasWidget",
+      );
+
       return mainCanvasWidget;
     }
   };
@@ -887,7 +891,12 @@ class ListWidget extends BaseWidget<
     const { flattenedChildCanvasWidgets = {}, mainCanvasId = "" } = this.props;
     const mainCanvasWidget = flattenedChildCanvasWidgets[mainCanvasId] || {};
     const { componentHeight, componentWidth } = this.props;
-    const metaMainCanvas = klona(mainCanvasWidget) ?? {};
+
+    const metaMainCanvas =
+      klonaRegularWithTelemetry(
+        mainCanvasWidget,
+        "ListWidget.mainMetaCanvasWidget",
+      ) ?? {};
 
     const { metaWidgetId, metaWidgetName } =
       this.metaWidgetGenerator.getContainerParentCache() || {};
diff --git a/app/client/src/widgets/SelectWidget/component/SelectButton.test.tsx b/app/client/src/widgets/SelectWidget/component/SelectButton.test.tsx
index 0b1b11d0f26b..4d4f6cacd730 100644
--- a/app/client/src/widgets/SelectWidget/component/SelectButton.test.tsx
+++ b/app/client/src/widgets/SelectWidget/component/SelectButton.test.tsx
@@ -4,6 +4,7 @@ import { fireEvent, render } from "@testing-library/react";
 
 import type { SelectButtonProps } from "./SelectButton";
 import SelectButton from "./SelectButton";
+import { CommonLocators } from "../../../../cypress/support/Objects/CommonLocators";
 
 // It is necessary to make a mock of the Icon component as the error falls due to React.lazy in importIconImpl
 jest.mock("@design-system/widgets-old", () => {
@@ -33,6 +34,8 @@ const renderComponent = (props: SelectButtonProps = defaultProps) => {
   return render(<SelectButton {...props} />);
 };
 
+const locators = new CommonLocators();
+
 describe("SelectButton", () => {
   it("should not fire click event when disabled", () => {
     const { getByTestId, getByText } = renderComponent({
@@ -60,4 +63,24 @@ describe("SelectButton", () => {
     fireEvent.click(getByTestId("selectbutton.btn.main"));
     expect(defaultProps.togglePopoverVisibility).toBeCalled();
   });
+
+  it("should not render cancel button when select widget required is true", () => {
+    const { container } = renderComponent({
+      ...defaultProps,
+      isRequired: true,
+    });
+    expect(
+      container.querySelector(locators._selectClearButton_dataTestId),
+    ).toBeNull();
+  });
+
+  it("should render cancel button when select widget required is false", () => {
+    const { container } = renderComponent({
+      ...defaultProps,
+      isRequired: false,
+    });
+    expect(
+      container.querySelector(locators._selectClearButton_dataTestId),
+    ).not.toBeNull();
+  });
 });
diff --git a/app/client/src/widgets/SelectWidget/component/SelectButton.tsx b/app/client/src/widgets/SelectWidget/component/SelectButton.tsx
index 154776774580..eb7d61ef07b2 100644
--- a/app/client/src/widgets/SelectWidget/component/SelectButton.tsx
+++ b/app/client/src/widgets/SelectWidget/component/SelectButton.tsx
@@ -17,6 +17,7 @@ export interface SelectButtonProps {
   togglePopoverVisibility: () => void;
   tooltipText?: string;
   value?: string;
+  isRequired?: boolean;
   hideCancelIcon?: boolean;
 }
 
@@ -26,6 +27,7 @@ function SelectButton(props: SelectButtonProps) {
     displayText,
     handleCancelClick,
     hideCancelIcon,
+    isRequired,
     spanRef,
     togglePopoverVisibility,
     tooltipText,
@@ -40,7 +42,7 @@ function SelectButton(props: SelectButtonProps) {
       onClick={togglePopoverVisibility}
       rightIcon={
         <StyledDiv>
-          {!isEmptyOrNill(value) && !hideCancelIcon ? (
+          {!isEmptyOrNill(value) && !hideCancelIcon && !isRequired ? (
             <Icon
               className="dropdown-icon cancel-icon"
               data-testid="selectbutton.btn.cancel"
diff --git a/app/client/src/widgets/SelectWidget/component/index.tsx b/app/client/src/widgets/SelectWidget/component/index.tsx
index acb7fedd5c23..ec5e8ed5b5cc 100644
--- a/app/client/src/widgets/SelectWidget/component/index.tsx
+++ b/app/client/src/widgets/SelectWidget/component/index.tsx
@@ -433,6 +433,7 @@ class SelectComponent extends React.Component<
               displayText={value.toString()}
               handleCancelClick={this.handleCancelClick}
               hideCancelIcon={this.props.hideCancelIcon}
+              isRequired={this.props.isRequired}
               spanRef={this.spanRef}
               togglePopoverVisibility={this.togglePopoverVisibility}
               tooltipText={tooltipText}
@@ -446,44 +447,45 @@ class SelectComponent extends React.Component<
 }
 
 export interface SelectComponentProps extends ComponentProps {
+  accentColor?: string;
+  borderRadius: string;
+  boxShadow?: string;
   className?: string;
+  compactMode: boolean;
   disabled?: boolean;
-  onOptionSelected: (optionSelected: DropdownOption) => void;
-  placeholder?: string;
+  dropDownWidth: number;
+  filterText?: string;
+  hasError?: boolean;
+  height: number;
+  hideCancelIcon?: boolean;
+  isDynamicHeightEnabled?: boolean;
+  isFilterable: boolean;
+  isLoading: boolean;
+  isOpen?: boolean;
+  isRequired?: boolean;
+  isValid: boolean;
+  label?: string | number;
   labelAlignment?: Alignment;
   labelPosition?: LabelPosition;
+  labelStyle?: string;
   labelText: string;
   labelTextColor?: string;
   labelTextSize?: TextSize;
-  labelStyle?: string;
-  labelWidth?: number;
   labelTooltip?: string;
-  compactMode: boolean;
-  selectedIndex?: number;
-  options: DropdownOption[];
-  isDynamicHeightEnabled?: boolean;
-  isLoading: boolean;
-  isFilterable: boolean;
-  isValid: boolean;
-  width: number;
-  dropDownWidth: number;
-  height: number;
-  serverSideFiltering: boolean;
-  hasError?: boolean;
-  onFilterChange: (text: string) => void;
-  onDropdownOpen?: () => void;
-  onDropdownClose?: () => void;
-  value?: string | number;
-  label?: string | number;
-  filterText?: string;
-  borderRadius: string;
-  boxShadow?: string;
-  accentColor?: string;
-  isOpen?: boolean;
+  labelWidth?: number;
   onClose?: () => void;
-  hideCancelIcon?: boolean;
+  onDropdownClose?: () => void;
+  onDropdownOpen?: () => void;
+  onFilterChange: (text: string) => void;
+  onOptionSelected: (optionSelected: DropdownOption) => void;
+  options: DropdownOption[];
+  placeholder?: string;
   resetFilterTextOnClose?: boolean;
   rtl?: boolean;
+  selectedIndex?: number;
+  serverSideFiltering: boolean;
+  value?: string | number;
+  width: number;
 }
 
 export default React.memo(SelectComponent);
diff --git a/app/client/src/widgets/SelectWidget/widget/index.tsx b/app/client/src/widgets/SelectWidget/widget/index.tsx
index 734ae4d83768..4e65799a9f15 100644
--- a/app/client/src/widgets/SelectWidget/widget/index.tsx
+++ b/app/client/src/widgets/SelectWidget/widget/index.tsx
@@ -858,6 +858,7 @@ class SelectWidget extends BaseWidget<SelectWidgetProps, WidgetState> {
         isDynamicHeightEnabled={isAutoHeightEnabledForWidget(this.props)}
         isFilterable={this.props.isFilterable}
         isLoading={this.props.isLoading}
+        isRequired={this.props.isRequired}
         isValid={this.props.isValid}
         label={this.props.selectedOptionLabel}
         labelAlignment={this.props.labelAlignment}
diff --git a/app/client/src/widgets/TableWidgetV2/widget/index.tsx b/app/client/src/widgets/TableWidgetV2/widget/index.tsx
index 09f45d48be86..7dfcf3be81b1 100644
--- a/app/client/src/widgets/TableWidgetV2/widget/index.tsx
+++ b/app/client/src/widgets/TableWidgetV2/widget/index.tsx
@@ -101,7 +101,6 @@ import { ImageCell } from "../component/cellComponents/ImageCell";
 import { VideoCell } from "../component/cellComponents/VideoCell";
 import { IconButtonCell } from "../component/cellComponents/IconButtonCell";
 import { EditActionCell } from "../component/cellComponents/EditActionsCell";
-import { klona as clone } from "klona";
 import { CheckboxCell } from "../component/cellComponents/CheckboxCell";
 import { SwitchCell } from "../component/cellComponents/SwitchCell";
 import { SelectCell } from "../component/cellComponents/SelectCell";
@@ -140,6 +139,7 @@ import {
 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 () =>
   retryPromise(async () => import("../component")),
@@ -1834,7 +1834,10 @@ class TableWidgetV2 extends BaseWidget<TableWidgetProps, WidgetState> {
   };
 
   removeRowFromTransientTableData = (index: number) => {
-    const newTransientTableData = clone(this.props.transientTableData);
+    const newTransientTableData = klonaRegularWithTelemetry(
+      this.props.transientTableData,
+      "TableWidgetV2.removeRowFromTransientTableData",
+    );
     const { commitBatchMetaUpdates, pushBatchMetaUpdates } = this.props;
 
     if (newTransientTableData) {
diff --git a/app/client/src/widgets/index.ts b/app/client/src/widgets/index.ts
index e4f7c3ca0f93..813c5e5f9158 100644
--- a/app/client/src/widgets/index.ts
+++ b/app/client/src/widgets/index.ts
@@ -68,6 +68,7 @@ import { WDSCurrencyInputWidget } from "./wds/WDSCurrencyInputWidget";
 import { WDSToolbarButtonsWidget } from "./wds/WDSToolbarButtonsWidget";
 import { WDSPhoneInputWidget } from "./wds/WDSPhoneInputWidget";
 import { WDSCheckboxGroupWidget } from "./wds/WDSCheckboxGroupWidget";
+import { WDSComboBoxWidget } from "./wds/WDSComboBoxWidget";
 import { WDSSwitchWidget } from "./wds/WDSSwitchWidget";
 import { WDSSwitchGroupWidget } from "./wds/WDSSwitchGroupWidget";
 import { WDSRadioGroupWidget } from "./wds/WDSRadioGroupWidget";
@@ -85,6 +86,7 @@ import { WDSEmailInputWidget } from "./wds/WDSEmailInputWidget";
 import { WDSPasswordInputWidget } from "./wds/WDSPasswordInputWidget";
 import { WDSNumberInputWidget } from "./wds/WDSNumberInputWidget";
 import { WDSMultilineInputWidget } from "./wds/WDSMultilineInputWidget";
+import { WDSSelectWidget } from "./wds/WDSSelectWidget";
 
 const LegacyWidgets = [
   CanvasWidget,
@@ -164,6 +166,7 @@ const WDSWidgets = [
   WDSToolbarButtonsWidget,
   WDSPhoneInputWidget,
   WDSCheckboxGroupWidget,
+  WDSComboBoxWidget,
   WDSSwitchWidget,
   WDSSwitchGroupWidget,
   WDSRadioGroupWidget,
@@ -181,6 +184,7 @@ const WDSWidgets = [
   WDSPasswordInputWidget,
   WDSNumberInputWidget,
   WDSMultilineInputWidget,
+  WDSSelectWidget,
 ];
 
 const Widgets = [
diff --git a/app/client/src/widgets/wds/WDSBaseInputWidget/__tests__/helpers.test.ts b/app/client/src/widgets/wds/WDSBaseInputWidget/__tests__/helpers.test.ts
new file mode 100644
index 000000000000..3b58f2a7d466
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSBaseInputWidget/__tests__/helpers.test.ts
@@ -0,0 +1,64 @@
+import type { WidgetProps } from "widgets/BaseWidget";
+import { isReadOnlyUpdateHook } from "../helpers";
+
+describe("isReadOnlyUpdateHook", () => {
+  it("should return the correct updates for input widget", () => {
+    const props1 = {
+      type: "WDS_INPUT_WIDGET",
+      inputType: "TEXT",
+    } as unknown as WidgetProps;
+
+    const updates = isReadOnlyUpdateHook(props1, "readOnly", true);
+    expect(updates).toEqual([
+      { propertyPath: "readOnly", propertyValue: true },
+      { propertyPath: "type", propertyValue: "WDS_KEY_VALUE_WIDGET" },
+    ]);
+
+    const updates2 = isReadOnlyUpdateHook(props1, "readOnly", false);
+    expect(updates2).toEqual([
+      { propertyPath: "readOnly", propertyValue: false },
+      { propertyPath: "type", propertyValue: "WDS_INPUT_WIDGET" },
+    ]);
+
+    const props2 = {
+      type: "WDS_EMAIL_INPUT_WIDGET",
+      inputType: "EMAIL",
+    } as unknown as WidgetProps;
+
+    const updates3 = isReadOnlyUpdateHook(props2, "readOnly", true);
+    expect(updates3).toEqual([
+      { propertyPath: "readOnly", propertyValue: true },
+      { propertyPath: "type", propertyValue: "WDS_KEY_VALUE_WIDGET" },
+    ]);
+
+    const updates4 = isReadOnlyUpdateHook(props2, "readOnly", false);
+    expect(updates4).toEqual([
+      { propertyPath: "readOnly", propertyValue: false },
+      { propertyPath: "type", propertyValue: "WDS_EMAIL_INPUT_WIDGET" },
+    ]);
+  });
+
+  it("should not change the type for currency widget", () => {
+    const props = {
+      type: "WDS_CURRENCY_INPUT_WIDGET",
+      inputType: "CURRENCY",
+    } as unknown as WidgetProps;
+
+    const updates = isReadOnlyUpdateHook(props, "readOnly", true);
+    expect(updates).toEqual([
+      { propertyPath: "readOnly", propertyValue: true },
+    ]);
+  });
+
+  it("should not change the type for phone widget", () => {
+    const props = {
+      type: "WDS_PHONE_INPUT_WIDGET",
+      inputType: "PHONE",
+    } as unknown as WidgetProps;
+
+    const updates = isReadOnlyUpdateHook(props, "readOnly", true);
+    expect(updates).toEqual([
+      { propertyPath: "readOnly", propertyValue: true },
+    ]);
+  });
+});
diff --git a/app/client/src/widgets/wds/WDSBaseInputWidget/config/contentConfig.ts b/app/client/src/widgets/wds/WDSBaseInputWidget/config/contentConfig.ts
index 25aaeabd6e82..af7adcd8f537 100644
--- a/app/client/src/widgets/wds/WDSBaseInputWidget/config/contentConfig.ts
+++ b/app/client/src/widgets/wds/WDSBaseInputWidget/config/contentConfig.ts
@@ -1,5 +1,6 @@
 import { ValidationTypes } from "constants/WidgetValidation";
 
+import { isReadOnlyUpdateHook } from "../helpers";
 import type { BaseInputWidgetProps } from "../widget/types";
 
 export const propertyPaneContentConfig = [
@@ -121,6 +122,8 @@ export const propertyPaneContentConfig = [
         isJSConvertible: true,
         isBindProperty: true,
         isTriggerProperty: false,
+        dependencies: ["type", "inputType"],
+        updateHook: isReadOnlyUpdateHook,
         validation: { type: ValidationTypes.BOOLEAN },
       },
       {
diff --git a/app/client/src/widgets/wds/WDSInputWidget/constants.ts b/app/client/src/widgets/wds/WDSBaseInputWidget/constants.ts
similarity index 100%
rename from app/client/src/widgets/wds/WDSInputWidget/constants.ts
rename to app/client/src/widgets/wds/WDSBaseInputWidget/constants.ts
diff --git a/app/client/src/widgets/wds/WDSBaseInputWidget/helpers.ts b/app/client/src/widgets/wds/WDSBaseInputWidget/helpers.ts
new file mode 100644
index 000000000000..12c1f2e7489a
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSBaseInputWidget/helpers.ts
@@ -0,0 +1,35 @@
+import type { WidgetProps } from "widgets/BaseWidget";
+import type { PropertyUpdates } from "WidgetProvider/constants";
+
+import type { InputType } from "./types";
+import { INPUT_TYPE_TO_WIDGET_TYPE_MAP } from "./constants";
+
+export function isReadOnlyUpdateHook(
+  props: WidgetProps,
+  propertyName: string,
+  propertyValue: boolean,
+) {
+  const updates: PropertyUpdates[] = [
+    {
+      propertyPath: propertyName,
+      propertyValue: propertyValue,
+    },
+  ];
+
+  // if user is marking readOnly as true and if the input type is not INPUT_CURRENCY_WIDGET or INPUT_PHONE_WIDGET,
+  // then we update the type to WDS_KEY_VALUE_WIDGET, else we update the type based on the input type
+  if (
+    !["WDS_CURRENCY_INPUT_WIDGET", "WDS_PHONE_INPUT_WIDGET"].includes(
+      props.type,
+    )
+  ) {
+    updates.push({
+      propertyPath: "type",
+      propertyValue: propertyValue
+        ? "WDS_KEY_VALUE_WIDGET"
+        : INPUT_TYPE_TO_WIDGET_TYPE_MAP[props.inputType as InputType],
+    });
+  }
+
+  return updates;
+}
diff --git a/app/client/src/widgets/wds/WDSBaseInputWidget/index.ts b/app/client/src/widgets/wds/WDSBaseInputWidget/index.ts
index f2620b05952d..624925243085 100644
--- a/app/client/src/widgets/wds/WDSBaseInputWidget/index.ts
+++ b/app/client/src/widgets/wds/WDSBaseInputWidget/index.ts
@@ -1,5 +1,8 @@
 import { WDSBaseInputWidget } from "./widget";
 
 export { WDSBaseInputWidget };
+
+export * from "./types";
+export * from "./constants";
 export type { BaseInputWidgetProps } from "./widget/types";
 export type { BaseInputComponentProps } from "./component/types";
diff --git a/app/client/src/widgets/wds/WDSBaseInputWidget/types.ts b/app/client/src/widgets/wds/WDSBaseInputWidget/types.ts
new file mode 100644
index 000000000000..81d8cf3e1ba1
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSBaseInputWidget/types.ts
@@ -0,0 +1,3 @@
+import type { INPUT_TYPES } from "./constants";
+
+export type InputType = (typeof INPUT_TYPES)[keyof typeof INPUT_TYPES];
diff --git a/app/client/src/widgets/wds/WDSComboBoxWidget/config/anvilConfig.ts b/app/client/src/widgets/wds/WDSComboBoxWidget/config/anvilConfig.ts
new file mode 100644
index 000000000000..dc7fe21e103c
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSComboBoxWidget/config/anvilConfig.ts
@@ -0,0 +1,11 @@
+import type { AnvilConfig } from "WidgetProvider/constants";
+
+export const anvilConfig: AnvilConfig = {
+  isLargeWidget: false,
+  widgetSize: {
+    minWidth: {
+      base: "100%",
+      "180px": "sizing-30",
+    },
+  },
+};
diff --git a/app/client/src/widgets/wds/WDSComboBoxWidget/config/autocompleteConfig.ts b/app/client/src/widgets/wds/WDSComboBoxWidget/config/autocompleteConfig.ts
new file mode 100644
index 000000000000..e709dc5e3801
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSComboBoxWidget/config/autocompleteConfig.ts
@@ -0,0 +1,11 @@
+import { DefaultAutocompleteDefinitions } from "widgets/WidgetUtils";
+
+export const autocompleteConfig = {
+  "!doc":
+    "A combo box combines a text input with a listbox, allowing users to filter a list of options to items matching a query.",
+  "!url": "https://docs.appsmith.com/widget-reference/radio",
+  isVisible: DefaultAutocompleteDefinitions.isVisible,
+  options: "[$__dropdownOption__$]",
+  selectedOptionValue: "string",
+  isRequired: "bool",
+};
diff --git a/app/client/src/widgets/wds/WDSComboBoxWidget/config/defaultsConfig.ts b/app/client/src/widgets/wds/WDSComboBoxWidget/config/defaultsConfig.ts
new file mode 100644
index 000000000000..96c64b6cf934
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSComboBoxWidget/config/defaultsConfig.ts
@@ -0,0 +1,21 @@
+import { ResponsiveBehavior } from "layoutSystems/common/utils/constants";
+import type { WidgetDefaultProps } from "WidgetProvider/constants";
+
+export const defaultsConfig = {
+  animateLoading: true,
+  label: "Label",
+  options: [
+    { label: "Option 1", value: "1" },
+    { label: "Option 2", value: "2" },
+    { label: "Option 3", value: "3" },
+  ],
+  defaultOptionValue: "",
+  isRequired: false,
+  isDisabled: false,
+  isVisible: true,
+  isInline: false,
+  widgetName: "ComboBox",
+  widgetType: "COMBOBOX",
+  version: 1,
+  responsiveBehavior: ResponsiveBehavior.Fill,
+} as unknown as WidgetDefaultProps;
diff --git a/app/client/src/widgets/wds/WDSComboBoxWidget/config/index.ts b/app/client/src/widgets/wds/WDSComboBoxWidget/config/index.ts
new file mode 100644
index 000000000000..995925903b3f
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSComboBoxWidget/config/index.ts
@@ -0,0 +1,7 @@
+export * from "./propertyPaneConfig";
+export { metaConfig } from "./metaConfig";
+export { anvilConfig } from "./anvilConfig";
+export { defaultsConfig } from "./defaultsConfig";
+export { settersConfig } from "./settersConfig";
+export { methodsConfig } from "./methodsConfig";
+export { autocompleteConfig } from "./autocompleteConfig";
diff --git a/app/client/src/widgets/wds/WDSComboBoxWidget/config/metaConfig.ts b/app/client/src/widgets/wds/WDSComboBoxWidget/config/metaConfig.ts
new file mode 100644
index 000000000000..2554b202cf53
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSComboBoxWidget/config/metaConfig.ts
@@ -0,0 +1,19 @@
+import { WIDGET_TAGS } from "constants/WidgetConstants";
+
+export const metaConfig = {
+  name: "ComboBox",
+  tags: [WIDGET_TAGS.SELECT],
+  needsMeta: true,
+  searchTags: [
+    "choice",
+    "option",
+    "choose",
+    "pick",
+    "combobox",
+    "select",
+    "dropdown",
+    "filter",
+    "autocomplete",
+    "input",
+  ],
+};
diff --git a/app/client/src/widgets/wds/WDSComboBoxWidget/config/methodsConfig.ts b/app/client/src/widgets/wds/WDSComboBoxWidget/config/methodsConfig.ts
new file mode 100644
index 000000000000..ec094152173a
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSComboBoxWidget/config/methodsConfig.ts
@@ -0,0 +1,21 @@
+import type {
+  PropertyUpdates,
+  SnipingModeProperty,
+} from "WidgetProvider/constants";
+import { ComboboxSelectIcon, ComboboxSelectThumbnail } from "appsmith-icons";
+
+export const methodsConfig = {
+  getSnipingModeUpdates: (
+    propValueMap: SnipingModeProperty,
+  ): PropertyUpdates[] => {
+    return [
+      {
+        propertyPath: "options",
+        propertyValue: propValueMap.data,
+        isDynamicPropertyPath: true,
+      },
+    ];
+  },
+  IconCmp: ComboboxSelectIcon,
+  ThumbnailCmp: ComboboxSelectThumbnail,
+};
diff --git a/app/client/src/widgets/wds/WDSComboBoxWidget/config/propertyPaneConfig/contentConfig.test.ts b/app/client/src/widgets/wds/WDSComboBoxWidget/config/propertyPaneConfig/contentConfig.test.ts
new file mode 100644
index 000000000000..d53d00b39e5d
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSComboBoxWidget/config/propertyPaneConfig/contentConfig.test.ts
@@ -0,0 +1,35 @@
+import type { WidgetProps } from "../../../../BaseWidget";
+import { handleWidgetTypeUpdate } from "./contentConfig";
+
+describe("handleWidgetTypeUpdate", () => {
+  it("should update the widget type and type property", () => {
+    const props = {} as WidgetProps;
+    const propertyName = "widgetType";
+    const propertyValue = "COMBOBOX";
+
+    expect(handleWidgetTypeUpdate(props, propertyName, propertyValue)).toEqual([
+      {
+        propertyPath: propertyName,
+        propertyValue: propertyValue,
+      },
+      {
+        propertyPath: "type",
+        propertyValue: "WDS_COMBOBOX_WIDGET",
+      },
+    ]);
+  });
+
+  it("should not update the type property for unknown widget type", () => {
+    const props = {} as WidgetProps;
+    const propertyName = "widgetType";
+    const propertyValue = "UNKNOWN";
+
+    // @ts-expect-error unknown widget type
+    expect(handleWidgetTypeUpdate(props, propertyName, propertyValue)).toEqual([
+      {
+        propertyPath: propertyName,
+        propertyValue: propertyValue,
+      },
+    ]);
+  });
+});
diff --git a/app/client/src/widgets/wds/WDSComboBoxWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/widgets/wds/WDSComboBoxWidget/config/propertyPaneConfig/contentConfig.ts
new file mode 100644
index 000000000000..9e41483d389d
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSComboBoxWidget/config/propertyPaneConfig/contentConfig.ts
@@ -0,0 +1,192 @@
+import { ValidationTypes } from "constants/WidgetValidation";
+import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { AutocompleteDataType } from "utils/autocomplete/AutocompleteDataType";
+import type { PropertyUpdates } from "../../../../../WidgetProvider/constants";
+import type { WidgetProps } from "../../../../BaseWidget";
+import type { WDSComboBoxWidgetProps } from "../../widget/types";
+import { optionsCustomValidation } from "./validations";
+
+type WidgetTypeValue = "SELECT" | "COMBOBOX";
+
+export const handleWidgetTypeUpdate = (
+  _props: WidgetProps,
+  propertyName: string,
+  propertyValue: WidgetTypeValue,
+) => {
+  const updates: PropertyUpdates[] = [
+    {
+      propertyPath: propertyName,
+      propertyValue: propertyValue,
+    },
+  ];
+
+  // Handle widget morphing
+  if (propertyName === "widgetType") {
+    const morphingMap: Record<WidgetTypeValue, string> = {
+      SELECT: "WDS_SELECT_WIDGET",
+      COMBOBOX: "WDS_COMBOBOX_WIDGET",
+    };
+
+    const targetWidgetType = morphingMap[propertyValue];
+
+    if (targetWidgetType) {
+      updates.push({
+        propertyPath: "type",
+        propertyValue: targetWidgetType,
+      });
+    }
+  }
+
+  return updates;
+};
+
+export const propertyPaneContentConfig = [
+  {
+    sectionName: "Data",
+    children: [
+      {
+        propertyName: "widgetType",
+        label: "Data type",
+        controlType: "DROP_DOWN",
+        options: [
+          {
+            label: "Select",
+            value: "SELECT",
+          },
+          {
+            label: "ComboBox",
+            value: "COMBOBOX",
+          },
+        ],
+        isBindProperty: false,
+        isTriggerProperty: false,
+        updateHook: handleWidgetTypeUpdate,
+      },
+      {
+        helpText: "Displays a list of unique options",
+        propertyName: "options",
+        label: "Options",
+        controlType: "OPTION_INPUT",
+        isJSConvertible: true,
+        isBindProperty: true,
+        isTriggerProperty: false,
+        dependencies: ["optionLabel", "optionValue"],
+        validation: {
+          type: ValidationTypes.FUNCTION,
+          params: {
+            fn: optionsCustomValidation,
+            expected: {
+              type: 'Array<{ "label": "string", "value": "string" | number}>',
+              example: `[{"label": "One", "value": "one"}]`,
+              autocompleteDataType: AutocompleteDataType.STRING,
+            },
+          },
+        },
+        evaluationSubstitutionType: EvaluationSubstitutionType.SMART_SUBSTITUTE,
+      },
+    ],
+  },
+  {
+    sectionName: "Label",
+    children: [
+      {
+        helpText: "Sets the label text of the options widget",
+        propertyName: "label",
+        label: "Text",
+        controlType: "INPUT_TEXT",
+        placeholderText: "Label",
+        isBindProperty: true,
+        isTriggerProperty: false,
+        validation: { type: ValidationTypes.TEXT },
+      },
+    ],
+  },
+  {
+    sectionName: "Validations",
+    children: [
+      {
+        propertyName: "isRequired",
+        label: "Required",
+        helpText: "Makes input to the widget mandatory",
+        controlType: "SWITCH",
+        isJSConvertible: true,
+        isBindProperty: true,
+        isTriggerProperty: false,
+        validation: { type: ValidationTypes.BOOLEAN },
+      },
+    ],
+  },
+  {
+    sectionName: "General",
+    children: [
+      {
+        helpText: "Show help text or details about current input",
+        propertyName: "labelTooltip",
+        label: "Tooltip",
+        controlType: "INPUT_TEXT",
+        placeholderText: "",
+        isBindProperty: true,
+        isTriggerProperty: false,
+        validation: { type: ValidationTypes.TEXT },
+      },
+      {
+        helpText: "Sets a placeholder text for the select",
+        propertyName: "placeholderText",
+        label: "Placeholder",
+        controlType: "INPUT_TEXT",
+        placeholderText: "",
+        isBindProperty: true,
+        isTriggerProperty: false,
+        validation: { type: ValidationTypes.TEXT },
+        hidden: (props: WDSComboBoxWidgetProps) => {
+          return Boolean(props.isReadOnly);
+        },
+      },
+      {
+        helpText: "Controls the visibility of the widget",
+        propertyName: "isVisible",
+        label: "Visible",
+        controlType: "SWITCH",
+        isJSConvertible: true,
+        isBindProperty: true,
+        isTriggerProperty: false,
+        validation: { type: ValidationTypes.BOOLEAN },
+      },
+      {
+        propertyName: "isDisabled",
+        label: "Disabled",
+        helpText: "Disables input to this widget",
+        controlType: "SWITCH",
+        isJSConvertible: true,
+        isBindProperty: true,
+        isTriggerProperty: false,
+        validation: { type: ValidationTypes.BOOLEAN },
+      },
+      {
+        propertyName: "animateLoading",
+        label: "Animate loading",
+        controlType: "SWITCH",
+        helpText: "Controls the loading of the widget",
+        defaultValue: true,
+        isJSConvertible: true,
+        isBindProperty: true,
+        isTriggerProperty: false,
+        validation: { type: ValidationTypes.BOOLEAN },
+      },
+    ],
+  },
+  {
+    sectionName: "Events",
+    children: [
+      {
+        helpText: "when a user changes the selected option",
+        propertyName: "onSelectionChange",
+        label: "onSelectionChange",
+        controlType: "ACTION_SELECTOR",
+        isJSConvertible: true,
+        isBindProperty: true,
+        isTriggerProperty: true,
+      },
+    ],
+  },
+];
diff --git a/app/client/src/widgets/wds/WDSComboBoxWidget/config/propertyPaneConfig/index.ts b/app/client/src/widgets/wds/WDSComboBoxWidget/config/propertyPaneConfig/index.ts
new file mode 100644
index 000000000000..7f43d3bde57a
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSComboBoxWidget/config/propertyPaneConfig/index.ts
@@ -0,0 +1 @@
+export { propertyPaneContentConfig } from "./contentConfig";
diff --git a/app/client/src/widgets/wds/WDSComboBoxWidget/config/propertyPaneConfig/validations/index.ts b/app/client/src/widgets/wds/WDSComboBoxWidget/config/propertyPaneConfig/validations/index.ts
new file mode 100644
index 000000000000..99196ff3ed4b
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSComboBoxWidget/config/propertyPaneConfig/validations/index.ts
@@ -0,0 +1 @@
+export { optionsCustomValidation } from "./optionsCustomValidation";
diff --git a/app/client/src/widgets/wds/WDSComboBoxWidget/config/propertyPaneConfig/validations/optionsCustomValidation.ts b/app/client/src/widgets/wds/WDSComboBoxWidget/config/propertyPaneConfig/validations/optionsCustomValidation.ts
new file mode 100644
index 000000000000..356d2155a85d
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSComboBoxWidget/config/propertyPaneConfig/validations/optionsCustomValidation.ts
@@ -0,0 +1,158 @@
+import type { ValidationResponse } from "constants/WidgetValidation";
+import type { LoDashStatic } from "lodash";
+import type { WidgetProps } from "../../../../../BaseWidget";
+
+interface ValidationErrorMessage {
+  name: string;
+  message: string;
+}
+
+/**
+ * Validation rules:
+ * 1. This property will take the value in the following format: Array<{ "label": "string", "value": "string" | number}>
+ * 2. The `value` property should consists of unique values only.
+ * 3. Data types of all the value props should be the same.
+ */
+export function optionsCustomValidation(
+  options: unknown,
+  _props: WidgetProps,
+  _: LoDashStatic,
+): ValidationResponse {
+  // UTILS
+  const createErrorValidationResponse = (
+    value: unknown,
+    message: ValidationErrorMessage,
+  ): ValidationResponse => ({
+    isValid: false,
+    parsed: value,
+    messages: [message],
+  });
+
+  const createSuccessValidationResponse = (
+    value: unknown,
+  ): ValidationResponse => ({
+    isValid: true,
+    parsed: value,
+  });
+
+  const hasDuplicates = (array: unknown[]): boolean =>
+    new Set(array).size !== array.length;
+
+  if (Array.isArray(options)) {
+    const isValidKeys = options.every((option) => {
+      return (
+        _.isPlainObject(option) &&
+        _.has(option, "label") &&
+        _.has(option, "value")
+      );
+    });
+
+    if (!isValidKeys) {
+      return createErrorValidationResponse(options, {
+        name: "ValidationError",
+        message:
+          'This value does not evaluate to type Array<{ "label": "string", "value": "string" | number }>',
+      });
+    }
+
+    return createSuccessValidationResponse(options);
+  }
+
+  // JS expects options to be a string
+  if (!_.isString(options)) {
+    return createErrorValidationResponse(options, {
+      name: "TypeError",
+      message: "This value does not evaluate to type string",
+    });
+  }
+
+  const validationUtil = (options: unknown[]) => {
+    let _isValid = true;
+    let message = { name: "", message: "" };
+
+    if (options.length === 0) {
+      return createErrorValidationResponse(options, {
+        name: "ValidationError",
+        message: "Options cannot be an empty array",
+      });
+    }
+
+    const isValidKeys = options.every((option) => {
+      return (
+        _.isPlainObject(option) &&
+        _.has(option, "label") &&
+        _.has(option, "value")
+      );
+    });
+
+    if (!isValidKeys) {
+      return createErrorValidationResponse(options, {
+        name: "ValidationError",
+        message:
+          'This value does not evaluate to type Array<{ "label": "string", "value": "string" | number }>',
+      });
+    }
+
+    for (let i = 0; i < options.length; i++) {
+      const option = options[i];
+
+      if (!_.isPlainObject(option)) {
+        _isValid = false;
+        message = {
+          name: "ValidationError",
+          message: "This value does not evaluate to type Object",
+        };
+        break;
+      }
+
+      if (_.keys(option).length === 0) {
+        _isValid = false;
+        message = {
+          name: "ValidationError",
+          message:
+            'This value does not evaluate to type { "label": "string", "value": "string" | number }',
+        };
+        break;
+      }
+
+      if (hasDuplicates(_.keys(option))) {
+        _isValid = false;
+        message = {
+          name: "ValidationError",
+          message: "All the keys must be unique",
+        };
+        break;
+      }
+    }
+
+    return {
+      isValid: _isValid,
+      parsed: _isValid ? options : [],
+      messages: [message],
+    };
+  };
+
+  const invalidResponse = {
+    isValid: false,
+    parsed: [],
+    messages: [
+      {
+        name: "TypeError",
+        message:
+          'This value does not evaluate to type Array<{ "label": "string", "value": "string" | number }>',
+      },
+    ],
+  };
+
+  try {
+    options = JSON.parse(options as string);
+
+    if (!Array.isArray(options)) {
+      return invalidResponse;
+    }
+
+    return validationUtil(options);
+  } catch (_error) {
+    return invalidResponse;
+  }
+}
diff --git a/app/client/src/widgets/wds/WDSComboBoxWidget/config/settersConfig.ts b/app/client/src/widgets/wds/WDSComboBoxWidget/config/settersConfig.ts
new file mode 100644
index 000000000000..e6cf8f7fc4d9
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSComboBoxWidget/config/settersConfig.ts
@@ -0,0 +1,16 @@
+export const settersConfig = {
+  __setters: {
+    setVisibility: {
+      path: "isVisible",
+      type: "boolean",
+    },
+    setDisabled: {
+      path: "isDisabled",
+      type: "boolean",
+    },
+    setData: {
+      path: "options",
+      type: "array",
+    },
+  },
+};
diff --git a/app/client/src/widgets/wds/WDSComboBoxWidget/index.ts b/app/client/src/widgets/wds/WDSComboBoxWidget/index.ts
new file mode 100644
index 000000000000..9e3a7a7eab67
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSComboBoxWidget/index.ts
@@ -0,0 +1,3 @@
+import { WDSComboBoxWidget } from "./widget";
+
+export { WDSComboBoxWidget };
diff --git a/app/client/src/widgets/wds/WDSComboBoxWidget/widget/helpers.ts b/app/client/src/widgets/wds/WDSComboBoxWidget/widget/helpers.ts
new file mode 100644
index 000000000000..b50216697ad3
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSComboBoxWidget/widget/helpers.ts
@@ -0,0 +1,16 @@
+import type { Validation } from "widgets/wds/WDSInputWidget/widget/types";
+import type { WDSComboBoxWidgetProps } from "./types";
+
+export function validateInput(props: WDSComboBoxWidgetProps): Validation {
+  if (!props.isValid) {
+    return {
+      validationStatus: "invalid",
+      errorMessage: "Please select an option",
+    };
+  }
+
+  return {
+    validationStatus: "valid",
+    errorMessage: "",
+  };
+}
diff --git a/app/client/src/widgets/wds/WDSComboBoxWidget/widget/index.tsx b/app/client/src/widgets/wds/WDSComboBoxWidget/widget/index.tsx
new file mode 100644
index 000000000000..e75189a06f58
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSComboBoxWidget/widget/index.tsx
@@ -0,0 +1,191 @@
+import { ComboBox } from "@appsmith/wds";
+import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
+import type { SetterConfig, Stylesheet } from "entities/AppTheming";
+import isNumber from "lodash/isNumber";
+import React from "react";
+import type {
+  AnvilConfig,
+  AutocompletionDefinitions,
+} from "WidgetProvider/constants";
+import type { WidgetState } from "widgets/BaseWidget";
+import BaseWidget from "widgets/BaseWidget";
+import {
+  anvilConfig,
+  autocompleteConfig,
+  defaultsConfig,
+  metaConfig,
+  methodsConfig,
+  propertyPaneContentConfig,
+  settersConfig,
+} 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]";
+};
+
+class WDSComboBoxWidget extends BaseWidget<
+  WDSComboBoxWidgetProps,
+  WidgetState
+> {
+  static type = "WDS_COMBOBOX_WIDGET";
+
+  static getConfig() {
+    return metaConfig;
+  }
+
+  static getDefaults() {
+    return defaultsConfig;
+  }
+
+  static getMethods() {
+    return methodsConfig;
+  }
+
+  static getAnvilConfig(): AnvilConfig | null {
+    return anvilConfig;
+  }
+
+  static getAutocompleteDefinitions(): AutocompletionDefinitions {
+    return autocompleteConfig;
+  }
+
+  static getPropertyPaneContentConfig() {
+    return propertyPaneContentConfig;
+  }
+
+  static getPropertyPaneStyleConfig() {
+    return [];
+  }
+
+  static getDerivedPropertiesMap() {
+    return {
+      selectedOption:
+        "{{_.find(this.options, { value: this.selectedOptionValue })}}",
+      isValid: `{{ this.isRequired ? !!this.selectedOptionValue : true }}`,
+      value: `{{this.selectedOptionValue}}`,
+    };
+  }
+
+  static getDefaultPropertiesMap(): Record<string, string> {
+    return {
+      selectedOptionValue: "defaultOptionValue",
+    };
+  }
+
+  static getMetaPropertiesMap() {
+    return {
+      selectedOptionValue: undefined,
+      isDirty: false,
+    };
+  }
+
+  static getStylesheetConfig(): Stylesheet {
+    return {};
+  }
+
+  componentDidUpdate(prevProps: WDSComboBoxWidgetProps): void {
+    if (
+      this.props.defaultOptionValue !== prevProps.defaultOptionValue &&
+      this.props.isDirty
+    ) {
+      this.props.updateWidgetMetaProperty("isDirty", false);
+    }
+  }
+
+  static getSetterConfig(): SetterConfig {
+    return settersConfig;
+  }
+
+  static getDependencyMap(): Record<string, string[]> {
+    return {
+      optionLabel: ["options"],
+      optionValue: ["options"],
+      defaultOptionValue: ["options"],
+    };
+  }
+
+  handleSelectionChange = (updatedValue: string | number | null) => {
+    let newVal;
+
+    if (updatedValue === null) {
+      newVal = "";
+    } else {
+      if (isNumber(updatedValue)) {
+        newVal = updatedValue;
+      } else if (
+        isTrueObject(this.props.options[0]) &&
+        isNumber(this.props.options[0].value)
+      ) {
+        newVal = parseFloat(updatedValue);
+      } else {
+        newVal = updatedValue;
+      }
+    }
+
+    const { commitBatchMetaUpdates, pushBatchMetaUpdates } = this.props;
+
+    // Set isDirty to true when the selection changes
+    if (!this.props.isDirty) {
+      pushBatchMetaUpdates("isDirty", true);
+    }
+
+    pushBatchMetaUpdates("selectedOptionValue", newVal, {
+      triggerPropertyName: "onSelectionChange",
+      dynamicString: this.props.onSelectionChange,
+      event: {
+        type: EventType.ON_OPTION_CHANGE,
+      },
+    });
+
+    commitBatchMetaUpdates();
+  };
+
+  optionsToItems = (
+    options: WDSComboBoxWidgetProps["options"],
+  ): ComboBoxItem[] => {
+    if (Array.isArray(options)) {
+      const items = options.map((option) => ({
+        label: option["label"] as string,
+        id: option["value"] as string,
+      }));
+
+      const isValidItems = items.every(
+        (item) => item.label !== undefined && item.id !== undefined,
+      );
+
+      return isValidItems ? items : [];
+    }
+
+    return [];
+  };
+
+  getWidgetView() {
+    const {
+      labelTooltip,
+      options,
+      placeholderText,
+      selectedOptionValue,
+      ...rest
+    } = this.props;
+
+    const validation = validateInput(this.props);
+
+    return (
+      <ComboBox
+        {...rest}
+        contextualHelp={labelTooltip}
+        errorMessage={validation.errorMessage}
+        isInvalid={validation.validationStatus === "invalid"}
+        items={this.optionsToItems(options)}
+        onSelectionChange={this.handleSelectionChange}
+        placeholder={placeholderText}
+        selectedKey={selectedOptionValue}
+      />
+    );
+  }
+}
+
+export { WDSComboBoxWidget };
diff --git a/app/client/src/widgets/wds/WDSComboBoxWidget/widget/types.ts b/app/client/src/widgets/wds/WDSComboBoxWidget/widget/types.ts
new file mode 100644
index 000000000000..b707f479302f
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSComboBoxWidget/widget/types.ts
@@ -0,0 +1,13 @@
+import type { WidgetProps } from "widgets/BaseWidget";
+
+export interface WDSComboBoxWidgetProps extends WidgetProps {
+  options: Record<string, unknown>[] | string;
+  selectedOptionValue: string;
+  onSelectionChange: string;
+  defaultOptionValue: string;
+  isRequired?: boolean;
+  isDisabled?: boolean;
+  label: string;
+  labelTooltip?: string;
+  isDirty: boolean;
+}
diff --git a/app/client/src/widgets/wds/WDSCurrencyInputWidget/widget/index.tsx b/app/client/src/widgets/wds/WDSCurrencyInputWidget/widget/index.tsx
index 982c7a63b97b..bc3d59e37f1f 100644
--- a/app/client/src/widgets/wds/WDSCurrencyInputWidget/widget/index.tsx
+++ b/app/client/src/widgets/wds/WDSCurrencyInputWidget/widget/index.tsx
@@ -11,7 +11,11 @@ import {
   formatCurrencyNumber,
   limitDecimalValue,
 } from "../component/utilities";
-import { getLocale, mergeWidgetConfig } from "utils/helpers";
+import {
+  getLocale,
+  klonaRegularWithTelemetry,
+  mergeWidgetConfig,
+} from "utils/helpers";
 import {
   getLocaleDecimalSeperator,
   getLocaleThousandSeparator,
@@ -26,7 +30,6 @@ import type { CurrencyInputWidgetProps } from "./types";
 import { WDSBaseInputWidget } from "widgets/wds/WDSBaseInputWidget";
 import { getCountryCodeFromCurrencyCode, validateInput } from "./helpers";
 import type { KeyDownEvent } from "widgets/wds/WDSBaseInputWidget/component/types";
-import { klona as clone } from "klona";
 
 class WDSCurrencyInputWidget extends WDSBaseInputWidget<
   CurrencyInputWidgetProps,
@@ -63,7 +66,10 @@ class WDSCurrencyInputWidget extends WDSBaseInputWidget<
   }
 
   static getPropertyPaneContentConfig() {
-    const parentConfig = clone(super.getPropertyPaneContentConfig());
+    const parentConfig = klonaRegularWithTelemetry(
+      super.getPropertyPaneContentConfig(),
+      "WDSCurrencyInputWidget.getPropertyPaneContentConfig",
+    );
     const labelSectionIndex = parentConfig.findIndex(
       (section) => section.sectionName === "Label",
     );
diff --git a/app/client/src/widgets/wds/WDSEmailInputWidget/widget/index.tsx b/app/client/src/widgets/wds/WDSEmailInputWidget/widget/index.tsx
index 332d42413c7a..721bb9e0e6ec 100644
--- a/app/client/src/widgets/wds/WDSEmailInputWidget/widget/index.tsx
+++ b/app/client/src/widgets/wds/WDSEmailInputWidget/widget/index.tsx
@@ -1,7 +1,7 @@
 import { WDSInputWidget } from "widgets/wds/WDSInputWidget";
 import { EmailInputIcon, EmailInputThumbnail } from "appsmith-icons";
 import { WIDGET_TAGS } from "constants/WidgetConstants";
-import { INPUT_TYPES } from "widgets/wds/WDSInputWidget/constants";
+import { INPUT_TYPES } from "widgets/wds/WDSBaseInputWidget";
 import type { WidgetBaseConfiguration } from "WidgetProvider/constants";
 
 class WDSEmailInputWidget extends WDSInputWidget {
diff --git a/app/client/src/widgets/wds/WDSHeadingWidget/widget/index.tsx b/app/client/src/widgets/wds/WDSHeadingWidget/widget/index.tsx
index 12563bccbab1..c044eedc4670 100644
--- a/app/client/src/widgets/wds/WDSHeadingWidget/widget/index.tsx
+++ b/app/client/src/widgets/wds/WDSHeadingWidget/widget/index.tsx
@@ -1,8 +1,8 @@
-import { klona as clone } from "klona";
 import { WIDGET_TAGS } from "constants/WidgetConstants";
 import { ValidationTypes } from "constants/WidgetValidation";
 import { WDSParagraphWidget } from "widgets/wds/WDSParagraphWidget";
 import { HeadingIcon, HeadingThumbnail } from "appsmith-icons";
+import { klonaRegularWithTelemetry } from "utils/helpers";
 
 class WDSHeadingWidget extends WDSParagraphWidget {
   static type = "WDS_HEADING_WIDGET";
@@ -33,7 +33,10 @@ class WDSHeadingWidget extends WDSParagraphWidget {
   }
 
   static getPropertyPaneContentConfig() {
-    const parentConfig = clone(super.getPropertyPaneContentConfig());
+    const parentConfig = klonaRegularWithTelemetry(
+      super.getPropertyPaneContentConfig(),
+      "WDSHeadingWidget.getPropertyPaneContentConfig",
+    );
 
     const generelSectionIndex = parentConfig.findIndex(
       (section) => section.sectionName === "General",
diff --git a/app/client/src/widgets/wds/WDSInputWidget/component/index.tsx b/app/client/src/widgets/wds/WDSInputWidget/component/index.tsx
index c7b16e234a95..2f01a175e887 100644
--- a/app/client/src/widgets/wds/WDSInputWidget/component/index.tsx
+++ b/app/client/src/widgets/wds/WDSInputWidget/component/index.tsx
@@ -2,10 +2,10 @@ import React from "react";
 import { isNil } from "lodash";
 import { TextInput } from "@appsmith/wds";
 import { Icon, TextArea } from "@appsmith/wds";
+import { useDebouncedValue } from "@mantine/hooks";
+import { INPUT_TYPES } from "widgets/wds/WDSBaseInputWidget";
 
-import { INPUT_TYPES } from "../constants";
 import type { InputComponentProps } from "./types";
-import { useDebouncedValue } from "@mantine/hooks";
 
 const DEBOUNCE_TIME = 300;
 
diff --git a/app/client/src/widgets/wds/WDSInputWidget/component/types.ts b/app/client/src/widgets/wds/WDSInputWidget/component/types.ts
index 547c77e81787..6a254d53fa0f 100644
--- a/app/client/src/widgets/wds/WDSInputWidget/component/types.ts
+++ b/app/client/src/widgets/wds/WDSInputWidget/component/types.ts
@@ -1,9 +1,7 @@
 import type { IconProps } from "@appsmith/wds";
-import type { BaseInputComponentProps } from "../../WDSBaseInputWidget";
-
-import type { INPUT_TYPES } from "../constants";
+import type { InputType } from "widgets/wds/WDSBaseInputWidget/types";
 
-export type InputType = (typeof INPUT_TYPES)[keyof typeof INPUT_TYPES];
+import type { BaseInputComponentProps } from "../../WDSBaseInputWidget";
 
 export interface InputComponentProps extends BaseInputComponentProps {
   inputType: InputType;
diff --git a/app/client/src/widgets/wds/WDSInputWidget/widget/helper.ts b/app/client/src/widgets/wds/WDSInputWidget/widget/helper.ts
index acc3392993df..d5799e2d9319 100644
--- a/app/client/src/widgets/wds/WDSInputWidget/widget/helper.ts
+++ b/app/client/src/widgets/wds/WDSInputWidget/widget/helper.ts
@@ -8,11 +8,14 @@ import {
   INPUT_INVALID_TYPE_ERROR,
   INPUT_TEXT_MAX_CHAR_ERROR,
 } from "ee/constants/messages";
-import type { InputType } from "../component/types";
+import type { InputType } from "widgets/wds/WDSBaseInputWidget";
 import type { WidgetProps } from "widgets/BaseWidget";
 
 import type { InputWidgetProps, Validation } from "./types";
-import { INPUT_TYPE_TO_WIDGET_TYPE_MAP, INPUT_TYPES } from "../constants";
+import {
+  INPUT_TYPE_TO_WIDGET_TYPE_MAP,
+  INPUT_TYPES,
+} from "widgets/wds/WDSBaseInputWidget";
 import type { PropertyUpdates } from "WidgetProvider/constants";
 import { getDefaultISDCode } from "widgets/wds/WDSPhoneInputWidget/constants";
 import { getDefaultCurrency } from "widgets/wds/WDSCurrencyInputWidget/constants";
diff --git a/app/client/src/widgets/wds/WDSInputWidget/widget/index.tsx b/app/client/src/widgets/wds/WDSInputWidget/widget/index.tsx
index 71698b222a2f..5d8730189a84 100644
--- a/app/client/src/widgets/wds/WDSInputWidget/widget/index.tsx
+++ b/app/client/src/widgets/wds/WDSInputWidget/widget/index.tsx
@@ -2,7 +2,6 @@ import React from "react";
 import { isNumber, merge, toString } from "lodash";
 import * as config from "../config";
 import InputComponent from "../component";
-import { INPUT_TYPES } from "../constants";
 import type { InputWidgetProps } from "./types";
 import { mergeWidgetConfig } from "utils/helpers";
 import { parseText, validateInput } from "./helper";
@@ -14,6 +13,7 @@ import type { DerivedPropertiesMap } from "WidgetProvider/factory";
 import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
 import type { KeyDownEvent } from "widgets/wds/WDSBaseInputWidget/component/types";
 import type { WidgetBaseConfiguration } from "WidgetProvider/constants";
+import { INPUT_TYPES } from "widgets/wds/WDSBaseInputWidget/constants";
 
 class WDSInputWidget extends WDSBaseInputWidget<InputWidgetProps, WidgetState> {
   static type = "WDS_INPUT_WIDGET";
diff --git a/app/client/src/widgets/wds/WDSMultilineInputWidget/widget/index.tsx b/app/client/src/widgets/wds/WDSMultilineInputWidget/widget/index.tsx
index d7174375c8b6..413950312c4a 100644
--- a/app/client/src/widgets/wds/WDSMultilineInputWidget/widget/index.tsx
+++ b/app/client/src/widgets/wds/WDSMultilineInputWidget/widget/index.tsx
@@ -1,8 +1,8 @@
 import { WIDGET_TAGS } from "constants/WidgetConstants";
 import { WDSInputWidget } from "widgets/wds/WDSInputWidget";
-import { MultilineInputIcon, MultilineInputThumbnail } from "appsmith-icons";
-import { INPUT_TYPES } from "widgets/wds/WDSInputWidget/constants";
 import type { WidgetBaseConfiguration } from "WidgetProvider/constants";
+import { INPUT_TYPES } from "widgets/wds/WDSBaseInputWidget/constants";
+import { MultilineInputIcon, MultilineInputThumbnail } from "appsmith-icons";
 
 class WDSMultilineInputWidget extends WDSInputWidget {
   static type = "WDS_MULTILINE_INPUT_WIDGET";
diff --git a/app/client/src/widgets/wds/WDSNumberInputWidget/widget/index.tsx b/app/client/src/widgets/wds/WDSNumberInputWidget/widget/index.tsx
index f5404cf22d76..0f67165c9c91 100644
--- a/app/client/src/widgets/wds/WDSNumberInputWidget/widget/index.tsx
+++ b/app/client/src/widgets/wds/WDSNumberInputWidget/widget/index.tsx
@@ -1,8 +1,8 @@
 import { WIDGET_TAGS } from "constants/WidgetConstants";
 import { WDSInputWidget } from "widgets/wds/WDSInputWidget";
 import { NumberInputIcon, NumberInputThumbnail } from "appsmith-icons";
-import { INPUT_TYPES } from "widgets/wds/WDSInputWidget/constants";
 import type { WidgetBaseConfiguration } from "WidgetProvider/constants";
+import { INPUT_TYPES } from "widgets/wds/WDSBaseInputWidget/constants";
 
 class WDSNumberInputWidget extends WDSInputWidget {
   static type = "WDS_NUMBER_INPUT_WIDGET";
diff --git a/app/client/src/widgets/wds/WDSParagraphWidget/__tests__/helpers.test.ts b/app/client/src/widgets/wds/WDSParagraphWidget/__tests__/helpers.test.ts
new file mode 100644
index 000000000000..28d5f818171e
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSParagraphWidget/__tests__/helpers.test.ts
@@ -0,0 +1,38 @@
+import type { WidgetProps } from "widgets/BaseWidget";
+import { fontSizeUpdateHook } from "../helpers";
+
+describe("fontSizeUpdateHook", () => {
+  it("should update the font size and type", () => {
+    const props = {
+      type: "WDS_PARAGRAPH_WIDGET",
+    } as unknown as WidgetProps;
+
+    const updates = fontSizeUpdateHook(props, "fontSize", "heading");
+
+    expect(updates).toEqual([
+      { propertyPath: "fontSize", propertyValue: "heading" },
+      { propertyPath: "type", propertyValue: "WDS_HEADING_WIDGET" },
+    ]);
+
+    const updates2 = fontSizeUpdateHook(props, "fontSize", "body");
+
+    expect(updates2).toEqual([
+      { propertyPath: "fontSize", propertyValue: "body" },
+      { propertyPath: "type", propertyValue: "WDS_PARAGRAPH_WIDGET" },
+    ]);
+
+    const updates3 = fontSizeUpdateHook(props, "fontSize", "subtitle");
+
+    expect(updates3).toEqual([
+      { propertyPath: "fontSize", propertyValue: "subtitle" },
+      { propertyPath: "type", propertyValue: "WDS_HEADING_WIDGET" },
+    ]);
+
+    const updates4 = fontSizeUpdateHook(props, "fontSize", "title");
+
+    expect(updates4).toEqual([
+      { propertyPath: "fontSize", propertyValue: "title" },
+      { propertyPath: "type", propertyValue: "WDS_HEADING_WIDGET" },
+    ]);
+  });
+});
diff --git a/app/client/src/widgets/wds/WDSParagraphWidget/config/defaultsConfig.ts b/app/client/src/widgets/wds/WDSParagraphWidget/config/defaultsConfig.ts
index e05fd9f14e00..d06d70a414a6 100644
--- a/app/client/src/widgets/wds/WDSParagraphWidget/config/defaultsConfig.ts
+++ b/app/client/src/widgets/wds/WDSParagraphWidget/config/defaultsConfig.ts
@@ -11,6 +11,7 @@ export const defaultsConfig = {
   fontSize: "body",
   textAlign: "left",
   textColor: "neutral",
+  fontStyle: undefined,
   widgetName: "Paragraph",
   shouldTruncate: false,
   version: 1,
diff --git a/app/client/src/widgets/wds/WDSParagraphWidget/config/propertyPaneConfig/styleConfig.ts b/app/client/src/widgets/wds/WDSParagraphWidget/config/propertyPaneConfig/styleConfig.ts
index e8aed4f314d6..06df5d9bbf93 100644
--- a/app/client/src/widgets/wds/WDSParagraphWidget/config/propertyPaneConfig/styleConfig.ts
+++ b/app/client/src/widgets/wds/WDSParagraphWidget/config/propertyPaneConfig/styleConfig.ts
@@ -1,6 +1,8 @@
 import { TYPOGRAPHY_VARIANTS } from "@appsmith/wds-theming";
 import { ValidationTypes } from "constants/WidgetValidation";
 
+import { fontSizeUpdateHook } from "../../helpers";
+
 export const propertyPaneStyleConfig = [
   {
     sectionName: "General",
@@ -32,7 +34,7 @@ export const propertyPaneStyleConfig = [
         isJSConvertible: true,
         isBindProperty: true,
         isTriggerProperty: false,
-        isReusable: true,
+        updateHook: fontSizeUpdateHook,
         validation: {
           type: ValidationTypes.TEXT,
           params: {
diff --git a/app/client/src/widgets/wds/WDSParagraphWidget/constants.ts b/app/client/src/widgets/wds/WDSParagraphWidget/constants.ts
new file mode 100644
index 000000000000..667d8d10ad14
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSParagraphWidget/constants.ts
@@ -0,0 +1,6 @@
+export const FONT_SIZE_TO_WIDGET_TYPE_MAP = {
+  body: "WDS_PARAGRAPH_WIDGET",
+  subtitle: "WDS_HEADING_WIDGET",
+  title: "WDS_HEADING_WIDGET",
+  heading: "WDS_HEADING_WIDGET",
+} as const;
diff --git a/app/client/src/widgets/wds/WDSParagraphWidget/helpers.ts b/app/client/src/widgets/wds/WDSParagraphWidget/helpers.ts
new file mode 100644
index 000000000000..29805cf95fd3
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSParagraphWidget/helpers.ts
@@ -0,0 +1,24 @@
+import type { PropertyUpdates } from "WidgetProvider/constants";
+import type { WidgetProps } from "widgets/BaseWidget";
+
+import { FONT_SIZE_TO_WIDGET_TYPE_MAP } from "./constants";
+
+export function fontSizeUpdateHook(
+  props: WidgetProps,
+  propertyName: string,
+  propertyValue: keyof typeof FONT_SIZE_TO_WIDGET_TYPE_MAP,
+) {
+  const updates: PropertyUpdates[] = [
+    {
+      propertyPath: propertyName,
+      propertyValue: propertyValue,
+    },
+  ];
+
+  updates.push({
+    propertyPath: "type",
+    propertyValue: FONT_SIZE_TO_WIDGET_TYPE_MAP[propertyValue],
+  });
+
+  return updates;
+}
diff --git a/app/client/src/widgets/wds/WDSPasswordInputWidget/widget/index.tsx b/app/client/src/widgets/wds/WDSPasswordInputWidget/widget/index.tsx
index 69b17b523d81..a47776ab386b 100644
--- a/app/client/src/widgets/wds/WDSPasswordInputWidget/widget/index.tsx
+++ b/app/client/src/widgets/wds/WDSPasswordInputWidget/widget/index.tsx
@@ -1,8 +1,8 @@
 import { WIDGET_TAGS } from "constants/WidgetConstants";
 import { WDSInputWidget } from "widgets/wds/WDSInputWidget";
-import { PasswordInputIcon, PasswordInputThumbnail } from "appsmith-icons";
-import { INPUT_TYPES } from "widgets/wds/WDSInputWidget/constants";
+import { INPUT_TYPES } from "widgets/wds/WDSBaseInputWidget/constants";
 import type { WidgetBaseConfiguration } from "WidgetProvider/constants";
+import { PasswordInputIcon, PasswordInputThumbnail } from "appsmith-icons";
 
 class WDSPasswordInputWidget extends WDSInputWidget {
   static type = "WDS_PASSWORD_INPUT_WIDGET";
diff --git a/app/client/src/widgets/wds/WDSPhoneInputWidget/index.ts b/app/client/src/widgets/wds/WDSPhoneInputWidget/index.ts
index e90ae83f8e38..7b18e9188ff3 100644
--- a/app/client/src/widgets/wds/WDSPhoneInputWidget/index.ts
+++ b/app/client/src/widgets/wds/WDSPhoneInputWidget/index.ts
@@ -1 +1,2 @@
+export * from "./constants";
 export { WDSPhoneInputWidget } from "./widget";
diff --git a/app/client/src/widgets/wds/WDSPhoneInputWidget/widget/index.tsx b/app/client/src/widgets/wds/WDSPhoneInputWidget/widget/index.tsx
index 86c5c769f617..e6c8ad4b4acc 100644
--- a/app/client/src/widgets/wds/WDSPhoneInputWidget/widget/index.tsx
+++ b/app/client/src/widgets/wds/WDSPhoneInputWidget/widget/index.tsx
@@ -1,9 +1,8 @@
 import React from "react";
 import log from "loglevel";
 import merge from "lodash/merge";
-import { klona as clone } from "klona";
 import * as Sentry from "@sentry/react";
-import { mergeWidgetConfig } from "utils/helpers";
+import { klonaRegularWithTelemetry, mergeWidgetConfig } from "utils/helpers";
 import type { CountryCode } from "libphonenumber-js";
 import type { WidgetState } from "widgets/BaseWidget";
 import type { DerivedPropertiesMap } from "WidgetProvider/factory";
@@ -50,7 +49,10 @@ class WDSPhoneInputWidget extends WDSBaseInputWidget<
   }
 
   static getPropertyPaneContentConfig() {
-    const parentConfig = clone(super.getPropertyPaneContentConfig());
+    const parentConfig = klonaRegularWithTelemetry(
+      super.getPropertyPaneContentConfig(),
+      "WDSPhoneInputWidget.getPropertyPaneContentConfig",
+    );
 
     const labelSectionIndex = parentConfig.findIndex(
       (section) => section.sectionName === "Label",
diff --git a/app/client/src/widgets/wds/WDSSelectWidget/config/anvilConfig.ts b/app/client/src/widgets/wds/WDSSelectWidget/config/anvilConfig.ts
new file mode 100644
index 000000000000..dc7fe21e103c
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSSelectWidget/config/anvilConfig.ts
@@ -0,0 +1,11 @@
+import type { AnvilConfig } from "WidgetProvider/constants";
+
+export const anvilConfig: AnvilConfig = {
+  isLargeWidget: false,
+  widgetSize: {
+    minWidth: {
+      base: "100%",
+      "180px": "sizing-30",
+    },
+  },
+};
diff --git a/app/client/src/widgets/wds/WDSSelectWidget/config/autocompleteConfig.ts b/app/client/src/widgets/wds/WDSSelectWidget/config/autocompleteConfig.ts
new file mode 100644
index 000000000000..18c4a96be3e7
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSSelectWidget/config/autocompleteConfig.ts
@@ -0,0 +1,11 @@
+import { DefaultAutocompleteDefinitions } from "widgets/WidgetUtils";
+
+export const autocompleteConfig = {
+  "!doc":
+    "Select widget lets the user choose one option from a dropdown list. It is similar to a SingleSelect Dropdown in its functionality",
+  "!url": "https://docs.appsmith.com/widget-reference/radio",
+  isVisible: DefaultAutocompleteDefinitions.isVisible,
+  options: "[$__dropdownOption__$]",
+  selectedOptionValue: "string",
+  isRequired: "bool",
+};
diff --git a/app/client/src/widgets/wds/WDSSelectWidget/config/defaultsConfig.ts b/app/client/src/widgets/wds/WDSSelectWidget/config/defaultsConfig.ts
new file mode 100644
index 000000000000..2f0b40d1e1b7
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSSelectWidget/config/defaultsConfig.ts
@@ -0,0 +1,21 @@
+import { ResponsiveBehavior } from "layoutSystems/common/utils/constants";
+import type { WidgetDefaultProps } from "WidgetProvider/constants";
+
+export const defaultsConfig = {
+  animateLoading: true,
+  label: "Label",
+  options: [
+    { label: "Option 1", value: "1" },
+    { label: "Option 2", value: "2" },
+    { label: "Option 3", value: "3" },
+  ],
+  defaultOptionValue: "",
+  isRequired: false,
+  isDisabled: false,
+  isVisible: true,
+  isInline: false,
+  widgetName: "Select",
+  widgetType: "SELECT",
+  version: 1,
+  responsiveBehavior: ResponsiveBehavior.Fill,
+} as unknown as WidgetDefaultProps;
diff --git a/app/client/src/widgets/wds/WDSSelectWidget/config/featuresConfig.ts b/app/client/src/widgets/wds/WDSSelectWidget/config/featuresConfig.ts
new file mode 100644
index 000000000000..60a677c66cb6
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSSelectWidget/config/featuresConfig.ts
@@ -0,0 +1,6 @@
+export const featuresConfig = {
+  dynamicHeight: {
+    sectionIndex: 3,
+    active: true,
+  },
+};
diff --git a/app/client/src/widgets/wds/WDSSelectWidget/config/index.ts b/app/client/src/widgets/wds/WDSSelectWidget/config/index.ts
new file mode 100644
index 000000000000..995925903b3f
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSSelectWidget/config/index.ts
@@ -0,0 +1,7 @@
+export * from "./propertyPaneConfig";
+export { metaConfig } from "./metaConfig";
+export { anvilConfig } from "./anvilConfig";
+export { defaultsConfig } from "./defaultsConfig";
+export { settersConfig } from "./settersConfig";
+export { methodsConfig } from "./methodsConfig";
+export { autocompleteConfig } from "./autocompleteConfig";
diff --git a/app/client/src/widgets/wds/WDSSelectWidget/config/metaConfig.ts b/app/client/src/widgets/wds/WDSSelectWidget/config/metaConfig.ts
new file mode 100644
index 000000000000..d7b522a26b38
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSSelectWidget/config/metaConfig.ts
@@ -0,0 +1,8 @@
+import { WIDGET_TAGS } from "constants/WidgetConstants";
+
+export const metaConfig = {
+  name: "Select",
+  tags: [WIDGET_TAGS.SELECT],
+  needsMeta: true,
+  searchTags: ["choice", "option", "choose", "pick", "select", "dropdown"],
+};
diff --git a/app/client/src/widgets/wds/WDSSelectWidget/config/methodsConfig.ts b/app/client/src/widgets/wds/WDSSelectWidget/config/methodsConfig.ts
new file mode 100644
index 000000000000..d0c86d2c7db6
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSSelectWidget/config/methodsConfig.ts
@@ -0,0 +1,21 @@
+import type {
+  PropertyUpdates,
+  SnipingModeProperty,
+} from "WidgetProvider/constants";
+import { RadioGroupIcon, SelectThumbnail } from "appsmith-icons";
+
+export const methodsConfig = {
+  getSnipingModeUpdates: (
+    propValueMap: SnipingModeProperty,
+  ): PropertyUpdates[] => {
+    return [
+      {
+        propertyPath: "options",
+        propertyValue: propValueMap.data,
+        isDynamicPropertyPath: true,
+      },
+    ];
+  },
+  IconCmp: RadioGroupIcon,
+  ThumbnailCmp: SelectThumbnail,
+};
diff --git a/app/client/src/widgets/wds/WDSSelectWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/widgets/wds/WDSSelectWidget/config/propertyPaneConfig/contentConfig.ts
new file mode 100644
index 000000000000..9466f1c8a93d
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSSelectWidget/config/propertyPaneConfig/contentConfig.ts
@@ -0,0 +1,219 @@
+import { ValidationTypes } from "constants/WidgetValidation";
+import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { AutocompleteDataType } from "utils/autocomplete/AutocompleteDataType";
+import type { WDSSelectWidgetProps } from "../../widget/types";
+import {
+  defaultOptionValidation,
+  optionsCustomValidation,
+} from "./validations";
+import type { WidgetProps } from "../../../../BaseWidget";
+import type { PropertyUpdates } from "../../../../../WidgetProvider/constants";
+
+type WidgetTypeValue = "SELECT" | "COMBOBOX";
+
+export const propertyPaneContentConfig = [
+  {
+    sectionName: "Data",
+    children: [
+      {
+        propertyName: "widgetType",
+        label: "Data type",
+        controlType: "DROP_DOWN",
+        options: [
+          {
+            label: "Select",
+            value: "SELECT",
+          },
+          {
+            label: "ComboBox",
+            value: "COMBOBOX",
+          },
+        ],
+        isBindProperty: false,
+        isTriggerProperty: false,
+        updateHook: (
+          _props: WidgetProps,
+          propertyName: string,
+          propertyValue: WidgetTypeValue,
+        ) => {
+          const updates: PropertyUpdates[] = [
+            {
+              propertyPath: propertyName,
+              propertyValue: propertyValue,
+            },
+          ];
+
+          // Handle widget morphing
+          if (propertyName === "widgetType") {
+            const morphingMap: Record<WidgetTypeValue, string> = {
+              SELECT: "WDS_SELECT_WIDGET",
+              COMBOBOX: "WDS_COMBOBOX_WIDGET",
+            };
+
+            const targetWidgetType = morphingMap[propertyValue];
+
+            if (targetWidgetType) {
+              updates.push({
+                propertyPath: "type",
+                propertyValue: targetWidgetType,
+              });
+            }
+          }
+
+          return updates;
+        },
+      },
+      {
+        helpText: "Displays a list of unique options",
+        propertyName: "options",
+        label: "Options",
+        controlType: "OPTION_INPUT",
+        isJSConvertible: true,
+        isBindProperty: true,
+        isTriggerProperty: false,
+        dependencies: ["optionLabel", "optionValue"],
+        validation: {
+          type: ValidationTypes.FUNCTION,
+          params: {
+            fn: optionsCustomValidation,
+            expected: {
+              type: 'Array<{ "label": "string", "value": "string" | number}>',
+              example: `[{"label": "One", "value": "one"}]`,
+              autocompleteDataType: AutocompleteDataType.STRING,
+            },
+          },
+        },
+        evaluationSubstitutionType: EvaluationSubstitutionType.SMART_SUBSTITUTE,
+      },
+      {
+        helpText: "Sets a default selected option",
+        propertyName: "defaultOptionValue",
+        label: "Default selected value",
+        placeholderText: "",
+        controlType: "INPUT_TEXT",
+        isBindProperty: true,
+        isTriggerProperty: false,
+        dependencies: ["options"],
+        /**
+         * Changing the validation to FUNCTION.
+         * If the user enters Integer inside {{}} e.g. {{1}} then value should evalute to integer.
+         * If user enters 1 e.g. then it should evaluate as string.
+         */
+        validation: {
+          type: ValidationTypes.FUNCTION,
+          params: {
+            fn: defaultOptionValidation,
+            expected: {
+              type: `string |\nnumber (only works in mustache syntax)`,
+              example: `abc | {{1}}`,
+              autocompleteDataType: AutocompleteDataType.STRING,
+            },
+          },
+        },
+      },
+    ],
+  },
+  {
+    sectionName: "Label",
+    children: [
+      {
+        helpText: "Sets the label text of the options widget",
+        propertyName: "label",
+        label: "Text",
+        controlType: "INPUT_TEXT",
+        placeholderText: "Label",
+        isBindProperty: true,
+        isTriggerProperty: false,
+        validation: { type: ValidationTypes.TEXT },
+      },
+    ],
+  },
+  {
+    sectionName: "Validations",
+    children: [
+      {
+        propertyName: "isRequired",
+        label: "Required",
+        helpText: "Makes input to the widget mandatory",
+        controlType: "SWITCH",
+        isJSConvertible: true,
+        isBindProperty: true,
+        isTriggerProperty: false,
+        validation: { type: ValidationTypes.BOOLEAN },
+      },
+    ],
+  },
+  {
+    sectionName: "General",
+    children: [
+      {
+        helpText: "Show help text or details about current input",
+        propertyName: "labelTooltip",
+        label: "Tooltip",
+        controlType: "INPUT_TEXT",
+        placeholderText: "",
+        isBindProperty: true,
+        isTriggerProperty: false,
+        validation: { type: ValidationTypes.TEXT },
+      },
+      {
+        helpText: "Sets a placeholder text for the select",
+        propertyName: "placeholderText",
+        label: "Placeholder",
+        controlType: "INPUT_TEXT",
+        placeholderText: "",
+        isBindProperty: true,
+        isTriggerProperty: false,
+        validation: { type: ValidationTypes.TEXT },
+        hidden: (props: WDSSelectWidgetProps) => {
+          return Boolean(props.isReadOnly);
+        },
+      },
+      {
+        helpText: "Controls the visibility of the widget",
+        propertyName: "isVisible",
+        label: "Visible",
+        controlType: "SWITCH",
+        isJSConvertible: true,
+        isBindProperty: true,
+        isTriggerProperty: false,
+        validation: { type: ValidationTypes.BOOLEAN },
+      },
+      {
+        propertyName: "isDisabled",
+        label: "Disabled",
+        helpText: "Disables input to this widget",
+        controlType: "SWITCH",
+        isJSConvertible: true,
+        isBindProperty: true,
+        isTriggerProperty: false,
+        validation: { type: ValidationTypes.BOOLEAN },
+      },
+      {
+        propertyName: "animateLoading",
+        label: "Animate loading",
+        controlType: "SWITCH",
+        helpText: "Controls the loading of the widget",
+        defaultValue: true,
+        isJSConvertible: true,
+        isBindProperty: true,
+        isTriggerProperty: false,
+        validation: { type: ValidationTypes.BOOLEAN },
+      },
+    ],
+  },
+  {
+    sectionName: "Events",
+    children: [
+      {
+        helpText: "when a user changes the selected option",
+        propertyName: "onSelectionChange",
+        label: "onSelectionChange",
+        controlType: "ACTION_SELECTOR",
+        isJSConvertible: true,
+        isBindProperty: true,
+        isTriggerProperty: true,
+      },
+    ],
+  },
+];
diff --git a/app/client/src/widgets/wds/WDSSelectWidget/config/propertyPaneConfig/index.ts b/app/client/src/widgets/wds/WDSSelectWidget/config/propertyPaneConfig/index.ts
new file mode 100644
index 000000000000..7f43d3bde57a
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSSelectWidget/config/propertyPaneConfig/index.ts
@@ -0,0 +1 @@
+export { propertyPaneContentConfig } from "./contentConfig";
diff --git a/app/client/src/widgets/wds/WDSSelectWidget/config/propertyPaneConfig/validations/defaultOptionValidation.ts b/app/client/src/widgets/wds/WDSSelectWidget/config/propertyPaneConfig/validations/defaultOptionValidation.ts
new file mode 100644
index 000000000000..463f49d9cc4a
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSSelectWidget/config/propertyPaneConfig/validations/defaultOptionValidation.ts
@@ -0,0 +1,67 @@
+import type { ValidationResponse } from "constants/WidgetValidation";
+import type { LoDashStatic } from "lodash";
+import type { WidgetProps } from "../../../../../BaseWidget";
+
+interface ValidationErrorMessage {
+  name: string;
+  message: string;
+}
+
+interface ValidationErrorMessage {
+  name: string;
+  message: string;
+}
+
+export function defaultOptionValidation(
+  value: unknown,
+  widgetProps: WidgetProps,
+  _: LoDashStatic,
+): ValidationResponse {
+  // UTILS
+  const isTrueObject = (item: unknown): item is Record<string, unknown> => {
+    return Object.prototype.toString.call(item) === "[object Object]";
+  };
+
+  const createErrorValidationResponse = (
+    value: unknown,
+    message: ValidationErrorMessage,
+  ): ValidationResponse => ({
+    isValid: false,
+    parsed: value,
+    messages: [message],
+  });
+
+  const createSuccessValidationResponse = (
+    value: unknown,
+  ): ValidationResponse => ({
+    isValid: true,
+    parsed: value,
+  });
+
+  const { options } = widgetProps;
+
+  if (value === "") {
+    return createSuccessValidationResponse(value);
+  }
+
+  // Is Form mode, otherwise it is JS mode
+  if (Array.isArray(options)) {
+    const values = _.map(widgetProps.options, (option) => {
+      if (isTrueObject(option)) {
+        return option["value"];
+      }
+    });
+
+    if (!values.includes(value)) {
+      return createErrorValidationResponse(value, {
+        name: "ValidationError",
+        message:
+          "Default value is missing in options. Please update the value.",
+      });
+    }
+
+    return createSuccessValidationResponse(value);
+  }
+
+  return createSuccessValidationResponse(value);
+}
diff --git a/app/client/src/widgets/wds/WDSSelectWidget/config/propertyPaneConfig/validations/index.ts b/app/client/src/widgets/wds/WDSSelectWidget/config/propertyPaneConfig/validations/index.ts
new file mode 100644
index 000000000000..a7a09713fb48
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSSelectWidget/config/propertyPaneConfig/validations/index.ts
@@ -0,0 +1,2 @@
+export { defaultOptionValidation } from "./defaultOptionValidation";
+export { optionsCustomValidation } from "./optionsCustomValidation";
diff --git a/app/client/src/widgets/wds/WDSSelectWidget/config/propertyPaneConfig/validations/optionsCustomValidation.ts b/app/client/src/widgets/wds/WDSSelectWidget/config/propertyPaneConfig/validations/optionsCustomValidation.ts
new file mode 100644
index 000000000000..356d2155a85d
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSSelectWidget/config/propertyPaneConfig/validations/optionsCustomValidation.ts
@@ -0,0 +1,158 @@
+import type { ValidationResponse } from "constants/WidgetValidation";
+import type { LoDashStatic } from "lodash";
+import type { WidgetProps } from "../../../../../BaseWidget";
+
+interface ValidationErrorMessage {
+  name: string;
+  message: string;
+}
+
+/**
+ * Validation rules:
+ * 1. This property will take the value in the following format: Array<{ "label": "string", "value": "string" | number}>
+ * 2. The `value` property should consists of unique values only.
+ * 3. Data types of all the value props should be the same.
+ */
+export function optionsCustomValidation(
+  options: unknown,
+  _props: WidgetProps,
+  _: LoDashStatic,
+): ValidationResponse {
+  // UTILS
+  const createErrorValidationResponse = (
+    value: unknown,
+    message: ValidationErrorMessage,
+  ): ValidationResponse => ({
+    isValid: false,
+    parsed: value,
+    messages: [message],
+  });
+
+  const createSuccessValidationResponse = (
+    value: unknown,
+  ): ValidationResponse => ({
+    isValid: true,
+    parsed: value,
+  });
+
+  const hasDuplicates = (array: unknown[]): boolean =>
+    new Set(array).size !== array.length;
+
+  if (Array.isArray(options)) {
+    const isValidKeys = options.every((option) => {
+      return (
+        _.isPlainObject(option) &&
+        _.has(option, "label") &&
+        _.has(option, "value")
+      );
+    });
+
+    if (!isValidKeys) {
+      return createErrorValidationResponse(options, {
+        name: "ValidationError",
+        message:
+          'This value does not evaluate to type Array<{ "label": "string", "value": "string" | number }>',
+      });
+    }
+
+    return createSuccessValidationResponse(options);
+  }
+
+  // JS expects options to be a string
+  if (!_.isString(options)) {
+    return createErrorValidationResponse(options, {
+      name: "TypeError",
+      message: "This value does not evaluate to type string",
+    });
+  }
+
+  const validationUtil = (options: unknown[]) => {
+    let _isValid = true;
+    let message = { name: "", message: "" };
+
+    if (options.length === 0) {
+      return createErrorValidationResponse(options, {
+        name: "ValidationError",
+        message: "Options cannot be an empty array",
+      });
+    }
+
+    const isValidKeys = options.every((option) => {
+      return (
+        _.isPlainObject(option) &&
+        _.has(option, "label") &&
+        _.has(option, "value")
+      );
+    });
+
+    if (!isValidKeys) {
+      return createErrorValidationResponse(options, {
+        name: "ValidationError",
+        message:
+          'This value does not evaluate to type Array<{ "label": "string", "value": "string" | number }>',
+      });
+    }
+
+    for (let i = 0; i < options.length; i++) {
+      const option = options[i];
+
+      if (!_.isPlainObject(option)) {
+        _isValid = false;
+        message = {
+          name: "ValidationError",
+          message: "This value does not evaluate to type Object",
+        };
+        break;
+      }
+
+      if (_.keys(option).length === 0) {
+        _isValid = false;
+        message = {
+          name: "ValidationError",
+          message:
+            'This value does not evaluate to type { "label": "string", "value": "string" | number }',
+        };
+        break;
+      }
+
+      if (hasDuplicates(_.keys(option))) {
+        _isValid = false;
+        message = {
+          name: "ValidationError",
+          message: "All the keys must be unique",
+        };
+        break;
+      }
+    }
+
+    return {
+      isValid: _isValid,
+      parsed: _isValid ? options : [],
+      messages: [message],
+    };
+  };
+
+  const invalidResponse = {
+    isValid: false,
+    parsed: [],
+    messages: [
+      {
+        name: "TypeError",
+        message:
+          'This value does not evaluate to type Array<{ "label": "string", "value": "string" | number }>',
+      },
+    ],
+  };
+
+  try {
+    options = JSON.parse(options as string);
+
+    if (!Array.isArray(options)) {
+      return invalidResponse;
+    }
+
+    return validationUtil(options);
+  } catch (_error) {
+    return invalidResponse;
+  }
+}
diff --git a/app/client/src/widgets/wds/WDSSelectWidget/config/settersConfig.ts b/app/client/src/widgets/wds/WDSSelectWidget/config/settersConfig.ts
new file mode 100644
index 000000000000..e6cf8f7fc4d9
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSSelectWidget/config/settersConfig.ts
@@ -0,0 +1,16 @@
+export const settersConfig = {
+  __setters: {
+    setVisibility: {
+      path: "isVisible",
+      type: "boolean",
+    },
+    setDisabled: {
+      path: "isDisabled",
+      type: "boolean",
+    },
+    setData: {
+      path: "options",
+      type: "array",
+    },
+  },
+};
diff --git a/app/client/src/widgets/wds/WDSSelectWidget/index.ts b/app/client/src/widgets/wds/WDSSelectWidget/index.ts
new file mode 100644
index 000000000000..bd2d7fe6086f
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSSelectWidget/index.ts
@@ -0,0 +1,3 @@
+import { WDSSelectWidget } from "./widget";
+
+export { WDSSelectWidget };
diff --git a/app/client/src/widgets/wds/WDSSelectWidget/widget/helpers.ts b/app/client/src/widgets/wds/WDSSelectWidget/widget/helpers.ts
new file mode 100644
index 000000000000..29a690d2845b
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSSelectWidget/widget/helpers.ts
@@ -0,0 +1,16 @@
+import type { Validation } from "widgets/wds/WDSInputWidget/widget/types";
+import type { WDSSelectWidgetProps } from "./types";
+
+export function validateInput(props: WDSSelectWidgetProps): Validation {
+  if (!props.isValid) {
+    return {
+      validationStatus: "invalid",
+      errorMessage: "Please select an option",
+    };
+  }
+
+  return {
+    validationStatus: "valid",
+    errorMessage: "",
+  };
+}
diff --git a/app/client/src/widgets/wds/WDSSelectWidget/widget/index.tsx b/app/client/src/widgets/wds/WDSSelectWidget/widget/index.tsx
new file mode 100644
index 000000000000..a5e3d7e0d2cd
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSSelectWidget/widget/index.tsx
@@ -0,0 +1,181 @@
+import { Select } from "@appsmith/wds";
+import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
+import type { SetterConfig, Stylesheet } from "entities/AppTheming";
+import isNumber from "lodash/isNumber";
+import React from "react";
+import type {
+  AnvilConfig,
+  AutocompletionDefinitions,
+} from "WidgetProvider/constants";
+import type { WidgetState } from "widgets/BaseWidget";
+import BaseWidget from "widgets/BaseWidget";
+import {
+  anvilConfig,
+  autocompleteConfig,
+  defaultsConfig,
+  metaConfig,
+  methodsConfig,
+  propertyPaneContentConfig,
+  settersConfig,
+} from "../config";
+import { validateInput } from "./helpers";
+import type { WDSSelectWidgetProps } from "./types";
+import type { SelectItem } from "@appsmith/wds/src/components/Select/src/types";
+
+const isTrueObject = (item: unknown): item is Record<string, unknown> => {
+  return Object.prototype.toString.call(item) === "[object Object]";
+};
+
+class WDSSelectWidget extends BaseWidget<WDSSelectWidgetProps, WidgetState> {
+  static type = "WDS_SELECT_WIDGET";
+
+  static getConfig() {
+    return metaConfig;
+  }
+
+  static getDefaults() {
+    return defaultsConfig;
+  }
+
+  static getMethods() {
+    return methodsConfig;
+  }
+
+  static getAnvilConfig(): AnvilConfig | null {
+    return anvilConfig;
+  }
+
+  static getDependencyMap(): Record<string, string[]> {
+    return {
+      optionLabel: ["options"],
+      optionValue: ["options"],
+      defaultOptionValue: ["options"],
+    };
+  }
+
+  static getAutocompleteDefinitions(): AutocompletionDefinitions {
+    return autocompleteConfig;
+  }
+
+  static getPropertyPaneContentConfig() {
+    return propertyPaneContentConfig;
+  }
+
+  static getPropertyPaneStyleConfig() {
+    return [];
+  }
+
+  static getDerivedPropertiesMap() {
+    return {
+      selectedOption:
+        "{{_.find(this.options, { value: this.selectedOptionValue })}}",
+      isValid: `{{ this.isRequired ? !!this.selectedOptionValue : true }}`,
+      value: `{{this.selectedOptionValue}}`,
+    };
+  }
+
+  static getDefaultPropertiesMap(): Record<string, string> {
+    return {
+      selectedOptionValue: "defaultOptionValue",
+    };
+  }
+
+  static getMetaPropertiesMap() {
+    return {
+      selectedOptionValue: undefined,
+      isDirty: false,
+    };
+  }
+
+  static getStylesheetConfig(): Stylesheet {
+    return {};
+  }
+
+  componentDidUpdate(prevProps: WDSSelectWidgetProps): void {
+    if (
+      this.props.defaultOptionValue !== prevProps.defaultOptionValue &&
+      this.props.isDirty
+    ) {
+      this.props.updateWidgetMetaProperty("isDirty", false);
+    }
+  }
+
+  static getSetterConfig(): SetterConfig {
+    return settersConfig;
+  }
+
+  handleChange = (updatedValue: string | number) => {
+    let newVal;
+
+    if (isNumber(updatedValue)) {
+      newVal = updatedValue;
+    } else if (
+      isTrueObject(this.props.options[0]) &&
+      isNumber(this.props.options[0].value)
+    ) {
+      newVal = parseFloat(updatedValue);
+    } else {
+      newVal = updatedValue;
+    }
+    const { commitBatchMetaUpdates, pushBatchMetaUpdates } = this.props;
+    // Set isDirty to true when the selection changes
+    if (!this.props.isDirty) {
+      pushBatchMetaUpdates("isDirty", true);
+    }
+
+    pushBatchMetaUpdates("selectedOptionValue", newVal, {
+      triggerPropertyName: "onSelectionChange",
+      dynamicString: this.props.onSelectionChange,
+      event: {
+        type: EventType.ON_OPTION_CHANGE,
+      },
+    });
+    commitBatchMetaUpdates();
+  };
+
+  optionsToSelectItems = (
+    options: WDSSelectWidgetProps["options"],
+  ): SelectItem[] => {
+    if (Array.isArray(options)) {
+      const items = options.map((option) => ({
+        label: option[this.props.optionLabel || "label"] as string,
+        id: option[this.props.optionValue || "value"] as string,
+      }));
+
+      const isValidItems = items.every(
+        (item) => item.label !== undefined && item.id !== undefined,
+      );
+
+      return isValidItems ? items : [];
+    }
+
+    return [];
+  };
+
+  getWidgetView() {
+    const {
+      labelTooltip,
+      options,
+      placeholderText,
+      selectedOptionValue,
+      ...rest
+    } = this.props;
+
+    const validation = validateInput(this.props);
+
+    return (
+      <Select
+        {...rest}
+        contextualHelp={labelTooltip}
+        errorMessage={validation.errorMessage}
+        isInvalid={validation.validationStatus === "invalid"}
+        items={this.optionsToSelectItems(options)}
+        onSelectionChange={this.handleChange}
+        placeholder={placeholderText}
+        selectedKey={selectedOptionValue}
+      />
+    );
+  }
+}
+
+export { WDSSelectWidget };
diff --git a/app/client/src/widgets/wds/WDSSelectWidget/widget/types.ts b/app/client/src/widgets/wds/WDSSelectWidget/widget/types.ts
new file mode 100644
index 000000000000..5bcda7981965
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSSelectWidget/widget/types.ts
@@ -0,0 +1,13 @@
+import type { WidgetProps } from "widgets/BaseWidget";
+
+export interface WDSSelectWidgetProps extends WidgetProps {
+  options: Record<string, unknown>[] | string;
+  selectedOptionValue: string;
+  onSelectionChange: string;
+  defaultOptionValue: string;
+  isRequired?: boolean;
+  isDisabled?: boolean;
+  label: string;
+  labelTooltip?: string;
+  isDirty: boolean;
+}
diff --git a/app/client/src/widgets/wds/WDSTableWidget/widget/index.tsx b/app/client/src/widgets/wds/WDSTableWidget/widget/index.tsx
index d55918fcf278..7d9d87c48da1 100644
--- a/app/client/src/widgets/wds/WDSTableWidget/widget/index.tsx
+++ b/app/client/src/widgets/wds/WDSTableWidget/widget/index.tsx
@@ -68,7 +68,6 @@ import {
   ButtonCell,
 } from "../component/cellComponents";
 
-import { klona as clone } from "klona";
 import localStorage from "utils/localStorage";
 import type { Stylesheet } from "entities/AppTheming";
 import type { getColumns } from "./reactTableUtils/getColumnsPureFn";
@@ -82,6 +81,7 @@ import type { FlattenedWidgetProps } from "WidgetProvider/constants";
 import * as config from "../config";
 import { getAnvilWidgetDOMId } from "layoutSystems/common/utils/LayoutElementPositionsObserver/utils";
 import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer";
+import { klonaRegularWithTelemetry } from "utils/helpers";
 
 const ReactTableComponent = lazy(async () =>
   retryPromise(async () => import("../component")),
@@ -1511,7 +1511,11 @@ export class WDSTableWidget extends BaseWidget<TableWidgetProps, WidgetState> {
   };
 
   removeRowFromTransientTableData = (index: number) => {
-    const newTransientTableData = clone(this.props.transientTableData);
+    const newTransientTableData = klonaRegularWithTelemetry(
+      this.props.transientTableData,
+      "WDSTableWidget.removeRowFromTransientTableData",
+    );
+
     const { commitBatchMetaUpdates, pushBatchMetaUpdates } = this.props;
 
     if (newTransientTableData) {
diff --git a/app/client/src/widgets/wds/constants.ts b/app/client/src/widgets/wds/constants.ts
index a4ac01a32eba..6a540de37c93 100644
--- a/app/client/src/widgets/wds/constants.ts
+++ b/app/client/src/widgets/wds/constants.ts
@@ -57,6 +57,8 @@ export const WDS_V2_WIDGET_MAP = {
   PASSWORD_INPUT_WIDGET: "WDS_PASSWORD_INPUT_WIDGET",
   NUMBER_INPUT_WIDGET: "WDS_NUMBER_INPUT_WIDGET",
   MULTILINE_INPUT_WIDGET: "WDS_MULTILINE_INPUT_WIDGET",
+  WDS_SELECT_WIDGET: "WDS_SELECT_WIDGET",
+  WDS_COMBOBOX_WIDGET: "WDS_COMBOBOX_WIDGET",
 
   // Anvil layout widgets
   ZONE_WIDGET: anvilWidgets.ZONE_WIDGET,
diff --git a/app/client/src/workers/common/DependencyMap/index.ts b/app/client/src/workers/common/DependencyMap/index.ts
index 54a23eafb455..52f5bc8a46d8 100644
--- a/app/client/src/workers/common/DependencyMap/index.ts
+++ b/app/client/src/workers/common/DependencyMap/index.ts
@@ -29,6 +29,7 @@ import {
 } from "ee/workers/Evaluation/Actions";
 import { isWidgetActionOrJsObject } from "ee/entities/DataTree/utils";
 import { getValidEntityType } from "workers/common/DataTreeEvaluator/utils";
+import type DependencyMap from "entities/DependencyMap";
 
 export function createDependencyMap(
   dataTreeEvalRef: DataTreeEvaluator,
@@ -72,6 +73,30 @@ export function createDependencyMap(
     inverseDependencies: dependencyMap.inverseDependencies,
   };
 }
+const addingAffectedNodesToList = (
+  affectedNodes: Set<string>,
+  addedNodes: string[],
+) => {
+  addedNodes.forEach((v) => affectedNodes.add(v));
+};
+
+const addNodesToDependencyMap =
+  (affectedNodes: Set<string>, dependencyMap: DependencyMap) =>
+  (addedNodes: Record<string, true>, strict?: boolean) => {
+    const didUpdateDep = dependencyMap.addNodes(addedNodes, strict);
+    if (didUpdateDep) {
+      addingAffectedNodesToList(affectedNodes, Object.keys(addedNodes));
+    }
+    return didUpdateDep;
+  };
+
+const setDependenciesToDependencyMap =
+  (affectedNodes: Set<string>, dependencyMap: DependencyMap) =>
+  (node: string, dependencies: string[]) => {
+    dependencyMap.addDependency(node, dependencies);
+
+    addingAffectedNodesToList(affectedNodes, [node, ...dependencies]);
+  };
 
 export const updateDependencyMap = ({
   configTree,
@@ -91,7 +116,15 @@ export const updateDependencyMap = ({
   const { allKeys, dependencyMap, oldConfigTree, oldUnEvalTree } =
     dataTreeEvalRef;
   let { errors: dataTreeEvalErrors } = dataTreeEvalRef;
-
+  const affectedNodes: Set<string> = new Set();
+  const addNodesToDepedencyMapFn = addNodesToDependencyMap(
+    affectedNodes,
+    dependencyMap,
+  );
+  const setDependenciesToDepedencyMapFn = setDependenciesToDependencyMap(
+    affectedNodes,
+    dependencyMap,
+  );
   translatedDiffs.forEach((dataTreeDiff) => {
     const {
       event,
@@ -117,15 +150,18 @@ export const updateDependencyMap = ({
           });
           // If a new entity is added, add setter functions to all nodes
           if (entityName === fullPropertyPath) {
-            const didUpdateDep = dependencyMap.addNodes(
-              getEntitySetterFunctions(entityConfig, entityName, entity),
+            const addedNodes = getEntitySetterFunctions(
+              entityConfig,
+              entityName,
+              entity,
             );
-            if (didUpdateDep) didUpdateDependencyMap = true;
+            didUpdateDependencyMap =
+              addNodesToDepedencyMapFn(addedNodes) || didUpdateDependencyMap;
           }
 
-          const didUpdateDep = dependencyMap.addNodes(allAddedPaths, false);
-
-          if (didUpdateDep) didUpdateDependencyMap = true;
+          didUpdateDependencyMap =
+            addNodesToDepedencyMapFn(allAddedPaths, false) ||
+            didUpdateDependencyMap;
 
           if (isWidgetActionOrJsObject(entity)) {
             if (!isDynamicLeaf(unEvalDataTree, fullPropertyPath, configTree)) {
@@ -141,7 +177,9 @@ export const updateDependencyMap = ({
                   ([path, pathDependencies]) => {
                     const { errors: extractDependencyErrors, references } =
                       extractInfoFromBindings(pathDependencies, allKeys);
-                    dependencyMap.addDependency(path, references);
+
+                    setDependenciesToDepedencyMapFn(path, references);
+
                     didUpdateDependencyMap = true;
                     dataTreeEvalErrors = dataTreeEvalErrors.concat(
                       extractDependencyErrors,
@@ -158,7 +196,9 @@ export const updateDependencyMap = ({
               );
               const { errors: extractDependencyErrors, references } =
                 extractInfoFromBindings(entityPathDependencies, allKeys);
-              dependencyMap.addDependency(fullPropertyPath, references);
+
+              setDependenciesToDepedencyMapFn(fullPropertyPath, references);
+
               didUpdateDependencyMap = true;
               dataTreeEvalErrors = dataTreeEvalErrors.concat(
                 extractDependencyErrors,
@@ -218,7 +258,8 @@ export const updateDependencyMap = ({
             );
             const { errors: extractDependencyErrors, references } =
               extractInfoFromBindings(entityPathDependencies, allKeys);
-            dependencyMap.addDependency(fullPropertyPath, references);
+            setDependenciesToDepedencyMapFn(fullPropertyPath, references);
+
             didUpdateDependencyMap = true;
             dataTreeEvalErrors = dataTreeEvalErrors.concat(
               extractDependencyErrors,
@@ -237,7 +278,10 @@ export const updateDependencyMap = ({
   const updateChangedDependenciesStart = performance.now();
 
   if (didUpdateDependencyMap) {
-    DependencyMapUtils.makeParentsDependOnChildren(dependencyMap);
+    DependencyMapUtils.linkAffectedChildNodesToParent(
+      dependencyMap,
+      affectedNodes,
+    );
     dataTreeEvalRef.sortedDependencies = dataTreeEvalRef.sortDependencies(
       dependencyMap,
       translatedDiffs,
diff --git a/app/client/test/factories/Widgets/ListV2Factory.ts b/app/client/test/factories/Widgets/ListV2Factory.ts
new file mode 100644
index 000000000000..04ba148880d0
--- /dev/null
+++ b/app/client/test/factories/Widgets/ListV2Factory.ts
@@ -0,0 +1,97 @@
+import * as Factory from "factory.ts";
+import { generateReactKey } from "utils/generators";
+import type { WidgetProps } from "widgets/BaseWidget";
+
+const widgetName = Factory.each((i) => `List${i + 1}`);
+
+export const ListV2Factory = Factory.Sync.makeFactory<WidgetProps>({
+  isVisible: true,
+  type: "LIST_WIDGET_V2",
+  backgroundColor: "transparent",
+  itemBackgroundColor: "#FFFFFF",
+  requiresFlatWidgetChildren: true,
+  hasMetaWidgets: true,
+  animateLoading: true,
+  gridType: "vertical",
+  minWidth: 450,
+  responsiveBehavior: "fill",
+  flexVerticalAlignment: "start",
+  dynamicBindingPathList: [
+    {
+      key: "currentItemsView",
+    },
+    {
+      key: "selectedItemView",
+    },
+    {
+      key: "triggeredItemView",
+    },
+    {
+      key: "primaryKeys",
+    },
+    {
+      key: "accentColor",
+    },
+    {
+      key: "borderRadius",
+    },
+    {
+      key: "boxShadow",
+    },
+  ],
+  currentItemsView: "{{[]}}",
+  selectedItemView: "{{{}}}",
+  triggeredItemView: "{{{}}}",
+  enhancements: true,
+  itemSpacing: 8,
+  templateHeight: 160,
+  listData: [
+    {
+      id: "001",
+      name: "Blue",
+      img: "https://assets.appsmith.com/widgets/default.png",
+    },
+    {
+      id: "002",
+      name: "Green",
+      img: "https://assets.appsmith.com/widgets/default.png",
+    },
+    {
+      id: "003",
+      name: "Red",
+      img: "https://assets.appsmith.com/widgets/default.png",
+    },
+  ],
+  pageSize: 3,
+  widgetName,
+  children: ["j3w480emeh"],
+  additionalStaticProps: [
+    "level",
+    "levelData",
+    "prefixMetaWidgetId",
+    "metaWidgetId",
+  ],
+  primaryKeys: `{{${widgetName}.listData.map((currentItem, currentIndex) => currentItem["id"] )}}`,
+  key: "vx9iap9z5u",
+  isCanvas: true,
+  needsErrorInfo: false,
+  widgetId: generateReactKey(),
+  renderMode: "CANVAS",
+  accentColor: "{{appsmith.theme.colors.primaryColor}}",
+  borderRadius: "{{appsmith.theme.borderRadius.appBorderRadius}}",
+  boxShadow: "{{appsmith.theme.boxShadow.appBoxShadow}}",
+  isLoading: false,
+  parentColumnSpace: 29.59375,
+  parentRowSpace: 10,
+  leftColumn: 5,
+  rightColumn: 29,
+  topRow: 20,
+  bottomRow: 60,
+  mobileLeftColumn: 5,
+  mobileRightColumn: 29,
+  mobileTopRow: 20,
+  mobileBottomRow: 60,
+  parentId: "0",
+  mainContainerId: "e342mwiluo",
+  mainCanvasId: "j3w480emeh",
+});
diff --git a/app/client/yarn.lock b/app/client/yarn.lock
index e2c9c3e3958f..8294edca4d7a 100644
--- a/app/client/yarn.lock
+++ b/app/client/yarn.lock
@@ -10631,6 +10631,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/dom-view-transitions@npm:^1.0.5":
+  version: 1.0.5
+  resolution: "@types/dom-view-transitions@npm:1.0.5"
+  checksum: 4190915a3d4c63d4c590d5e64d14ca1d1140496a75adb5af64b0ef13e075cc7676bff926f5c5c60305c4f6d46965a196c119a7960cbe0ff40e95e17e82334c22
+  languageName: node
+  linkType: hard
+
 "@types/dom4@npm:^2.0.1":
   version: 2.0.2
   resolution: "@types/dom4@npm:2.0.2"
@@ -13214,6 +13221,7 @@ __metadata:
     "@types/d3-geo": ^3.1.0
     "@types/deep-diff": ^1.0.0
     "@types/dom-mediacapture-record": ^1.0.11
+    "@types/dom-view-transitions": ^1.0.5
     "@types/downloadjs": ^1.4.2
     "@types/google.maps": ^3.51.0
     "@types/jest": ^27.4.1
@@ -13301,7 +13309,7 @@ __metadata:
     cypress-network-idle: ^1.14.2
     cypress-plugin-tab: ^1.0.5
     cypress-real-events: ^1.8.1
-    cypress-repeat-updated: ^1.0.1
+    cypress-repeat-pro: ^1.0.1
     cypress-tags: ^1.1.2
     cypress-terminal-report: ^5.3.6
     cypress-wait-until: ^1.7.2
@@ -16928,9 +16936,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cypress-repeat-updated@npm:^1.0.1":
+"cypress-repeat-pro@npm:^1.0.1":
   version: 1.0.1
-  resolution: "cypress-repeat-updated@npm:1.0.1"
+  resolution: "cypress-repeat-pro@npm:1.0.1"
   dependencies:
     arg: 5.0.2
     bluebird: 3.7.2
@@ -16939,8 +16947,8 @@ __metadata:
   peerDependencies:
     cypress: ">=5.3.0"
   bin:
-    cypress-repeat: index.js
-  checksum: 842107e5e1c17b9b1e4d910bfe429b6c1ca8ae6765cd985fc5f08087da36b47e19c52fbc99f936a698cfa18f364c2f674f4af0e2ed9d41fd216f594e72b2506b
+    cypress-repeat-pro: index.js
+  checksum: e62a21479b62a5d5624ce21bdd8204afd754082d851d5fc712ad76e39ca2cfe6d446c2a1434025be77fa9d76fa257609285879e9841efecc26be4d25454fb732
   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 bc5778813737..23891664b741 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
@@ -23,7 +23,6 @@
 import org.json.JSONObject;
 import org.springframework.context.annotation.Import;
 import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
 import org.springframework.util.FileSystemUtils;
 import org.springframework.util.StringUtils;
 import reactor.core.publisher.Mono;
@@ -279,12 +278,16 @@ protected Set<String> updateEntitiesInRepo(ApplicationGitReference applicationGi
 
         fileOperations.scanAndDeleteDirectoryForDeletedResources(validPages, baseRepo.resolve(PAGE_DIRECTORY));
 
-        // Save JS Libs if there's at least one change
-        if (modifiedResources != null
-                && (modifiedResources.isAllModified()
-                        || !CollectionUtils.isEmpty(
-                                modifiedResources.getModifiedResourceMap().get(CUSTOM_JS_LIB_LIST)))) {
+        // Earlier this condition included that modified resource not be null, and
+        // it should either have allModified flag turned as true or CUSTOM_JS_LIB_LIST resource map is not empty
+        // Save JS Libs if there's at least one change.
 
+        // What are the possible caveats of making this change?
+        // Since each resource in the entry needs to be present in the Modified resource map to be written
+        // There won't be any differences in writing files.
+        // In terms of performance, we would need to access the customJSLib directory every time to
+        // compare with the valid js libs.
+        if (modifiedResources != null) {
             Path jsLibDirectory = baseRepo.resolve(JS_LIB_DIRECTORY);
             Set<Map.Entry<String, Object>> jsLibEntries =
                     applicationGitReference.getJsLibraries().entrySet();
diff --git a/app/server/appsmith-git/src/main/java/com/appsmith/git/service/ce/GitExecutorCEImpl.java b/app/server/appsmith-git/src/main/java/com/appsmith/git/service/ce/GitExecutorCEImpl.java
index d0c71d702873..bf0f3ab349d5 100644
--- a/app/server/appsmith-git/src/main/java/com/appsmith/git/service/ce/GitExecutorCEImpl.java
+++ b/app/server/appsmith-git/src/main/java/com/appsmith/git/service/ce/GitExecutorCEImpl.java
@@ -224,10 +224,8 @@ public Mono<String> pushApplication(
         // open the repo
         Path baseRepoPath = createRepoPath(repoSuffix);
 
-        return gitConfig
-                .getIsAtomicPushAllowed()
-                .flatMap(isAtomicPushAllowed -> {
-                    return Mono.using(
+        return gitConfig.getIsAtomicPushAllowed().flatMap(isAtomicPushAllowed -> {
+            return Mono.using(
                             () -> Git.open(baseRepoPath.toFile()),
                             git -> Mono.fromCallable(() -> {
                                         log.debug(Thread.currentThread().getName() + ": pushing changes to remote "
@@ -265,9 +263,12 @@ public Mono<String> pushApplication(
                                     .timeout(Duration.ofMillis(Constraint.TIMEOUT_MILLIS))
                                     .name(GitSpan.FS_PUSH)
                                     .tap(Micrometer.observation(observationRegistry)),
-                            Git::close);
-                })
-                .subscribeOn(scheduler);
+                            Git::close)
+                    // this subscribeOn on is required because Mono.using
+                    // is not deferring the execution of push and for that reason it runs on the
+                    // lettuce-nioEventLoop thread instead of boundedElastic
+                    .subscribeOn(scheduler);
+        });
     }
 
     /** Clone the repo to the file path : container-volume/orgId/defaultAppId/repo/<Data>
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ActionCollectionSpan.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ActionCollectionSpan.java
new file mode 100644
index 000000000000..d385ce46ee68
--- /dev/null
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ActionCollectionSpan.java
@@ -0,0 +1,5 @@
+package com.appsmith.external.constants.spans;
+
+import com.appsmith.external.constants.spans.ce.ActionCollectionSpanCE;
+
+public class ActionCollectionSpan extends ActionCollectionSpanCE {}
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/LayoutSpan.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/LayoutSpan.java
new file mode 100644
index 000000000000..0e717763b3f7
--- /dev/null
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/LayoutSpan.java
@@ -0,0 +1,5 @@
+package com.appsmith.external.constants.spans;
+
+import com.appsmith.external.constants.spans.ce.LayoutSpanCE;
+
+public class LayoutSpan extends LayoutSpanCE {}
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/ActionCollectionSpanCE.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/ActionCollectionSpanCE.java
new file mode 100644
index 000000000000..c95f431fac0a
--- /dev/null
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/ActionCollectionSpanCE.java
@@ -0,0 +1,21 @@
+package com.appsmith.external.constants.spans.ce;
+
+import static com.appsmith.external.constants.spans.BaseSpan.APPSMITH_SPAN_PREFIX;
+
+/**
+ * Please make sure that all span names start with `appsmith.` because span with any other naming format would get
+ * dropped / ignored as defined in TracingConfig.java
+ */
+public class ActionCollectionSpanCE {
+    // Action Collection spans
+    public static final String ACTION_COLLECTION_UPDATE = APPSMITH_SPAN_PREFIX + "update.actionCollection";
+    public static final String GENERATE_ACTION_COLLECTION_BY_VIEW_MODE =
+            APPSMITH_SPAN_PREFIX + "generate.actionCollectionByViewMode";
+    public static final String POPULATE_ACTION_COLLECTION_BY_VIEW_MODE =
+            APPSMITH_SPAN_PREFIX + "populate.actionCollectionByViewMode";
+    public static final String SAVE_ACTION_COLLECTION_LAST_EDIT_INFO =
+            APPSMITH_SPAN_PREFIX + "save.actionCollectionLastEditInfo";
+
+    // Getter spans
+    public static final String GET_ACTION_COLLECTION_BY_ID = APPSMITH_SPAN_PREFIX + "get.actionCollectionById";
+}
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 42c2e3753f23..1cbec44a3a75 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
@@ -23,13 +23,18 @@ public class ActionSpanCE {
     public static final String GET_UNPUBLISHED_ACTION = APPSMITH_SPAN_PREFIX + "get.action.unpublished";
     public static final String GET_VIEW_MODE_ACTION = APPSMITH_SPAN_PREFIX + "get.action.viewmode";
     public static final String GET_ACTION_REPOSITORY_CALL = APPSMITH_SPAN_PREFIX + "get.action.repository.call";
-    public static final String VIEW_MODE_FILTER_ACTION = ACTIONS_VIEW_MODE_PREFIX + "filter";
-    public static final String VIEW_MODE_SANITISE_ACTION = ACTIONS_VIEW_MODE_PREFIX + "sanitise";
     public static final String VIEW_MODE_INITIAL_ACTION = ACTIONS_VIEW_MODE_PREFIX + "initial";
     public static final String VIEW_MODE_FINAL_ACTION = ACTIONS_VIEW_MODE_PREFIX + "final";
     public static final String VIEW_MODE_SET_PLUGIN_ID_AND_TYPE_JS = ACTIONS_VIEW_MODE_PREFIX + "set_js";
     public static final String VIEW_MODE_SET_PLUGIN_ID_AND_TYPE_ACTION = ACTIONS_VIEW_MODE_PREFIX + "set_action";
     public static final String VIEW_MODE_FETCH_PLUGIN_FROM_DB = ACTIONS_VIEW_MODE_PREFIX + "plugindb";
     public static final String VIEW_MODE_FETCH_ACTIONS_FROM_DB = ACTIONS_VIEW_MODE_PREFIX + "fetchactions";
-    public static final String VIEW_MODE_FETCH_ACTIONS_FROM_DB_QUERY = ACTIONS_VIEW_MODE_PREFIX + "actionsdb";
+    public static final String GET_ACTION_BY_ID = APPSMITH_SPAN_PREFIX + "get.actionById";
+
+    // Action creation, update and delete spans
+    public static final String UPDATE_SINGLE_ACTION = APPSMITH_SPAN_PREFIX + "update.single.action";
+    public static final String UPDATE_ACTION_BASED_ON_CONTEXT = APPSMITH_SPAN_PREFIX + "update.action.context";
+    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";
 }
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 6e27900e5920..57a8982e0e30 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
@@ -1,7 +1,10 @@
 package com.appsmith.external.constants.spans.ce;
 
+import static com.appsmith.external.constants.spans.ConsolidatedApiSpanNames.APPLICATION_ID_SPAN;
 import static com.appsmith.external.constants.spans.ConsolidatedApiSpanNames.CONSOLIDATED_API_PREFIX;
 
 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";
 }
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
new file mode 100644
index 000000000000..98c972bd1285
--- /dev/null
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/LayoutSpanCE.java
@@ -0,0 +1,18 @@
+package com.appsmith.external.constants.spans.ce;
+
+import static com.appsmith.external.constants.spans.BaseSpan.APPSMITH_SPAN_PREFIX;
+
+public class LayoutSpanCE {
+    public static final String UPDATE_LAYOUT = "updateLayout.";
+    public static final String UPDATE_PAGE_LAYOUT_BY_PAGE_ID = APPSMITH_SPAN_PREFIX + UPDATE_LAYOUT + "pageId";
+    public static final String UPDATE_LAYOUT_METHOD = APPSMITH_SPAN_PREFIX + UPDATE_LAYOUT + "method";
+    public static final String UPDATE_LAYOUT_DSL_METHOD = APPSMITH_SPAN_PREFIX + UPDATE_LAYOUT + "dsl.method";
+    public static final String UPDATE_LAYOUT_BASED_ON_CONTEXT = APPSMITH_SPAN_PREFIX + UPDATE_LAYOUT + "context";
+
+    public static final String FIND_ALL_ON_LOAD_EXECUTABLES =
+            APPSMITH_SPAN_PREFIX + "onLoadExecutablesUtil.findAllOnLoadExecutables";
+    public static final String UPDATE_EXECUTABLES_EXECUTE_ONLOAD =
+            APPSMITH_SPAN_PREFIX + "onLoadExecutablesUtil.updateExecutablesExecuteOnLoad";
+    public static final String FIND_AND_UPDATE_LAYOUT =
+            APPSMITH_SPAN_PREFIX + "onLoadExecutablesUtil.findAndUpdateLayout";
+}
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 42169197bee2..8f3e8f78ed16 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
@@ -1,5 +1,7 @@
 package com.appsmith.external.constants.spans.ce;
 
+import static com.appsmith.external.constants.spans.BaseSpan.APPSMITH_SPAN_PREFIX;
+
 public class PageSpanCE {
     public static final String PAGES = "pages.";
     public static final String GET_PAGE = PAGES + "getpage";
@@ -11,4 +13,6 @@ public class PageSpanCE {
     public static final String MARK_RECENTLY_ACCESSED_RESOURCES_PAGES = PAGES + "update_recently_accessed_pages";
     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";
 }
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/helpers/Stopwatch.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/helpers/Stopwatch.java
index 1fc597c01f82..9d6fdb3eba6a 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/helpers/Stopwatch.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/helpers/Stopwatch.java
@@ -25,6 +25,18 @@ public void stopAndLogTimeInMillis() {
         log.debug("Execute time: {}, Time elapsed: {}ms", this.flow, this.watch.getTime(TimeUnit.MILLISECONDS));
     }
 
+    /**
+     * This is a temporary function created to log stopwatch timer within the plugin package
+     * Due to this bug https://github.com/appsmithorg/appsmith/issues/36073 logging is not working in the plugin package
+     */
+    public void stopAndLogTimeInMillisWithSysOut() {
+        if (!this.watch.isStopped()) {
+            this.watch.stop();
+        }
+        System.out.println(String.format(
+                "Execute time: %s, Time elapsed: %dms", this.flow, this.watch.getTime(TimeUnit.MILLISECONDS)));
+    }
+
     public void stopTimer() {
         if (!this.watch.isStopped()) {
             this.watch.stop();
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/BaseDomain.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/BaseDomain.java
index fcea678d0d69..3a880a5c3063 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/BaseDomain.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/BaseDomain.java
@@ -120,10 +120,10 @@ public void setPolicies(Set<Policy> policies) {
     }
 
     /**
-     * This method is used to set the policyMap and also nullify the policies field if required. This acts as a
-     * backward compatible method till we replace direct assignment to policyMap field. By default, from the codebase
-     * we expect that the policies field should be nullified, but the same is not true when triggered it from startup
-     * migrations till {@link Migration057PolicySetToPolicyMap} is executed. This is because we update the policies via:
+     * This method is used to set the policies and policyMap field if required. This acts as a backward compatible
+     * method till we replace direct assignment to policyMap field. By default, from the codebase we expect that the
+     * policyMap field should have all elements from policies, but the same is not true when triggered it from startup
+     * migrations till {@link Migration059PolicySetToPolicyMap} is executed. This is because we update the policies via:
      * 1. The setter method
      * 2. Direct assignment to the field (check {@link Migration042AddPermissionsForGitOperations})
      * The 2nd use-case is what makes it difficult to track and update policies in migrations. We thought of updating
@@ -131,21 +131,15 @@ public void setPolicies(Set<Policy> policies) {
      * which leaves the room for errors and is not a good practice.
      *
      * @param policies                  The set of policies to be set
-     * @param shouldNullifyPolicies     A boolean flag to decide if the policies field should be nullified
+     * @param shouldUpdatePolicyMap     A boolean flag to decide if the policyMap field should be updated
      */
     @JsonView({Views.Internal.class})
     @Deprecated(forRemoval = true, since = "Use policyMap instead")
-    public void setPolicies(Set<Policy> policies, boolean shouldNullifyPolicies) {
-        if (!shouldNullifyPolicies) {
-            // This block should be used only for startup migrations to make sure we have the updated values in policies
-            // only, before running the migration to switch from policies to policyMap.
-            this.policies = policies;
-            this.policyMap = null;
-            return;
+    public void setPolicies(Set<Policy> policies, boolean shouldUpdatePolicyMap) {
+        this.policies = policies;
+        if (shouldUpdatePolicyMap) {
+            this.policyMap = policySetToMap(policies);
         }
-        // Explicitly set policies to null as it is deprecated and should not be used.
-        this.policyMap = policySetToMap(policies);
-        this.policies = null;
     }
 
     public static Map<String, Policy> policySetToMap(Set<Policy> policies) {
@@ -176,6 +170,9 @@ public void makePristine() {
         if (this.getPolicyMap() != null) {
             this.getPolicyMap().clear();
         }
+        if (this.getPolicies() != null) {
+            this.policies = new HashSet<>();
+        }
     }
 
     /**
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/Datasource.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/Datasource.java
index e2b41d1c8076..e067733a8094 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/Datasource.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/Datasource.java
@@ -54,7 +54,7 @@ public class Datasource extends GitSyncedDomain {
     String templateName;
 
     // This is only kept public for embedded datasource
-    @JsonView({Views.Public.class, FromRequest.class})
+    @JsonView({Views.Public.class, FromRequest.class, Git.class})
     DatasourceConfiguration datasourceConfiguration;
 
     @Transient
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/DatasourceConfiguration.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/DatasourceConfiguration.java
index ee6c0097cf42..5a81b66b730c 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/DatasourceConfiguration.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/DatasourceConfiguration.java
@@ -1,6 +1,7 @@
 package com.appsmith.external.models;
 
 import com.appsmith.external.views.FromRequest;
+import com.appsmith.external.views.Git;
 import com.appsmith.external.views.Views;
 import com.fasterxml.jackson.annotation.JsonView;
 import lombok.AllArgsConstructor;
@@ -37,17 +38,17 @@ public class DatasourceConfiguration implements AppsmithDomain {
 
     Boolean sshProxyEnabled;
 
-    @JsonView({Views.Public.class, FromRequest.class})
+    @JsonView({Views.Public.class, FromRequest.class, Git.class})
     List<Property> properties;
 
     // For REST API.
-    @JsonView({Views.Public.class, FromRequest.class})
+    @JsonView({Views.Public.class, FromRequest.class, Git.class})
     String url;
 
-    @JsonView({Views.Public.class, FromRequest.class})
+    @JsonView({Views.Public.class, FromRequest.class, Git.class})
     List<Property> headers;
 
-    @JsonView({Views.Public.class, FromRequest.class})
+    @JsonView({Views.Public.class, FromRequest.class, Git.class})
     List<Property> queryParameters;
 
     public boolean isSshProxyEnabled() {
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/SSHConnection.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/SSHConnection.java
index cfea37a7ba92..dc3ae180ca0f 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/SSHConnection.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/SSHConnection.java
@@ -1,5 +1,6 @@
 package com.appsmith.external.models;
 
+import com.appsmith.external.views.FromRequest;
 import com.appsmith.external.views.Views;
 import com.fasterxml.jackson.annotation.JsonView;
 import lombok.AllArgsConstructor;
@@ -24,11 +25,13 @@ public enum AuthType {
         PASSWORD
     }
 
+    @JsonView({Views.Public.class, FromRequest.class})
     String host;
 
+    @JsonView({Views.Public.class, FromRequest.class})
     Long port;
 
-    @JsonView(Views.Public.class)
+    @JsonView({Views.Public.class, FromRequest.class})
     List<Endpoint> endpoints;
 
     public void setEndpoints(List<Endpoint> endpoints) {
@@ -40,9 +43,12 @@ public void setEndpoints(List<Endpoint> endpoints) {
         }
     }
 
+    @JsonView({Views.Public.class, FromRequest.class})
     String username;
 
+    @JsonView({Views.Public.class, FromRequest.class})
     AuthType authType;
 
+    @JsonView({Views.Public.class, FromRequest.class})
     SSHPrivateKey privateKey;
 }
diff --git a/app/server/appsmith-plugins/amazons3Plugin/src/main/java/com/external/plugins/AmazonS3Plugin.java b/app/server/appsmith-plugins/amazons3Plugin/src/main/java/com/external/plugins/AmazonS3Plugin.java
index b4166191fe8c..d14626056018 100644
--- a/app/server/appsmith-plugins/amazons3Plugin/src/main/java/com/external/plugins/AmazonS3Plugin.java
+++ b/app/server/appsmith-plugins/amazons3Plugin/src/main/java/com/external/plugins/AmazonS3Plugin.java
@@ -416,6 +416,9 @@ public Mono<ActionExecutionResult> executeParameterized(
                 DatasourceConfiguration datasourceConfiguration,
                 ActionConfiguration actionConfiguration) {
 
+            String printMessage =
+                    Thread.currentThread().getName() + ": executeParameterized() called for AmazonS3 plugin.";
+            System.out.println(printMessage);
             final Map<String, Object> formData = actionConfiguration.getFormData();
             List<Map.Entry<String, String>> parameters = new ArrayList<>();
 
@@ -464,6 +467,8 @@ private Mono<ActionExecutionResult> executeCommon(
                 DatasourceConfiguration datasourceConfiguration,
                 ActionConfiguration actionConfiguration) {
 
+            String printMessage = Thread.currentThread().getName() + ": executeCommon() called for AmazonS3 plugin.";
+            System.out.println(printMessage);
             final String[] query = new String[1];
             Map<String, Object> requestProperties = new HashMap<>();
             List<RequestParamDTO> requestParams = new ArrayList<>();
@@ -539,6 +544,8 @@ private Mono<ActionExecutionResult> executeCommon(
                         Object actionResult;
                         switch (s3Action) {
                             case LIST:
+                                System.out.println(
+                                        Thread.currentThread().getName() + ": LIST action called for AmazonS3 plugin.");
                                 String prefix = getDataValueSafelyFromFormData(formData, LIST_PREFIX, STRING_TYPE, "");
                                 requestParams.add(new RequestParamDTO(LIST_PREFIX, prefix, null, null, null));
 
@@ -637,6 +644,8 @@ private Mono<ActionExecutionResult> executeCommon(
 
                                 break;
                             case UPLOAD_FILE_FROM_BODY: {
+                                System.out.println(Thread.currentThread().getName()
+                                        + ": UPLOAD_FILE_FROM_BODY action called for AmazonS3 plugin.");
                                 requestParams.add(
                                         new RequestParamDTO(ACTION_CONFIGURATION_PATH, path, null, null, null));
 
@@ -688,6 +697,8 @@ private Mono<ActionExecutionResult> executeCommon(
                                 break;
                             }
                             case UPLOAD_MULTIPLE_FILES_FROM_BODY: {
+                                System.out.println(Thread.currentThread().getName()
+                                        + ": UPLOAD_MULTIPLE_FILES_FROM_BODY action called for AmazonS3 plugin.");
                                 requestParams.add(
                                         new RequestParamDTO(ACTION_CONFIGURATION_PATH, path, null, null, null));
 
@@ -740,6 +751,8 @@ private Mono<ActionExecutionResult> executeCommon(
                                 break;
                             }
                             case READ_FILE:
+                                System.out.println(Thread.currentThread().getName()
+                                        + ": READ_FILE action called for AmazonS3 plugin.");
                                 requestParams.add(
                                         new RequestParamDTO(ACTION_CONFIGURATION_PATH, path, null, null, null));
 
@@ -757,6 +770,8 @@ private Mono<ActionExecutionResult> executeCommon(
                                 actionResult = Map.of("fileData", result);
                                 break;
                             case DELETE_FILE:
+                                System.out.println(Thread.currentThread().getName()
+                                        + ": DELETE_FILE action called for AmazonS3 plugin.");
                                 requestParams.add(
                                         new RequestParamDTO(ACTION_CONFIGURATION_PATH, path, null, null, null));
 
@@ -768,6 +783,8 @@ private Mono<ActionExecutionResult> executeCommon(
                                 actionResult = Map.of("status", "File deleted successfully");
                                 break;
                             case DELETE_MULTIPLE_FILES:
+                                System.out.println(Thread.currentThread().getName()
+                                        + ": DELETE_MULTIPLE_FILES action called for AmazonS3 plugin.");
                                 requestParams.add(
                                         new RequestParamDTO(ACTION_CONFIGURATION_PATH, path, null, null, null));
 
@@ -806,7 +823,7 @@ private Mono<ActionExecutionResult> executeCommon(
                         ActionExecutionResult actionExecutionResult = new ActionExecutionResult();
                         actionExecutionResult.setBody(result);
                         actionExecutionResult.setIsExecutionSuccess(true);
-                        log.debug("In the S3 Plugin, got action execution result");
+                        System.out.println("In the S3 Plugin, got action execution result");
                         return Mono.just(actionExecutionResult);
                     })
                     .onErrorResume(e -> {
@@ -825,6 +842,8 @@ private Mono<ActionExecutionResult> executeCommon(
                     })
                     // Now set the request in the result to be returned to the server
                     .map(actionExecutionResult -> {
+                        System.out.println(Thread.currentThread().getName()
+                                + ": Setting the actionExecutionResult for AmazonS3 plugin.");
                         ActionExecutionRequest actionExecutionRequest = new ActionExecutionRequest();
                         actionExecutionRequest.setQuery(query[0]);
                         actionExecutionRequest.setProperties(requestProperties);
@@ -873,7 +892,8 @@ private DeleteObjectsRequest getDeleteObjectsRequest(String bucketName, List<Str
 
         @Override
         public Mono<AmazonS3> datasourceCreate(DatasourceConfiguration datasourceConfiguration) {
-
+            String printMessage = Thread.currentThread().getName() + ": datasourceCreate() called for AmazonS3 plugin.";
+            System.out.println(printMessage);
             try {
                 Class.forName(S3_DRIVER);
             } catch (ClassNotFoundException e) {
@@ -901,13 +921,17 @@ public Mono<AmazonS3> datasourceCreate(DatasourceConfiguration datasourceConfigu
 
         @Override
         public void datasourceDestroy(AmazonS3 connection) {
+            String printMessage =
+                    Thread.currentThread().getName() + ": datasourceDestroy() called for AmazonS3 plugin.";
+            System.out.println(printMessage);
             if (connection != null) {
                 Mono.fromCallable(() -> {
                             connection.shutdown();
                             return connection;
                         })
                         .onErrorResume(exception -> {
-                            log.debug("Error closing S3 connection.", exception);
+                            System.out.println("Error closing S3 connection.");
+                            exception.printStackTrace();
                             return Mono.empty();
                         })
                         .subscribeOn(scheduler)
@@ -917,6 +941,9 @@ public void datasourceDestroy(AmazonS3 connection) {
 
         @Override
         public Set<String> validateDatasource(DatasourceConfiguration datasourceConfiguration) {
+            String printMessage =
+                    Thread.currentThread().getName() + ": validateDatasource() called for AmazonS3 plugin.";
+            System.out.println(printMessage);
             Set<String> invalids = new HashSet<>();
 
             if (datasourceConfiguration == null || datasourceConfiguration.getAuthentication() == null) {
@@ -978,6 +1005,8 @@ public Set<String> validateDatasource(DatasourceConfiguration datasourceConfigur
 
         @Override
         public Mono<DatasourceTestResult> testDatasource(DatasourceConfiguration datasourceConfiguration) {
+            String printMessage = Thread.currentThread().getName() + ": testDatasource() called for AmazonS3 plugin.";
+            System.out.println(printMessage);
             if (datasourceConfiguration == null) {
                 return Mono.just(new DatasourceTestResult(
                         S3ErrorMessages.DS_AT_LEAST_ONE_MANDATORY_PARAMETER_MISSING_ERROR_MSG));
@@ -1000,6 +1029,8 @@ public Mono<DatasourceTestResult> testDatasource(DatasourceConfiguration datasou
                                  *   object with wrong credentials does not throw any exception.
                                  * - Hence, adding a listBuckets() method call to test the connection.
                                  */
+                                System.out.println(Thread.currentThread().getName()
+                                        + ": listBuckets() called for AmazonS3 plugin.");
                                 connection.listBuckets();
                                 return new DatasourceTestResult();
                             })
@@ -1037,6 +1068,8 @@ private Mono<DatasourceTestResult> testGoogleCloudStorage(DatasourceConfiguratio
             return datasourceCreate(datasourceConfiguration)
                     .flatMap(connection -> Mono.fromCallable(() -> {
                                 connection.listObjects(defaultBucket);
+                                System.out.println(Thread.currentThread().getName()
+                                        + ": connection.listObjects() called for AmazonS3 plugin.");
                                 return new DatasourceTestResult();
                             })
                             .onErrorResume(error -> {
@@ -1062,9 +1095,13 @@ private Mono<DatasourceTestResult> testGoogleCloudStorage(DatasourceConfiguratio
         public Mono<DatasourceStructure> getStructure(
                 AmazonS3 connection, DatasourceConfiguration datasourceConfiguration) {
 
+            String printMessage = Thread.currentThread().getName() + ": getStructure() called for AmazonS3 plugin.";
+            System.out.println(printMessage);
             return Mono.fromSupplier(() -> {
                         List<DatasourceStructure.Table> tableList;
                         try {
+                            System.out.println(Thread.currentThread().getName()
+                                    + ": connection.listBuckets() called for AmazonS3 plugin.");
                             tableList = connection.listBuckets().stream()
                                     /* Get name of each bucket */
                                     .map(Bucket::getName)
@@ -1113,6 +1150,9 @@ public Object substituteValueInInput(
                 Object... args) {
             String jsonBody = (String) input;
             Param param = (Param) args[0];
+            String printMessage =
+                    Thread.currentThread().getName() + ": substituteValueInInput() called for AmazonS3 plugin.";
+            System.out.println(printMessage);
             return DataTypeStringUtils.jsonSmartReplacementPlaceholderWithValue(
                     jsonBody, value, null, insertedParams, null, param);
         }
@@ -1158,6 +1198,9 @@ void uploadFileInS3(
         @Override
         public Mono<Void> sanitizeGenerateCRUDPageTemplateInfo(
                 List<ActionConfiguration> actionConfigurationList, Object... args) {
+            String printMessage = Thread.currentThread().getName()
+                    + ": sanitizeGenerateCRUDPageTemplateInfo() called for AmazonS3 plugin.";
+            System.out.println(printMessage);
             if (isEmpty(actionConfigurationList)) {
                 return Mono.empty();
             }
diff --git a/app/server/appsmith-plugins/amazons3Plugin/src/main/java/com/external/utils/DatasourceUtils.java b/app/server/appsmith-plugins/amazons3Plugin/src/main/java/com/external/utils/DatasourceUtils.java
index 96b5a3b5f500..8a20d55b6993 100644
--- a/app/server/appsmith-plugins/amazons3Plugin/src/main/java/com/external/utils/DatasourceUtils.java
+++ b/app/server/appsmith-plugins/amazons3Plugin/src/main/java/com/external/utils/DatasourceUtils.java
@@ -101,7 +101,7 @@ public static S3ServiceProvider fromString(String name) throws AppsmithPluginExc
      */
     public static AmazonS3ClientBuilder getS3ClientBuilder(DatasourceConfiguration datasourceConfiguration)
             throws AppsmithPluginException {
-
+        System.out.println(Thread.currentThread().getName() + ": getS3ClientBuilder action called.");
         DBAuth authentication = (DBAuth) datasourceConfiguration.getAuthentication();
         String accessKey = authentication.getUsername();
         String secretKey = authentication.getPassword();
diff --git a/app/server/appsmith-plugins/amazons3Plugin/src/main/resources/editor/create.json b/app/server/appsmith-plugins/amazons3Plugin/src/main/resources/editor/create.json
index bd075899bcc1..e99b738928ce 100644
--- a/app/server/appsmith-plugins/amazons3Plugin/src/main/resources/editor/create.json
+++ b/app/server/appsmith-plugins/amazons3Plugin/src/main/resources/editor/create.json
@@ -1,13 +1,12 @@
 {
   "identifier": "UPLOAD_FILE_FROM_BODY",
-  "controlType": "SECTION",
+  "controlType": "SECTION_V2",
   "conditionals": {
     "show": "{{actionConfiguration.formData.command.data === 'UPLOAD_FILE_FROM_BODY'}}"
   },
   "children": [
     {
-      "controlType": "SECTION",
-      "label": "Select bucket to query",
+      "controlType": "DOUBLE_COLUMN_ZONE",
       "children": [
         {
           "label": "Bucket name",
@@ -16,12 +15,17 @@
           "evaluationSubstitutionType": "TEMPLATE",
           "isRequired": true,
           "initialValue": ""
+        },
+        {
+          "label": "Expiry duration of signed URL (minutes)",
+          "configProperty": "actionConfiguration.formData.create.expiry.data",
+          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+          "initialValue": "5"
         }
       ]
     },
     {
-      "controlType": "SECTION",
-      "label": "Query",
+      "controlType": "DOUBLE_COLUMN_ZONE",
       "description": "Optional",
       "children": [
         {
@@ -45,13 +49,13 @@
               "value": "NO"
             }
           ]
-        },
-        {
-          "label": "Expiry duration of signed URL (minutes)",
-          "configProperty": "actionConfiguration.formData.create.expiry.data",
-          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
-          "initialValue": "5"
-        },
+        }
+      ]
+    },
+    {
+      "controlType": "SINGLE_COLUMN_ZONE",
+      "description": "Optional",
+      "children": [
         {
           "label": "Content",
           "configProperty": "actionConfiguration.formData.body.data",
diff --git a/app/server/appsmith-plugins/amazons3Plugin/src/main/resources/editor/create_many.json b/app/server/appsmith-plugins/amazons3Plugin/src/main/resources/editor/create_many.json
index 712278db4716..1ed2d5fb59c2 100644
--- a/app/server/appsmith-plugins/amazons3Plugin/src/main/resources/editor/create_many.json
+++ b/app/server/appsmith-plugins/amazons3Plugin/src/main/resources/editor/create_many.json
@@ -1,13 +1,12 @@
 {
   "identifier": "UPLOAD_MULTIPLE_FILES_FROM_BODY",
-  "controlType": "SECTION",
+  "controlType": "SECTION_V2",
   "conditionals": {
     "show": "{{actionConfiguration.formData.command.data === 'UPLOAD_MULTIPLE_FILES_FROM_BODY'}}"
   },
   "children": [
     {
-      "controlType": "SECTION",
-      "label": "Select bucket to query",
+      "controlType": "DOUBLE_COLUMN_ZONE",
       "children": [
         {
           "label": "Bucket name",
@@ -16,12 +15,17 @@
           "evaluationSubstitutionType": "TEMPLATE",
           "isRequired": true,
           "initialValue": ""
+        },
+        {
+          "label": "Expiry duration of signed URL (minutes)",
+          "configProperty": "actionConfiguration.formData.create.expiry.data",
+          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+          "initialValue": "5"
         }
       ]
     },
     {
-      "controlType": "SECTION",
-      "label": "Query",
+      "controlType": "DOUBLE_COLUMN_ZONE",
       "description": "Optional",
       "children": [
         {
@@ -45,13 +49,13 @@
               "value": "NO"
             }
           ]
-        },
-        {
-          "label": "Expiry duration of signed URL (minutes)",
-          "configProperty": "actionConfiguration.formData.create.expiry.data",
-          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
-          "initialValue": "5"
-        },
+        }
+      ]
+    },
+    {
+      "controlType": "SINGLE_COLUMN_ZONE",
+      "description": "Optional",
+      "children": [
         {
           "label": "Content",
           "configProperty": "actionConfiguration.formData.body.data",
diff --git a/app/server/appsmith-plugins/amazons3Plugin/src/main/resources/editor/delete.json b/app/server/appsmith-plugins/amazons3Plugin/src/main/resources/editor/delete.json
index 29ebcb00dd54..053132225d5f 100644
--- a/app/server/appsmith-plugins/amazons3Plugin/src/main/resources/editor/delete.json
+++ b/app/server/appsmith-plugins/amazons3Plugin/src/main/resources/editor/delete.json
@@ -1,13 +1,12 @@
 {
   "identifier": "DELETE_FILE",
-  "controlType": "SECTION",
+  "controlType": "SECTION_V2",
   "conditionals": {
     "show": "{{actionConfiguration.formData.command.data === 'DELETE_FILE'}}"
   },
   "children": [
     {
-      "controlType": "SECTION",
-      "label": "Select bucket to query",
+      "controlType": "DOUBLE_COLUMN_ZONE",
       "children": [
         {
           "label": "Bucket name",
@@ -20,8 +19,7 @@
       ]
     },
     {
-      "controlType": "SECTION",
-      "label": "Query",
+      "controlType": "DOUBLE_COLUMN_ZONE",
       "description": "Optional",
       "children": [
         {
diff --git a/app/server/appsmith-plugins/amazons3Plugin/src/main/resources/editor/delete_many.json b/app/server/appsmith-plugins/amazons3Plugin/src/main/resources/editor/delete_many.json
index e8b8fdb88871..1c4352297e3b 100644
--- a/app/server/appsmith-plugins/amazons3Plugin/src/main/resources/editor/delete_many.json
+++ b/app/server/appsmith-plugins/amazons3Plugin/src/main/resources/editor/delete_many.json
@@ -1,13 +1,12 @@
 {
   "identifier": "DELETE_MULTIPLE_FILES",
-  "controlType": "SECTION",
+  "controlType": "SECTION_V2",
   "conditionals": {
     "show": "{{actionConfiguration.formData.command.data === 'DELETE_MULTIPLE_FILES'}}"
   },
   "children": [
     {
-      "controlType": "SECTION",
-      "label": "Select bucket to query",
+      "controlType": "DOUBLE_COLUMN_ZONE",
       "children": [
         {
           "label": "Bucket name",
@@ -16,7 +15,12 @@
           "evaluationSubstitutionType": "TEMPLATE",
           "isRequired": true,
           "initialValue": ""
-        },
+        }
+      ]
+    },
+    {
+      "controlType": "SINGLE_COLUMN_ZONE",
+      "children": [
         {
           "label": "List of Files",
           "configProperty": "actionConfiguration.formData.path.data",
diff --git a/app/server/appsmith-plugins/amazons3Plugin/src/main/resources/editor/list.json b/app/server/appsmith-plugins/amazons3Plugin/src/main/resources/editor/list.json
index 0a85b2df4e73..c9fbfc4cf731 100644
--- a/app/server/appsmith-plugins/amazons3Plugin/src/main/resources/editor/list.json
+++ b/app/server/appsmith-plugins/amazons3Plugin/src/main/resources/editor/list.json
@@ -1,13 +1,12 @@
 {
   "identifier": "LIST",
-  "controlType": "SECTION",
+  "controlType": "SECTION_V2",
   "conditionals": {
     "show": "{{actionConfiguration.formData.command.data === 'LIST'}}"
   },
   "children": [
     {
-      "controlType": "SECTION",
-      "label": "Select bucket to query",
+      "controlType": "DOUBLE_COLUMN_ZONE",
       "children": [
         {
           "label": "Bucket name",
@@ -16,62 +15,17 @@
           "evaluationSubstitutionType": "TEMPLATE",
           "isRequired": true,
           "initialValue": ""
-        }
-      ]
-    },
-    {
-      "controlType": "SECTION",
-      "label": "Query",
-      "description": "Optional",
-      "children": [
+        },
         {
           "label": "Prefix",
           "configProperty": "actionConfiguration.formData.list.prefix.data",
           "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
           "initialValue": ""
-        },
-        {
-          "label": "Where",
-          "configProperty": "actionConfiguration.formData.list.where.data",
-          "nestedLevels": 3,
-          "controlType": "WHERE_CLAUSE",
-          "-subtitle": "Array of Objects",
-          "-tooltipText": "Array of Objects",
-          "-alternateViewTypes": ["json"],
-          "logicalTypes": [
-            {
-              "label": "AND",
-              "value": "AND"
-            },
-            {
-              "label": "OR",
-              "value": "OR"
-            }
-          ],
-          "comparisonTypes": [
-            {
-              "label": "==",
-              "value": "EQ"
-            },
-            {
-              "label": "!=",
-              "value": "NOT_EQ"
-            },
-            {
-              "label": "in",
-              "value": "IN"
-            },
-            {
-              "label": "not in",
-              "value": "NOT_IN"
-            }
-          ]
         }
       ]
     },
     {
-      "controlType": "SECTION",
-      "label": "Options",
+      "controlType": "DOUBLE_COLUMN_ZONE",
       "children": [
         {
           "label": "Generate signed URL",
@@ -122,9 +76,52 @@
               "value": "NO"
             }
           ]
+        }
+      ]
+    },
+    {
+      "controlType": "SINGLE_COLUMN_ZONE",
+      "description": "Optional",
+      "children": [
+        {
+          "label": "Filter data",
+          "configProperty": "actionConfiguration.formData.list.where.data",
+          "nestedLevels": 3,
+          "controlType": "WHERE_CLAUSE",
+          "-subtitle": "Array of Objects",
+          "-tooltipText": "Array of Objects",
+          "-alternateViewTypes": ["json"],
+          "logicalTypes": [
+            {
+              "label": "AND",
+              "value": "AND"
+            },
+            {
+              "label": "OR",
+              "value": "OR"
+            }
+          ],
+          "comparisonTypes": [
+            {
+              "label": "==",
+              "value": "EQ"
+            },
+            {
+              "label": "!=",
+              "value": "NOT_EQ"
+            },
+            {
+              "label": "in",
+              "value": "IN"
+            },
+            {
+              "label": "not in",
+              "value": "NOT_IN"
+            }
+          ]
         },
         {
-          "label": "Sort By",
+          "label": "Sort data",
           "configProperty": "actionConfiguration.formData.list.sortBy.data",
           "controlType": "SORTING",
           "-subtitle": "Array of Objects",
@@ -132,7 +129,7 @@
           "-alternateViewTypes": ["json"]
         },
         {
-          "label": "Paginate By",
+          "label": "Paginate data",
           "configProperty": "actionConfiguration.formData.list.pagination.data",
           "controlType": "PAGINATION",
           "-subtitle": "Object",
diff --git a/app/server/appsmith-plugins/amazons3Plugin/src/main/resources/editor/read.json b/app/server/appsmith-plugins/amazons3Plugin/src/main/resources/editor/read.json
index ca069a97380f..749f86709c27 100644
--- a/app/server/appsmith-plugins/amazons3Plugin/src/main/resources/editor/read.json
+++ b/app/server/appsmith-plugins/amazons3Plugin/src/main/resources/editor/read.json
@@ -1,13 +1,12 @@
 {
   "identifier": "READ_FILE",
-  "controlType": "SECTION",
+  "controlType": "SECTION_V2",
   "conditionals": {
     "show": "{{actionConfiguration.formData.command.data === 'READ_FILE'}}"
   },
   "children": [
     {
-      "controlType": "SECTION",
-      "label": "Select bucket to query",
+      "controlType": "DOUBLE_COLUMN_ZONE",
       "children": [
         {
           "label": "Bucket name",
@@ -20,8 +19,7 @@
       ]
     },
     {
-      "controlType": "SECTION",
-      "label": "Query",
+      "controlType": "DOUBLE_COLUMN_ZONE",
       "description": "Optional",
       "children": [
         {
diff --git a/app/server/appsmith-plugins/amazons3Plugin/src/main/resources/editor/root.json b/app/server/appsmith-plugins/amazons3Plugin/src/main/resources/editor/root.json
index 82d8d5d91d12..0a1976bf8f15 100644
--- a/app/server/appsmith-plugins/amazons3Plugin/src/main/resources/editor/root.json
+++ b/app/server/appsmith-plugins/amazons3Plugin/src/main/resources/editor/root.json
@@ -1,39 +1,44 @@
 {
   "editor": [
     {
-      "controlType": "SECTION",
+      "controlType": "SECTION_V2",
       "identifier": "SELECTOR",
       "children": [
         {
-          "label": "Command",
-          "description": "Choose the method you would like to use",
-          "configProperty": "actionConfiguration.formData.command.data",
-          "controlType": "DROP_DOWN",
-          "initialValue": "LIST",
-          "options": [
+          "controlType": "DOUBLE_COLUMN_ZONE",
+          "children": [
             {
-              "label": "List files in bucket",
-              "value": "LIST"
-            },
-            {
-              "label": "Create a new file",
-              "value": "UPLOAD_FILE_FROM_BODY"
-            },
-            {
-              "label": "Create multiple new files",
-              "value": "UPLOAD_MULTIPLE_FILES_FROM_BODY"
-            },
-            {
-              "label": "Read file",
-              "value": "READ_FILE"
-            },
-            {
-              "label": "Delete file",
-              "value": "DELETE_FILE"
-            },
-            {
-              "label": "Delete multiple files",
-              "value": "DELETE_MULTIPLE_FILES"
+              "label": "Command",
+              "description": "Choose the method you would like to use",
+              "configProperty": "actionConfiguration.formData.command.data",
+              "controlType": "DROP_DOWN",
+              "initialValue": "LIST",
+              "options": [
+                {
+                  "label": "List files in bucket",
+                  "value": "LIST"
+                },
+                {
+                  "label": "Create a new file",
+                  "value": "UPLOAD_FILE_FROM_BODY"
+                },
+                {
+                  "label": "Create multiple new files",
+                  "value": "UPLOAD_MULTIPLE_FILES_FROM_BODY"
+                },
+                {
+                  "label": "Read file",
+                  "value": "READ_FILE"
+                },
+                {
+                  "label": "Delete file",
+                  "value": "DELETE_FILE"
+                },
+                {
+                  "label": "Delete multiple files",
+                  "value": "DELETE_MULTIPLE_FILES"
+                }
+              ]
             }
           ]
         }
diff --git a/app/server/appsmith-plugins/anthropicPlugin/src/main/java/com/external/plugins/AnthropicPlugin.java b/app/server/appsmith-plugins/anthropicPlugin/src/main/java/com/external/plugins/AnthropicPlugin.java
index 7d8559d93180..a91fc0ee11ce 100644
--- a/app/server/appsmith-plugins/anthropicPlugin/src/main/java/com/external/plugins/AnthropicPlugin.java
+++ b/app/server/appsmith-plugins/anthropicPlugin/src/main/java/com/external/plugins/AnthropicPlugin.java
@@ -74,6 +74,8 @@ protected AnthropicPluginExecutor(SharedConfig sharedConfig) {
 
         @Override
         public Mono<DatasourceTestResult> testDatasource(DatasourceConfiguration datasourceConfiguration) {
+            String printMessage = Thread.currentThread().getName() + ": testDatasource() called for Anthropic plugin.";
+            System.out.println(printMessage);
             final ApiKeyAuth apiKeyAuth = (ApiKeyAuth) datasourceConfiguration.getAuthentication();
             if (!StringUtils.hasText(apiKeyAuth.getValue())) {
                 return Mono.error(new AppsmithPluginException(
@@ -110,6 +112,10 @@ public Mono<ActionExecutionResult> executeParameterized(
                 ExecuteActionDTO executeActionDTO,
                 DatasourceConfiguration datasourceConfiguration,
                 ActionConfiguration actionConfiguration) {
+
+            String printMessage =
+                    Thread.currentThread().getName() + ": executeParameterized() called for Anthropic plugin.";
+            System.out.println(printMessage);
             // Get prompt from action configuration
             List<Map.Entry<String, String>> parameters = new ArrayList<>();
 
@@ -248,6 +254,8 @@ private Object formatResponseBodyAsCompletionAPI(String model, byte[] response)
         @Override
         public Mono<TriggerResultDTO> trigger(
                 APIConnection connection, DatasourceConfiguration datasourceConfiguration, TriggerRequestDTO request) {
+            String printMessage = Thread.currentThread().getName() + ": trigger() called for Anthropic plugin.";
+            System.out.println(printMessage);
             final ApiKeyAuth apiKeyAuth = (ApiKeyAuth) datasourceConfiguration.getAuthentication();
             if (!StringUtils.hasText(apiKeyAuth.getValue())) {
                 return Mono.error(new AppsmithPluginException(
@@ -309,6 +317,9 @@ public Mono<TriggerResultDTO> trigger(
 
         @Override
         public Set<String> validateDatasource(DatasourceConfiguration datasourceConfiguration) {
+            String printMessage =
+                    Thread.currentThread().getName() + ": validateDatasource() called for Anthropic plugin.";
+            System.out.println(printMessage);
             return RequestUtils.validateApiKeyAuthDatasource(datasourceConfiguration);
         }
 
diff --git a/app/server/appsmith-plugins/anthropicPlugin/src/main/resources/editor/chat.json b/app/server/appsmith-plugins/anthropicPlugin/src/main/resources/editor/chat.json
new file mode 100644
index 000000000000..a1621376380e
--- /dev/null
+++ b/app/server/appsmith-plugins/anthropicPlugin/src/main/resources/editor/chat.json
@@ -0,0 +1,130 @@
+{
+  "identifier": "CHAT",
+  "controlType": "SECTION_V2",
+  "conditionals": {
+    "show": "{{actionConfiguration.formData.command.data === 'CHAT'}}"
+  },
+  "children": [
+    {
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "children": [
+        {
+          "label": "Models",
+          "tooltipText": "Select the model for response generation",
+          "subtitle": "ID of the model to use.",
+          "isRequired": true,
+          "propertyName": "chat_model_id",
+          "configProperty": "actionConfiguration.formData.chatModel.data",
+          "controlType": "DROP_DOWN",
+          "initialValue": "",
+          "options": [],
+          "placeholderText": "All models will be fetched.",
+          "fetchOptionsConditionally": true,
+          "setFirstOptionAsDefault": true,
+          "alternateViewTypes": ["json"],
+          "conditionals": {
+            "enable": "{{true}}",
+            "fetchDynamicValues": {
+              "condition": "{{actionConfiguration.formData.command.data === 'CHAT'}}",
+              "config": {
+                "params": {
+                  "requestType": "CHAT_MODELS",
+                  "displayType": "DROP_DOWN"
+                }
+              }
+            }
+          }
+        },
+        {
+          "label": "Max Tokens",
+          "tooltipText": "The maximum number of tokens to generate in the chat completion.",
+          "subtitle": "The maximum number of tokens to generate in the chat completion.",
+          "Description": "Put a positive integer value",
+          "configProperty": "actionConfiguration.formData.maxTokens",
+          "controlType": "INPUT_TEXT",
+          "initialValue": "256",
+          "isRequired": true,
+          "dataType": "NUMBER",
+          "customStyles": {
+            "width": "270px",
+            "minWidth": "270px"
+          }
+        }
+      ]
+    },
+    {
+      "controlType": "SINGLE_COLUMN_ZONE",
+      "children": [
+        {
+          "label": "System Prompt",
+          "Description": "Provide additional instructions for the AI model as system prompt",
+          "subtitle": "Provide additional instructions for the AI model as system prompt",
+          "configProperty": "actionConfiguration.formData.systemPrompt.data",
+          "controlType": "QUERY_DYNAMIC_TEXT",
+          "placeholderText": "Write some text or use {{ }} to reference a dynamic text value",
+          "initialValue": "",
+          "isRequired": false,
+          "customStyles": {
+            "width": "590px",
+            "minWidth": "400px"
+          }
+        },
+        {
+          "label": "Messages",
+          "tooltipText": "Ask a question",
+          "subtitle": "A list of messages comprising the conversation so far.",
+          "propertyName": "messages",
+          "isRequired": true,
+          "configProperty": "actionConfiguration.formData.messages.data",
+          "controlType": "ARRAY_FIELD",
+          "addMoreButtonLabel": "Add message",
+          "alternateViewTypes": ["json"],
+          "schema": [
+            {
+              "label": "Role",
+              "key": "role",
+              "controlType": "DROP_DOWN",
+              "initialValue": "Human",
+              "options": [
+                {
+                  "label": "Human",
+                  "value": "Human"
+                },
+                {
+                  "label": "Assistant",
+                  "value": "Assistant"
+                }
+              ]
+            },
+            {
+              "label": "Content",
+              "key": "content",
+              "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+              "placeholderText": "{{ UserInput.text }}"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "children": [
+        {
+          "label": "Temperature",
+          "tooltipText": "Put a value between 0 and 1",
+          "Description": "Put a value between 0 and 1",
+          "subtitle": "Defaults to 1. Ranges from 0 to 1. Use temp closer to 0 for analytical / multiple choice, and closer to 1 for creative and generative tasks.",
+          "configProperty": "actionConfiguration.formData.temperature",
+          "controlType": "INPUT_TEXT",
+          "dataType": "NUMBER",
+          "initialValue": "1",
+          "isRequired": false,
+          "customStyles": {
+            "width": "270px",
+            "minWidth": "270px"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/app/server/appsmith-plugins/anthropicPlugin/src/main/resources/editor/root.json b/app/server/appsmith-plugins/anthropicPlugin/src/main/resources/editor/root.json
index 2b674a2fc49d..abc010dddc76 100644
--- a/app/server/appsmith-plugins/anthropicPlugin/src/main/resources/editor/root.json
+++ b/app/server/appsmith-plugins/anthropicPlugin/src/main/resources/editor/root.json
@@ -2,7 +2,7 @@
   "editor": [
     {
       "controlType": "SECTION_V2",
-      "identifier": "SECTION-ONE",
+      "identifier": "SELECTOR",
       "children": [
         {
           "controlType": "DOUBLE_COLUMN_ZONE",
@@ -27,316 +27,9 @@
               ]
             }
           ]
-        },
-        {
-          "controlType": "DOUBLE_COLUMN_ZONE",
-          "identifier": "SO-Z2",
-          "conditionals": {
-            "show": "{{actionConfiguration.formData.command.data === 'CHAT'}}"
-          },
-          "children": [
-            {
-              "label": "Models",
-              "tooltipText": "Select the model for response generation",
-              "subtitle": "ID of the model to use.",
-              "isRequired": true,
-              "propertyName": "chat_model_id",
-              "configProperty": "actionConfiguration.formData.chatModel.data",
-              "controlType": "DROP_DOWN",
-              "initialValue": "",
-              "options": [],
-              "placeholderText": "All models will be fetched.",
-              "fetchOptionsConditionally": true,
-              "setFirstOptionAsDefault": true,
-              "alternateViewTypes": ["json"],
-              "conditionals": {
-                "enable": "{{true}}",
-                "fetchDynamicValues": {
-                  "condition": "{{actionConfiguration.formData.command.data === 'CHAT'}}",
-                  "config": {
-                    "params": {
-                      "requestType": "CHAT_MODELS",
-                      "displayType": "DROP_DOWN"
-                    }
-                  }
-                }
-              }
-            },
-            {
-              "label": "Max Tokens",
-              "tooltipText": "The maximum number of tokens to generate in the chat completion.",
-              "subtitle": "The maximum number of tokens to generate in the chat completion.",
-              "Description": "Put a positive integer value",
-              "configProperty": "actionConfiguration.formData.maxTokens",
-              "controlType": "INPUT_TEXT",
-              "initialValue": "256",
-              "isRequired": true,
-              "dataType": "NUMBER",
-              "customStyles": {
-                "width": "270px",
-                "minWidth": "270px"
-              }
-            }
-          ]
-        },
-        {
-          "controlType": "SINGLE_COLUMN_ZONE",
-          "identifier": "SO-Z3",
-          "conditionals": {
-            "show": "{{actionConfiguration.formData.command.data === 'CHAT'}}"
-          },
-          "children": [
-            {
-              "label": "System Prompt",
-              "Description": "Provide additional instructions for the AI model as system prompt",
-              "subtitle": "Provide additional instructions for the AI model as system prompt",
-              "configProperty": "actionConfiguration.formData.systemPrompt.data",
-              "controlType": "QUERY_DYNAMIC_TEXT",
-              "placeholderText": "Write some text or use {{ }} to reference a dynamic text value",
-              "initialValue": "",
-              "isRequired": false,
-              "customStyles": {
-                "width": "590px",
-                "minWidth": "400px"
-              }
-            }
-          ]
-        },
-        {
-          "controlType": "DOUBLE_COLUMN_ZONE",
-          "identifier": "SO-Z4",
-          "conditionals": {
-            "show": "{{actionConfiguration.formData.command.data === 'VISION'}}"
-          },
-          "children": [
-            {
-              "label": "Models",
-              "tooltipText": "Select the model for response generation",
-              "subtitle": "ID of the model to use.",
-              "isRequired": true,
-              "propertyName": "vision_model_id",
-              "configProperty": "actionConfiguration.formData.visionModel.data",
-              "controlType": "DROP_DOWN",
-              "initialValue": "",
-              "options": [],
-              "placeholderText": "All models will be fetched.",
-              "fetchOptionsConditionally": true,
-              "setFirstOptionAsDefault": true,
-              "alternateViewTypes": ["json"],
-              "conditionals": {
-                "enable": "{{true}}",
-                "fetchDynamicValues": {
-                  "condition": "{{actionConfiguration.formData.command.data === 'VISION'}}",
-                  "config": {
-                    "params": {
-                      "requestType": "VISION_MODELS",
-                      "displayType": "DROP_DOWN"
-                    }
-                  }
-                }
-              }
-            },
-            {
-              "label": "Max Tokens",
-              "tooltipText": "The maximum number of tokens to generate in the chat completion.",
-              "subtitle": "The maximum number of tokens to generate in the chat completion.",
-              "Description": "Put a positive integer value",
-              "configProperty": "actionConfiguration.formData.maxTokens",
-              "controlType": "INPUT_TEXT",
-              "initialValue": "256",
-              "isRequired": true,
-              "dataType": "NUMBER",
-              "customStyles": {
-                "width": "270px",
-                "minWidth": "270px"
-              }
-            }
-          ]
-        },
-        {
-          "controlType": "SINGLE_COLUMN_ZONE",
-          "identifier": "SO-Z5",
-          "conditionals": {
-            "show": "{{actionConfiguration.formData.command.data === 'VISION'}}"
-          },
-          "children": [
-            {
-              "label": "System Prompt",
-              "Description": "Provide additional instructions for the AI model as system prompt",
-              "subtitle": "Provide additional instructions for the AI model as system prompt",
-              "configProperty": "actionConfiguration.formData.systemPrompt.data",
-              "controlType": "QUERY_DYNAMIC_TEXT",
-              "placeholderText": "Write some text or use {{ }} to reference a dynamic text value",
-              "initialValue": "",
-              "isRequired": false
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "controlType": "SECTION_V2",
-      "identifier": "SECTION-TWO",
-      "children": [
-        {
-          "controlType": "SINGLE_COLUMN_ZONE",
-          "identifier": "ST-Z1",
-          "conditionals": {
-            "show": "{{actionConfiguration.formData.command.data === 'CHAT'}}"
-          },
-          "children": [
-            {
-              "label": "Messages",
-              "tooltipText": "Ask a question",
-              "subtitle": "A list of messages comprising the conversation so far.",
-              "propertyName": "messages",
-              "isRequired": true,
-              "configProperty": "actionConfiguration.formData.messages.data",
-              "controlType": "ARRAY_FIELD",
-              "addMoreButtonLabel": "Add message",
-              "alternateViewTypes": ["json"],
-              "schema": [
-                {
-                  "label": "Role",
-                  "key": "role",
-                  "controlType": "DROP_DOWN",
-                  "initialValue": "Human",
-                  "options": [
-                    {
-                      "label": "Human",
-                      "value": "Human"
-                    },
-                    {
-                      "label": "Assistant",
-                      "value": "Assistant"
-                    }
-                  ]
-                },
-                {
-                  "label": "Content",
-                  "key": "content",
-                  "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
-                  "placeholderText": "{{ UserInput.text }}"
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "controlType": "SINGLE_COLUMN_ZONE",
-          "identifier": "ST-Z2",
-          "conditionals": {
-            "show": "{{actionConfiguration.formData.command.data === 'VISION'}}"
-          },
-          "children": [
-            {
-              "label": "Messages",
-              "tooltipText": "Ask a question",
-              "subtitle": "A list of messages comprising the conversation so far. You can pass base64 encoded image directly in the request.",
-              "propertyName": "messages",
-              "isRequired": true,
-              "configProperty": "actionConfiguration.formData.messages.data",
-              "controlType": "ARRAY_FIELD",
-              "addMoreButtonLabel": "Add message",
-              "alternateViewTypes": ["json"],
-              "schema": [
-                {
-                  "label": "Role",
-                  "key": "role",
-                  "controlType": "DROP_DOWN",
-                  "initialValue": "Human",
-                  "options": [
-                    {
-                      "label": "Human",
-                      "value": "Human"
-                    },
-                    {
-                      "label": "Assistant",
-                      "value": "Assistant"
-                    }
-                  ]
-                },
-                {
-                  "label": "Type",
-                  "key": "type",
-                  "controlType": "DROP_DOWN",
-                  "initialValue": "text",
-                  "options": [
-                    {
-                      "label": "Text",
-                      "value": "text"
-                    },
-                    {
-                      "label": "Image",
-                      "value": "image"
-                    }
-                  ]
-                },
-                {
-                  "label": "Content",
-                  "key": "content",
-                  "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
-                  "placeholderText": "{{Img1.image}} or {{Input1.text}}"
-                }
-              ]
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "controlType": "SECTION_V2",
-      "identifier": "SECTION-THREE",
-      "children": [
-        {
-          "controlType": "DOUBLE_COLUMN_ZONE",
-          "identifier": "STH-Z1",
-          "conditionals": {
-            "show": "{{actionConfiguration.formData.command.data === 'CHAT'}}"
-          },
-          "children": [
-            {
-              "label": "Temperature",
-              "tooltipText": "Put a value between 0 and 1",
-              "Description": "Put a value between 0 and 1",
-              "subtitle": "Defaults to 1. Ranges from 0 to 1. Use temp closer to 0 for analytical / multiple choice, and closer to 1 for creative and generative tasks.",
-              "configProperty": "actionConfiguration.formData.temperature",
-              "controlType": "INPUT_TEXT",
-              "dataType": "NUMBER",
-              "initialValue": "1",
-              "isRequired": false,
-              "customStyles": {
-                "width": "270px",
-                "minWidth": "270px"
-              }
-            }
-          ]
-        },
-        {
-          "controlType": "DOUBLE_COLUMN_ZONE",
-          "identifier": "STH-Z2",
-          "conditionals": {
-            "show": "{{actionConfiguration.formData.command.data === 'VISION'}}"
-          },
-          "children": [
-            {
-              "label": "Temperature",
-              "tooltipText": "Put a value between 0 and 1",
-              "Description": "Put a value between 0 and 1",
-              "subtitle": "Defaults to 1. Ranges from 0 to 1. Use temp closer to 0 for analytical / multiple choice, and closer to 1 for creative and generative tasks.",
-              "configProperty": "actionConfiguration.formData.temperature",
-              "controlType": "INPUT_TEXT",
-              "dataType": "NUMBER",
-              "initialValue": "1",
-              "isRequired": false,
-              "customStyles": {
-                "width": "270px",
-                "minWidth": "270px"
-              }
-            }
-          ]
         }
       ]
     }
-  ]
+  ],
+  "files": ["chat.json", "vision.json"]
 }
diff --git a/app/server/appsmith-plugins/anthropicPlugin/src/main/resources/editor/vision.json b/app/server/appsmith-plugins/anthropicPlugin/src/main/resources/editor/vision.json
new file mode 100644
index 000000000000..282ddac5355b
--- /dev/null
+++ b/app/server/appsmith-plugins/anthropicPlugin/src/main/resources/editor/vision.json
@@ -0,0 +1,142 @@
+{
+  "identifier": "VISION",
+  "controlType": "SECTION_V2",
+  "conditionals": {
+    "show": "{{actionConfiguration.formData.command.data === 'VISION'}}"
+  },
+  "children": [
+    {
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "children": [
+        {
+          "label": "Models",
+          "tooltipText": "Select the model for response generation",
+          "subtitle": "ID of the model to use.",
+          "isRequired": true,
+          "propertyName": "vision_model_id",
+          "configProperty": "actionConfiguration.formData.visionModel.data",
+          "controlType": "DROP_DOWN",
+          "initialValue": "",
+          "options": [],
+          "placeholderText": "All models will be fetched.",
+          "fetchOptionsConditionally": true,
+          "setFirstOptionAsDefault": true,
+          "alternateViewTypes": ["json"],
+          "conditionals": {
+            "enable": "{{true}}",
+            "fetchDynamicValues": {
+              "condition": "{{actionConfiguration.formData.command.data === 'VISION'}}",
+              "config": {
+                "params": {
+                  "requestType": "VISION_MODELS",
+                  "displayType": "DROP_DOWN"
+                }
+              }
+            }
+          }
+        },
+        {
+          "label": "Max Tokens",
+          "tooltipText": "The maximum number of tokens to generate in the chat completion.",
+          "subtitle": "The maximum number of tokens to generate in the chat completion.",
+          "Description": "Put a positive integer value",
+          "configProperty": "actionConfiguration.formData.maxTokens",
+          "controlType": "INPUT_TEXT",
+          "initialValue": "256",
+          "isRequired": true,
+          "dataType": "NUMBER",
+          "customStyles": {
+            "width": "270px",
+            "minWidth": "270px"
+          }
+        }
+      ]
+    },
+    {
+      "controlType": "SINGLE_COLUMN_ZONE",
+      "children": [
+        {
+          "label": "System Prompt",
+          "Description": "Provide additional instructions for the AI model as system prompt",
+          "subtitle": "Provide additional instructions for the AI model as system prompt",
+          "configProperty": "actionConfiguration.formData.systemPrompt.data",
+          "controlType": "QUERY_DYNAMIC_TEXT",
+          "placeholderText": "Write some text or use {{ }} to reference a dynamic text value",
+          "initialValue": "",
+          "isRequired": false
+        },
+        {
+          "label": "Messages",
+          "tooltipText": "Ask a question",
+          "subtitle": "A list of messages comprising the conversation so far. You can pass base64 encoded image directly in the request.",
+          "propertyName": "messages",
+          "isRequired": true,
+          "configProperty": "actionConfiguration.formData.messages.data",
+          "controlType": "ARRAY_FIELD",
+          "addMoreButtonLabel": "Add message",
+          "alternateViewTypes": ["json"],
+          "schema": [
+            {
+              "label": "Role",
+              "key": "role",
+              "controlType": "DROP_DOWN",
+              "initialValue": "Human",
+              "options": [
+                {
+                  "label": "Human",
+                  "value": "Human"
+                },
+                {
+                  "label": "Assistant",
+                  "value": "Assistant"
+                }
+              ]
+            },
+            {
+              "label": "Type",
+              "key": "type",
+              "controlType": "DROP_DOWN",
+              "initialValue": "text",
+              "options": [
+                {
+                  "label": "Text",
+                  "value": "text"
+                },
+                {
+                  "label": "Image",
+                  "value": "image"
+                }
+              ]
+            },
+            {
+              "label": "Content",
+              "key": "content",
+              "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+              "placeholderText": "{{Img1.image}} or {{Input1.text}}"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "children": [
+        {
+          "label": "Temperature",
+          "tooltipText": "Put a value between 0 and 1",
+          "Description": "Put a value between 0 and 1",
+          "subtitle": "Defaults to 1. Ranges from 0 to 1. Use temp closer to 0 for analytical / multiple choice, and closer to 1 for creative and generative tasks.",
+          "configProperty": "actionConfiguration.formData.temperature",
+          "controlType": "INPUT_TEXT",
+          "dataType": "NUMBER",
+          "initialValue": "1",
+          "isRequired": false,
+          "customStyles": {
+            "width": "270px",
+            "minWidth": "270px"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/app/server/appsmith-plugins/appsmithAiPlugin/src/main/java/com/external/plugins/AppsmithAiPlugin.java b/app/server/appsmith-plugins/appsmithAiPlugin/src/main/java/com/external/plugins/AppsmithAiPlugin.java
index 5d44245d8fa6..ff2335daff21 100644
--- a/app/server/appsmith-plugins/appsmithAiPlugin/src/main/java/com/external/plugins/AppsmithAiPlugin.java
+++ b/app/server/appsmith-plugins/appsmithAiPlugin/src/main/java/com/external/plugins/AppsmithAiPlugin.java
@@ -65,6 +65,9 @@ public AppsmithAiPluginExecutor(SharedConfig config) {
 
         @Override
         public Mono<APIConnection> datasourceCreate(DatasourceConfiguration datasourceConfiguration) {
+            String printMessage =
+                    Thread.currentThread().getName() + ": datasourceCreate() called for AppsmithAI plugin.";
+            System.out.println(printMessage);
             ApiKeyAuth apiKeyAuth = new ApiKeyAuth();
             apiKeyAuth.setValue("test-key");
             return ApiKeyAuthentication.create(apiKeyAuth)
@@ -78,6 +81,8 @@ public Mono<APIConnection> datasourceCreate(DatasourceConfiguration datasourceCo
         @Override
         public Mono<TriggerResultDTO> trigger(
                 APIConnection connection, DatasourceConfiguration datasourceConfiguration, TriggerRequestDTO request) {
+            String printMessage = Thread.currentThread().getName() + ": trigger() called for AppsmithAI plugin.";
+            System.out.println(printMessage);
             SourceDetails sourceDetails = SourceDetails.createSourceDetails(request);
             String requestType = request.getRequestType();
             if (UPLOAD_FILES.equals(requestType)) {
@@ -143,6 +148,9 @@ public Mono<ActionExecutionResult> executeParameterized(
                 DatasourceConfiguration datasourceConfiguration,
                 ActionConfiguration actionConfiguration) {
 
+            String printMessage =
+                    Thread.currentThread().getName() + ": executeParameterized() called for AppsmithAI plugin.";
+            System.out.println(printMessage);
             // Get input from action configuration
             List<Map.Entry<String, String>> parameters = new ArrayList<>();
 
@@ -162,6 +170,8 @@ public Mono<ActionExecutionResult> executeCommon(
                 List<Map.Entry<String, String>> insertedParams,
                 ExecuteActionDTO executeActionDTO) {
 
+            String printMessage = Thread.currentThread().getName() + ": executeCommon() called for AppsmithAI plugin.";
+            System.out.println(printMessage);
             // Initializing object for error condition
             ActionExecutionResult errorResult = new ActionExecutionResult();
             initUtils.initializeResponseWithError(errorResult);
@@ -199,11 +209,16 @@ public Mono<ActionExecutionResult> executeCommon(
 
         @Override
         public Set<String> validateDatasource(DatasourceConfiguration datasourceConfiguration, boolean isEmbedded) {
+            String printMessage =
+                    Thread.currentThread().getName() + ": validateDatasource() called for AppsmithAI plugin.";
+            System.out.println(printMessage);
             return Set.of();
         }
 
         @Override
         public Mono<DatasourceStorage> preSaveHook(DatasourceStorage datasourceStorage) {
+            String printMessage = Thread.currentThread().getName() + ": preSaveHook() called for AppsmithAI plugin.";
+            System.out.println(printMessage);
             return aiServerService
                     .associateDatasource(createAssociateDTO(datasourceStorage))
                     .thenReturn(datasourceStorage);
@@ -211,6 +226,8 @@ public Mono<DatasourceStorage> preSaveHook(DatasourceStorage datasourceStorage)
 
         @Override
         public Mono<DatasourceStorage> preDeleteHook(DatasourceStorage datasourceStorage) {
+            String printMessage = Thread.currentThread().getName() + ": preDeleteHook() called for AppsmithAI plugin.";
+            System.out.println(printMessage);
             DatasourceConfiguration datasourceConfiguration = datasourceStorage.getDatasourceConfiguration();
             if (hasFiles(datasourceConfiguration)) {
                 return aiServerService
diff --git a/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/editor/imageCaptioning.json b/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/editor/imageCaptioning.json
index 366774f1510a..0be963c58514 100644
--- a/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/editor/imageCaptioning.json
+++ b/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/editor/imageCaptioning.json
@@ -1,51 +1,57 @@
 {
+  "controlType": "SECTION_V2",
   "identifier": "IMAGE_CAPTION",
-  "controlType": "SECTION",
   "conditionals": {
     "show": "{{actionConfiguration.formData.usecase.data === 'IMAGE_CAPTION'}}"
   },
   "children": [
     {
-      "label": "Try out these examples",
-      "Description": "Try out these examples",
-      "subtitle": "",
-      "configProperty": "",
-      "controlType": "FORM_TEMPLATE",
-      "isRequired": false,
-      "options": [
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "identifier": "IMAGE-CAPTION-Z1",
+      "children": [
         {
-          "label": "Product description",
-          "value": {
-            "actionConfiguration.formData.imageCaption.input.data": "https://i.imgur.com/Eiq5s0F.png",
-            "actionConfiguration.formData.imageCaption.instructions.data": "Write a 200 word product description"
-          }
+          "label": "Try out these examples",
+          "Description": "Try out these examples",
+          "subtitle": "",
+          "configProperty": "",
+          "controlType": "FORM_TEMPLATE",
+          "isRequired": false,
+          "options": [
+            {
+              "label": "Product description",
+              "value": {
+                "actionConfiguration.formData.imageCaption.input.data": "https://i.imgur.com/Eiq5s0F.png",
+                "actionConfiguration.formData.imageCaption.instructions.data": "Write a 200 word product description"
+              }
+            }
+          ]
         }
       ]
     },
     {
-      "label": "Input",
-      "Description": "Provide an image URL or the base64 encoded image",
-      "subtitle": "Provide an image URL or the base64 encoded image",
-      "configProperty": "actionConfiguration.formData.imageCaption.input.data",
-      "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
-      "placeholderText": "Write some text or use {{ }} to reference a dynamic text value",
-      "isRequired": true,
-      "customStyles": {
-        "width": "700px"
-      }
-    },
-    {
-      "label": "Additional Instructions",
-      "Description": "Provide additional instructions to tweak the caption",
-      "subtitle": "Provide additional instructions to tweak the caption",
-      "configProperty": "actionConfiguration.formData.imageCaption.instructions.data",
-      "controlType": "QUERY_DYNAMIC_TEXT",
-      "placeholderText": "Write some text or use {{ }} to reference a dynamic text value",
-      "isRequired": false,
-      "initialValue": "",
-      "customStyles": {
-        "width": "700px"
-      }
+      "controlType": "SINGLE_COLUMN_ZONE",
+      "identifier": "IMAGE-CAPTION-Z2",
+      "children": [
+        {
+          "label": "Input",
+          "Description": "Provide an image URL or the base64 encoded image",
+          "subtitle": "Provide an image URL or the base64 encoded image",
+          "configProperty": "actionConfiguration.formData.imageCaption.input.data",
+          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+          "placeholderText": "Write some text or use {{ }} to reference a dynamic text value",
+          "isRequired": true
+        },
+        {
+          "label": "Additional Instructions",
+          "Description": "Provide additional instructions to tweak the caption",
+          "subtitle": "Provide additional instructions to tweak the caption",
+          "configProperty": "actionConfiguration.formData.imageCaption.instructions.data",
+          "controlType": "QUERY_DYNAMIC_TEXT",
+          "placeholderText": "Write some text or use {{ }} to reference a dynamic text value",
+          "isRequired": false,
+          "initialValue": ""
+        }
+      ]
     }
   ]
 }
diff --git a/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/editor/imageClassification.json b/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/editor/imageClassification.json
index d038793a19d6..7f1316b6edda 100644
--- a/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/editor/imageClassification.json
+++ b/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/editor/imageClassification.json
@@ -1,72 +1,75 @@
 {
+  "controlType": "SECTION_V2",
   "identifier": "IMAGE_CLASSIFY",
-  "controlType": "SECTION",
   "conditionals": {
     "show": "{{actionConfiguration.formData.usecase.data === 'IMAGE_CLASSIFY'}}"
   },
   "children": [
     {
-      "label": "Try out these examples",
-      "Description": "Try out these examples",
-      "subtitle": "",
-      "configProperty": "",
-      "controlType": "FORM_TEMPLATE",
-      "isRequired": false,
-      "options": [
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "identifier": "IMAGE-CLASSIFY-Z1",
+      "children": [
         {
-          "label": "Product category",
-          "value": {
-            "actionConfiguration.formData.imageClassify.input.data": "https://i.imgur.com/Eiq5s0F.png",
-            "actionConfiguration.formData.imageClassify.instructions.data": "Identify the category of clothing. Apply only one category.",
-            "actionConfiguration.formData.imageClassify.labels.data": "Jacket, Shirt, Pant, T-Shirt, Shorts, Dress, Skirt"
-          }
-        },
-        {
-          "label": "IT Asset Tagging",
-          "value": {
-            "actionConfiguration.formData.imageClassify.input.data": "https://i.imgur.com/EqfqRQY.png",
-            "actionConfiguration.formData.imageClassify.instructions.data": "Tag the IT hardware.",
-            "actionConfiguration.formData.imageClassify.labels.data": "Laptop, Phone, Headphones, Mouse, Keyboard, Monitor"
-          }
+          "label": "Try out these examples",
+          "Description": "Try out these examples",
+          "subtitle": "",
+          "configProperty": "",
+          "controlType": "FORM_TEMPLATE",
+          "isRequired": false,
+          "options": [
+            {
+              "label": "Product category",
+              "value": {
+                "actionConfiguration.formData.imageClassify.input.data": "https://i.imgur.com/Eiq5s0F.png",
+                "actionConfiguration.formData.imageClassify.instructions.data": "Identify the category of clothing. Apply only one category.",
+                "actionConfiguration.formData.imageClassify.labels.data": "Jacket, Shirt, Pant, T-Shirt, Shorts, Dress, Skirt"
+              }
+            },
+            {
+              "label": "IT Asset Tagging",
+              "value": {
+                "actionConfiguration.formData.imageClassify.input.data": "https://i.imgur.com/EqfqRQY.png",
+                "actionConfiguration.formData.imageClassify.instructions.data": "Tag the IT hardware.",
+                "actionConfiguration.formData.imageClassify.labels.data": "Laptop, Phone, Headphones, Mouse, Keyboard, Monitor"
+              }
+            }
+          ]
         }
       ]
     },
     {
-      "label": "Input",
-      "Description": "Provide an image URL or the base64 encoded image for AI to extract entities from",
-      "subtitle": "Provide an image URL or the base64 encoded image for AI to extract entities from",
-      "configProperty": "actionConfiguration.formData.imageClassify.input.data",
-      "placeholderText": "Write some text or use {{ }} to reference a dynamic text value",
-      "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
-      "isRequired": true,
-      "customStyles": {
-        "width": "700px"
-      }
-    },
-    {
-      "label": "Labels",
-      "Description": "Provide labels as comma-separated string input for classification",
-      "subtitle": "Provide a comma separated list of labels to classify the Input on",
-      "configProperty": "actionConfiguration.formData.imageClassify.labels.data",
-      "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
-      "placeholderText": "Write a list of comma separated text values or use {{ }} to reference a dynamic value",
-      "isRequired": true,
-      "customStyles": {
-        "width": "700px"
-      }
-    },
-    {
-      "label": "Additional Instructions",
-      "Description": "Provide additional instructions to tweak the classification",
-      "subtitle": "Provide additional instructions to tweak the classification",
-      "configProperty": "actionConfiguration.formData.imageClassify.instructions.data",
-      "controlType": "QUERY_DYNAMIC_TEXT",
-      "placeholderText": "Write some text or use {{ }} to reference a dynamic text value",
-      "isRequired": false,
-      "initialValue": "",
-      "customStyles": {
-        "width": "700px"
-      }
+      "controlType": "SINGLE_COLUMN_ZONE",
+      "identifier": "IMAGE-CLASSIFY-Z2",
+      "children": [
+        {
+          "label": "Input",
+          "Description": "Provide an image URL or the base64 encoded image for AI to extract entities from",
+          "subtitle": "Provide an image URL or the base64 encoded image for AI to extract entities from",
+          "configProperty": "actionConfiguration.formData.imageClassify.input.data",
+          "placeholderText": "Write some text or use {{ }} to reference a dynamic text value",
+          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+          "isRequired": true
+        },
+        {
+          "label": "Labels",
+          "Description": "Provide labels as comma-separated string input for classification",
+          "subtitle": "Provide a comma separated list of labels to classify the Input on",
+          "configProperty": "actionConfiguration.formData.imageClassify.labels.data",
+          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+          "placeholderText": "Write a list of comma separated text values or use {{ }} to reference a dynamic value",
+          "isRequired": true
+        },
+        {
+          "label": "Additional Instructions",
+          "Description": "Provide additional instructions to tweak the classification",
+          "subtitle": "Provide additional instructions to tweak the classification",
+          "configProperty": "actionConfiguration.formData.imageClassify.instructions.data",
+          "controlType": "QUERY_DYNAMIC_TEXT",
+          "placeholderText": "Write some text or use {{ }} to reference a dynamic text value",
+          "isRequired": false,
+          "initialValue": ""
+        }
+      ]
     }
   ]
 }
diff --git a/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/editor/imageEntityExtraction.json b/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/editor/imageEntityExtraction.json
index 9b0fdce0c734..579b8e66e1ad 100644
--- a/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/editor/imageEntityExtraction.json
+++ b/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/editor/imageEntityExtraction.json
@@ -1,69 +1,75 @@
 {
+  "controlType": "SECTION_V2",
   "identifier": "IMAGE_ENTITY_EXTRACT",
-  "controlType": "SECTION",
   "conditionals": {
     "show": "{{actionConfiguration.formData.usecase.data === 'IMAGE_ENTITY_EXTRACT'}}"
   },
   "children": [
     {
-      "label": "Try out these examples",
-      "Description": "Try out these examples",
-      "subtitle": "",
-      "configProperty": "",
-      "controlType": "FORM_TEMPLATE",
-      "isRequired": false,
-      "options": [
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "identifier": "IMAGE-ENTITY-EXTRACT-Z1",
+      "children": [
         {
-          "label": "KYC document",
-          "value": {
-            "actionConfiguration.formData.imageEntity.input.data": "https://i.imgur.com/5h9SfGf.jpgg",
-            "actionConfiguration.formData.imageEntity.labels.data": "name, date of birth, gender, licence number, height",
-            "actionConfiguration.formData.imageEntity.instructions.data": ""
-          }
-        },
-        {
-          "label": "Expense report",
-          "value": {
-            "actionConfiguration.formData.imageEntity.input.data": "https://i.imgur.com/z2PlaKB.jpg",
-            "actionConfiguration.formData.imageEntity.labels.data": "food items, tax, total cost, date of purchase",
-            "actionConfiguration.formData.imageEntity.instructions.data": "The date should be in dd/mm/yyyy format"
-          }
+          "label": "Try out these examples",
+          "Description": "Try out these examples",
+          "subtitle": "",
+          "configProperty": "",
+          "controlType": "FORM_TEMPLATE",
+          "isRequired": false,
+          "options": [
+            {
+              "label": "KYC document",
+              "value": {
+                "actionConfiguration.formData.imageEntity.input.data": "https://i.imgur.com/5h9SfGf.jpgg",
+                "actionConfiguration.formData.imageEntity.labels.data": "name, date of birth, gender, licence number, height",
+                "actionConfiguration.formData.imageEntity.instructions.data": ""
+              }
+            },
+            {
+              "label": "Expense report",
+              "value": {
+                "actionConfiguration.formData.imageEntity.input.data": "https://i.imgur.com/z2PlaKB.jpg",
+                "actionConfiguration.formData.imageEntity.labels.data": "food items, tax, total cost, date of purchase",
+                "actionConfiguration.formData.imageEntity.instructions.data": "The date should be in dd/mm/yyyy format"
+              }
+            }
+          ]
         }
       ]
     },
     {
-      "label": "Input",
-      "Description": "Provide an image URL or the base64 encoded image",
-      "subtitle": "Provide an image URL or the base64 encoded image",
-      "configProperty": "actionConfiguration.formData.imageEntity.input.data",
-      "placeholderText": "Write some text or use {{ }} to reference a dynamic text value",
-      "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
-      "isRequired": true,
-      "customStyles": {
-        "width": "700px"
-      }
-    },
-    {
-      "label": "Entities",
-      "Description": "Provide a comma separated list of entities to extract from the Input",
-      "subtitle": "Provide a comma separated list of entities to extract from the Input",
-      "configProperty": "actionConfiguration.formData.imageEntity.labels.data",
-      "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
-      "placeholderText": "Write a list of comma separated text values or use {{ }} to reference a dynamic value",
-      "isRequired": true,
-      "customStyles": {
-        "width": "700px"
-      }
-    },
-    {
-      "label": "Additional Instructions",
-      "Description": "Provide additional instructions for the AI to tweak the entity extraction",
-      "subtitle": "Provide additional instructions for the AI to tweak the entity extraction",
-      "configProperty": "actionConfiguration.formData.imageEntity.instructions.data",
-      "controlType": "QUERY_DYNAMIC_TEXT",
-      "placeholderText": "Write some text or use {{ }} to reference a dynamic text value",
-      "initialValue": "",
-      "isRequired": false
+      "controlType": "SINGLE_COLUMN_ZONE",
+      "identifier": "IMAGE-ENTITY-EXTRACT-Z2",
+      "children": [
+        {
+          "label": "Input",
+          "Description": "Provide an image URL or the base64 encoded image",
+          "subtitle": "Provide an image URL or the base64 encoded image",
+          "configProperty": "actionConfiguration.formData.imageEntity.input.data",
+          "placeholderText": "Write some text or use {{ }} to reference a dynamic text value",
+          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+          "isRequired": true
+        },
+        {
+          "label": "Entities",
+          "Description": "Provide a comma separated list of entities to extract from the Input",
+          "subtitle": "Provide a comma separated list of entities to extract from the Input",
+          "configProperty": "actionConfiguration.formData.imageEntity.labels.data",
+          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+          "placeholderText": "Write a list of comma separated text values or use {{ }} to reference a dynamic value",
+          "isRequired": true
+        },
+        {
+          "label": "Additional Instructions",
+          "Description": "Provide additional instructions for the AI to tweak the entity extraction",
+          "subtitle": "Provide additional instructions for the AI to tweak the entity extraction",
+          "configProperty": "actionConfiguration.formData.imageEntity.instructions.data",
+          "controlType": "QUERY_DYNAMIC_TEXT",
+          "placeholderText": "Write some text or use {{ }} to reference a dynamic text value",
+          "initialValue": "",
+          "isRequired": false
+        }
+      ]
     }
   ]
 }
diff --git a/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/editor/root.json b/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/editor/root.json
index bb0c7d61f004..428dd04959d8 100644
--- a/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/editor/root.json
+++ b/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/editor/root.json
@@ -1,44 +1,50 @@
 {
   "editor": [
     {
-      "controlType": "SECTION",
+      "controlType": "SECTION_V2",
       "identifier": "SELECTOR",
       "children": [
         {
-          "label": "Action",
-          "description": "Choose the action you would like to use",
-          "configProperty": "actionConfiguration.formData.usecase.data",
-          "controlType": "DROP_DOWN",
-          "isRequired": true,
-          "initialValue": "TEXT_GENERATE",
-          "options": [
+          "controlType": "DOUBLE_COLUMN_ZONE",
+          "identifier": "SELECTOR-Z1",
+          "children": [
             {
-              "label": "Generate text",
-              "value": "TEXT_GENERATE"
-            },
-            {
-              "label": "Classify text",
-              "value": "TEXT_CLASSIFY"
-            },
-            {
-              "label": "Summarise text",
-              "value": "TEXT_SUMMARY"
-            },
-            {
-              "label": "Extract entities from text",
-              "value": "TEXT_ENTITY_EXTRACT"
-            },
-            {
-              "label": "Classify Image",
-              "value": "IMAGE_CLASSIFY"
-            },
-            {
-              "label": "Describe Image",
-              "value": "IMAGE_CAPTION"
-            },
-            {
-              "label": "Extract entities from image",
-              "value": "IMAGE_ENTITY_EXTRACT"
+              "label": "Action",
+              "description": "Choose the action you would like to use",
+              "configProperty": "actionConfiguration.formData.usecase.data",
+              "controlType": "DROP_DOWN",
+              "isRequired": true,
+              "initialValue": "TEXT_GENERATE",
+              "options": [
+                {
+                  "label": "Generate text",
+                  "value": "TEXT_GENERATE"
+                },
+                {
+                  "label": "Classify text",
+                  "value": "TEXT_CLASSIFY"
+                },
+                {
+                  "label": "Summarise text",
+                  "value": "TEXT_SUMMARY"
+                },
+                {
+                  "label": "Extract entities from text",
+                  "value": "TEXT_ENTITY_EXTRACT"
+                },
+                {
+                  "label": "Classify Image",
+                  "value": "IMAGE_CLASSIFY"
+                },
+                {
+                  "label": "Describe Image",
+                  "value": "IMAGE_CAPTION"
+                },
+                {
+                  "label": "Extract entities from image",
+                  "value": "IMAGE_ENTITY_EXTRACT"
+                }
+              ]
             }
           ]
         }
diff --git a/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/editor/textClassification.json b/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/editor/textClassification.json
index 84fd690f7f22..0b3b9b491717 100644
--- a/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/editor/textClassification.json
+++ b/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/editor/textClassification.json
@@ -1,74 +1,83 @@
 {
+  "controlType": "SECTION_V2",
   "identifier": "TEXT_CLASSIFY",
-  "controlType": "SECTION",
   "conditionals": {
     "show": "{{actionConfiguration.formData.usecase.data === 'TEXT_CLASSIFY'}}"
   },
   "children": [
     {
-      "label": "Try out these examples",
-      "Description": "Try out these examples",
-      "subtitle": "",
-      "configProperty": "",
-      "controlType": "FORM_TEMPLATE",
-      "isRequired": false,
-      "options": [
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "identifier": "TEXT-CLASSIFY-Z1",
+      "children": [
         {
-          "label": "Customer support",
-          "value": {
-            "actionConfiguration.formData.textClassify.input.data": "[\"Hello, I recently made a purchase on your platform, but I encountered an issue during the payment process. The transaction didnt go through, and Im unsure of the cause. Could you please assist? Best, Alice\",\n“Hi Alice, We apologize for any inconvenience. To assist you better, could you provide us with the error message you received, if any? Also, please check if your payment method is valid. Thanks, Support Team\",\n\"I didnt receive any specific error message; the transaction just failed. My payment method should be working fine as I used it elsewhere without any problems. Regards, Alice\",\n\"Thank you for the information, Alice. We will look into this matter and update you as soon as we have more information. In the meantime, could you try a different payment method? Best, Support Team\"]",
-            "actionConfiguration.formData.textClassify.instructions.data": "If no label fits the input, apply “General” label",
-            "actionConfiguration.formData.textClassify.labels.data": "Technical, Urgent, Billing, Account, Upgrade, Bug, Refund"
-          }
+          "label": "Try out these examples",
+          "Description": "Try out these examples",
+          "subtitle": "",
+          "configProperty": "",
+          "controlType": "FORM_TEMPLATE",
+          "isRequired": false,
+          "options": [
+            {
+              "label": "Customer support",
+              "value": {
+                "actionConfiguration.formData.textClassify.input.data": "[\"Hello, I recently made a purchase on your platform, but I encountered an issue during the payment process. The transaction didnt go through, and Im unsure of the cause. Could you please assist? Best, Alice\",\n“Hi Alice, We apologize for any inconvenience. To assist you better, could you provide us with the error message you received, if any? Also, please check if your payment method is valid. Thanks, Support Team\",\n\"I didnt receive any specific error message; the transaction just failed. My payment method should be working fine as I used it elsewhere without any problems. Regards, Alice\",\n\"Thank you for the information, Alice. We will look into this matter and update you as soon as we have more information. In the meantime, could you try a different payment method? Best, Support Team\"]",
+                "actionConfiguration.formData.textClassify.instructions.data": "If no label fits the input, apply “General” label",
+                "actionConfiguration.formData.textClassify.labels.data": "Technical, Urgent, Billing, Account, Upgrade, Bug, Refund"
+              }
+            },
+            {
+              "label": "Product review",
+              "value": {
+                "actionConfiguration.formData.textClassify.input.data": "Received my laptop stand from Macazon after a significant delay in delivery, which was a bit disappointing. Upon unboxing, I noticed the build seemed sturdy, but unfortunately, the stand doesn't function as expected. It's supposed to be adjustable, but the mechanism is quite stiff, making it challenging to change angles or heights.",
+                "actionConfiguration.formData.textClassify.instructions.data": "Strictly apply only one label",
+                "actionConfiguration.formData.textClassify.labels.data": "Positive, Neutral, Negative"
+              }
+            },
+            {
+              "label": "GitHub Issue",
+              "value": {
+                "actionConfiguration.formData.textClassify.input.data": "When console statement is long then the text is truncated when printed on the debugger as seen in the screenshot\n\nSteps To Reproduce\nAdd following statement to the editor and execute the function to observe truncation\nconsole.log('This is a long statement to display truncation issue present on the debugger. You can see this statement not being printed in whole')",
+                "actionConfiguration.formData.textClassify.instructions.data": "",
+                "actionConfiguration.formData.textClassify.labels.data": "Bug, Feature Request, Enhancement"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "controlType": "SINGLE_COLUMN_ZONE",
+      "identifier": "TEXT-CLASSIFY-Z2",
+      "children": [
+        {
+          "label": "Input",
+          "Description": "Provide some text for AI to classify",
+          "subtitle": "Provide some text for AI to classify",
+          "placeholderText": "Write some text or use {{ }} to reference a dynamic text value",
+          "configProperty": "actionConfiguration.formData.textClassify.input.data",
+          "controlType": "QUERY_DYNAMIC_TEXT",
+          "isRequired": true
         },
         {
-          "label": "Product review",
-          "value": {
-            "actionConfiguration.formData.textClassify.input.data": "Received my laptop stand from Macazon after a significant delay in delivery, which was a bit disappointing. Upon unboxing, I noticed the build seemed sturdy, but unfortunately, the stand doesn't function as expected. It's supposed to be adjustable, but the mechanism is quite stiff, making it challenging to change angles or heights.",
-            "actionConfiguration.formData.textClassify.instructions.data": "Strictly apply only one label",
-            "actionConfiguration.formData.textClassify.labels.data": "Positive, Neutral, Negative"
-          }
+          "label": "Labels",
+          "Description": "Provide a comma separated list of labels to classify the Input on",
+          "subtitle": "Provide a comma separated list of labels to classify the Input on",
+          "configProperty": "actionConfiguration.formData.textClassify.labels.data",
+          "placeholderText": "Write a list of comma separated text values or use {{ }} to reference a dynamic value",
+          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+          "isRequired": true
         },
         {
-          "label": "GitHub Issue",
-          "value": {
-            "actionConfiguration.formData.textClassify.input.data": "When console statement is long then the text is truncated when printed on the debugger as seen in the screenshot\n\nSteps To Reproduce\nAdd following statement to the editor and execute the function to observe truncation\nconsole.log('This is a long statement to display truncation issue present on the debugger. You can see this statement not being printed in whole')",
-            "actionConfiguration.formData.textClassify.instructions.data": "",
-            "actionConfiguration.formData.textClassify.labels.data": "Bug, Feature Request, Enhancement"
-          }
+          "label": "Additional Instructions",
+          "Description": "Provide additional instructions for the AI to tweak the text classification",
+          "subtitle": "Provide additional instructions for the AI to tweak the text classification",
+          "configProperty": "actionConfiguration.formData.textClassify.instructions.data",
+          "controlType": "QUERY_DYNAMIC_TEXT",
+          "placeholderText": "Write some text or use {{ }} to reference a dynamic text value",
+          "initialValue": "",
+          "isRequired": false
         }
       ]
-    },
-    {
-      "label": "Input",
-      "Description": "Provide some text for AI to classify",
-      "subtitle": "Provide some text for AI to classify",
-      "placeholderText": "Write some text or use {{ }} to reference a dynamic text value",
-      "configProperty": "actionConfiguration.formData.textClassify.input.data",
-      "controlType": "QUERY_DYNAMIC_TEXT",
-      "isRequired": true
-    },
-    {
-      "label": "Labels",
-      "Description": "Provide a comma separated list of labels to classify the Input on",
-      "subtitle": "Provide a comma separated list of labels to classify the Input on",
-      "configProperty": "actionConfiguration.formData.textClassify.labels.data",
-      "placeholderText": "Write a list of comma separated text values or use {{ }} to reference a dynamic value",
-      "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
-      "isRequired": true,
-      "customStyles": {
-        "width": "872px"
-      }
-    },
-    {
-      "label": "Additional Instructions",
-      "Description": "Provide additional instructions for the AI to tweak the text classification",
-      "subtitle": "Provide additional instructions for the AI to tweak the text classification",
-      "configProperty": "actionConfiguration.formData.textClassify.instructions.data",
-      "controlType": "QUERY_DYNAMIC_TEXT",
-      "placeholderText": "Write some text or use {{ }} to reference a dynamic text value",
-      "initialValue": "",
-      "isRequired": false
     }
   ]
 }
diff --git a/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/editor/textEntityExtraction.json b/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/editor/textEntityExtraction.json
index 69de07de8f01..ee72728b3078 100644
--- a/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/editor/textEntityExtraction.json
+++ b/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/editor/textEntityExtraction.json
@@ -1,66 +1,75 @@
 {
+  "controlType": "SECTION_V2",
   "identifier": "TEXT_ENTITY_EXTRACT",
-  "controlType": "SECTION",
   "conditionals": {
     "show": "{{actionConfiguration.formData.usecase.data === 'TEXT_ENTITY_EXTRACT'}}"
   },
   "children": [
     {
-      "label": "Try out these examples",
-      "Description": "Try out these examples",
-      "subtitle": "",
-      "configProperty": "",
-      "controlType": "FORM_TEMPLATE",
-      "isRequired": false,
-      "options": [
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "identifier": "TEXT-ENTITY-EXTRACT-Z1",
+      "children": [
         {
-          "label": "Customer support",
-          "value": {
-            "actionConfiguration.formData.textEntity.input.data": "Dear team,\n\nI have a query regarding the address update process in my profile. I recently moved to a new location, and I need to update my address to 1234 Oak Street, Newville, NV 12345. However, I am encountering an error on the website. Could you assist me with this? My account number is 99892.\n\nRegards, \nMark ",
-            "actionConfiguration.formData.textEntity.instructions.data": "If you’re unable to extract an entity, respond with \"Not found\"",
-            "actionConfiguration.formData.textEntity.labels.data": "name, address, account number, gender"
-          }
-        },
-        {
-          "label": "Inspection report",
-          "value": {
-            "actionConfiguration.formData.textEntity.input.data": "The 2018 Toyota Camry with a mileage of 45,000 miles, VIN 1HGBH41JXMN109186, was thoroughly inspected on January 9, 2024. The engine and transmission are in good condition, showing no significant issues and well-maintained fluid levels. The brakes, however, require attention with the front brake pads and rear brake discs needing replacement due to wear and warping. The suspension system also needs attention; both front struts and rear shock absorbers show signs of leakage and wear and are recommended for replacement. Tire inspection revealed uneven wear patterns with the front left and rear right tires nearing the legal limit for tread depth, necessitating replacement. The exhaust system is in good condition with no observable leaks or corrosion. The electrical system needs attention, particularly the battery, which shows reduced capacity and needs replacement. Cooling system checks out well with adequate coolant levels and no leaks. Some lights and indicators, including the right headlight bulb and rear left turn indicator, are non-functional or dimming and need replacing. The windshield wipers are ineffective and require replacement. Interior components and the body and frame are in good condition, showing only minor wear and superficial damage. In conclusion, while the 2018 Toyota Camry is generally in good condition, it requires maintenance, particularly for the braking system, suspension, tires, electrical systems, lights, and windshield wipers. Addressing these issues will ensure the vehicle’s safety and performance. Regular check-ups are advised to monitor the condition of parts currently in good or fair condition. This inspection was conducted by John Doe, an ASE Certified Mechanic, at XYZ Auto Service Center.",
-            "actionConfiguration.formData.textEntity.instructions.data": "Remove special characters in the VIN and extract the date in MM/DD/YYYY format.",
-            "actionConfiguration.formData.textEntity.labels.data": "year, make, model, VIN, date, mechanic name, service centre name, overall condition"
-          }
+          "label": "Try out these examples",
+          "Description": "Try out these examples",
+          "subtitle": "",
+          "configProperty": "",
+          "controlType": "FORM_TEMPLATE",
+          "isRequired": false,
+          "options": [
+            {
+              "label": "Customer support",
+              "value": {
+                "actionConfiguration.formData.textEntity.input.data": "Dear team,\n\nI have a query regarding the address update process in my profile. I recently moved to a new location, and I need to update my address to 1234 Oak Street, Newville, NV 12345. However, I am encountering an error on the website. Could you assist me with this? My account number is 99892.\n\nRegards, \nMark ",
+                "actionConfiguration.formData.textEntity.instructions.data": "If you’re unable to extract an entity, respond with \"Not found\"",
+                "actionConfiguration.formData.textEntity.labels.data": "name, address, account number, gender"
+              }
+            },
+            {
+              "label": "Inspection report",
+              "value": {
+                "actionConfiguration.formData.textEntity.input.data": "The 2018 Toyota Camry with a mileage of 45,000 miles, VIN 1HGBH41JXMN109186, was thoroughly inspected on January 9, 2024. The engine and transmission are in good condition, showing no significant issues and well-maintained fluid levels. The brakes, however, require attention with the front brake pads and rear brake discs needing replacement due to wear and warping. The suspension system also needs attention; both front struts and rear shock absorbers show signs of leakage and wear and are recommended for replacement. Tire inspection revealed uneven wear patterns with the front left and rear right tires nearing the legal limit for tread depth, necessitating replacement. The exhaust system is in good condition with no observable leaks or corrosion. The electrical system needs attention, particularly the battery, which shows reduced capacity and needs replacement. Cooling system checks out well with adequate coolant levels and no leaks. Some lights and indicators, including the right headlight bulb and rear left turn indicator, are non-functional or dimming and need replacing. The windshield wipers are ineffective and require replacement. Interior components and the body and frame are in good condition, showing only minor wear and superficial damage. In conclusion, while the 2018 Toyota Camry is generally in good condition, it requires maintenance, particularly for the braking system, suspension, tires, electrical systems, lights, and windshield wipers. Addressing these issues will ensure the vehicle’s safety and performance. Regular check-ups are advised to monitor the condition of parts currently in good or fair condition. This inspection was conducted by John Doe, an ASE Certified Mechanic, at XYZ Auto Service Center.",
+                "actionConfiguration.formData.textEntity.instructions.data": "Remove special characters in the VIN and extract the date in MM/DD/YYYY format.",
+                "actionConfiguration.formData.textEntity.labels.data": "year, make, model, VIN, date, mechanic name, service centre name, overall condition"
+              }
+            }
+          ]
         }
       ]
     },
     {
-      "label": "Input",
-      "Description": "Provide some text for AI to extract entities from",
-      "subtitle": "Provide some text for AI to extract entities from",
-      "placeholderText": "Write some text or use {{ }} to reference a dynamic text value",
-      "configProperty": "actionConfiguration.formData.textEntity.input.data",
-      "controlType": "QUERY_DYNAMIC_TEXT",
-      "isRequired": true
-    },
-    {
-      "label": "Entities",
-      "Description": "Provide a comma separated list of entities to extract from the Input",
-      "subtitle": "Provide a comma separated list of entities to extract from the Input",
-      "placeholderText": "Write a list of comma separated text values or use {{ }} to reference a dynamic value",
-      "configProperty": "actionConfiguration.formData.textEntity.labels.data",
-      "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
-      "isRequired": true,
-      "customStyles": {
-        "width": "872px"
-      }
-    },
-    {
-      "label": "Additional Instructions",
-      "Description": "Provide additional instructions for the AI to tweak the entity extraction",
-      "subtitle": "Provide additional instructions for the AI to tweak the entity extraction",
-      "configProperty": "actionConfiguration.formData.textEntity.instructions.data",
-      "controlType": "QUERY_DYNAMIC_TEXT",
-      "placeholderText": "Write some text or use {{ }} to reference a dynamic text value",
-      "initialValue": "",
-      "isRequired": false
+      "controlType": "SINGLE_COLUMN_ZONE",
+      "identifier": "TEXT-ENTITY-EXTRACT-Z2",
+      "children": [
+        {
+          "label": "Input",
+          "Description": "Provide some text for AI to extract entities from",
+          "subtitle": "Provide some text for AI to extract entities from",
+          "placeholderText": "Write some text or use {{ }} to reference a dynamic text value",
+          "configProperty": "actionConfiguration.formData.textEntity.input.data",
+          "controlType": "QUERY_DYNAMIC_TEXT",
+          "isRequired": true
+        },
+        {
+          "label": "Entities",
+          "Description": "Provide a comma separated list of entities to extract from the Input",
+          "subtitle": "Provide a comma separated list of entities to extract from the Input",
+          "placeholderText": "Write a list of comma separated text values or use {{ }} to reference a dynamic value",
+          "configProperty": "actionConfiguration.formData.textEntity.labels.data",
+          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+          "isRequired": true
+        },
+        {
+          "label": "Additional Instructions",
+          "Description": "Provide additional instructions for the AI to tweak the entity extraction",
+          "subtitle": "Provide additional instructions for the AI to tweak the entity extraction",
+          "configProperty": "actionConfiguration.formData.textEntity.instructions.data",
+          "controlType": "QUERY_DYNAMIC_TEXT",
+          "placeholderText": "Write some text or use {{ }} to reference a dynamic text value",
+          "initialValue": "",
+          "isRequired": false
+        }
+      ]
     }
   ]
 }
diff --git a/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/editor/textGeneration.json b/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/editor/textGeneration.json
index 389ac206bd20..a2a938b67b47 100644
--- a/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/editor/textGeneration.json
+++ b/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/editor/textGeneration.json
@@ -1,73 +1,91 @@
 {
+  "controlType": "SECTION_V2",
   "identifier": "TEXT_GENERATE",
-  "controlType": "SECTION",
   "conditionals": {
     "show": "{{actionConfiguration.formData.usecase.data === 'TEXT_GENERATE'}}"
   },
   "children": [
     {
-      "label": "Try out these examples",
-      "Description": "Try out these examples",
-      "subtitle": "",
-      "configProperty": "",
-      "controlType": "FORM_TEMPLATE",
-      "isRequired": false,
-      "options": [
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "identifier": "TEXT-GENERATE-Z1",
+      "children": [
         {
-          "label": "Email Response",
-          "value": {
-            "actionConfiguration.formData.textGeneration.input.data": "Write an 100 word apologetic email response to a delay in order shipment due to operational reasons and assure them that the order will be delivered today"
-          }
-        },
-        {
-          "label": "Product description",
-          "value": {
-            "actionConfiguration.formData.textGeneration.input.data": "Write a creative product description for an electric car named RevaX, with the keywords- fast charging, 200 miles per single charge, compact, eco-friendly, economical. This is targeted towards a climate concious tech/EV enthusiast who enjoys driving. Also describe the benefits of this product in less than 80 words"
-          }
-        },
-        {
-          "label": "Candidate response",
-          "value": {
-            "actionConfiguration.formData.textGeneration.input.data": "Write a personalised email rejecting Bob’s application for the Software Engineering position at Acme corp due to gaps in technical skills. Make sure the email has a polite tone but contains less than 150 words."
-          }
+          "label": "Try out these examples",
+          "Description": "Try out these examples",
+          "subtitle": "",
+          "configProperty": "",
+          "controlType": "FORM_TEMPLATE",
+          "isRequired": false,
+          "options": [
+            {
+              "label": "Email Response",
+              "value": {
+                "actionConfiguration.formData.textGeneration.input.data": "Write an 100 word apologetic email response to a delay in order shipment due to operational reasons and assure them that the order will be delivered today"
+              }
+            },
+            {
+              "label": "Product description",
+              "value": {
+                "actionConfiguration.formData.textGeneration.input.data": "Write a creative product description for an electric car named RevaX, with the keywords- fast charging, 200 miles per single charge, compact, eco-friendly, economical. This is targeted towards a climate concious tech/EV enthusiast who enjoys driving. Also describe the benefits of this product in less than 80 words"
+              }
+            },
+            {
+              "label": "Candidate response",
+              "value": {
+                "actionConfiguration.formData.textGeneration.input.data": "Write a personalised email rejecting Bob’s application for the Software Engineering position at Acme corp due to gaps in technical skills. Make sure the email has a polite tone but contains less than 150 words."
+              }
+            }
+          ]
         }
       ]
     },
     {
-      "label": "Prompt",
-      "Description": "Provide an prompt for AI to generate text",
-      "subtitle": "Provide an prompt for AI to generate text",
-      "configProperty": "actionConfiguration.formData.textGeneration.input.data",
-      "controlType": "QUERY_DYNAMIC_TEXT",
-      "placeholderText": "Write some text or use {{ }} to reference a dynamic text value",
-      "initialValue": "",
-      "isRequired": true
+      "controlType": "SINGLE_COLUMN_ZONE",
+      "identifier": "TEXT-GENERATE-Z2",
+      "children": [
+        {
+          "label": "Prompt",
+          "Description": "Provide a prompt for AI to generate text",
+          "subtitle": "Provide a prompt for AI to generate text",
+          "configProperty": "actionConfiguration.formData.textGeneration.input.data",
+          "controlType": "QUERY_DYNAMIC_TEXT",
+          "placeholderText": "Write some text or use {{ }} to reference a dynamic text value",
+          "initialValue": "",
+          "isRequired": true
+        }
+      ]
     },
     {
-      "label": "Use context from files",
-      "tooltipText": "Enhance the AI response by providing custom context. Using this option will generate accurate responses that are grounded in file contents.",
-      "subtitle": "Select files for enhanced AI responses based on file contents. Upload files on the datasource (Data > your Appsmith AI Datasource > Edit > Upload files)",
-      "isRequired": false,
-      "propertyName": "fileIds",
-      "configProperty": "actionConfiguration.formData.fileIds.data",
-      "controlType": "DROP_DOWN",
-      "initialValue": [],
-      "options": [],
-      "isMultiSelect": true,
-      "placeholderText": "Select files",
-      "fetchOptionsConditionally": true,
-      "conditionals": {
-        "enable": "{{true}}",
-        "fetchDynamicValues": {
-          "condition": "{{actionConfiguration.formData.usecase.data === 'TEXT_GENERATE'}}",
-          "config": {
-            "params": {
-              "requestType": "LIST_FILES",
-              "displayType": "DROP_DOWN"
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "identifier": "TEXT-GENERATE-Z3",
+      "children": [
+        {
+          "label": "Use context from files",
+          "tooltipText": "Enhance the AI response by providing custom context. Using this option will generate accurate responses that are grounded in file contents.",
+          "subtitle": "Select files for enhanced AI responses based on file contents. Upload files on the datasource (Data > your Appsmith AI Datasource > Edit > Upload files)",
+          "isRequired": false,
+          "propertyName": "fileIds",
+          "configProperty": "actionConfiguration.formData.fileIds.data",
+          "controlType": "DROP_DOWN",
+          "initialValue": [],
+          "options": [],
+          "isMultiSelect": true,
+          "placeholderText": "Select files",
+          "fetchOptionsConditionally": true,
+          "conditionals": {
+            "enable": "{{true}}",
+            "fetchDynamicValues": {
+              "condition": "{{actionConfiguration.formData.usecase.data === 'TEXT_GENERATE'}}",
+              "config": {
+                "params": {
+                  "requestType": "LIST_FILES",
+                  "displayType": "DROP_DOWN"
+                }
+              }
             }
           }
         }
-      }
+      ]
     }
   ]
 }
diff --git a/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/editor/textSummarization.json b/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/editor/textSummarization.json
index 0ba71c93df2d..765d82496a1b 100644
--- a/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/editor/textSummarization.json
+++ b/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/editor/textSummarization.json
@@ -1,59 +1,71 @@
 {
+  "controlType": "SECTION_V2",
   "identifier": "TEXT_SUMMARY",
-  "controlType": "SECTION",
   "conditionals": {
     "show": "{{actionConfiguration.formData.usecase.data === 'TEXT_SUMMARY'}}"
   },
   "children": [
     {
-      "label": "Try out these examples",
-      "Description": "Try out these examples",
-      "subtitle": "",
-      "configProperty": "",
-      "controlType": "FORM_TEMPLATE",
-      "isRequired": false,
-      "options": [
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "identifier": "TEXT-SUMMARY-Z1",
+      "children": [
         {
-          "label": "Support conversation",
-          "value": {
-            "actionConfiguration.formData.textSummary.input.data": "[\"Hey team, I am experiencing difficulties with logging into my account. Despite entering the correct credentials, I keep getting an error message. This issue is preventing me from accessing your services, and I would appreciate a prompt resolution. Regards, Bob\", \n\"Hello Bob, Thank you for reaching out. We apologize for the inconvenience. Can you please confirm if you have tried resetting your password? Additionally, please ensure that your browser is up-to-date. Best, Support Team\",\n\"Hi, I tried resetting my password, but the issue persists. Also, my browser is updated to the latest version. Can you please look into this further? Thanks, Bob\",\n\"Thank you for the update, Bob. We will investigate this further and get back to you shortly. In the meantime, can you try accessing your account from a different device? Regards, Support Team\"]",
-            "actionConfiguration.formData.textSummary.instructions.data": "The input is a customer support conversation and contains an array of messages between the customer and the support agent. Summarise the conversation in less than 200 words."
-          }
-        },
+          "label": "Try out these examples",
+          "Description": "Try out these examples",
+          "subtitle": "",
+          "configProperty": "",
+          "controlType": "FORM_TEMPLATE",
+          "isRequired": false,
+          "options": [
+            {
+              "label": "Support conversation",
+              "value": {
+                "actionConfiguration.formData.textSummary.input.data": "[\"Hey team, I am experiencing difficulties with logging into my account. Despite entering the correct credentials, I keep getting an error message. This issue is preventing me from accessing your services, and I would appreciate a prompt resolution. Regards, Bob\", \n\"Hello Bob, Thank you for reaching out. We apologize for the inconvenience. Can you please confirm if you have tried resetting your password? Additionally, please ensure that your browser is up-to-date. Best, Support Team\",\n\"Hi, I tried resetting my password, but the issue persists. Also, my browser is updated to the latest version. Can you please look into this further? Thanks, Bob\",\n\"Thank you for the update, Bob. We will investigate this further and get back to you shortly. In the meantime, can you try accessing your account from a different device? Regards, Support Team\"]",
+                "actionConfiguration.formData.textSummary.instructions.data": "The input is a customer support conversation and contains an array of messages between the customer and the support agent. Summarise the conversation in less than 200 words."
+              }
+            },
+            {
+              "label": "Blog post",
+              "value": {
+                "actionConfiguration.formData.textSummary.input.data": "The iPhone 15, Apple's latest entry in its iconic smartphone series, is a testament to the company's continued innovation and commitment to user experience. This review delves into its design, performance, camera, battery life, and unique features, offering a comprehensive overview for both tech enthusiasts and the average consumer. The iPhone 15 sports a sleek design that follows Apple's philosophy of elegance and simplicity. The chassis, a harmonious blend of glass and stainless steel, feels robust yet luxurious. It’s slightly lighter than its predecessor, making it more comfortable to hold for extended periods. The standout design element is the bezel-less OLED display, which offers an immersive viewing experience. The IP68 rating ensures durability against dust and water, making it a reliable companion for everyday use. The Super Retina XDR display on the iPhone 15 is a visual feast. The colors are vibrant, and the blacks are deep, thanks to the OLED technology. With a 120Hz refresh rate, the responsiveness is fluid, whether scrolling through web pages or playing high-intensity games. The brightness levels are impressive, offering excellent visibility even in direct sunlight.\nAudio quality has also seen an upgrade. The speakers deliver richer and more detailed sound, enhancing the overall multimedia experience. Whether it's watching movies or playing games, the audio is immersive and well-balanced. At the heart of the iPhone 15 is Apple's new A17 Bionic chip, which sets a new benchmark in smartphone performance. Coupled with improved machine learning capabilities and a more efficient GPU, it handles everything from everyday tasks to demanding applications with ease. The iOS integration is seamless, providing a user-friendly and intuitive interface. The camera system on the iPhone 15 is where Apple has made significant strides. The new sensor-shift optical image stabilization is a game-changer, particularly in low-light conditions. The images are sharp, with excellent dynamic range and color accuracy. The Night mode is more refined, capturing stunning details in dark environments.\nThe video capabilities are equally impressive. The Cinematic mode, which allows for depth-of-field adjustments, brings a professional touch to video recordings. The ProRAW and ProRes formats cater to professional photographers and videographers who demand higher control and quality. Battery life has always been a strong suit for iPhones, and the iPhone 15 continues this tradition. Even with heavy usage, the phone comfortably lasts a full day, thanks to the efficiency of the A17 chip and the larger battery. The fast charging and MagSafe wireless charging are convenient, though the absence of a charging brick in the box may be a point of contention for some users.The iPhone 15 introduces some noteworthy features. The integration of satellite connectivity for emergency services is a significant safety addition. The improved Face ID works flawlessly, even with masks, making it more practical in current times. The iPhone 15 is a remarkable smartphone that balances innovation with user experience. While it follows the evolutionary path rather than a revolutionary leap, the refinements in camera technology, performance, and unique features like satellite connectivity make it a compelling choice for anyone looking to upgrade. The higher price point might be a hurdle, but for those invested in the Apple ecosystem, the iPhone 15 offers a seamless and premium experience that's hard to match.",
+                "actionConfiguration.formData.textSummary.instructions.data": "Summarise the phone review in less than 250 words and highlight the key features."
+              }
+            },
+            {
+              "label": "Inspection report",
+              "value": {
+                "actionConfiguration.formData.textSummary.input.data": "So, this Honda Civic here is 5 years old, got an automatic transmission, and a 1.2L engine. She's been on the road for about 50,000 km. Overall, she's doing okay, but there are a few things that need some attention. The brake pads are pretty much worn out. It's important to get these changed soon for safety, especially when you need to stop quickly or in wet conditions. Next, let's talk tires. The tread on these is getting pretty low, almost hitting the legal limit. Definitely need new ones for a better grip on the road, you don't want to be slipping around, especially when it's raining. Now, the battery is showing its age, not holding charge like it used to. Wouldn't be surprised if one day it just doesn't start the car. Better to swap it out now than be stuck later. The suspension bushings, too, are worn. Changing them will definitely improve the ride, make it smoother. The rest of the car – the engine, transmission, and the interior – they're all in pretty good shape. Just the usual signs of use, nothing major. If you keep up with regular maintenance and take care of these issues I've mentioned, she's going to keep running smoothly for a good long time. Regular check-ups, fixing these bits, and she'll be good as new.",
+                "actionConfiguration.formData.textSummary.instructions.data": "Summarise the inspection report in less than 100 words and highlight the most important points to be noted"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "controlType": "SINGLE_COLUMN_ZONE",
+      "identifier": "TEXT-SUMMARY-Z2",
+      "children": [
         {
-          "label": "Blog post",
-          "value": {
-            "actionConfiguration.formData.textSummary.input.data": "The iPhone 15, Apple's latest entry in its iconic smartphone series, is a testament to the company's continued innovation and commitment to user experience. This review delves into its design, performance, camera, battery life, and unique features, offering a comprehensive overview for both tech enthusiasts and the average consumer. The iPhone 15 sports a sleek design that follows Apple's philosophy of elegance and simplicity. The chassis, a harmonious blend of glass and stainless steel, feels robust yet luxurious. It’s slightly lighter than its predecessor, making it more comfortable to hold for extended periods. The standout design element is the bezel-less OLED display, which offers an immersive viewing experience. The IP68 rating ensures durability against dust and water, making it a reliable companion for everyday use. The Super Retina XDR display on the iPhone 15 is a visual feast. The colors are vibrant, and the blacks are deep, thanks to the OLED technology. With a 120Hz refresh rate, the responsiveness is fluid, whether scrolling through web pages or playing high-intensity games. The brightness levels are impressive, offering excellent visibility even in direct sunlight.\nAudio quality has also seen an upgrade. The speakers deliver richer and more detailed sound, enhancing the overall multimedia experience. Whether it's watching movies or playing games, the audio is immersive and well-balanced. At the heart of the iPhone 15 is Apple's new A17 Bionic chip, which sets a new benchmark in smartphone performance. Coupled with improved machine learning capabilities and a more efficient GPU, it handles everything from everyday tasks to demanding applications with ease. The iOS integration is seamless, providing a user-friendly and intuitive interface. The camera system on the iPhone 15 is where Apple has made significant strides. The new sensor-shift optical image stabilization is a game-changer, particularly in low-light conditions. The images are sharp, with excellent dynamic range and color accuracy. The Night mode is more refined, capturing stunning details in dark environments.\nThe video capabilities are equally impressive. The Cinematic mode, which allows for depth-of-field adjustments, brings a professional touch to video recordings. The ProRAW and ProRes formats cater to professional photographers and videographers who demand higher control and quality. Battery life has always been a strong suit for iPhones, and the iPhone 15 continues this tradition. Even with heavy usage, the phone comfortably lasts a full day, thanks to the efficiency of the A17 chip and the larger battery. The fast charging and MagSafe wireless charging are convenient, though the absence of a charging brick in the box may be a point of contention for some users.The iPhone 15 introduces some noteworthy features. The integration of satellite connectivity for emergency services is a significant safety addition. The improved Face ID works flawlessly, even with masks, making it more practical in current times. The iPhone 15 is a remarkable smartphone that balances innovation with user experience. While it follows the evolutionary path rather than a revolutionary leap, the refinements in camera technology, performance, and unique features like satellite connectivity make it a compelling choice for anyone looking to upgrade. The higher price point might be a hurdle, but for those invested in the Apple ecosystem, the iPhone 15 offers a seamless and premium experience that's hard to match.",
-            "actionConfiguration.formData.textSummary.instructions.data": "Summarise the phone review in less than 250 words and highlight the key features."
-          }
+          "label": "Input",
+          "Description": "Provide some text for AI to summarise",
+          "subtitle": "Provide some text for AI to summarise",
+          "configProperty": "actionConfiguration.formData.textSummary.input.data",
+          "placeholderText": "Write some text or use {{ }} to reference a dynamic text value",
+          "controlType": "QUERY_DYNAMIC_TEXT",
+          "isRequired": true
         },
         {
-          "label": "Inspection report",
-          "value": {
-            "actionConfiguration.formData.textSummary.input.data": "So, this Honda Civic here is 5 years old, got an automatic transmission, and a 1.2L engine. She's been on the road for about 50,000 km. Overall, she's doing okay, but there are a few things that need some attention. The brake pads are pretty much worn out. It's important to get these changed soon for safety, especially when you need to stop quickly or in wet conditions. Next, let's talk tires. The tread on these is getting pretty low, almost hitting the legal limit. Definitely need new ones for a better grip on the road, you don't want to be slipping around, especially when it's raining. Now, the battery is showing its age, not holding charge like it used to. Wouldn't be surprised if one day it just doesn't start the car. Better to swap it out now than be stuck later. The suspension bushings, too, are worn. Changing them will definitely improve the ride, make it smoother. The rest of the car – the engine, transmission, and the interior – they're all in pretty good shape. Just the usual signs of use, nothing major. If you keep up with regular maintenance and take care of these issues I've mentioned, she's going to keep running smoothly for a good long time. Regular check-ups, fixing these bits, and she'll be good as new.",
-            "actionConfiguration.formData.textSummary.instructions.data": "Summarise the inspection report in less than 100 words and highlight the most important points to be noted"
-          }
+          "label": "Additional Instructions",
+          "Description": "Provide additional instructions for the AI to tweak the summarization",
+          "subtitle": "Provide additional instructions for the AI to tweak the summarization",
+          "configProperty": "actionConfiguration.formData.textSummary.instructions.data",
+          "controlType": "QUERY_DYNAMIC_TEXT",
+          "placeholderText": "Write some text or use {{ }} to reference a dynamic text value",
+          "initialValue": "",
+          "isRequired": false
         }
       ]
-    },
-    {
-      "label": "Input",
-      "Description": "Provide some text for AI to summarise",
-      "subtitle": "Provide some text for AI to summarise",
-      "configProperty": "actionConfiguration.formData.textSummary.input.data",
-      "placeholderText": "Write some text or use {{ }} to reference a dynamic text value",
-      "controlType": "QUERY_DYNAMIC_TEXT",
-      "isRequired": true
-    },
-    {
-      "label": "Additional Instructions",
-      "Description": "Provide additional instructions for the AI to tweak the summarization",
-      "subtitle": "Provide additional instructions for the AI to tweak the summarization",
-      "configProperty": "actionConfiguration.formData.textSummary.instructions.data",
-      "controlType": "QUERY_DYNAMIC_TEXT",
-      "placeholderText": "Write some text or use {{ }} to reference a dynamic text value",
-      "initialValue": "",
-      "isRequired": false
     }
   ]
 }
diff --git a/app/server/appsmith-plugins/arangoDBPlugin/src/main/java/com/external/plugins/ArangoDBPlugin.java b/app/server/appsmith-plugins/arangoDBPlugin/src/main/java/com/external/plugins/ArangoDBPlugin.java
index 2b25c529e51c..8c750a5e9e57 100644
--- a/app/server/appsmith-plugins/arangoDBPlugin/src/main/java/com/external/plugins/ArangoDBPlugin.java
+++ b/app/server/appsmith-plugins/arangoDBPlugin/src/main/java/com/external/plugins/ArangoDBPlugin.java
@@ -85,6 +85,8 @@ public Mono<ActionExecutionResult> execute(
                 DatasourceConfiguration datasourceConfiguration,
                 ActionConfiguration actionConfiguration) {
 
+            String printMessage = Thread.currentThread().getName() + ": execute() called for ArangoDB plugin.";
+            System.out.println(printMessage);
             if (!isConnectionValid(db)) {
                 return Mono.error(new StaleConnectionException(CONNECTION_INVALID_ERROR_MSG));
             }
@@ -99,7 +101,8 @@ public Mono<ActionExecutionResult> execute(
             }
 
             return Mono.fromCallable(() -> {
-                        log.debug("In the ArangoDBPlugin, got action execution result");
+                        System.out.println(Thread.currentThread().getName()
+                                + ": got action execution result from ArangoDB plugin.");
                         ArangoCursor<Map> cursor = db.query(query, null, null, Map.class);
                         ActionExecutionResult result = new ActionExecutionResult();
                         result.setIsExecutionSuccess(true);
@@ -176,7 +179,11 @@ private boolean isConnectionValid(ArangoDatabase db) {
         @Override
         public Mono<ArangoDatabase> datasourceCreate(DatasourceConfiguration datasourceConfiguration) {
 
+            String printMessage = Thread.currentThread().getName() + ": datasourceCreate() called for ArangoDB plugin.";
+            System.out.println(printMessage);
             return (Mono<ArangoDatabase>) Mono.fromCallable(() -> {
+                        System.out.println(
+                                Thread.currentThread().getName() + ": inside schdeuled thread from ArangoDB plugin.");
                         List<Endpoint> nonEmptyEndpoints = datasourceConfiguration.getEndpoints().stream()
                                 .filter(endpoint -> isNonEmptyEndpoint(endpoint))
                                 .collect(Collectors.toList());
@@ -256,11 +263,17 @@ private boolean isAuthenticationMissing(DBAuth auth) {
 
         @Override
         public void datasourceDestroy(ArangoDatabase db) {
+            String printMessage =
+                    Thread.currentThread().getName() + ": datasourceDestroy() called for ArangoDB plugin.";
+            System.out.println(printMessage);
             db.arango().shutdown();
         }
 
         @Override
         public Set<String> validateDatasource(DatasourceConfiguration datasourceConfiguration) {
+            String printMessage =
+                    Thread.currentThread().getName() + ": validateDatasource() called for ArangoDB plugin.";
+            System.out.println(printMessage);
             Set<String> invalids = new HashSet<>();
 
             DBAuth auth = (DBAuth) datasourceConfiguration.getAuthentication();
@@ -305,12 +318,15 @@ private boolean isEndpointAvailable(List<Endpoint> endpoints) {
 
         @Override
         public Mono<DatasourceTestResult> testDatasource(ArangoDatabase connection) {
+            String printMessage = Thread.currentThread().getName() + ": testDatasource() called for ArangoDB plugin.";
+            System.out.println(printMessage);
             return Mono.fromCallable(() -> {
                         connection.getVersion();
                         return new DatasourceTestResult();
                     })
                     .onErrorResume(error -> {
-                        log.error("Error when testing ArangoDB datasource.", error);
+                        System.out.println("Error when testing ArangoDB datasource.");
+                        error.printStackTrace();
                         return Mono.just(new DatasourceTestResult(arangoDBErrorUtils.getReadableError(error)));
                     })
                     .timeout(
@@ -321,6 +337,8 @@ public Mono<DatasourceTestResult> testDatasource(ArangoDatabase connection) {
         @Override
         public Mono<DatasourceStructure> getStructure(
                 ArangoDatabase db, DatasourceConfiguration datasourceConfiguration) {
+            String printMessage = Thread.currentThread().getName() + ": getStructure() called for ArangoDB plugin.";
+            System.out.println(printMessage);
             final DatasourceStructure structure = new DatasourceStructure();
             List<DatasourceStructure.Table> tables = new ArrayList<>();
             structure.setTables(tables);
@@ -340,6 +358,8 @@ public Mono<DatasourceStructure> getStructure(
             return Flux.fromIterable(collections)
                     .filter(collectionEntity -> !collectionEntity.getIsSystem())
                     .flatMap(collectionEntity -> {
+                        System.out.println(Thread.currentThread().getName()
+                                + ": got collectionEntity result from ArangoDB plugin.");
                         final ArrayList<DatasourceStructure.Column> columns = new ArrayList<>();
                         final ArrayList<DatasourceStructure.Template> templates = new ArrayList<>();
                         final String collectionName = collectionEntity.getName();
@@ -365,6 +385,8 @@ public Mono<DatasourceStructure> getStructure(
                                 Mono.just(document));
                     })
                     .flatMap(tuple -> {
+                        System.out.println(Thread.currentThread().getName()
+                                + ": generating templates and structure in ArangoDB plugin.");
                         final ArrayList<DatasourceStructure.Column> columns = tuple.getT1();
                         final ArrayList<DatasourceStructure.Template> templates = tuple.getT2();
                         String collectionName = tuple.getT3();
@@ -381,6 +403,9 @@ public Mono<DatasourceStructure> getStructure(
 
         @Override
         public Mono<String> getEndpointIdentifierForRateLimit(DatasourceConfiguration datasourceConfiguration) {
+            String printMessage = Thread.currentThread().getName()
+                    + ": getEndpointIdentifierForRateLimit() called for ArangoDB plugin.";
+            System.out.println(printMessage);
             List<Endpoint> endpoints = datasourceConfiguration.getEndpoints();
             String identifier = "";
             // When hostname and port both are available, both will be used as identifier
diff --git a/app/server/appsmith-plugins/awsLambdaPlugin/src/main/java/com/external/plugins/AwsLambdaPlugin.java b/app/server/appsmith-plugins/awsLambdaPlugin/src/main/java/com/external/plugins/AwsLambdaPlugin.java
index 8a4757400ced..f9fe1e083178 100644
--- a/app/server/appsmith-plugins/awsLambdaPlugin/src/main/java/com/external/plugins/AwsLambdaPlugin.java
+++ b/app/server/appsmith-plugins/awsLambdaPlugin/src/main/java/com/external/plugins/AwsLambdaPlugin.java
@@ -60,10 +60,14 @@ public Mono<ActionExecutionResult> execute(
                 DatasourceConfiguration datasourceConfiguration,
                 ActionConfiguration actionConfiguration) {
 
+            String printMessage = Thread.currentThread().getName() + ": execute() called for AWS Lambda plugin.";
+            System.out.println(printMessage);
             Map<String, Object> formData = actionConfiguration.getFormData();
             String command = getDataValueSafelyFromFormData(formData, "command", STRING_TYPE);
 
             return Mono.fromCallable(() -> {
+                        System.out.println(Thread.currentThread().getName()
+                                + ": creating action execution result for AWS Lambda plugin.");
                         ActionExecutionResult result;
                         switch (Objects.requireNonNull(command)) {
                             case "LIST_FUNCTIONS" -> result = listFunctions(actionConfiguration, connection);
@@ -90,6 +94,8 @@ public Mono<ActionExecutionResult> execute(
         @Override
         public Mono<TriggerResultDTO> trigger(
                 AWSLambda connection, DatasourceConfiguration datasourceConfiguration, TriggerRequestDTO request) {
+            String printMessage = Thread.currentThread().getName() + ": trigger() called for AWS Lambda plugin.";
+            System.out.println(printMessage);
             if (!StringUtils.hasText(request.getRequestType())) {
                 throw new AppsmithPluginException(
                         AppsmithPluginError.PLUGIN_EXECUTE_ARGUMENT_ERROR, "request type is missing");
@@ -143,6 +149,9 @@ ActionExecutionResult listFunctions(ActionConfiguration actionConfiguration, AWS
 
         @Override
         public Mono<AWSLambda> datasourceCreate(DatasourceConfiguration datasourceConfiguration) {
+            String printMessage =
+                    Thread.currentThread().getName() + ": datasourceCreate() called for AWS Lambda plugin.";
+            System.out.println(printMessage);
             DBAuth authentication = (DBAuth) datasourceConfiguration.getAuthentication();
             String accessKey = authentication.getUsername();
             String secretKey = authentication.getPassword();
@@ -178,6 +187,8 @@ public void datasourceDestroy(AWSLambda connection) {
 
         @Override
         public Mono<DatasourceTestResult> testDatasource(AWSLambda connection) {
+            String printMessage = Thread.currentThread().getName() + ": testDatasource() called for AWS Lambda plugin.";
+            System.out.println(printMessage);
             return Mono.fromCallable(() -> {
                         /*
                          * - Please note that as of 28 Jan 2021, the way Amazon client SDK works, creating a connection
@@ -207,6 +218,9 @@ public Mono<DatasourceTestResult> testDatasource(AWSLambda connection) {
 
         @Override
         public Set<String> validateDatasource(DatasourceConfiguration datasourceConfiguration) {
+            String printMessage =
+                    Thread.currentThread().getName() + ": validateDatasource() called for AWS Lambda plugin.";
+            System.out.println(printMessage);
             Set<String> invalids = new HashSet<>();
             if (datasourceConfiguration == null
                     || datasourceConfiguration.getAuthentication() == null
diff --git a/app/server/appsmith-plugins/awsLambdaPlugin/src/main/resources/editor/invoke.json b/app/server/appsmith-plugins/awsLambdaPlugin/src/main/resources/editor/invoke.json
index a6234eedaf5b..fb9b4df44900 100644
--- a/app/server/appsmith-plugins/awsLambdaPlugin/src/main/resources/editor/invoke.json
+++ b/app/server/appsmith-plugins/awsLambdaPlugin/src/main/resources/editor/invoke.json
@@ -1,12 +1,12 @@
 {
   "identifier": "INVOKE_FUNCTION",
-  "controlType": "SECTION",
+  "controlType": "SECTION_V2",
   "conditionals": {
     "show": "{{actionConfiguration.formData.command.data === 'INVOKE_FUNCTION'}}"
   },
   "children": [
     {
-      "controlType": "SECTION",
+      "controlType": "DOUBLE_COLUMN_ZONE",
       "label": "Details of lambda function",
       "children": [
         {
@@ -63,7 +63,12 @@
           "fetchOptionsConditionally": false,
           "setFirstOptionAsDefault": true,
           "alternateViewTypes": ["json"]
-        },
+        }
+      ]
+    },
+    {
+      "controlType": "SINGLE_COLUMN_ZONE",
+      "children": [
         {
           "label": "Post body",
           "configProperty": "actionConfiguration.formData.body.data",
diff --git a/app/server/appsmith-plugins/awsLambdaPlugin/src/main/resources/editor/list.json b/app/server/appsmith-plugins/awsLambdaPlugin/src/main/resources/editor/list.json
index 72e004a0c09b..897468ad1d3c 100644
--- a/app/server/appsmith-plugins/awsLambdaPlugin/src/main/resources/editor/list.json
+++ b/app/server/appsmith-plugins/awsLambdaPlugin/src/main/resources/editor/list.json
@@ -1,6 +1,6 @@
 {
   "identifier": "LIST_FUNCTIONS",
-  "controlType": "SECTION",
+  "controlType": "SECTION_V2",
   "conditionals": {
     "show": "{{actionConfiguration.formData.command.data === 'LIST_FUNCTIONS'}}"
   },
diff --git a/app/server/appsmith-plugins/awsLambdaPlugin/src/main/resources/editor/root.json b/app/server/appsmith-plugins/awsLambdaPlugin/src/main/resources/editor/root.json
index 5eda3741730f..00bc0a8e402c 100644
--- a/app/server/appsmith-plugins/awsLambdaPlugin/src/main/resources/editor/root.json
+++ b/app/server/appsmith-plugins/awsLambdaPlugin/src/main/resources/editor/root.json
@@ -1,23 +1,29 @@
 {
   "editor": [
     {
-      "controlType": "SECTION",
+      "controlType": "SECTION_V2",
       "identifier": "SELECTOR",
+
       "children": [
         {
-          "label": "Command",
-          "description": "Choose the method you would like to use",
-          "configProperty": "actionConfiguration.formData.command.data",
-          "controlType": "DROP_DOWN",
-          "initialValue": "LIST_FUNCTIONS",
-          "options": [
+          "controlType": "DOUBLE_COLUMN_ZONE",
+          "children": [
             {
-              "label": "List all functions",
-              "value": "LIST_FUNCTIONS"
-            },
-            {
-              "label": "Invoke a function",
-              "value": "INVOKE_FUNCTION"
+              "label": "Command",
+              "description": "Choose the method you would like to use",
+              "configProperty": "actionConfiguration.formData.command.data",
+              "controlType": "DROP_DOWN",
+              "initialValue": "LIST_FUNCTIONS",
+              "options": [
+                {
+                  "label": "List all functions",
+                  "value": "LIST_FUNCTIONS"
+                },
+                {
+                  "label": "Invoke a function",
+                  "value": "INVOKE_FUNCTION"
+                }
+              ]
             }
           ]
         }
diff --git a/app/server/appsmith-plugins/databricksPlugin/src/main/java/com/external/plugins/DatabricksPlugin.java b/app/server/appsmith-plugins/databricksPlugin/src/main/java/com/external/plugins/DatabricksPlugin.java
index 3b40911be6a6..c25c9b5a77db 100644
--- a/app/server/appsmith-plugins/databricksPlugin/src/main/java/com/external/plugins/DatabricksPlugin.java
+++ b/app/server/appsmith-plugins/databricksPlugin/src/main/java/com/external/plugins/DatabricksPlugin.java
@@ -79,12 +79,16 @@ public Mono<ActionExecutionResult> execute(
                 DatasourceConfiguration datasourceConfiguration,
                 ActionConfiguration actionConfiguration) {
 
+            String printMessage = Thread.currentThread().getName() + ": execute() called for Databricks plugin.";
+            System.out.println(printMessage);
             String query = actionConfiguration.getBody();
 
             List<Map<String, Object>> rowsList = new ArrayList<>(INITIAL_ROWLIST_CAPACITY);
             final List<String> columnsList = new ArrayList<>();
 
             return (Mono<ActionExecutionResult>) Mono.fromCallable(() -> {
+                        System.out.println(Thread.currentThread().getName()
+                                + ": creating action execution result from Databricks plugin.");
                         try {
 
                             // Check for connection validity :
@@ -179,6 +183,9 @@ public Mono<ActionExecutionResult> execute(
         @Override
         public Mono<Connection> datasourceCreate(DatasourceConfiguration datasourceConfiguration) {
 
+            String printMessage =
+                    Thread.currentThread().getName() + ": datasourceCreate() called for Databricks plugin.";
+            System.out.println(printMessage);
             // Ensure the databricks JDBC driver is loaded.
             try {
                 Class.forName(JDBC_DRIVER);
@@ -242,6 +249,8 @@ public Mono<Connection> datasourceCreate(DatasourceConfiguration datasourceConfi
             }
 
             return (Mono<Connection>) Mono.fromCallable(() -> {
+                        System.out.println(
+                                Thread.currentThread().getName() + ": creating connection from Databricks plugin.");
                         Connection connection = DriverManager.getConnection(url, p);
 
                         // Execute statements to default catalog and schema for all queries on this datasource.
@@ -292,6 +301,9 @@ public Mono<Connection> datasourceCreate(DatasourceConfiguration datasourceConfi
 
         @Override
         public void datasourceDestroy(Connection connection) {
+            String printMessage =
+                    Thread.currentThread().getName() + ": datasourceDestroy() called for Databricks plugin.";
+            System.out.println(printMessage);
             try {
                 if (connection != null) {
                     connection.close();
@@ -310,7 +322,11 @@ public Set<String> validateDatasource(DatasourceConfiguration datasourceConfigur
         @Override
         public Mono<DatasourceStructure> getStructure(
                 Connection connection, DatasourceConfiguration datasourceConfiguration) {
+            String printMessage = Thread.currentThread().getName() + ": getStructure() called for Databricks plugin.";
+            System.out.println(printMessage);
             return Mono.fromSupplier(() -> {
+                        System.out.println(Thread.currentThread().getName()
+                                + ": fetching datasource structure from Databricks plugin.");
                         final DatasourceStructure structure = new DatasourceStructure();
                         final Map<String, DatasourceStructure.Table> tablesByName =
                                 new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
@@ -347,7 +363,6 @@ public Mono<DatasourceStructure> getStructure(
                             for (DatasourceStructure.Table table : structure.getTables()) {
                                 table.getKeys().sort(Comparator.naturalOrder());
                             }
-                            log.debug("Got the structure of Databricks DB");
                             return structure;
                         } catch (SQLException e) {
                             return Mono.error(new AppsmithPluginException(
diff --git a/app/server/appsmith-plugins/databricksPlugin/src/main/resources/editor/root.json b/app/server/appsmith-plugins/databricksPlugin/src/main/resources/editor/root.json
index 49a61e3faf81..bab24a7605cd 100644
--- a/app/server/appsmith-plugins/databricksPlugin/src/main/resources/editor/root.json
+++ b/app/server/appsmith-plugins/databricksPlugin/src/main/resources/editor/root.json
@@ -1,14 +1,20 @@
 {
   "editor": [
     {
-      "controlType": "SECTION",
+      "controlType": "SECTION_V2",
       "identifier": "SELECTOR",
       "children": [
         {
-          "label": "",
-          "configProperty": "actionConfiguration.body",
-          "controlType": "QUERY_DYNAMIC_TEXT",
-          "evaluationSubstitutionType": "TEMPLATE"
+          "controlType": "SINGLE_COLUMN_ZONE",
+          "identifier": "SELECTOR-Z1",
+          "children": [
+            {
+              "label": "",
+              "configProperty": "actionConfiguration.body",
+              "controlType": "QUERY_DYNAMIC_TEXT",
+              "evaluationSubstitutionType": "TEMPLATE"
+            }
+          ]
         }
       ]
     }
diff --git a/app/server/appsmith-plugins/dynamoPlugin/src/main/java/com/external/plugins/DynamoPlugin.java b/app/server/appsmith-plugins/dynamoPlugin/src/main/java/com/external/plugins/DynamoPlugin.java
index 964e9a993f6e..18a8219cc383 100644
--- a/app/server/appsmith-plugins/dynamoPlugin/src/main/java/com/external/plugins/DynamoPlugin.java
+++ b/app/server/appsmith-plugins/dynamoPlugin/src/main/java/com/external/plugins/DynamoPlugin.java
@@ -91,6 +91,8 @@ public static class DynamoPluginExecutor implements PluginExecutor<DynamoDbClien
         private final Scheduler scheduler = Schedulers.boundedElastic();
 
         public Object extractValue(Object rawItem) {
+            String printMessage = Thread.currentThread().getName() + ": extractValue() called for Dynamo plugin.";
+            System.out.println(printMessage);
 
             if (!(rawItem instanceof List) && !(rawItem instanceof Map)) {
                 return rawItem;
@@ -162,7 +164,9 @@ public Object extractValue(Object rawItem) {
          */
         public Object getTransformedResponse(Map<String, Object> rawResponse, String action)
                 throws AppsmithPluginException {
-
+            String printMessage =
+                    Thread.currentThread().getName() + ": getTransformedResponse() called for Dynamo plugin.";
+            System.out.println(printMessage);
             Map<String, Object> transformedResponse = new HashMap<>();
             for (Map.Entry<String, Object> responseEntry : rawResponse.entrySet()) {
                 Object rawItems = responseEntry.getValue();
@@ -184,12 +188,15 @@ public Mono<ActionExecutionResult> execute(
                 DynamoDbClient ddb,
                 DatasourceConfiguration datasourceConfiguration,
                 ActionConfiguration actionConfiguration) {
-
+            String printMessage = Thread.currentThread().getName() + ": execute() called for Dynamo plugin.";
+            System.out.println(printMessage);
             final Map<String, Object> requestData = new HashMap<>();
             final String body = actionConfiguration.getBody();
             List<RequestParamDTO> requestParams = new ArrayList<>();
 
             return Mono.fromCallable(() -> {
+                        System.out.println(Thread.currentThread().getName()
+                                + ": creating action execution result from DynamoDB plugin.");
                         ActionExecutionResult result = new ActionExecutionResult();
 
                         final String action = actionConfiguration.getPath();
@@ -251,7 +258,6 @@ public Mono<ActionExecutionResult> execute(
                         }
 
                         result.setIsExecutionSuccess(true);
-                        log.debug("In the DynamoPlugin, got action execution result");
                         return result;
                     })
                     .onErrorResume(error -> {
@@ -280,8 +286,11 @@ public Mono<ActionExecutionResult> execute(
 
         @Override
         public Mono<DynamoDbClient> datasourceCreate(DatasourceConfiguration datasourceConfiguration) {
-
+            String printMessage = Thread.currentThread().getName() + ": datasourceCreate() called for Dynamo plugin.";
+            System.out.println(printMessage);
             return Mono.fromCallable(() -> {
+                        System.out.println(
+                                Thread.currentThread().getName() + ": creating dynamodbclient from DynamoDB plugin.");
                         final DynamoDbClientBuilder builder = DynamoDbClient.builder();
 
                         if (!CollectionUtils.isEmpty(datasourceConfiguration.getEndpoints())) {
@@ -317,6 +326,8 @@ public void datasourceDestroy(DynamoDbClient client) {
 
         @Override
         public Set<String> validateDatasource(@NonNull DatasourceConfiguration datasourceConfiguration) {
+            String printMessage = Thread.currentThread().getName() + ": validateDatasource() called for Dynamo plugin.";
+            System.out.println(printMessage);
             Set<String> invalids = new HashSet<>();
 
             final DBAuth authentication = (DBAuth) datasourceConfiguration.getAuthentication();
@@ -341,6 +352,8 @@ public Set<String> validateDatasource(@NonNull DatasourceConfiguration datasourc
 
         @Override
         public Mono<DatasourceTestResult> testDatasource(DynamoDbClient connection) {
+            String printMessage = Thread.currentThread().getName() + ": testDatasource() called for Dynamo plugin.";
+            System.out.println(printMessage);
             return Mono.fromCallable(() -> {
                 /*
                  * - Creating a connection with false credentials does not throw an error. Hence,
@@ -354,7 +367,11 @@ public Mono<DatasourceTestResult> testDatasource(DynamoDbClient connection) {
         @Override
         public Mono<DatasourceStructure> getStructure(
                 DynamoDbClient ddb, DatasourceConfiguration datasourceConfiguration) {
+            String printMessage = Thread.currentThread().getName() + ": getStructure() called for Dynamo plugin.";
+            System.out.println(printMessage);
             return Mono.fromCallable(() -> {
+                        System.out.println(Thread.currentThread().getName()
+                                + ": creating datasourceStructure from DynamoDB plugin.");
                         final ListTablesResponse listTablesResponse = ddb.listTables();
 
                         List<DatasourceStructure.Table> tables = new ArrayList<>();
diff --git a/app/server/appsmith-plugins/elasticSearchPlugin/src/main/java/com/external/plugins/ElasticSearchPlugin.java b/app/server/appsmith-plugins/elasticSearchPlugin/src/main/java/com/external/plugins/ElasticSearchPlugin.java
index b1ed9a985e83..ffdfa491863a 100644
--- a/app/server/appsmith-plugins/elasticSearchPlugin/src/main/java/com/external/plugins/ElasticSearchPlugin.java
+++ b/app/server/appsmith-plugins/elasticSearchPlugin/src/main/java/com/external/plugins/ElasticSearchPlugin.java
@@ -80,12 +80,16 @@ public Mono<ActionExecutionResult> execute(
                 DatasourceConfiguration datasourceConfiguration,
                 ActionConfiguration actionConfiguration) {
 
+            String printMessage = Thread.currentThread().getName() + ": execute() called for ElasticSearch plugin.";
+            System.out.println(printMessage);
             final Map<String, Object> requestData = new HashMap<>();
 
             String query = actionConfiguration.getBody();
             List<RequestParamDTO> requestParams = new ArrayList<>();
 
             return Mono.fromCallable(() -> {
+                        System.out.println(Thread.currentThread().getName()
+                                + ": creating action execution result from ElasticSearch plugin.");
                         final ActionExecutionResult result = new ActionExecutionResult();
 
                         String body = query;
@@ -148,7 +152,7 @@ public Mono<ActionExecutionResult> execute(
                         }
 
                         result.setIsExecutionSuccess(true);
-                        log.debug("In the Elastic Search Plugin, got action execution result");
+                        System.out.println("In the Elastic Search Plugin, got action execution result");
                         return Mono.just(result);
                     })
                     .flatMap(obj -> obj)
@@ -167,6 +171,8 @@ public Mono<ActionExecutionResult> execute(
                     })
                     // Now set the request in the result to be returned to the server
                     .map(result -> {
+                        System.out.println(Thread.currentThread().getName()
+                                + ": setting the request in the result to be returned from ElasticSearch plugin.");
                         ActionExecutionRequest request = new ActionExecutionRequest();
                         request.setProperties(requestData);
                         request.setQuery(query);
@@ -192,7 +198,9 @@ public Long getPort(Endpoint endpoint) {
 
         @Override
         public Mono<RestClient> datasourceCreate(DatasourceConfiguration datasourceConfiguration) {
-
+            String printMessage =
+                    Thread.currentThread().getName() + ": datasourceCreate() called for ElasticSearch plugin.";
+            System.out.println(printMessage);
             final List<HttpHost> hosts = new ArrayList<>();
 
             for (Endpoint endpoint : datasourceConfiguration.getEndpoints()) {
@@ -247,6 +255,9 @@ public void datasourceDestroy(RestClient client) {
 
         @Override
         public Set<String> validateDatasource(DatasourceConfiguration datasourceConfiguration) {
+            String printMessage =
+                    Thread.currentThread().getName() + ": validateDatasource() called for ElasticSearch plugin.";
+            System.out.println(printMessage);
             Set<String> invalids = new HashSet<>();
 
             if (CollectionUtils.isEmpty(datasourceConfiguration.getEndpoints())) {
@@ -271,6 +282,9 @@ public Set<String> validateDatasource(DatasourceConfiguration datasourceConfigur
 
         @Override
         public Mono<DatasourceTestResult> testDatasource(RestClient connection) {
+            String printMessage =
+                    Thread.currentThread().getName() + ": testDatasource() called for ElasticSearch plugin.";
+            System.out.println(printMessage);
             return Mono.fromCallable(() -> {
                 if (connection == null) {
                     return new DatasourceTestResult("Null client object to ElasticSearch.");
@@ -320,6 +334,9 @@ public Mono<DatasourceTestResult> testDatasource(RestClient connection) {
 
         @Override
         public Mono<String> getEndpointIdentifierForRateLimit(DatasourceConfiguration datasourceConfiguration) {
+            String printMessage = Thread.currentThread().getName()
+                    + ": getEndpointIdentifierForRateLimit() called for ElasticSearch plugin.";
+            System.out.println(printMessage);
             List<Endpoint> endpoints = datasourceConfiguration.getEndpoints();
             String identifier = "";
             // When hostname and port both are available, both will be used as identifier
diff --git a/app/server/appsmith-plugins/firestorePlugin/src/main/java/com/external/plugins/FirestorePlugin.java b/app/server/appsmith-plugins/firestorePlugin/src/main/java/com/external/plugins/FirestorePlugin.java
index fe20eb013935..e839027abe98 100644
--- a/app/server/appsmith-plugins/firestorePlugin/src/main/java/com/external/plugins/FirestorePlugin.java
+++ b/app/server/appsmith-plugins/firestorePlugin/src/main/java/com/external/plugins/FirestorePlugin.java
@@ -138,6 +138,9 @@ public Mono<ActionExecutionResult> executeParameterized(
                 DatasourceConfiguration datasourceConfiguration,
                 ActionConfiguration actionConfiguration) {
 
+            String printMessage =
+                    Thread.currentThread().getName() + ": executeParameterized() called for Firestore plugin.";
+            System.out.println(printMessage);
             Object smartSubstitutionObject = actionConfiguration.getFormData().getOrDefault(SMART_SUBSTITUTION, TRUE);
             Boolean smartJsonSubstitution = TRUE;
             if (smartSubstitutionObject instanceof Boolean) {
@@ -244,6 +247,8 @@ public Mono<ActionExecutionResult> executeParameterized(
                         }
 
                         try {
+                            System.out.println(Thread.currentThread().getName()
+                                    + ": objectMapper.readValue invoked from Firestore plugin.");
                             return Mono.just(objectMapper.readValue(strBody, HashMap.class));
                         } catch (IOException e) {
                             return Mono.error(new AppsmithPluginException(
@@ -315,6 +320,8 @@ && isTimestampAndDeleteFieldValuePathEmpty(formData)) {
                     })
                     // Now set the request in the result to be returned to the server
                     .map(result -> {
+                        System.out.println(Thread.currentThread().getName()
+                                + ": setting the request in action execution result from Firestore plugin.");
                         ActionExecutionRequest request = new ActionExecutionRequest();
                         request.setProperties(requestData);
                         request.setQuery(query);
@@ -501,6 +508,9 @@ public Mono<ActionExecutionResult> handleDocumentLevelMethod(
                 Map<String, Object> mapBody,
                 String query,
                 List<RequestParamDTO> requestParams) {
+            String printMessage =
+                    Thread.currentThread().getName() + ": handleDocumentLevelMethod() called for Firestore plugin.";
+            System.out.println(printMessage);
             return Mono.just(method)
                     // Get the actual Java method to be called.
                     .flatMap(method1 -> {
@@ -578,7 +588,6 @@ public Mono<ActionExecutionResult> handleDocumentLevelMethod(
                             return Mono.error(e);
                         }
                         result.setIsExecutionSuccess(true);
-                        log.debug("In the Firestore Plugin, got action execution result");
                         return Mono.just(result);
                     });
         }
@@ -594,7 +603,9 @@ public Mono<ActionExecutionResult> handleCollectionLevelMethod(
                 List<RequestParamDTO> requestParams,
                 Set<String> hintMessages,
                 ActionConfiguration actionConfiguration) {
-
+            String printMessage =
+                    Thread.currentThread().getName() + ": handleCollectionLevelMethod() called for Firestore plugin.";
+            System.out.println(printMessage);
             final CollectionReference collection = connection.collection(path);
 
             if (method == Method.GET_COLLECTION) {
@@ -773,7 +784,6 @@ private Mono<ActionExecutionResult> methodGetCollection(
                             return Mono.error(e);
                         }
                         result.setIsExecutionSuccess(true);
-                        log.debug("In the Firestore Plugin, got action execution result for get collection");
                         return Mono.just(result);
                     });
         }
@@ -824,7 +834,6 @@ private Mono<ActionExecutionResult> methodAddToCollection(
                             return Mono.error(e);
                         }
                         result.setIsExecutionSuccess(true);
-                        log.debug("In the Firestore Plugin, got action execution result for add to collection");
                         return Mono.just(result);
                     });
         }
@@ -892,6 +901,9 @@ private Object resultToMap(Object objResult, boolean isRoot) throws AppsmithPlug
 
         @Override
         public Mono<Firestore> datasourceCreate(DatasourceConfiguration datasourceConfiguration) {
+            String printMessage =
+                    Thread.currentThread().getName() + ": datasourceCreate() called for Firestore plugin.";
+            System.out.println(printMessage);
             final DBAuth authentication = (DBAuth) datasourceConfiguration.getAuthentication();
 
             final Set<String> errors = validateDatasource(datasourceConfiguration);
@@ -907,6 +919,8 @@ public Mono<Firestore> datasourceCreate(DatasourceConfiguration datasourceConfig
             InputStream serviceAccount = new ByteArrayInputStream(clientJson.getBytes());
 
             return Mono.fromSupplier(() -> {
+                        System.out.println(Thread.currentThread().getName()
+                                + ": instantiating googlecredentials object from Firestore plugin.");
                         GoogleCredentials credentials;
                         try {
                             credentials = GoogleCredentials.fromStream(serviceAccount);
@@ -937,12 +951,13 @@ public Mono<Firestore> datasourceCreate(DatasourceConfiguration datasourceConfig
 
         @Override
         public Mono<DatasourceTestResult> testDatasource(DatasourceConfiguration datasourceConfiguration) {
-
+            String printMessage = Thread.currentThread().getName() + ": testDatasource() called for Firestore plugin.";
+            System.out.println(printMessage);
             return datasourceCreate(datasourceConfiguration).flatMap(connection -> {
                 try {
                     connection.listCollections();
                 } catch (FirestoreException e) {
-                    log.debug("Invalid datasource configuration : {}", e.getMessage());
+                    System.out.println("Invalid datasource configuration: " + e.getMessage());
                     if (e.getMessage().contains("Metadata operations require admin authentication")) {
                         DatasourceTestResult datasourceTestResult = new DatasourceTestResult();
                         datasourceTestResult.setMessages(new HashSet<>(
@@ -964,6 +979,9 @@ public void datasourceDestroy(Firestore connection) {
 
         @Override
         public Set<String> validateDatasource(DatasourceConfiguration datasourceConfiguration) {
+            String printMessage =
+                    Thread.currentThread().getName() + ": validateDatasource() called for Firestore plugin.";
+            System.out.println(printMessage);
             final DBAuth authentication = (DBAuth) datasourceConfiguration.getAuthentication();
 
             Set<String> invalids = new HashSet<>();
@@ -991,7 +1009,11 @@ public Set<String> validateDatasource(DatasourceConfiguration datasourceConfigur
         @Override
         public Mono<DatasourceStructure> getStructure(
                 Firestore connection, DatasourceConfiguration datasourceConfiguration) {
+            String printMessage = Thread.currentThread().getName() + ": getStructure() called for Firestore plugin.";
+            System.out.println(printMessage);
             return Mono.fromSupplier(() -> {
+                        System.out.println(Thread.currentThread().getName()
+                                + ": invoking connection.listCollections() from Firestore plugin.");
                         Iterable<CollectionReference> collectionReferences = connection.listCollections();
 
                         List<DatasourceStructure.Table> tables = StreamSupport.stream(
diff --git a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/addToCollection.json b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/addToCollection.json
index 00c1dee01838..c8394db1e544 100644
--- a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/addToCollection.json
+++ b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/addToCollection.json
@@ -1,32 +1,50 @@
 {
+  "controlType": "SECTION_V2",
   "identifier": "ADD_TO_COLLECTION",
-  "controlType": "SECTION",
   "conditionals": {
     "show": "{{actionConfiguration.formData.command.data === 'ADD_TO_COLLECTION'}}"
   },
   "children": [
     {
-      "label": "Collection/Document path",
-      "configProperty": "actionConfiguration.formData.path.data",
-      "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
-      "evaluationSubstitutionType": "TEMPLATE",
-      "isRequired": true,
-      "initialValue": ""
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "identifier": "ADD-TO-COLLECTION-Z1",
+      "children": [
+        {
+          "label": "Collection/Document path",
+          "configProperty": "actionConfiguration.formData.path.data",
+          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+          "evaluationSubstitutionType": "TEMPLATE",
+          "isRequired": true,
+          "initialValue": ""
+        }
+      ]
     },
     {
-      "label": "Body",
-      "configProperty": "actionConfiguration.formData.body.data",
-      "controlType": "QUERY_DYNAMIC_TEXT",
-      "initialValue": "",
-      "placeholderText": "{\n  \"name\": {{nameInput.text}},\n  \"dob\": {{dobPicker.formattedDate}},\n  \"gender\": {{genderSelect.selectedOptionValue}} \n}"
+      "controlType": "SINGLE_COLUMN_ZONE",
+      "identifier": "ADD-TO-COLLECTION-Z2",
+      "children": [
+        {
+          "label": "Body",
+          "configProperty": "actionConfiguration.formData.body.data",
+          "controlType": "QUERY_DYNAMIC_TEXT",
+          "initialValue": "",
+          "placeholderText": "{\n  \"name\": {{nameInput.text}},\n  \"dob\": {{dobPicker.formattedDate}},\n  \"gender\": {{genderSelect.selectedOptionValue}} \n}"
+        }
+      ]
     },
     {
-      "label": "Timestamp Path",
-      "configProperty": "actionConfiguration.formData.timestampValuePath.data",
-      "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
-      "evaluationSubstitutionType": "TEMPLATE",
-      "initialValue": "",
-      "placeholderText": "[ \"checkinLog.timestampKey\" ]"
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "identifier": "ADD-TO-COLLECTION-Z3",
+      "children": [
+        {
+          "label": "Timestamp Path",
+          "configProperty": "actionConfiguration.formData.timestampValuePath.data",
+          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+          "evaluationSubstitutionType": "TEMPLATE",
+          "initialValue": "",
+          "placeholderText": "[ \"checkinLog.timestampKey\" ]"
+        }
+      ]
     }
   ]
 }
diff --git a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/createDocument.json b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/createDocument.json
index 2da8632fd281..18fc12a2f3b5 100644
--- a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/createDocument.json
+++ b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/createDocument.json
@@ -1,32 +1,50 @@
 {
+  "controlType": "SECTION_V2",
   "identifier": "CREATE_DOCUMENT",
-  "controlType": "SECTION",
   "conditionals": {
     "show": "{{actionConfiguration.formData.command.data === 'CREATE_DOCUMENT'}}"
   },
   "children": [
     {
-      "label": "Collection Name",
-      "configProperty": "actionConfiguration.formData.path.data",
-      "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
-      "evaluationSubstitutionType": "TEMPLATE",
-      "isRequired": true,
-      "initialValue": ""
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "identifier": "CREATE-DOCUMENT-Z1",
+      "children": [
+        {
+          "label": "Collection Name",
+          "configProperty": "actionConfiguration.formData.path.data",
+          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+          "evaluationSubstitutionType": "TEMPLATE",
+          "isRequired": true,
+          "initialValue": ""
+        }
+      ]
     },
     {
-      "label": "Body",
-      "configProperty": "actionConfiguration.formData.body.data",
-      "controlType": "QUERY_DYNAMIC_TEXT",
-      "initialValue": "",
-      "placeholderText": "{\n  \"name\": {{nameInput.text}},\n  \"dob\": {{dobPicker.formattedDate}},\n  \"gender\": {{genderSelect.selectedOptionValue}} \n}"
+      "controlType": "SINGLE_COLUMN_ZONE",
+      "identifier": "CREATE-DOCUMENT-Z2",
+      "children": [
+        {
+          "label": "Body",
+          "configProperty": "actionConfiguration.formData.body.data",
+          "controlType": "QUERY_DYNAMIC_TEXT",
+          "initialValue": "",
+          "placeholderText": "{\n  \"name\": {{nameInput.text}},\n  \"dob\": {{dobPicker.formattedDate}},\n  \"gender\": {{genderSelect.selectedOptionValue}} \n}"
+        }
+      ]
     },
     {
-      "label": "Timestamp Path",
-      "configProperty": "actionConfiguration.formData.timestampValuePath.data",
-      "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
-      "evaluationSubstitutionType": "TEMPLATE",
-      "initialValue": "",
-      "placeholderText": "[ \"checkinLog.timestampKey\" ]"
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "identifier": "CREATE-DOCUMENT-Z3",
+      "children": [
+        {
+          "label": "Timestamp Path",
+          "configProperty": "actionConfiguration.formData.timestampValuePath.data",
+          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+          "evaluationSubstitutionType": "TEMPLATE",
+          "initialValue": "",
+          "placeholderText": "[ \"checkinLog.timestampKey\" ]"
+        }
+      ]
     }
   ]
 }
diff --git a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/deleteDocument.json b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/deleteDocument.json
index 651fc4cd2943..5943ec682a37 100644
--- a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/deleteDocument.json
+++ b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/deleteDocument.json
@@ -1,18 +1,24 @@
 {
+  "controlType": "SECTION_V2",
   "identifier": "DELETE_DOCUMENT",
-  "controlType": "SECTION",
   "conditionals": {
     "show": "{{actionConfiguration.formData.command.data === 'DELETE_DOCUMENT'}}"
   },
   "children": [
     {
-      "label": "Collection/Document path",
-      "configProperty": "actionConfiguration.formData.path.data",
-      "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
-      "evaluationSubstitutionType": "TEMPLATE",
-      "isRequired": true,
-      "placeholderText": "collection/{{Table1.selectedRow._ref}}",
-      "initialValue": ""
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "identifier": "DELETE-DOCUMENT-Z1",
+      "children": [
+        {
+          "label": "Collection/Document path",
+          "configProperty": "actionConfiguration.formData.path.data",
+          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+          "evaluationSubstitutionType": "TEMPLATE",
+          "isRequired": true,
+          "placeholderText": "collection/{{Table1.selectedRow._ref}}",
+          "initialValue": ""
+        }
+      ]
     }
   ]
 }
diff --git a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/getCollection.json b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/getCollection.json
index ef11956f380e..b1e5d07b5364 100644
--- a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/getCollection.json
+++ b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/getCollection.json
@@ -1,101 +1,131 @@
 {
+  "controlType": "SECTION_V2",
   "identifier": "GET_COLLECTION",
-  "controlType": "SECTION",
   "conditionals": {
     "show": "{{actionConfiguration.formData.command.data === 'GET_COLLECTION'}}"
   },
   "children": [
     {
-      "label": "Collection Name",
-      "configProperty": "actionConfiguration.formData.path.data",
-      "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
-      "evaluationSubstitutionType": "TEMPLATE",
-      "isRequired": true,
-      "initialValue": ""
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "identifier": "GET-COLLECTION-Z1",
+      "children": [
+        {
+          "label": "Collection Name",
+          "configProperty": "actionConfiguration.formData.path.data",
+          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+          "evaluationSubstitutionType": "TEMPLATE",
+          "isRequired": true,
+          "initialValue": ""
+        }
+      ]
     },
     {
-      "label": "Where",
-      "configProperty": "actionConfiguration.formData.where.data",
-      "nestedLevels": 1,
-      "controlType": "WHERE_CLAUSE",
-      "-subtitle": "Array of Objects",
-      "-tooltipText": "Array of Objects",
-      "-alternateViewTypes": ["json"],
-      "logicalTypes": [
+      "controlType": "SINGLE_COLUMN_ZONE",
+      "identifier": "GET-COLLECTION-Z2",
+      "children": [
         {
-          "label": "AND",
-          "value": "AND"
+          "label": "Where",
+          "configProperty": "actionConfiguration.formData.where.data",
+          "nestedLevels": 1,
+          "controlType": "WHERE_CLAUSE",
+          "-subtitle": "Array of Objects",
+          "-tooltipText": "Array of Objects",
+          "-alternateViewTypes": ["json"],
+          "logicalTypes": [
+            {
+              "label": "AND",
+              "value": "AND"
+            }
+          ],
+          "comparisonTypes": [
+            {
+              "label": "==",
+              "value": "EQ"
+            },
+            {
+              "label": "<",
+              "value": "LT"
+            },
+            {
+              "label": "<=",
+              "value": "LTE"
+            },
+            {
+              "label": ">=",
+              "value": "GTE"
+            },
+            {
+              "label": ">",
+              "value": "GT"
+            },
+            {
+              "label": "in",
+              "value": "IN"
+            },
+            {
+              "label": "Contains",
+              "value": "ARRAY_CONTAINS"
+            },
+            {
+              "label": "Contains Any",
+              "value": "ARRAY_CONTAINS_ANY"
+            }
+          ]
         }
-      ],
-      "comparisonTypes": [
-        {
-          "label": "==",
-          "value": "EQ"
-        },
-        {
-          "label": "<",
-          "value": "LT"
-        },
-        {
-          "label": "<=",
-          "value": "LTE"
-        },
-        {
-          "label": ">=",
-          "value": "GTE"
-        },
-        {
-          "label": ">",
-          "value": "GT"
-        },
+      ]
+    },
+    {
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "identifier": "GET-COLLECTION-Z3",
+      "children": [
         {
-          "label": "in",
-          "value": "IN"
-        },
+          "label": "Order By",
+          "configProperty": "actionConfiguration.formData.orderBy.data",
+          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+          "evaluationSubstitutionType": "TEMPLATE",
+          "isRequired": false,
+          "initialValue": "",
+          "placeholderText": "[\"ascKey\", \"-descKey\"]"
+        }
+      ]
+    },
+    {
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "identifier": "GET-COLLECTION-Z4",
+      "children": [
         {
-          "label": "Contains",
-          "value": "ARRAY_CONTAINS"
+          "label": "Start After",
+          "configProperty": "actionConfiguration.formData.next.data",
+          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+          "evaluationSubstitutionType": "TEMPLATE",
+          "isRequired": false,
+          "initialValue": "",
+          "palceholderText": ""
         },
         {
-          "label": "Contains Any",
-          "value": "ARRAY_CONTAINS_ANY"
+          "label": "End Before",
+          "configProperty": "actionConfiguration.formData.prev.data",
+          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+          "evaluationSubstitutionType": "TEMPLATE",
+          "isRequired": false,
+          "initialValue": ""
         }
       ]
     },
     {
-      "label": "Order By",
-      "configProperty": "actionConfiguration.formData.orderBy.data",
-      "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
-      "evaluationSubstitutionType": "TEMPLATE",
-      "isRequired": false,
-      "initialValue": "",
-      "placeholderText": "[\"ascKey\", \"-descKey\"]"
-    },
-    {
-      "label": "Start After",
-      "configProperty": "actionConfiguration.formData.next.data",
-      "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
-      "evaluationSubstitutionType": "TEMPLATE",
-      "isRequired": false,
-      "initialValue": "",
-      "palceholderText": ""
-    },
-    {
-      "label": "End Before",
-      "configProperty": "actionConfiguration.formData.prev.data",
-      "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
-      "evaluationSubstitutionType": "TEMPLATE",
-      "isRequired": false,
-      "initialValue": ""
-    },
-    {
-      "label": "Limit",
-      "configProperty": "actionConfiguration.formData.limitDocuments.data",
-      "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
-      "evaluationSubstitutionType": "TEMPLATE",
-      "isRequired": false,
-      "palceholderText": "{{Table1.pageSize}}",
-      "initialValue": "10"
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "identifier": "GET-COLLECTION-Z5",
+      "children": [
+        {
+          "label": "Limit",
+          "configProperty": "actionConfiguration.formData.limitDocuments.data",
+          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+          "evaluationSubstitutionType": "TEMPLATE",
+          "isRequired": false,
+          "palceholderText": "{{Table1.pageSize}}",
+          "initialValue": "10"
+        }
+      ]
     }
   ]
 }
diff --git a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/getDocument.json b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/getDocument.json
index 2f1aa00bfc35..8422d805738e 100644
--- a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/getDocument.json
+++ b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/getDocument.json
@@ -1,17 +1,23 @@
 {
+  "controlType": "SECTION_V2",
   "identifier": "GET_DOCUMENT",
-  "controlType": "SECTION",
   "conditionals": {
     "show": "{{actionConfiguration.formData.command.data === 'GET_DOCUMENT'}}"
   },
   "children": [
     {
-      "label": "Collection/Document path",
-      "configProperty": "actionConfiguration.formData.path.data",
-      "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
-      "evaluationSubstitutionType": "TEMPLATE",
-      "isRequired": true,
-      "initialValue": ""
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "identifier": "GET-DOCUMENT-Z1",
+      "children": [
+        {
+          "label": "Collection/Document path",
+          "configProperty": "actionConfiguration.formData.path.data",
+          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+          "evaluationSubstitutionType": "TEMPLATE",
+          "isRequired": true,
+          "initialValue": ""
+        }
+      ]
     }
   ]
 }
diff --git a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/root.json b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/root.json
index e15b769264c8..c0986810e99b 100644
--- a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/root.json
+++ b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/root.json
@@ -1,43 +1,49 @@
 {
   "editor": [
     {
-      "controlType": "SECTION",
+      "controlType": "SECTION_V2",
       "identifier": "SELECTOR",
       "children": [
         {
-          "label": "Command",
-          "description": "Choose method you would like to use",
-          "configProperty": "actionConfiguration.formData.command.data",
-          "controlType": "DROP_DOWN",
-          "initialValue": "GET_COLLECTION",
-          "options": [
+          "controlType": "DOUBLE_COLUMN_ZONE",
+          "identifier": "SELECTOR-Z1",
+          "children": [
             {
-              "label": "List Documents",
-              "value": "GET_COLLECTION"
-            },
-            {
-              "label": "Create document",
-              "value": "CREATE_DOCUMENT"
-            },
-            {
-              "label": "Update document",
-              "value": "UPDATE_DOCUMENT"
-            },
-            {
-              "label": "Delete document",
-              "value": "DELETE_DOCUMENT"
-            },
-            {
-              "label": "Get Document",
-              "value": "GET_DOCUMENT"
-            },
-            {
-              "label": "Upsert Document",
-              "value": "SET_DOCUMENT"
-            },
-            {
-              "label": "Add document to collection",
-              "value": "ADD_TO_COLLECTION"
+              "label": "Command",
+              "description": "Choose method you would like to use",
+              "configProperty": "actionConfiguration.formData.command.data",
+              "controlType": "DROP_DOWN",
+              "initialValue": "GET_COLLECTION",
+              "options": [
+                {
+                  "label": "List Documents",
+                  "value": "GET_COLLECTION"
+                },
+                {
+                  "label": "Create document",
+                  "value": "CREATE_DOCUMENT"
+                },
+                {
+                  "label": "Update document",
+                  "value": "UPDATE_DOCUMENT"
+                },
+                {
+                  "label": "Delete document",
+                  "value": "DELETE_DOCUMENT"
+                },
+                {
+                  "label": "Get Document",
+                  "value": "GET_DOCUMENT"
+                },
+                {
+                  "label": "Upsert Document",
+                  "value": "SET_DOCUMENT"
+                },
+                {
+                  "label": "Add document to collection",
+                  "value": "ADD_TO_COLLECTION"
+                }
+              ]
             }
           ]
         }
diff --git a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/setDocument.json b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/setDocument.json
index a874402b7f94..25dd8b0da1f5 100644
--- a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/setDocument.json
+++ b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/setDocument.json
@@ -1,32 +1,50 @@
 {
+  "controlType": "SECTION_V2",
   "identifier": "SET_DOCUMENT",
-  "controlType": "SECTION",
   "conditionals": {
     "show": "{{actionConfiguration.formData.command.data === 'SET_DOCUMENT'}}"
   },
   "children": [
     {
-      "label": "Collection/Document path",
-      "configProperty": "actionConfiguration.formData.path.data",
-      "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
-      "evaluationSubstitutionType": "TEMPLATE",
-      "isRequired": true,
-      "initialValue": ""
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "identifier": "SET-DOCUMENT-Z1",
+      "children": [
+        {
+          "label": "Collection/Document path",
+          "configProperty": "actionConfiguration.formData.path.data",
+          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+          "evaluationSubstitutionType": "TEMPLATE",
+          "isRequired": true,
+          "initialValue": ""
+        }
+      ]
     },
     {
-      "label": "Body",
-      "configProperty": "actionConfiguration.formData.body.data",
-      "controlType": "QUERY_DYNAMIC_TEXT",
-      "initialValue": "",
-      "placeholderText": "{\n  \"name\": {{nameInput.text}},\n  \"dob\": {{dobPicker.formattedDate}},\n  \"gender\": {{genderSelect.selectedOptionValue}} \n}"
+      "controlType": "SINGLE_COLUMN_ZONE",
+      "identifier": "SET-DOCUMENT-Z2",
+      "children": [
+        {
+          "label": "Body",
+          "configProperty": "actionConfiguration.formData.body.data",
+          "controlType": "QUERY_DYNAMIC_TEXT",
+          "initialValue": "",
+          "placeholderText": "{\n  \"name\": {{nameInput.text}},\n  \"dob\": {{dobPicker.formattedDate}},\n  \"gender\": {{genderSelect.selectedOptionValue}} \n}"
+        }
+      ]
     },
     {
-      "label": "Timestamp Path",
-      "configProperty": "actionConfiguration.formData.timestampValuePath.data",
-      "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
-      "evaluationSubstitutionType": "TEMPLATE",
-      "initialValue": "",
-      "placeholderText": "[ \"checkinLog.timestampKey\" ]"
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "identifier": "SET-DOCUMENT-Z3",
+      "children": [
+        {
+          "label": "Timestamp Path",
+          "configProperty": "actionConfiguration.formData.timestampValuePath.data",
+          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+          "evaluationSubstitutionType": "TEMPLATE",
+          "initialValue": "",
+          "placeholderText": "[ \"checkinLog.timestampKey\" ]"
+        }
+      ]
     }
   ]
 }
diff --git a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/updateDocument.json b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/updateDocument.json
index 6bb8ef57d3af..3cdbda305dc0 100644
--- a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/updateDocument.json
+++ b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/updateDocument.json
@@ -1,41 +1,59 @@
 {
+  "controlType": "SECTION_V2",
   "identifier": "UPDATE_DOCUMENT",
-  "controlType": "SECTION",
   "conditionals": {
     "show": "{{actionConfiguration.formData.command.data === 'UPDATE_DOCUMENT'}}"
   },
   "children": [
     {
-      "label": "Collection/Document path",
-      "configProperty": "actionConfiguration.formData.path.data",
-      "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
-      "evaluationSubstitutionType": "TEMPLATE",
-      "isRequired": true,
-      "initialValue": ""
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "identifier": "UPDATE-DOCUMENT-Z1",
+      "children": [
+        {
+          "label": "Collection/Document path",
+          "configProperty": "actionConfiguration.formData.path.data",
+          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+          "evaluationSubstitutionType": "TEMPLATE",
+          "isRequired": true,
+          "initialValue": ""
+        }
+      ]
     },
     {
-      "label": "Body",
-      "configProperty": "actionConfiguration.formData.body.data",
-      "controlType": "QUERY_DYNAMIC_TEXT",
-      "initialValue": "",
-      "placeholderText": "{\n  \"name\": {{nameInput.text}},\n  \"dob\": {{dobPicker.formattedDate}},\n  \"gender\": {{genderSelect.selectedOptionValue}} \n}"
+      "controlType": "SINGLE_COLUMN_ZONE",
+      "identifier": "UPDATE-DOCUMENT-Z2",
+      "children": [
+        {
+          "label": "Body",
+          "configProperty": "actionConfiguration.formData.body.data",
+          "controlType": "QUERY_DYNAMIC_TEXT",
+          "initialValue": "",
+          "placeholderText": "{\n  \"name\": {{nameInput.text}},\n  \"dob\": {{dobPicker.formattedDate}},\n  \"gender\": {{genderSelect.selectedOptionValue}} \n}"
+        }
+      ]
     },
     {
-      "label": "Delete Key Path",
-      "configProperty": "actionConfiguration.formData.deleteKeyPath.data",
-      "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
-      "evaluationSubstitutionType": "TEMPLATE",
-      "isRequired": true,
-      "initialValue": "",
-      "placeholderText": "[\"userKey.nestedNamekey\"]"
-    },
-    {
-      "label": "Timestamp Path",
-      "configProperty": "actionConfiguration.formData.timestampValuePath.data",
-      "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
-      "evaluationSubstitutionType": "TEMPLATE",
-      "initialValue": "",
-      "placeholderText": "[ \"checkinLog.timestampKey\" ]"
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "identifier": "UPDATE-DOCUMENT-Z3",
+      "children": [
+        {
+          "label": "Delete Key Path",
+          "configProperty": "actionConfiguration.formData.deleteKeyPath.data",
+          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+          "evaluationSubstitutionType": "TEMPLATE",
+          "isRequired": true,
+          "initialValue": "",
+          "placeholderText": "[\"userKey.nestedNamekey\"]"
+        },
+        {
+          "label": "Timestamp Path",
+          "configProperty": "actionConfiguration.formData.timestampValuePath.data",
+          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+          "evaluationSubstitutionType": "TEMPLATE",
+          "initialValue": "",
+          "placeholderText": "[ \"checkinLog.timestampKey\" ]"
+        }
+      ]
     }
   ]
 }
diff --git a/app/server/appsmith-plugins/googleAiPlugin/src/main/java/com/external/plugins/GoogleAiPlugin.java b/app/server/appsmith-plugins/googleAiPlugin/src/main/java/com/external/plugins/GoogleAiPlugin.java
index 534fce99f754..1736acd1b38c 100644
--- a/app/server/appsmith-plugins/googleAiPlugin/src/main/java/com/external/plugins/GoogleAiPlugin.java
+++ b/app/server/appsmith-plugins/googleAiPlugin/src/main/java/com/external/plugins/GoogleAiPlugin.java
@@ -66,6 +66,8 @@ protected GoogleAiPluginExecutor(SharedConfig sharedConfig) {
          */
         @Override
         public Mono<DatasourceTestResult> testDatasource(DatasourceConfiguration datasourceConfiguration) {
+            String printMessage = Thread.currentThread().getName() + ": testDatasource() called for GoogleAI plugin.";
+            System.out.println(printMessage);
             final ApiKeyAuth apiKeyAuth = (ApiKeyAuth) datasourceConfiguration.getAuthentication();
             if (!StringUtils.hasText(apiKeyAuth.getValue())) {
                 return Mono.error(new AppsmithPluginException(
@@ -96,6 +98,9 @@ public Mono<ActionExecutionResult> executeParameterized(
                 ExecuteActionDTO executeActionDTO,
                 DatasourceConfiguration datasourceConfiguration,
                 ActionConfiguration actionConfiguration) {
+            String printMessage =
+                    Thread.currentThread().getName() + ": executeParameterized() called for GoogleAI plugin.";
+            System.out.println(printMessage);
             // Get prompt from action configuration
             List<Map.Entry<String, String>> parameters = new ArrayList<>();
 
@@ -194,11 +199,16 @@ public Mono<ActionExecutionResult> executeParameterized(
         @Override
         public Mono<TriggerResultDTO> trigger(
                 APIConnection connection, DatasourceConfiguration datasourceConfiguration, TriggerRequestDTO request) {
+            String printMessage = Thread.currentThread().getName() + ": trigger() called for GoogleAI plugin.";
+            System.out.println(printMessage);
             return Mono.just(new TriggerResultDTO(getDataToMap(GoogleAIConstants.GOOGLE_AI_MODELS)));
         }
 
         @Override
         public Set<String> validateDatasource(DatasourceConfiguration datasourceConfiguration) {
+            String printMessage =
+                    Thread.currentThread().getName() + ": validateDatasource() called for GoogleAI plugin.";
+            System.out.println(printMessage);
             return RequestUtils.validateApiKeyAuthDatasource(datasourceConfiguration);
         }
 
diff --git a/app/server/appsmith-plugins/googleAiPlugin/src/main/resources/editor/generate.json b/app/server/appsmith-plugins/googleAiPlugin/src/main/resources/editor/generate.json
index 77b91621ed84..666f70412261 100644
--- a/app/server/appsmith-plugins/googleAiPlugin/src/main/resources/editor/generate.json
+++ b/app/server/appsmith-plugins/googleAiPlugin/src/main/resources/editor/generate.json
@@ -1,77 +1,89 @@
 {
+  "controlType": "SECTION_V2",
   "identifier": "CHAT",
-  "controlType": "SECTION",
   "conditionals": {
     "show": "{{actionConfiguration.formData.command.data === 'GENERATE_CONTENT'}}"
   },
   "children": [
     {
-      "label": "Models",
-      "tooltipText": "Select the model for content generation",
-      "subtitle": "ID of the model to use.",
-      "isRequired": true,
-      "propertyName": "generate_content_model_id",
-      "configProperty": "actionConfiguration.formData.generateContentModel.data",
-      "controlType": "DROP_DOWN",
-      "initialValue": "",
-      "options": [],
-      "placeholderText": "All models will be fetched.",
-      "fetchOptionsConditionally": true,
-      "setFirstOptionAsDefault": true,
-      "alternateViewTypes": ["json"],
-      "conditionals": {
-        "enable": "{{true}}",
-        "fetchDynamicValues": {
-          "condition": "{{actionConfiguration.formData.command.data === 'GENERATE_CONTENT'}}",
-          "config": {
-            "params": {
-              "requestType": "GENERATE_CONTENT_MODELS",
-              "displayType": "DROP_DOWN"
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "identifier": "CHAT-Z1",
+      "children": [
+        {
+          "label": "Models",
+          "tooltipText": "Select the model for content generation",
+          "subtitle": "ID of the model to use.",
+          "isRequired": true,
+          "propertyName": "generate_content_model_id",
+          "configProperty": "actionConfiguration.formData.generateContentModel.data",
+          "controlType": "DROP_DOWN",
+          "initialValue": "",
+          "options": [],
+          "placeholderText": "All models will be fetched.",
+          "fetchOptionsConditionally": true,
+          "setFirstOptionAsDefault": true,
+          "alternateViewTypes": ["json"],
+          "conditionals": {
+            "enable": "{{true}}",
+            "fetchDynamicValues": {
+              "condition": "{{actionConfiguration.formData.command.data === 'GENERATE_CONTENT'}}",
+              "config": {
+                "params": {
+                  "requestType": "GENERATE_CONTENT_MODELS",
+                  "displayType": "DROP_DOWN"
+                }
+              }
             }
           }
         }
-      }
+      ]
     },
     {
-      "label": "Messages",
-      "tooltipText": "Ask a question",
-      "subtitle": "A list of messages to generate the content",
-      "propertyName": "messages",
-      "isRequired": true,
-      "configProperty": "actionConfiguration.formData.messages.data",
-      "controlType": "ARRAY_FIELD",
-      "addMoreButtonLabel": "Add message",
-      "alternateViewTypes": ["json"],
-      "schema": [
+      "controlType": "SINGLE_COLUMN_ZONE",
+      "identifier": "CHAT-Z2",
+      "children": [
         {
-          "label": "Role",
-          "key": "role",
-          "controlType": "DROP_DOWN",
-          "initialValue": "user",
-          "options": [
+          "label": "Messages",
+          "tooltipText": "Ask a question",
+          "subtitle": "A list of messages to generate the content",
+          "propertyName": "messages",
+          "isRequired": true,
+          "configProperty": "actionConfiguration.formData.messages.data",
+          "controlType": "ARRAY_FIELD",
+          "addMoreButtonLabel": "Add message",
+          "alternateViewTypes": ["json"],
+          "schema": [
             {
-              "label": "User",
-              "value": "user"
-            }
-          ]
-        },
-        {
-          "label": "Type",
-          "key": "type",
-          "controlType": "DROP_DOWN",
-          "initialValue": "text",
-          "options": [
+              "label": "Role",
+              "key": "role",
+              "controlType": "DROP_DOWN",
+              "initialValue": "user",
+              "options": [
+                {
+                  "label": "User",
+                  "value": "user"
+                }
+              ]
+            },
             {
-              "label": "Text",
-              "value": "text"
+              "label": "Type",
+              "key": "type",
+              "controlType": "DROP_DOWN",
+              "initialValue": "text",
+              "options": [
+                {
+                  "label": "Text",
+                  "value": "text"
+                }
+              ]
+            },
+            {
+              "label": "Content",
+              "key": "content",
+              "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+              "placeholderText": "{{ UserInput.text }}"
             }
           ]
-        },
-        {
-          "label": "Content",
-          "key": "content",
-          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
-          "placeholderText": "{{ UserInput.text }}"
         }
       ]
     }
diff --git a/app/server/appsmith-plugins/googleAiPlugin/src/main/resources/editor/root.json b/app/server/appsmith-plugins/googleAiPlugin/src/main/resources/editor/root.json
index 63734eca3b2c..420679b5eb69 100644
--- a/app/server/appsmith-plugins/googleAiPlugin/src/main/resources/editor/root.json
+++ b/app/server/appsmith-plugins/googleAiPlugin/src/main/resources/editor/root.json
@@ -1,20 +1,26 @@
 {
   "editor": [
     {
-      "controlType": "SECTION",
+      "controlType": "SECTION_V2",
       "identifier": "SELECTOR",
       "children": [
         {
-          "label": "Command",
-          "description": "Choose the method you would like to use",
-          "configProperty": "actionConfiguration.formData.command.data",
-          "controlType": "DROP_DOWN",
-          "isRequired": true,
-          "initialValue": "GENERATE_CONTENT",
-          "options": [
+          "controlType": "DOUBLE_COLUMN_ZONE",
+          "identifier": "SELECTOR-Z1",
+          "children": [
             {
-              "label": "Generate Content",
-              "value": "GENERATE_CONTENT"
+              "label": "Command",
+              "description": "Choose the method you would like to use",
+              "configProperty": "actionConfiguration.formData.command.data",
+              "controlType": "DROP_DOWN",
+              "isRequired": true,
+              "initialValue": "GENERATE_CONTENT",
+              "options": [
+                {
+                  "label": "Generate Content",
+                  "value": "GENERATE_CONTENT"
+                }
+              ]
             }
           ]
         }
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 5f6cd38dec88..95bc2d4c4325 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
@@ -82,6 +82,9 @@ public Mono<ActionExecutionResult> executeParameterized(
                 DatasourceConfiguration datasourceConfiguration,
                 ActionConfiguration actionConfiguration) {
 
+            String printMessage =
+                    Thread.currentThread().getName() + ": executeParameterized() called for GoogleSheets plugin.";
+            System.out.println(printMessage);
             boolean smartJsonSubstitution;
             final Map<String, Object> formData = actionConfiguration.getFormData();
             List<Map.Entry<String, String>> parameters = new ArrayList<>();
@@ -140,6 +143,9 @@ public Mono<ActionExecutionResult> executeCommon(
                 DatasourceConfiguration datasourceConfiguration,
                 ActionConfiguration actionConfiguration) {
 
+            String printMessage =
+                    Thread.currentThread().getName() + ": executeCommon() called for GoogleSheets plugin.";
+            System.out.println(printMessage);
             // Initializing object for error condition
             ActionExecutionResult errorResult = new ActionExecutionResult();
             errorResult.setStatusCode(GSheetsPluginError.QUERY_EXECUTION_FAILED.getAppErrorCode());
@@ -249,7 +255,8 @@ public Mono<ActionExecutionResult> executeCommon(
                                 })
                                 .onErrorResume(e -> {
                                     errorResult.setBody(Exceptions.unwrap(e).getMessage());
-                                    log.debug("Received error on Google Sheets action execution", e);
+                                    System.out.println("Received error on Google Sheets action execution");
+                                    e.printStackTrace();
                                     if (!(e instanceof AppsmithPluginException)) {
                                         e = new AppsmithPluginException(
                                                 GSheetsPluginError.QUERY_EXECUTION_FAILED,
@@ -317,6 +324,8 @@ public Object substituteValueInInput(
         @Override
         public Mono<TriggerResultDTO> trigger(
                 Void connection, DatasourceConfiguration datasourceConfiguration, TriggerRequestDTO request) {
+            String printMessage = Thread.currentThread().getName() + ": trigger() called for GoogleSheets plugin.";
+            System.out.println(printMessage);
             final TriggerMethod triggerMethod = GoogleSheetsMethodStrategy.getTriggerMethod(request, objectMapper);
             MethodConfig methodConfig = new MethodConfig(request);
 
@@ -387,6 +396,9 @@ public void updateCrudTemplateFormData(
                 Map<String, Object> formData,
                 Map<String, String> mappedColumns,
                 Map<String, String> pluginSpecificTemplateParams) {
+            String printMessage =
+                    Thread.currentThread().getName() + ": updateCrudTemplateFormData() called for GoogleSheets plugin.";
+            System.out.println(printMessage);
             pluginSpecificTemplateParams.forEach((k, v) -> {
                 if (formData.containsKey(k)) {
                     setDataValueSafelyInFormData(formData, k, v);
@@ -400,6 +412,9 @@ public void updateCrudTemplateFormData(
 
         @Override
         public Mono<DatasourceConfiguration> getDatasourceMetadata(DatasourceConfiguration datasourceConfiguration) {
+            String printMessage =
+                    Thread.currentThread().getName() + ": getDatasourceMetadata() called for GoogleSheets plugin.";
+            System.out.println(printMessage);
             return GetDatasourceMetadataMethod.getDatasourceMetadata(datasourceConfiguration);
         }
     }
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 66447b9f563a..25774c83cf29 100644
--- a/app/server/appsmith-plugins/googleSheetsPlugin/src/main/resources/form.json
+++ b/app/server/appsmith-plugins/googleSheetsPlugin/src/main/resources/form.json
@@ -38,18 +38,6 @@
             {
               "label": "Read / Write / Delete | Selected google sheets",
               "value": "https://www.googleapis.com/auth/drive.file"
-            },
-            {
-              "label": "Read / Write / Delete | All google sheets",
-              "value": "https://www.googleapis.com/auth/spreadsheets,https://www.googleapis.com/auth/drive"
-            },
-            {
-              "label": "Read / Write | All google sheets",
-              "value": "https://www.googleapis.com/auth/spreadsheets,https://www.googleapis.com/auth/drive.readonly"
-            },
-            {
-              "label": "Read | All google sheets",
-              "value": "https://www.googleapis.com/auth/spreadsheets.readonly,https://www.googleapis.com/auth/drive.readonly"
             }
           ],
           "initialValue": "https://www.googleapis.com/auth/spreadsheets,https://www.googleapis.com/auth/drive",
diff --git a/app/server/appsmith-plugins/graphqlPlugin/src/main/java/com/external/plugins/GraphQLPlugin.java b/app/server/appsmith-plugins/graphqlPlugin/src/main/java/com/external/plugins/GraphQLPlugin.java
index 14b61d10a76f..68c057bfa3c8 100644
--- a/app/server/appsmith-plugins/graphqlPlugin/src/main/java/com/external/plugins/GraphQLPlugin.java
+++ b/app/server/appsmith-plugins/graphqlPlugin/src/main/java/com/external/plugins/GraphQLPlugin.java
@@ -85,6 +85,9 @@ public Mono<ActionExecutionResult> executeParameterized(
                 DatasourceConfiguration datasourceConfiguration,
                 ActionConfiguration actionConfiguration) {
 
+            String printMessage =
+                    Thread.currentThread().getName() + ": executeParameterized() called for GraphQL plugin.";
+            System.out.println(printMessage);
             final List<Property> properties = actionConfiguration.getPluginSpecifiedTemplates();
             List<Map.Entry<String, String>> parameters = new ArrayList<>();
 
@@ -161,6 +164,8 @@ public Mono<ActionExecutionResult> executeCommon(
                 ActionConfiguration actionConfiguration,
                 List<Map.Entry<String, String>> insertedParams) {
 
+            String printMessage = Thread.currentThread().getName() + ": executeCommon() called for GraphQL plugin.";
+            System.out.println(printMessage);
             // Initializing object for error condition
             ActionExecutionResult errorResult = new ActionExecutionResult();
             initUtils.initializeResponseWithError(errorResult);
diff --git a/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/MongoPlugin.java b/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/MongoPlugin.java
index 8d451d2ca959..f097f99bd7d0 100644
--- a/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/MongoPlugin.java
+++ b/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/MongoPlugin.java
@@ -12,6 +12,7 @@
 import com.appsmith.external.helpers.DataTypeStringUtils;
 import com.appsmith.external.helpers.MustacheHelper;
 import com.appsmith.external.helpers.PluginUtils;
+import com.appsmith.external.helpers.Stopwatch;
 import com.appsmith.external.models.ActionConfiguration;
 import com.appsmith.external.models.ActionExecutionRequest;
 import com.appsmith.external.models.ActionExecutionResult;
@@ -243,6 +244,9 @@ public Mono<ActionExecutionResult> executeParameterized(
                 DatasourceConfiguration datasourceConfiguration,
                 ActionConfiguration actionConfiguration) {
 
+            String printMessage =
+                    Thread.currentThread().getName() + ": executeParameterized() called for Mongo plugin.";
+            System.out.println(printMessage);
             final Map<String, Object> formData = actionConfiguration.getFormData();
             List<Map.Entry<String, String>> parameters = new ArrayList<>();
 
@@ -304,8 +308,10 @@ public Mono<ActionExecutionResult> executeCommon(
                 ActionConfiguration actionConfiguration,
                 List<Map.Entry<String, String>> parameters) {
 
+            String printMessage = Thread.currentThread().getName() + ": executeCommon() called for Mongo plugin.";
+            System.out.println(printMessage);
             if (mongoClient == null) {
-                log.info("Encountered null connection in MongoDB plugin. Reporting back.");
+                System.out.println("Encountered null connection in MongoDB plugin. Reporting back.");
                 throw new StaleConnectionException(MONGO_CLIENT_NULL_ERROR_MSG);
             }
             Mono<Document> mongoOutputMono;
@@ -313,6 +319,7 @@ public Mono<ActionExecutionResult> executeCommon(
             String query;
             List<RequestParamDTO> requestParams;
             try {
+                System.out.println(Thread.currentThread().getName() + ": mongoClient.getDatabase from Mongo plugin.");
                 MongoDatabase database = mongoClient.getDatabase(getDatabaseName(datasourceConfiguration));
 
                 final Map<String, Object> formData = actionConfiguration.getFormData();
@@ -379,9 +386,14 @@ public Mono<ActionExecutionResult> executeCommon(
                                  `new` field in the command. Let's return that value to the user.
                                 */
                                 if (outputJson.has(VALUE)) {
+                                    System.out.println(Thread.currentThread().getName()
+                                            + ": objectMapper.readTree.VALUE from Mongo plugin.");
+                                    Stopwatch processStopwatch =
+                                            new Stopwatch("Mongo Plugin objectMapper readTree.VALUE");
                                     result.setBody(objectMapper.readTree(
                                             cleanUp(new JSONObject().put(VALUE, outputJson.get(VALUE)))
                                                     .toString()));
+                                    processStopwatch.stopAndLogTimeInMillisWithSysOut();
                                 }
 
                                 /*
@@ -389,9 +401,14 @@ public Mono<ActionExecutionResult> executeCommon(
                                  results. In case there are no results for find, this key is not present in the result json.
                                 */
                                 if (outputJson.has("cursor")) {
+                                    System.out.println(Thread.currentThread().getName()
+                                            + ": objectMapper.readTree.CURSOR from Mongo plugin.");
+                                    Stopwatch processStopwatch =
+                                            new Stopwatch("Mongo Plugin objectMapper readTree.CURSOR");
                                     JSONArray outputResult = (JSONArray) cleanUp(
                                             outputJson.getJSONObject("cursor").getJSONArray("firstBatch"));
                                     result.setBody(objectMapper.readTree(outputResult.toString()));
+                                    processStopwatch.stopAndLogTimeInMillisWithSysOut();
                                 }
 
                                 /*
@@ -400,8 +417,12 @@ public Mono<ActionExecutionResult> executeCommon(
                                  number of documents inserted.
                                 */
                                 if (outputJson.has("n")) {
+                                    System.out.println(Thread.currentThread().getName()
+                                            + ": objectMapper.readTree.N from Mongo plugin.");
+                                    Stopwatch processStopwatch = new Stopwatch("Mongo Plugin objectMapper readTree.N");
                                     JSONObject body = new JSONObject().put("n", outputJson.getBigInteger("n"));
                                     result.setBody(objectMapper.readTree(body.toString()));
+                                    processStopwatch.stopAndLogTimeInMillisWithSysOut();
                                     headerArray.put(body);
                                 }
 
@@ -410,9 +431,14 @@ public Mono<ActionExecutionResult> executeCommon(
                                  documents updated.
                                 */
                                 if (outputJson.has(N_MODIFIED)) {
+                                    System.out.println(Thread.currentThread().getName()
+                                            + ": objectMapper.readTree.N_MODIFIED from Mongo plugin.");
+                                    Stopwatch processStopwatch =
+                                            new Stopwatch("Mongo Plugin objectMapper readTree.N_MODIFIED");
                                     JSONObject body =
                                             new JSONObject().put(N_MODIFIED, outputJson.getBigInteger(N_MODIFIED));
                                     result.setBody(objectMapper.readTree(body.toString()));
+                                    processStopwatch.stopAndLogTimeInMillisWithSysOut();
                                     headerArray.put(body);
                                 }
 
@@ -422,14 +448,25 @@ public Mono<ActionExecutionResult> executeCommon(
                                 if (outputJson.has(VALUES)) {
                                     JSONArray outputResult = (JSONArray) cleanUp(outputJson.getJSONArray(VALUES));
 
+                                    System.out.println(Thread.currentThread().getName()
+                                            + ": objectMapper.createObjectNode from Mongo plugin.");
+                                    Stopwatch processStopwatch =
+                                            new Stopwatch("Mongo Plugin objectMapper createObjectNode");
                                     ObjectNode resultNode = objectMapper.createObjectNode();
+                                    processStopwatch.stopAndLogTimeInMillisWithSysOut();
 
                                     // Create a JSON structure with the results stored with a key to abide by the
                                     // Server-Client contract of only sending array of objects in result.
+                                    Stopwatch processStopwatch1 =
+                                            new Stopwatch("Mongo Plugin objectMapper readTree outputResult");
                                     resultNode.putArray(VALUES).addAll((ArrayNode)
                                             objectMapper.readTree(outputResult.toString()));
+                                    processStopwatch1.stopAndLogTimeInMillisWithSysOut();
 
+                                    Stopwatch processStopwatch2 =
+                                            new Stopwatch("Mongo Plugin objectMapper readTree resultNode");
                                     result.setBody(objectMapper.readTree(resultNode.toString()));
+                                    processStopwatch2.stopAndLogTimeInMillisWithSysOut();
                                 }
 
                                 /*
@@ -440,7 +477,11 @@ public Mono<ActionExecutionResult> executeCommon(
 
                             JSONObject statusJson = new JSONObject().put("ok", status);
                             headerArray.put(statusJson);
+                            System.out.println(
+                                    Thread.currentThread().getName() + ": objectMapper readTree for Mongo plugin.");
+                            Stopwatch processStopwatch = new Stopwatch("Mongo Plugin objectMapper readTree");
                             result.setHeaders(objectMapper.readTree(headerArray.toString()));
+                            processStopwatch.stopAndLogTimeInMillisWithSysOut();
                         } catch (JsonProcessingException e) {
                             return Mono.error(new AppsmithPluginException(
                                     MongoPluginError.QUERY_EXECUTION_FAILED,
@@ -452,7 +493,8 @@ public Mono<ActionExecutionResult> executeCommon(
                     })
                     .onErrorResume(error -> {
                         if (error instanceof StaleConnectionException) {
-                            log.debug("The mongo connection seems to have been invalidated or doesn't exist anymore");
+                            System.out.println(
+                                    "The mongo connection seems to have been invalidated or doesn't exist anymore");
                             return Mono.error(error);
                         } else if (!(error instanceof AppsmithPluginException)) {
                             error = new AppsmithPluginException(
@@ -467,6 +509,8 @@ public Mono<ActionExecutionResult> executeCommon(
                     })
                     // Now set the request in the result to be returned to the server
                     .map(actionExecutionResult -> {
+                        System.out.println(Thread.currentThread().getName()
+                                + ": building actionExecutionResult from Mongo plugin.");
                         ActionExecutionRequest request = new ActionExecutionRequest();
                         request.setQuery(query);
                         if (!parameters.isEmpty()) {
@@ -494,6 +538,8 @@ public Mono<ActionExecutionResult> executeCommon(
          */
         @Override
         public String sanitizeReplacement(String replacementValue, DataType dataType) {
+            String printMessage = Thread.currentThread().getName() + ": sanitizeReplacement() called for Mongo plugin.";
+            System.out.println(printMessage);
             replacementValue = removeOrAddQuotesAroundMongoDBSpecialTypes(replacementValue);
 
             if (DataType.BSON_SPECIAL_DATA_TYPES.equals(dataType)) {
@@ -521,6 +567,10 @@ For all other data types the replacementValue is prepared for replacement (by us
          */
         @Override
         public ActionConfiguration getSchemaPreviewActionConfig(Template queryTemplate, Boolean isMock) {
+
+            String printMessage =
+                    Thread.currentThread().getName() + ": getSchemaPreviewActionConfig() called for Mongo plugin.";
+            System.out.println(printMessage);
             // For mongo, currently this experiment will only exist for mock DB movies
             // Later on we can extend it for all mongo datasources
             if (isMock) {
@@ -581,7 +631,12 @@ private String removeOrAddQuotesAroundMongoDBSpecialTypes(String query) {
                         try {
                             argWithoutQuotes = matcher.group(4);
                             if (specialType.isQuotesRequiredAroundParameter()) {
+                                System.out.println(Thread.currentThread().getName()
+                                        + ": objectMapper writeValueAsString for Mongo plugin.");
+                                Stopwatch processStopwatch =
+                                        new Stopwatch("Mongo Plugin objectMapper writeValueAsString");
                                 argWithoutQuotes = objectMapper.writeValueAsString(argWithoutQuotes);
+                                processStopwatch.stopAndLogTimeInMillisWithSysOut();
                             }
                         } catch (JsonProcessingException e) {
                             throw new AppsmithPluginException(
@@ -703,9 +758,12 @@ public Mono<MongoClient> datasourceCreate(DatasourceConfiguration datasourceConf
               a user that doesn't have write permissions on the database.
               Ref: https://api.mongodb.com/java/2.13/com/mongodb/DB.html#setReadOnly-java.lang.Boolean-
             */
-
+            String printMessage = Thread.currentThread().getName() + ": datasourceCreate() called for Mongo plugin.";
+            System.out.println(printMessage);
             return Mono.just(datasourceConfiguration)
                     .flatMap(dsConfig -> {
+                        System.out.println(
+                                Thread.currentThread().getName() + ": buildClientURI called from Mongo plugin.");
                         try {
                             return Mono.just(buildClientURI(dsConfig));
                         } catch (AppsmithPluginException e) {
@@ -745,6 +803,8 @@ public void datasourceDestroy(MongoClient mongoClient) {
 
         @Override
         public Set<String> validateDatasource(DatasourceConfiguration datasourceConfiguration) {
+            String printMessage = Thread.currentThread().getName() + ": validateDatasource() called for Mongo plugin.";
+            System.out.println(printMessage);
             Set<String> invalids = new HashSet<>();
             List<Property> properties = datasourceConfiguration.getProperties();
             DBAuth authentication = (DBAuth) datasourceConfiguration.getAuthentication();
@@ -833,6 +893,8 @@ public Set<String> validateDatasource(DatasourceConfiguration datasourceConfigur
         @Override
         public Mono<DatasourceTestResult> testDatasource(DatasourceConfiguration datasourceConfiguration) {
 
+            String printMessage = Thread.currentThread().getName() + ": testDatasource() called for Mongo plugin.";
+            System.out.println(printMessage);
             Function<TimeoutException, Throwable> timeoutExceptionThrowableFunction =
                     error -> new AppsmithPluginException(
                             AppsmithPluginError.PLUGIN_DATASOURCE_TIMEOUT_ERROR,
@@ -840,6 +902,8 @@ public Mono<DatasourceTestResult> testDatasource(DatasourceConfiguration datasou
 
             return datasourceCreate(datasourceConfiguration)
                     .flatMap(mongoClient -> {
+                        System.out.println(
+                                Thread.currentThread().getName() + ":Finding list of databases for Mongo plugin.");
                         final Publisher<String> result = mongoClient.listDatabaseNames();
                         final Mono<List<String>> documentMono =
                                 Flux.from(result).collectList().cache();
@@ -899,6 +963,8 @@ public Mono<DatasourceTestResult> testDatasource(DatasourceConfiguration datasou
         @Override
         public Mono<DatasourceStructure> getStructure(
                 MongoClient mongoClient, DatasourceConfiguration datasourceConfiguration, Boolean isMock) {
+            String printMessage = Thread.currentThread().getName() + ": getStructure() called for Mongo plugin.";
+            System.out.println(printMessage);
             final DatasourceStructure structure = new DatasourceStructure();
             List<DatasourceStructure.Table> tables = new ArrayList<>();
             structure.setTables(tables);
@@ -1030,6 +1096,9 @@ public Mono<ActionExecutionResult> execute(
          */
         @Override
         public void extractAndSetNativeQueryFromFormData(ActionConfiguration actionConfiguration) {
+            String printMessage = Thread.currentThread().getName()
+                    + ": extractAndSetNativeQueryFromFormData() called for Mongo plugin.";
+            System.out.println(printMessage);
             Map<String, Object> formData = actionConfiguration.getFormData();
             if (formData != null && !formData.isEmpty()) {
                 /* If it is not raw command, then it must be one of the mongo form commands */
diff --git a/app/server/appsmith-plugins/mongoPlugin/src/main/resources/editor/aggregate.json b/app/server/appsmith-plugins/mongoPlugin/src/main/resources/editor/aggregate.json
index 323f7f760c4b..1241370d274f 100644
--- a/app/server/appsmith-plugins/mongoPlugin/src/main/resources/editor/aggregate.json
+++ b/app/server/appsmith-plugins/mongoPlugin/src/main/resources/editor/aggregate.json
@@ -1,13 +1,13 @@
 {
+  "controlType": "SECTION_V2",
   "identifier": "AGGREGATE",
-  "controlType": "SECTION",
   "conditionals": {
     "show": "{{actionConfiguration.formData.command.data === 'AGGREGATE'}}"
   },
   "children": [
     {
-      "controlType": "SECTION",
-      "label": "Select collection to query",
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "identifier": "AGGREGATE-Z1",
       "children": [
         {
           "label": "Collection",
@@ -32,9 +32,8 @@
       ]
     },
     {
-      "controlType": "SECTION",
-      "label": "Query",
-      "description": "Optional",
+      "controlType": "SINGLE_COLUMN_ZONE",
+      "identifier": "AGGREGATE-Z2",
       "children": [
         {
           "label": "Array of pipelines",
@@ -47,11 +46,17 @@
       ]
     },
     {
-      "label": "Limit",
-      "configProperty": "actionConfiguration.formData.aggregate.limit.data",
-      "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
-      "evaluationSubstitutionType": "TEMPLATE",
-      "initialValue": "10"
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "identifier": "AGGREGATE-Z3",
+      "children": [
+        {
+          "label": "Limit",
+          "configProperty": "actionConfiguration.formData.aggregate.limit.data",
+          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+          "evaluationSubstitutionType": "TEMPLATE",
+          "initialValue": "10"
+        }
+      ]
     }
   ]
 }
diff --git a/app/server/appsmith-plugins/mongoPlugin/src/main/resources/editor/count.json b/app/server/appsmith-plugins/mongoPlugin/src/main/resources/editor/count.json
index 70a9ddc79895..e8848d8ca2e5 100644
--- a/app/server/appsmith-plugins/mongoPlugin/src/main/resources/editor/count.json
+++ b/app/server/appsmith-plugins/mongoPlugin/src/main/resources/editor/count.json
@@ -1,13 +1,13 @@
 {
+  "controlType": "SECTION_V2",
   "identifier": "COUNT",
-  "controlType": "SECTION",
   "conditionals": {
     "show": "{{actionConfiguration.formData.command.data === 'COUNT'}}"
   },
   "children": [
     {
-      "controlType": "SECTION",
-      "label": "Select collection to query",
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "identifier": "COUNT-Z1",
       "children": [
         {
           "label": "Collection",
@@ -32,9 +32,8 @@
       ]
     },
     {
-      "controlType": "SECTION",
-      "label": "Query",
-      "description": "Optional",
+      "controlType": "SINGLE_COLUMN_ZONE",
+      "identifier": "COUNT-Z2",
       "children": [
         {
           "label": "Query",
diff --git a/app/server/appsmith-plugins/mongoPlugin/src/main/resources/editor/delete.json b/app/server/appsmith-plugins/mongoPlugin/src/main/resources/editor/delete.json
index d5fce44dbbe1..8a3ada65124e 100644
--- a/app/server/appsmith-plugins/mongoPlugin/src/main/resources/editor/delete.json
+++ b/app/server/appsmith-plugins/mongoPlugin/src/main/resources/editor/delete.json
@@ -1,13 +1,13 @@
 {
+  "controlType": "SECTION_V2",
   "identifier": "DELETE",
-  "controlType": "SECTION",
   "conditionals": {
     "show": "{{actionConfiguration.formData.command.data === 'DELETE'}}"
   },
   "children": [
     {
-      "controlType": "SECTION",
-      "label": "Select collection to query",
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "identifier": "DELETE-Z1",
       "children": [
         {
           "label": "Collection",
@@ -32,9 +32,8 @@
       ]
     },
     {
-      "controlType": "SECTION",
-      "label": "Query",
-      "description": "Optional",
+      "controlType": "SINGLE_COLUMN_ZONE",
+      "identifier": "DELETE-Z2",
       "children": [
         {
           "label": "Query",
@@ -43,7 +42,13 @@
           "inputType": "JSON",
           "evaluationSubstitutionType": "TEMPLATE",
           "placeholderText": "{rating : {$gte : 9}}"
-        },
+        }
+      ]
+    },
+    {
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "identifier": "DELETE-Z3",
+      "children": [
         {
           "label": "Limit",
           "configProperty": "actionConfiguration.formData.delete.limit.data",
diff --git a/app/server/appsmith-plugins/mongoPlugin/src/main/resources/editor/distinct.json b/app/server/appsmith-plugins/mongoPlugin/src/main/resources/editor/distinct.json
index ab4bfc4fb0d0..240c8edff7a7 100644
--- a/app/server/appsmith-plugins/mongoPlugin/src/main/resources/editor/distinct.json
+++ b/app/server/appsmith-plugins/mongoPlugin/src/main/resources/editor/distinct.json
@@ -1,13 +1,13 @@
 {
+  "controlType": "SECTION_V2",
   "identifier": "DISTINCT",
-  "controlType": "SECTION",
   "conditionals": {
     "show": "{{actionConfiguration.formData.command.data === 'DISTINCT'}}"
   },
   "children": [
     {
-      "controlType": "SECTION",
-      "label": "Select collection to query",
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "identifier": "DISTINCT-Z1",
       "children": [
         {
           "label": "Collection",
@@ -32,9 +32,8 @@
       ]
     },
     {
-      "controlType": "SECTION",
-      "label": "Query",
-      "description": "Optional",
+      "controlType": "SINGLE_COLUMN_ZONE",
+      "identifier": "DISTINCT-Z2",
       "children": [
         {
           "label": "Query",
@@ -43,7 +42,13 @@
           "inputType": "JSON",
           "evaluationSubstitutionType": "TEMPLATE",
           "placeholderText": "{rating : {$gte : 9}}"
-        },
+        }
+      ]
+    },
+    {
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "identifier": "DISTINCT-Z3",
+      "children": [
         {
           "label": "Key",
           "configProperty": "actionConfiguration.formData.distinct.key.data",
diff --git a/app/server/appsmith-plugins/mongoPlugin/src/main/resources/editor/find.json b/app/server/appsmith-plugins/mongoPlugin/src/main/resources/editor/find.json
index 741a77885283..3dfec0d2c602 100644
--- a/app/server/appsmith-plugins/mongoPlugin/src/main/resources/editor/find.json
+++ b/app/server/appsmith-plugins/mongoPlugin/src/main/resources/editor/find.json
@@ -1,13 +1,13 @@
 {
+  "controlType": "SECTION_V2",
   "identifier": "FIND",
-  "controlType": "SECTION",
   "conditionals": {
     "show": "{{actionConfiguration.formData.command.data === 'FIND'}}"
   },
   "children": [
     {
-      "controlType": "SECTION",
-      "label": "Select collection to query",
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "identifier": "FIND-Z1",
       "children": [
         {
           "label": "Collection",
@@ -32,9 +32,8 @@
       ]
     },
     {
-      "controlType": "SECTION",
-      "label": "Query",
-      "description": "Optional",
+      "controlType": "SINGLE_COLUMN_ZONE",
+      "identifier": "FIND-Z2",
       "children": [
         {
           "label": "Query",
@@ -42,7 +41,13 @@
           "controlType": "QUERY_DYNAMIC_TEXT",
           "evaluationSubstitutionType": "TEMPLATE",
           "placeholderText": "{rating : {$gte : 9}}"
-        },
+        }
+      ]
+    },
+    {
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "identifier": "FIND-Z3",
+      "children": [
         {
           "label": "Sort",
           "configProperty": "actionConfiguration.formData.find.sort.data",
@@ -58,7 +63,13 @@
           "inputType": "JSON",
           "evaluationSubstitutionType": "TEMPLATE",
           "placeholderText": "{name : 1}"
-        },
+        }
+      ]
+    },
+    {
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "identifier": "FIND-Z4",
+      "children": [
         {
           "label": "Limit",
           "configProperty": "actionConfiguration.formData.find.limit.data",
diff --git a/app/server/appsmith-plugins/mongoPlugin/src/main/resources/editor/insert.json b/app/server/appsmith-plugins/mongoPlugin/src/main/resources/editor/insert.json
index e70f7f903bc9..488553124586 100644
--- a/app/server/appsmith-plugins/mongoPlugin/src/main/resources/editor/insert.json
+++ b/app/server/appsmith-plugins/mongoPlugin/src/main/resources/editor/insert.json
@@ -1,13 +1,13 @@
 {
+  "controlType": "SECTION_V2",
   "identifier": "INSERT",
-  "controlType": "SECTION",
   "conditionals": {
     "show": "{{actionConfiguration.formData.command.data === 'INSERT'}}"
   },
   "children": [
     {
-      "controlType": "SECTION",
-      "label": "Select collection to query",
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "identifier": "INSERT-Z1",
       "children": [
         {
           "label": "Collection",
@@ -32,9 +32,8 @@
       ]
     },
     {
-      "controlType": "SECTION",
-      "label": "Query",
-      "description": "Optional",
+      "controlType": "SINGLE_COLUMN_ZONE",
+      "identifier": "INSERT-Z2",
       "children": [
         {
           "label": "Documents",
diff --git a/app/server/appsmith-plugins/mongoPlugin/src/main/resources/editor/raw.json b/app/server/appsmith-plugins/mongoPlugin/src/main/resources/editor/raw.json
index 6829311c3817..609dd4b991ef 100644
--- a/app/server/appsmith-plugins/mongoPlugin/src/main/resources/editor/raw.json
+++ b/app/server/appsmith-plugins/mongoPlugin/src/main/resources/editor/raw.json
@@ -1,14 +1,13 @@
 {
+  "controlType": "SECTION_V2",
   "identifier": "RAW",
-  "controlType": "SECTION",
   "conditionals": {
     "show": "{{actionConfiguration.formData.command.data === 'RAW'}}"
   },
   "children": [
     {
-      "controlType": "SECTION",
-      "label": "Query",
-      "description": "Optional",
+      "controlType": "SINGLE_COLUMN_ZONE",
+      "identifier": "RAW-Z1",
       "children": [
         {
           "label": "",
diff --git a/app/server/appsmith-plugins/mongoPlugin/src/main/resources/editor/root.json b/app/server/appsmith-plugins/mongoPlugin/src/main/resources/editor/root.json
index 7d1c79dc8ef9..2f7f7b68b407 100644
--- a/app/server/appsmith-plugins/mongoPlugin/src/main/resources/editor/root.json
+++ b/app/server/appsmith-plugins/mongoPlugin/src/main/resources/editor/root.json
@@ -1,47 +1,53 @@
 {
   "editor": [
     {
-      "controlType": "SECTION",
+      "controlType": "SECTION_V2",
       "identifier": "SELECTOR",
       "children": [
         {
-          "label": "Command",
-          "description": "Choose method you would like to use to query the database",
-          "configProperty": "actionConfiguration.formData.command.data",
-          "controlType": "DROP_DOWN",
-          "initialValue": "FIND",
-          "options": [
+          "controlType": "DOUBLE_COLUMN_ZONE",
+          "identifier": "SELECTOR-Z1",
+          "children": [
             {
-              "label": "Find document(s)",
-              "value": "FIND"
-            },
-            {
-              "label": "Insert document(s)",
-              "value": "INSERT"
-            },
-            {
-              "label": "Update document(s)",
-              "value": "UPDATE"
-            },
-            {
-              "label": "Delete document(s)",
-              "value": "DELETE"
-            },
-            {
-              "label": "Count",
-              "value": "COUNT"
-            },
-            {
-              "label": "Distinct",
-              "value": "DISTINCT"
-            },
-            {
-              "label": "Aggregate",
-              "value": "AGGREGATE"
-            },
-            {
-              "label": "Raw",
-              "value": "RAW"
+              "label": "Command",
+              "description": "Choose method you would like to use to query the database",
+              "configProperty": "actionConfiguration.formData.command.data",
+              "controlType": "DROP_DOWN",
+              "initialValue": "FIND",
+              "options": [
+                {
+                  "label": "Find document(s)",
+                  "value": "FIND"
+                },
+                {
+                  "label": "Insert document(s)",
+                  "value": "INSERT"
+                },
+                {
+                  "label": "Update document(s)",
+                  "value": "UPDATE"
+                },
+                {
+                  "label": "Delete document(s)",
+                  "value": "DELETE"
+                },
+                {
+                  "label": "Count",
+                  "value": "COUNT"
+                },
+                {
+                  "label": "Distinct",
+                  "value": "DISTINCT"
+                },
+                {
+                  "label": "Aggregate",
+                  "value": "AGGREGATE"
+                },
+                {
+                  "label": "Raw",
+                  "value": "RAW"
+                }
+              ]
             }
           ]
         }
diff --git a/app/server/appsmith-plugins/mongoPlugin/src/main/resources/editor/update.json b/app/server/appsmith-plugins/mongoPlugin/src/main/resources/editor/update.json
index bcd4aae93c70..4f9a19c52f9c 100644
--- a/app/server/appsmith-plugins/mongoPlugin/src/main/resources/editor/update.json
+++ b/app/server/appsmith-plugins/mongoPlugin/src/main/resources/editor/update.json
@@ -1,13 +1,13 @@
 {
+  "controlType": "SECTION_V2",
   "identifier": "UPDATE",
-  "controlType": "SECTION",
   "conditionals": {
     "show": "{{actionConfiguration.formData.command.data === 'UPDATE'}}"
   },
   "children": [
     {
-      "controlType": "SECTION",
-      "label": "Select collection to query",
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "identifier": "UPDATE-Z1",
       "children": [
         {
           "label": "Collection",
@@ -32,9 +32,8 @@
       ]
     },
     {
-      "controlType": "SECTION",
-      "label": "Query",
-      "description": "Optional",
+      "controlType": "SINGLE_COLUMN_ZONE",
+      "identifier": "UPDATE-Z2",
       "children": [
         {
           "label": "Query",
@@ -43,7 +42,13 @@
           "inputType": "JSON",
           "evaluationSubstitutionType": "TEMPLATE",
           "placeholderText": "{rating : {$gte : 9}}"
-        },
+        }
+      ]
+    },
+    {
+      "controlType": "SINGLE_COLUMN_ZONE",
+      "identifier": "UPDATE-Z3",
+      "children": [
         {
           "label": "Update",
           "configProperty": "actionConfiguration.formData.updateMany.update.data",
@@ -51,7 +56,13 @@
           "inputType": "JSON",
           "evaluationSubstitutionType": "TEMPLATE",
           "placeholderText": "{ $inc: { score: 1 } }"
-        },
+        }
+      ]
+    },
+    {
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "identifier": "UPDATE-Z4",
+      "children": [
         {
           "label": "Limit",
           "configProperty": "actionConfiguration.formData.updateMany.limit.data",
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 130b67dce889..36e0c57c1022 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
@@ -8,6 +8,7 @@
 import com.appsmith.external.exceptions.pluginExceptions.StaleConnectionException;
 import com.appsmith.external.helpers.DataTypeServiceUtils;
 import com.appsmith.external.helpers.MustacheHelper;
+import com.appsmith.external.helpers.Stopwatch;
 import com.appsmith.external.models.ActionConfiguration;
 import com.appsmith.external.models.ActionExecutionRequest;
 import com.appsmith.external.models.ActionExecutionResult;
@@ -134,6 +135,9 @@ public Mono<ActionExecutionResult> executeParameterized(
                 DatasourceConfiguration datasourceConfiguration,
                 ActionConfiguration actionConfiguration) {
 
+            String printMessage =
+                    Thread.currentThread().getName() + ": executeParameterized() called for MSSQL plugin.";
+            System.out.println(printMessage);
             String query = actionConfiguration.getBody();
             // Check for query parameter before performing the probably expensive fetch connection from the pool op.
             if (!StringUtils.hasLength(query)) {
@@ -182,6 +186,8 @@ public Mono<ActionExecutionResult> executeCommon(
                 List<MustacheBindingToken> mustacheValuesInOrder,
                 ExecuteActionDTO executeActionDTO) {
 
+            String printMessage = Thread.currentThread().getName() + ": executeCommon() called for MSSQL plugin.";
+            System.out.println(printMessage);
             final Map<String, Object> requestData = new HashMap<>();
             requestData.put("preparedStatement", TRUE.equals(preparedStatement) ? true : false);
 
@@ -192,6 +198,8 @@ public Mono<ActionExecutionResult> executeCommon(
                     List.of(new RequestParamDTO(ACTION_CONFIGURATION_BODY, transformedQuery, null, null, psParams));
 
             return Mono.fromCallable(() -> {
+                        System.out.println(
+                                Thread.currentThread().getName() + ": within mono callable from MSSQL plugin.");
                         boolean isResultSet;
                         Connection sqlConnectionFromPool;
                         Statement statement = null;
@@ -219,7 +227,7 @@ public Mono<ActionExecutionResult> executeCommon(
                             if (sqlConnectionFromPool == null
                                     || sqlConnectionFromPool.isClosed()
                                     || !sqlConnectionFromPool.isValid(VALIDITY_CHECK_TIMEOUT)) {
-                                log.info("Encountered stale connection in MsSQL plugin. Reporting back.");
+                                System.out.println("Encountered stale connection in MsSQL plugin. Reporting back.");
 
                                 if (sqlConnectionFromPool == null) {
                                     return Mono.error(new StaleConnectionException(CONNECTION_NULL_ERROR_MSG));
@@ -238,7 +246,8 @@ public Mono<ActionExecutionResult> executeCommon(
                             // This exception is thrown only when the timeout to `isValid` is negative. Since, that's
                             // not the case,
                             // here, this should never happen.
-                            log.error("Error checking validity of MsSQL connection.", error);
+                            System.out.println("Error checking validity of MsSQL connection.");
+                            error.printStackTrace();
                         }
 
                         // Log HikariCP status
@@ -297,10 +306,13 @@ public Mono<ActionExecutionResult> executeCommon(
                         }
 
                         ActionExecutionResult result = new ActionExecutionResult();
+                        System.out.println(Thread.currentThread().getName()
+                                + ": objectMapper.valueToTree invoked from MSSQL plugin.");
+                        Stopwatch processStopwatch = new Stopwatch("MSSQL Plugin objectMapper valueToTree");
                         result.setBody(objectMapper.valueToTree(rowsList));
+                        processStopwatch.stopAndLogTimeInMillisWithSysOut();
                         result.setMessages(populateHintMessages(columnsList));
                         result.setIsExecutionSuccess(true);
-                        log.debug("In the MssqlPlugin, got action execution result");
                         return Mono.just(result);
                     })
                     .flatMap(obj -> obj)
@@ -316,6 +328,8 @@ public Mono<ActionExecutionResult> executeCommon(
                     })
                     // Now set the request in the result to be returned back to the server
                     .map(actionExecutionResult -> {
+                        System.out.println(Thread.currentThread().getName()
+                                + ": setting request in the actionExecutionResult from MSSQL plugin.");
                         ActionExecutionRequest request = new ActionExecutionRequest();
                         request.setQuery(query);
                         request.setProperties(requestData);
@@ -345,8 +359,10 @@ private Set<String> populateHintMessages(List<String> columnNames) {
 
         @Override
         public Mono<HikariDataSource> datasourceCreate(DatasourceConfiguration datasourceConfiguration) {
+            String printMessage = Thread.currentThread().getName() + ": datasourceCreate() called for MSSQL plugin.";
+            System.out.println(printMessage);
             return Mono.fromCallable(() -> {
-                        log.debug("Connecting to SQL Server db");
+                        System.out.println(Thread.currentThread().getName() + ": Connecting to SQL Server db");
                         return createConnectionPool(datasourceConfiguration);
                     })
                     .subscribeOn(scheduler);
@@ -361,6 +377,8 @@ public void datasourceDestroy(HikariDataSource connection) {
 
         @Override
         public Set<String> validateDatasource(@NonNull DatasourceConfiguration datasourceConfiguration) {
+            String printMessage = Thread.currentThread().getName() + ": validateDatasource() called for MSSQL plugin.";
+            System.out.println(printMessage);
             Set<String> invalids = new HashSet<>();
 
             if (isEmpty(datasourceConfiguration.getEndpoints())) {
@@ -404,6 +422,8 @@ public Mono<ActionExecutionResult> execute(
         @Override
         public Mono<DatasourceStructure> getStructure(
                 HikariDataSource connection, DatasourceConfiguration datasourceConfiguration) {
+            String printMessage = Thread.currentThread().getName() + ": getStructure() called for MSSQL plugin.";
+            System.out.println(printMessage);
             return MssqlDatasourceUtils.getStructure(connection, datasourceConfiguration);
         }
 
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 58833ea9e1d8..68a9921add6b 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
@@ -9,6 +9,7 @@
 import com.appsmith.external.helpers.MustacheHelper;
 import com.appsmith.external.helpers.SSHTunnelContext;
 import com.appsmith.external.helpers.SSHUtils;
+import com.appsmith.external.helpers.Stopwatch;
 import com.appsmith.external.models.ActionConfiguration;
 import com.appsmith.external.models.ActionExecutionRequest;
 import com.appsmith.external.models.ActionExecutionResult;
@@ -182,6 +183,9 @@ public Mono<ActionExecutionResult> executeParameterized(
                 DatasourceConfiguration datasourceConfiguration,
                 ActionConfiguration actionConfiguration) {
 
+            String printMessage =
+                    Thread.currentThread().getName() + ": executeParameterized() called for MySQL plugin.";
+            System.out.println(printMessage);
             final Map<String, Object> requestData = new HashMap<>();
 
             Boolean isPreparedStatement;
@@ -240,6 +244,9 @@ public Mono<ActionExecutionResult> executeParameterized(
 
         @Override
         public ActionConfiguration getSchemaPreviewActionConfig(Template queryTemplate, Boolean isMock) {
+            String printMessage =
+                    Thread.currentThread().getName() + ": getSchemaPreviewActionConfig() called for MySQL plugin.";
+            System.out.println(printMessage);
             ActionConfiguration actionConfig = new ActionConfiguration();
             // Sets query body
             actionConfig.setBody(queryTemplate.getBody());
@@ -255,6 +262,9 @@ public ActionConfiguration getSchemaPreviewActionConfig(Template queryTemplate,
 
         @Override
         public Mono<String> getEndpointIdentifierForRateLimit(DatasourceConfiguration datasourceConfiguration) {
+            String printMessage =
+                    Thread.currentThread().getName() + ": getEndpointIdentifierForRateLimit() called for MySQL plugin.";
+            System.out.println(printMessage);
             List<Endpoint> endpoints = datasourceConfiguration.getEndpoints();
             SSHConnection sshProxy = datasourceConfiguration.getSshProxy();
             String identifier = "";
@@ -285,6 +295,8 @@ public Mono<ActionExecutionResult> executeCommon(
                 List<MustacheBindingToken> mustacheValuesInOrder,
                 ExecuteActionDTO executeActionDTO,
                 Map<String, Object> requestData) {
+            String printMessage = Thread.currentThread().getName() + ": executeCommon() called for MySQL plugin.";
+            System.out.println(printMessage);
             ConnectionPool connectionPool = connectionContext.getConnection();
             SSHTunnelContext sshTunnelContext = connectionContext.getSshTunnelContext();
             String query = actionConfiguration.getBody();
@@ -385,10 +397,16 @@ isConnectionValid && isSSHTunnelConnected(sshTunnelContext))
                                 return resultMono
                                         .map(res -> {
                                             ActionExecutionResult result = new ActionExecutionResult();
+                                            System.out.println(
+                                                    Thread.currentThread().getName()
+                                                            + ": objectMapper.valueToTree from MySQL plugin.");
+                                            Stopwatch processStopwatch =
+                                                    new Stopwatch("MySQL Plugin objectMapper valueToTree");
                                             result.setBody(objectMapper.valueToTree(rowsList));
+                                            processStopwatch.stopAndLogTimeInMillisWithSysOut();
                                             result.setMessages(populateHintMessages(columnsList));
                                             result.setIsExecutionSuccess(true);
-                                            log.debug("In the MySqlPlugin, got action execution result");
+                                            System.out.println("In the MySqlPlugin, got action execution result");
                                             return result;
                                         })
                                         .onErrorResume(error -> {
@@ -428,6 +446,9 @@ isConnectionValid && isSSHTunnelConnected(sshTunnelContext))
                                         })
                                         // Now set the request in the result to be returned to the server
                                         .map(actionExecutionResult -> {
+                                            System.out.println(
+                                                    Thread.currentThread().getName()
+                                                            + ": setting the request in actionExecutionResult from MySQL plugin.");
                                             ActionExecutionRequest request = new ActionExecutionRequest();
                                             request.setQuery(finalQuery);
                                             request.setProperties(requestData);
@@ -470,7 +491,7 @@ private Flux<Result> createAndExecuteQueryFromConnection(
                 return Flux.from(connectionStatement.execute());
             }
 
-            log.debug("Query : {}", query);
+            System.out.println("Query : " + query);
 
             List<Map.Entry<String, String>> parameters = new ArrayList<>();
             try {
@@ -495,6 +516,8 @@ private Flux<Result> createAndExecuteQueryFromConnection(
 
         @Override
         public Mono<DatasourceTestResult> testDatasource(ConnectionContext<ConnectionPool> connectionContext) {
+            String printMessage = Thread.currentThread().getName() + ": testDatasource() called for MySQL plugin.";
+            System.out.println(printMessage);
             ConnectionPool pool = connectionContext.getConnection();
             return Mono.just(pool)
                     .flatMap(p -> p.create())
@@ -647,6 +670,8 @@ public Mono<ActionExecutionResult> execute(
         @Override
         public Mono<ConnectionContext<ConnectionPool>> datasourceCreate(
                 DatasourceConfiguration datasourceConfiguration) {
+            String printMessage = Thread.currentThread().getName() + ": datasourceCreate() called for MySQL plugin.";
+            System.out.println(printMessage);
             return Mono.just(datasourceConfiguration).flatMap(ignore -> {
                 ConnectionContext<ConnectionPool> connectionContext;
                 try {
@@ -663,6 +688,8 @@ public Mono<ConnectionContext<ConnectionPool>> datasourceCreate(
 
         @Override
         public void datasourceDestroy(ConnectionContext<ConnectionPool> connectionContext) {
+            String printMessage = Thread.currentThread().getName() + ": datasourceDestroy() called for MySQL plugin.";
+            System.out.println(printMessage);
             Mono.just(connectionContext)
                     .flatMap(ignore -> {
                         SSHTunnelContext sshTunnelContext = connectionContext.getSshTunnelContext();
@@ -677,7 +704,7 @@ public void datasourceDestroy(ConnectionContext<ConnectionPool> connectionContex
                                 sshTunnelContext.getSshClient().disconnect();
                                 sshTunnelContext.getThread().stop();
                             } catch (IOException e) {
-                                log.debug("Failed to destroy SSH tunnel context: {}", e.getMessage());
+                                System.out.println("Failed to destroy SSH tunnel context: " + e.getMessage());
                             }
                         }
 
@@ -695,7 +722,8 @@ public void datasourceDestroy(ConnectionContext<ConnectionPool> connectionContex
                 connectionPool
                         .disposeLater()
                         .onErrorResume(exception -> {
-                            log.debug("Could not destroy MySQL connection pool", exception);
+                            System.out.println("Could not destroy MySQL connection pool");
+                            exception.printStackTrace();
                             return Mono.empty();
                         })
                         .subscribeOn(scheduler)
@@ -705,12 +733,16 @@ public void datasourceDestroy(ConnectionContext<ConnectionPool> connectionContex
 
         @Override
         public Set<String> validateDatasource(DatasourceConfiguration datasourceConfiguration) {
+            String printMessage = Thread.currentThread().getName() + ": validateDatasource() called for MySQL plugin.";
+            System.out.println(printMessage);
             return MySqlDatasourceUtils.validateDatasource(datasourceConfiguration);
         }
 
         @Override
         public Mono<DatasourceStructure> getStructure(
                 ConnectionContext<ConnectionPool> connectionContext, DatasourceConfiguration datasourceConfiguration) {
+            String printMessage = Thread.currentThread().getName() + ": getStructure() called for MySQL plugin.";
+            System.out.println(printMessage);
             final DatasourceStructure structure = new DatasourceStructure();
             final Map<String, DatasourceStructure.Table> tablesByName = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
             final Map<String, DatasourceStructure.Key> keyRegistry = new HashMap<>();
@@ -769,6 +801,8 @@ isConnectionValid && isSSHTunnelConnected(sshTunnelContext))
                                     })
                                     .collectList()
                                     .map(list -> {
+                                        System.out.println(
+                                                Thread.currentThread().getName() + ": getTemplates from MySQL plugin.");
                                         /* Get templates for each table and put those in. */
                                         getTemplates(tablesByName);
                                         structure.setTables(new ArrayList<>(tablesByName.values()));
diff --git a/app/server/appsmith-plugins/openAiPlugin/src/main/java/com/external/plugins/OpenAiPlugin.java b/app/server/appsmith-plugins/openAiPlugin/src/main/java/com/external/plugins/OpenAiPlugin.java
index 967b6d1a3631..a4561b6fb4cd 100644
--- a/app/server/appsmith-plugins/openAiPlugin/src/main/java/com/external/plugins/OpenAiPlugin.java
+++ b/app/server/appsmith-plugins/openAiPlugin/src/main/java/com/external/plugins/OpenAiPlugin.java
@@ -75,6 +75,9 @@ public Mono<ActionExecutionResult> executeParameterized(
                 DatasourceConfiguration datasourceConfiguration,
                 ActionConfiguration actionConfiguration) {
 
+            String printMessage =
+                    Thread.currentThread().getName() + ": executeParameterized() called for OpenAI plugin.";
+            System.out.println(printMessage);
             // Get prompt from action configuration
             List<Map.Entry<String, String>> parameters = new ArrayList<>();
 
@@ -92,6 +95,8 @@ public Mono<ActionExecutionResult> executeCommon(
                 ActionConfiguration actionConfiguration,
                 List<Map.Entry<String, String>> insertedParams) {
 
+            String printMessage = Thread.currentThread().getName() + ": executeCommon() called for OpenAI plugin.";
+            System.out.println(printMessage);
             // Initializing object for error condition
             ActionExecutionResult errorResult = new ActionExecutionResult();
             initUtils.initializeResponseWithError(errorResult);
@@ -200,6 +205,8 @@ private String sha256(String base) {
 
         @Override
         public Set<String> validateDatasource(DatasourceConfiguration datasourceConfiguration) {
+            String printMessage = Thread.currentThread().getName() + ": validateDatasource() called for OpenAI plugin.";
+            System.out.println(printMessage);
             return RequestUtils.validateBearerTokenDatasource(datasourceConfiguration);
         }
 
@@ -207,6 +214,8 @@ public Set<String> validateDatasource(DatasourceConfiguration datasourceConfigur
         public Mono<TriggerResultDTO> trigger(
                 APIConnection connection, DatasourceConfiguration datasourceConfiguration, TriggerRequestDTO request) {
 
+            String printMessage = Thread.currentThread().getName() + ": trigger() called for OpenAI plugin.";
+            System.out.println(printMessage);
             // Authentication will already be valid at this point
             final BearerTokenAuth bearerTokenAuth = (BearerTokenAuth) datasourceConfiguration.getAuthentication();
             assert (bearerTokenAuth.getBearerToken() != null);
@@ -276,6 +285,8 @@ public Mono<TriggerResultDTO> trigger(
 
         @Override
         public Mono<DatasourceTestResult> testDatasource(DatasourceConfiguration datasourceConfiguration) {
+            String printMessage = Thread.currentThread().getName() + ": testDatasource() called for OpenAI plugin.";
+            System.out.println(printMessage);
             final BearerTokenAuth bearerTokenAuth = (BearerTokenAuth) datasourceConfiguration.getAuthentication();
 
             HttpMethod httpMethod = HttpMethod.GET;
diff --git a/app/server/appsmith-plugins/openAiPlugin/src/main/resources/editor/chat.json b/app/server/appsmith-plugins/openAiPlugin/src/main/resources/editor/chat.json
index c29af65c27eb..73feb0ca802a 100644
--- a/app/server/appsmith-plugins/openAiPlugin/src/main/resources/editor/chat.json
+++ b/app/server/appsmith-plugins/openAiPlugin/src/main/resources/editor/chat.json
@@ -1,92 +1,99 @@
 {
   "identifier": "CHAT",
-  "controlType": "SECTION",
+  "controlType": "SECTION_V2",
   "conditionals": {
     "show": "{{actionConfiguration.formData.command.data === 'CHAT'}}"
   },
   "children": [
     {
-      "label": "Models",
-      "tooltipText": "Select the model for response generation",
-      "subtitle": "ID of the model to use.",
-      "isRequired": true,
-      "propertyName": "chat_model_id",
-      "configProperty": "actionConfiguration.formData.chatModel.data",
-      "controlType": "DROP_DOWN",
-      "initialValue": "",
-      "options": [],
-      "placeholderText": "All models will be fetched.",
-      "fetchOptionsConditionally": true,
-      "setFirstOptionAsDefault": true,
-      "alternateViewTypes": ["json"],
-      "conditionals": {
-        "enable": "{{true}}",
-        "fetchDynamicValues": {
-          "condition": "{{actionConfiguration.formData.command.data === 'CHAT'}}",
-          "config": {
-            "params": {
-              "requestType": "CHAT_MODELS",
-              "displayType": "DROP_DOWN"
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "children": [
+        {
+          "label": "Models",
+          "tooltipText": "Select the model for response generation",
+          "subtitle": "ID of the model to use.",
+          "isRequired": true,
+          "propertyName": "chat_model_id",
+          "configProperty": "actionConfiguration.formData.chatModel.data",
+          "controlType": "DROP_DOWN",
+          "initialValue": "",
+          "options": [],
+          "placeholderText": "All models will be fetched.",
+          "fetchOptionsConditionally": true,
+          "setFirstOptionAsDefault": true,
+          "alternateViewTypes": ["json"],
+          "conditionals": {
+            "enable": "{{true}}",
+            "fetchDynamicValues": {
+              "condition": "{{actionConfiguration.formData.command.data === 'CHAT'}}",
+              "config": {
+                "params": {
+                  "requestType": "CHAT_MODELS",
+                  "displayType": "DROP_DOWN"
+                }
+              }
             }
           }
+        },
+        {
+          "label": "Max Tokens",
+          "tooltipText": "The maximum number of tokens to generate in the chat completion.",
+          "subtitle": "The maximum number of tokens to generate in the chat completion.",
+          "Description": "Put a positive integer value",
+          "configProperty": "actionConfiguration.formData.maxTokens",
+          "controlType": "INPUT_TEXT",
+          "initialValue": "16",
+          "isRequired": true,
+          "dataType": "NUMBER"
         }
-      }
-    },
-    {
-      "label": "Max Tokens",
-      "tooltipText": "The maximum number of tokens to generate in the chat completion.",
-      "subtitle": "The maximum number of tokens to generate in the chat completion.",
-      "Description": "Put a positive integer value",
-      "configProperty": "actionConfiguration.formData.maxTokens",
-      "controlType": "INPUT_TEXT",
-      "initialValue": "16",
-      "isRequired": true,
-      "dataType": "NUMBER",
-      "customStyles": {
-        "width": "270px",
-        "minWidth": "270px"
-      }
+      ]
     },
     {
-      "label": "Messages",
-      "tooltipText": "Ask a question",
-      "subtitle": "A list of messages comprising the conversation so far.",
-      "propertyName": "messages",
-      "isRequired": true,
-      "configProperty": "actionConfiguration.formData.messages.data",
-      "controlType": "ARRAY_FIELD",
-      "alternateViewTypes": ["json"],
-      "addMoreButtonLabel": "Add message",
-      "schema": [
+      "controlType": "SINGLE_COLUMN_ZONE",
+      "children": [
         {
-          "label": "Role",
-          "key": "role",
-          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
-          "placeholderText": "user OR system",
-          "initialValue": "user"
-        },
-        {
-          "label": "Content",
-          "key": "content",
-          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
-          "placeholderText": "{{ UserInput.text }}"
+          "label": "Messages",
+          "tooltipText": "Ask a question",
+          "subtitle": "A list of messages comprising the conversation so far.",
+          "propertyName": "messages",
+          "isRequired": true,
+          "configProperty": "actionConfiguration.formData.messages.data",
+          "controlType": "ARRAY_FIELD",
+          "alternateViewTypes": ["json"],
+          "addMoreButtonLabel": "Add message",
+          "schema": [
+            {
+              "label": "Role",
+              "key": "role",
+              "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+              "placeholderText": "user OR system",
+              "initialValue": "user"
+            },
+            {
+              "label": "Content",
+              "key": "content",
+              "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+              "placeholderText": "{{ UserInput.text }}"
+            }
+          ]
         }
       ]
     },
     {
-      "label": "Temperature",
-      "tooltipText": "Put a value between 0 and 2",
-      "Description": "Put a value between 0 and 2",
-      "subtitle": "What sampling temperature to use, between 0 and 2. Higher values like 0.8 will make the output more random, while lower values like 0.2 will make it more focused and deterministic.",
-      "configProperty": "actionConfiguration.formData.temperature",
-      "controlType": "INPUT_TEXT",
-      "dataType": "NUMBER",
-      "initialValue": "0",
-      "isRequired": false,
-      "customStyles": {
-        "width": "270px",
-        "minWidth": "270px"
-      }
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "children": [
+        {
+          "label": "Temperature",
+          "tooltipText": "Put a value between 0 and 2",
+          "Description": "Put a value between 0 and 2",
+          "subtitle": "What sampling temperature to use, between 0 and 2. Higher values like 0.8 will make the output more random, while lower values like 0.2 will make it more focused and deterministic.",
+          "configProperty": "actionConfiguration.formData.temperature",
+          "controlType": "INPUT_TEXT",
+          "dataType": "NUMBER",
+          "initialValue": "0",
+          "isRequired": false
+        }
+      ]
     }
   ]
 }
diff --git a/app/server/appsmith-plugins/openAiPlugin/src/main/resources/editor/embeddings.json b/app/server/appsmith-plugins/openAiPlugin/src/main/resources/editor/embeddings.json
index 362172f9dea1..eb5560da1ee2 100644
--- a/app/server/appsmith-plugins/openAiPlugin/src/main/resources/editor/embeddings.json
+++ b/app/server/appsmith-plugins/openAiPlugin/src/main/resources/editor/embeddings.json
@@ -1,63 +1,78 @@
 {
   "identifier": "EMBEDDINGS",
-  "controlType": "SECTION",
+  "controlType": "SECTION_V2",
   "conditionals": {
     "show": "{{actionConfiguration.formData.command.data === 'EMBEDDINGS'}}"
   },
   "children": [
     {
-      "label": "Models",
-      "tooltipText": "Select the model for embedding generation",
-      "subtitle": "ID of the model to use.",
-      "isRequired": true,
-      "propertyName": "embedding_model_id",
-      "configProperty": "actionConfiguration.formData.embeddingsModel.data",
-      "controlType": "DROP_DOWN",
-      "initialValue": "",
-      "options": [],
-      "placeholderText": "All models will be fetched.",
-      "fetchOptionsConditionally": true,
-      "setFirstOptionAsDefault": true,
-      "alternateViewTypes": ["json"],
-      "conditionals": {
-        "enable": "{{true}}",
-        "fetchDynamicValues": {
-          "condition": "{{actionConfiguration.formData.command.data === 'EMBEDDINGS'}}",
-          "config": {
-            "params": {
-              "requestType": "EMBEDDING_MODELS",
-              "displayType": "DROP_DOWN"
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "children": [
+        {
+          "label": "Models",
+          "tooltipText": "Select the model for embedding generation",
+          "subtitle": "ID of the model to use.",
+          "isRequired": true,
+          "propertyName": "embedding_model_id",
+          "configProperty": "actionConfiguration.formData.embeddingsModel.data",
+          "controlType": "DROP_DOWN",
+          "initialValue": "",
+          "options": [],
+          "placeholderText": "All models will be fetched.",
+          "fetchOptionsConditionally": true,
+          "setFirstOptionAsDefault": true,
+          "alternateViewTypes": ["json"],
+          "conditionals": {
+            "enable": "{{true}}",
+            "fetchDynamicValues": {
+              "condition": "{{actionConfiguration.formData.command.data === 'EMBEDDINGS'}}",
+              "config": {
+                "params": {
+                  "requestType": "EMBEDDING_MODELS",
+                  "displayType": "DROP_DOWN"
+                }
+              }
             }
           }
         }
-      }
+      ]
     },
     {
-      "label": "Input",
-      "tooltipText": "Provide the string or array of strings",
-      "subtitle": "Input text to embed, encoded as a string or array of tokens. To embed multiple inputs in a single request, pass an array of strings or array of token arrays.",
-      "propertyName": "input",
-      "configProperty": "actionConfiguration.formData.input",
-      "controlType": "QUERY_DYNAMIC_TEXT",
-      "isRequired": true,
-      "placeholderText": "Hello World! OR ['hello', 'world']"
+      "controlType": "SINGLE_COLUMN_ZONE",
+      "children": [
+        {
+          "label": "Input",
+          "tooltipText": "Provide the string or array of strings",
+          "subtitle": "Input text to embed, encoded as a string or array of tokens. To embed multiple inputs in a single request, pass an array of strings or array of token arrays.",
+          "propertyName": "input",
+          "configProperty": "actionConfiguration.formData.input",
+          "controlType": "QUERY_DYNAMIC_TEXT",
+          "isRequired": true,
+          "placeholderText": "Hello World! OR ['hello', 'world']"
+        }
+      ]
     },
     {
-      "label": "Encoding Format",
-      "tooltipText": "Defaults to float",
-      "subtitle": "The format to return the embeddings in. Can be either float or base64",
-      "configProperty": "actionConfiguration.formData.encodingFormat",
-      "controlType": "DROP_DOWN",
-      "isRequired": false,
-      "initialValue": "float",
-      "options": [
-        {
-          "label": "float",
-          "value": "float"
-        },
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "children": [
         {
-          "label": "base64",
-          "value": "base64"
+          "label": "Encoding Format",
+          "tooltipText": "Defaults to float",
+          "subtitle": "The format to return the embeddings in. Can be either float or base64",
+          "configProperty": "actionConfiguration.formData.encodingFormat",
+          "controlType": "DROP_DOWN",
+          "isRequired": false,
+          "initialValue": "float",
+          "options": [
+            {
+              "label": "float",
+              "value": "float"
+            },
+            {
+              "label": "base64",
+              "value": "base64"
+            }
+          ]
         }
       ]
     }
diff --git a/app/server/appsmith-plugins/openAiPlugin/src/main/resources/editor/root.json b/app/server/appsmith-plugins/openAiPlugin/src/main/resources/editor/root.json
index cdc832c9e96f..45a64dc74fe7 100644
--- a/app/server/appsmith-plugins/openAiPlugin/src/main/resources/editor/root.json
+++ b/app/server/appsmith-plugins/openAiPlugin/src/main/resources/editor/root.json
@@ -1,28 +1,33 @@
 {
   "editor": [
     {
-      "controlType": "SECTION",
+      "controlType": "SECTION_V2",
       "identifier": "SELECTOR",
       "children": [
         {
-          "label": "Command",
-          "description": "Choose the method you would like to use",
-          "configProperty": "actionConfiguration.formData.command.data",
-          "controlType": "DROP_DOWN",
-          "isRequired": true,
-          "initialValue": "CHAT",
-          "options": [
+          "controlType": "DOUBLE_COLUMN_ZONE",
+          "children": [
             {
-              "label": "Chat",
-              "value": "CHAT"
-            },
-            {
-              "label": "Embeddings",
-              "value": "EMBEDDINGS"
-            },
-            {
-              "label": "Vision",
-              "value": "VISION"
+              "label": "Command",
+              "description": "Choose the method you would like to use",
+              "configProperty": "actionConfiguration.formData.command.data",
+              "controlType": "DROP_DOWN",
+              "isRequired": true,
+              "initialValue": "CHAT",
+              "options": [
+                {
+                  "label": "Chat",
+                  "value": "CHAT"
+                },
+                {
+                  "label": "Embeddings",
+                  "value": "EMBEDDINGS"
+                },
+                {
+                  "label": "Vision",
+                  "value": "VISION"
+                }
+              ]
             }
           ]
         }
diff --git a/app/server/appsmith-plugins/openAiPlugin/src/main/resources/editor/vision.json b/app/server/appsmith-plugins/openAiPlugin/src/main/resources/editor/vision.json
index 2a72bcbb932d..d0641b18c6c6 100644
--- a/app/server/appsmith-plugins/openAiPlugin/src/main/resources/editor/vision.json
+++ b/app/server/appsmith-plugins/openAiPlugin/src/main/resources/editor/vision.json
@@ -1,124 +1,128 @@
 {
   "identifier": "VISION",
-  "controlType": "SECTION",
+  "controlType": "SECTION_V2",
   "conditionals": {
     "show": "{{actionConfiguration.formData.command.data === 'VISION'}}"
   },
   "children": [
     {
-      "label": "Models",
-      "tooltipText": "Select the model for response generation",
-      "subtitle": "ID of the model to use.",
-      "isRequired": true,
-      "propertyName": "vision_model_id",
-      "configProperty": "actionConfiguration.formData.visionModel.data",
-      "controlType": "DROP_DOWN",
-      "initialValue": "",
-      "options": [],
-      "placeholderText": "All models will be fetched.",
-      "fetchOptionsConditionally": true,
-      "setFirstOptionAsDefault": true,
-      "alternateViewTypes": ["json"],
-      "conditionals": {
-        "enable": "{{true}}",
-        "fetchDynamicValues": {
-          "condition": "{{actionConfiguration.formData.command.data === 'VISION'}}",
-          "config": {
-            "params": {
-              "requestType": "VISION_MODELS",
-              "displayType": "DROP_DOWN"
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "children": [
+        {
+          "label": "Models",
+          "tooltipText": "Select the model for response generation",
+          "subtitle": "ID of the model to use.",
+          "isRequired": true,
+          "propertyName": "vision_model_id",
+          "configProperty": "actionConfiguration.formData.visionModel.data",
+          "controlType": "DROP_DOWN",
+          "initialValue": "",
+          "options": [],
+          "placeholderText": "All models will be fetched.",
+          "fetchOptionsConditionally": true,
+          "setFirstOptionAsDefault": true,
+          "alternateViewTypes": ["json"],
+          "conditionals": {
+            "enable": "{{true}}",
+            "fetchDynamicValues": {
+              "condition": "{{actionConfiguration.formData.command.data === 'VISION'}}",
+              "config": {
+                "params": {
+                  "requestType": "VISION_MODELS",
+                  "displayType": "DROP_DOWN"
+                }
+              }
             }
           }
-        }
-      }
-    },
-    {
-      "label": "Max Tokens",
-      "tooltipText": "The maximum number of tokens to generate in the chat completion.",
-      "subtitle": "The maximum number of tokens to generate in the chat completion.",
-      "Description": "Put a positive integer value",
-      "configProperty": "actionConfiguration.formData.maxTokens",
-      "controlType": "INPUT_TEXT",
-      "initialValue": "16",
-      "isRequired": true,
-      "dataType": "NUMBER",
-      "customStyles": {
-        "width": "270px",
-        "minWidth": "270px"
-      }
-    },
-    {
-      "label": "System Messages",
-      "tooltipText": "Provide system instructions to the assistant",
-      "subtitle": "A list of messages for Assistant as instructions",
-      "propertyName": "systemMessages",
-      "isRequired": false,
-      "configProperty": "actionConfiguration.formData.systemMessages.data",
-      "controlType": "ARRAY_FIELD",
-      "alternateViewTypes": ["json"],
-      "addMoreButtonLabel": "Add System Message",
-      "customStyles": {
-        "width": "40vw"
-      },
-      "schema": [
+        },
         {
-          "label": "Content",
-          "key": "content",
-          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
-          "placeholderText": "{{ UserInput.text }}",
-          "initialValue": "As an OCR expert your skills are unparalleled. Respond with just the text in the image"
+          "label": "Max Tokens",
+          "tooltipText": "The maximum number of tokens to generate in the chat completion.",
+          "subtitle": "The maximum number of tokens to generate in the chat completion.",
+          "Description": "Put a positive integer value",
+          "configProperty": "actionConfiguration.formData.maxTokens",
+          "controlType": "INPUT_TEXT",
+          "initialValue": "16",
+          "isRequired": true,
+          "dataType": "NUMBER"
         }
       ]
     },
     {
-      "label": "User Messages",
-      "tooltipText": "Provide User queries",
-      "subtitle": "A list of user messages or images. You can pass a link to the image or the base64 encoded image directly in the request.",
-      "propertyName": "userMessages",
-      "isRequired": true,
-      "configProperty": "actionConfiguration.formData.userMessages.data",
-      "controlType": "ARRAY_FIELD",
-      "alternateViewTypes": ["json"],
-      "addMoreButtonLabel": "Add User message or Image",
-      "schema": [
+      "controlType": "SINGLE_COLUMN_ZONE",
+      "children": [
         {
-          "label": "Type",
-          "key": "type",
-          "controlType": "DROP_DOWN",
-          "initialValue": "text",
-          "options": [
+          "label": "System Messages",
+          "tooltipText": "Provide system instructions to the assistant",
+          "subtitle": "A list of messages for Assistant as instructions",
+          "propertyName": "systemMessages",
+          "isRequired": false,
+          "configProperty": "actionConfiguration.formData.systemMessages.data",
+          "controlType": "ARRAY_FIELD",
+          "alternateViewTypes": ["json"],
+          "addMoreButtonLabel": "Add System Message",
+          "schema": [
             {
-              "label": "Text",
-              "value": "text"
-            },
-            {
-              "label": "Image",
-              "value": "image"
+              "label": "Content",
+              "key": "content",
+              "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+              "placeholderText": "{{ UserInput.text }}",
+              "initialValue": "As an OCR expert your skills are unparalleled. Respond with just the text in the image"
             }
           ]
         },
         {
-          "label": "Content",
-          "key": "content",
-          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
-          "placeholderText": "{{Img1.image}} or {{Input1.text}}"
+          "label": "User Messages",
+          "tooltipText": "Provide User queries",
+          "subtitle": "A list of user messages or images. You can pass a link to the image or the base64 encoded image directly in the request.",
+          "propertyName": "userMessages",
+          "isRequired": true,
+          "configProperty": "actionConfiguration.formData.userMessages.data",
+          "controlType": "ARRAY_FIELD",
+          "alternateViewTypes": ["json"],
+          "addMoreButtonLabel": "Add User message or Image",
+          "schema": [
+            {
+              "label": "Type",
+              "key": "type",
+              "controlType": "DROP_DOWN",
+              "initialValue": "text",
+              "options": [
+                {
+                  "label": "Text",
+                  "value": "text"
+                },
+                {
+                  "label": "Image",
+                  "value": "image"
+                }
+              ]
+            },
+            {
+              "label": "Content",
+              "key": "content",
+              "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+              "placeholderText": "{{Img1.image}} or {{Input1.text}}"
+            }
+          ]
         }
       ]
     },
     {
-      "label": "Temperature",
-      "tooltipText": "Put a value between 0 and 2",
-      "Description": "Put a value between 0 and 2",
-      "subtitle": "What sampling temperature to use, between 0 and 2. Higher values like 0.8 will make the output more random, while lower values like 0.2 will make it more focused and deterministic.",
-      "configProperty": "actionConfiguration.formData.temperature",
-      "controlType": "INPUT_TEXT",
-      "dataType": "NUMBER",
-      "initialValue": "0",
-      "isRequired": false,
-      "customStyles": {
-        "width": "270px",
-        "minWidth": "270px"
-      }
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "children": [
+        {
+          "label": "Temperature",
+          "tooltipText": "Put a value between 0 and 2",
+          "Description": "Put a value between 0 and 2",
+          "subtitle": "What sampling temperature to use, between 0 and 2. Higher values like 0.8 will make the output more random, while lower values like 0.2 will make it more focused and deterministic.",
+          "configProperty": "actionConfiguration.formData.temperature",
+          "controlType": "INPUT_TEXT",
+          "dataType": "NUMBER",
+          "initialValue": "0",
+          "isRequired": false
+        }
+      ]
     }
   ]
 }
diff --git a/app/server/appsmith-plugins/oraclePlugin/src/main/java/com/external/plugins/OraclePlugin.java b/app/server/appsmith-plugins/oraclePlugin/src/main/java/com/external/plugins/OraclePlugin.java
index 3555dcdf9629..b6ff9f9cfbea 100644
--- a/app/server/appsmith-plugins/oraclePlugin/src/main/java/com/external/plugins/OraclePlugin.java
+++ b/app/server/appsmith-plugins/oraclePlugin/src/main/java/com/external/plugins/OraclePlugin.java
@@ -94,6 +94,8 @@ public static class OraclePluginExecutor implements SmartSubstitutionInterface,
 
         @Override
         public Mono<HikariDataSource> datasourceCreate(DatasourceConfiguration datasourceConfiguration) {
+            String printMessage = Thread.currentThread().getName() + ": datasourceCreate() called for Oracle plugin.";
+            System.out.println(printMessage);
             try {
                 Class.forName(JDBC_DRIVER);
             } catch (ClassNotFoundException e) {
@@ -104,7 +106,7 @@ public Mono<HikariDataSource> datasourceCreate(DatasourceConfiguration datasourc
             }
 
             return Mono.fromCallable(() -> {
-                        log.debug(Thread.currentThread().getName() + ": Connecting to Oracle db");
+                        System.out.println(Thread.currentThread().getName() + ": Connecting to Oracle db");
                         return createConnectionPool(datasourceConfiguration);
                     })
                     .subscribeOn(scheduler);
@@ -117,6 +119,8 @@ public void datasourceDestroy(HikariDataSource connection) {
 
         @Override
         public Set<String> validateDatasource(DatasourceConfiguration datasourceConfiguration) {
+            String printMessage = Thread.currentThread().getName() + ": validateDatasource() called for Oracle plugin.";
+            System.out.println(printMessage);
             return OracleDatasourceUtils.validateDatasource(datasourceConfiguration);
         }
 
@@ -135,6 +139,10 @@ public Mono<ActionExecutionResult> executeParameterized(
                 ExecuteActionDTO executeActionDTO,
                 DatasourceConfiguration datasourceConfiguration,
                 ActionConfiguration actionConfiguration) {
+
+            String printMessage =
+                    Thread.currentThread().getName() + ": executeParameterized() called for Oracle plugin.";
+            System.out.println(printMessage);
             final Map<String, Object> formData = actionConfiguration.getFormData();
             String query = getDataValueSafelyFromFormData(formData, BODY, STRING_TYPE, null);
             // Check for query parameter before performing the probably expensive fetch connection from the pool op.
@@ -193,6 +201,8 @@ private Mono<ActionExecutionResult> executeCommon(
                 List<MustacheBindingToken> mustacheValuesInOrder,
                 ExecuteActionDTO executeActionDTO) {
 
+            String printMessage = Thread.currentThread().getName() + ": executeCommon() called for Oracle plugin.";
+            System.out.println(printMessage);
             final Map<String, Object> requestData = new HashMap<>();
             requestData.put("preparedStatement", TRUE.equals(preparedStatement) ? true : false);
 
@@ -221,7 +231,8 @@ private Mono<ActionExecutionResult> executeCommon(
                             // library throws SQLException in case the pool is closed or there is an issue initializing
                             // the connection pool which can also be translated in our world to StaleConnectionException
                             // and should then trigger the destruction and recreation of the pool.
-                            log.debug("Exception Occurred while getting connection from pool" + e.getMessage());
+                            System.out.println(
+                                    "Exception Occurred while getting connection from pool" + e.getMessage());
                             e.printStackTrace(System.out);
                             return Mono.error(
                                     e instanceof StaleConnectionException
@@ -274,9 +285,9 @@ private Mono<ActionExecutionResult> executeCommon(
                                     statement,
                                     preparedQuery);
                         } catch (SQLException e) {
-                            log.debug(Thread.currentThread().getName()
+                            System.out.println(Thread.currentThread().getName()
                                     + ": In the OraclePlugin, got action execution error");
-                            log.debug(e.getMessage());
+                            System.out.println(e.getMessage());
                             return Mono.error(new AppsmithPluginException(
                                     OraclePluginError.QUERY_EXECUTION_FAILED,
                                     OracleErrorMessages.QUERY_EXECUTION_FAILED_ERROR_MSG,
@@ -294,7 +305,7 @@ private Mono<ActionExecutionResult> executeCommon(
                         result.setBody(objectMapper.valueToTree(rowsList));
                         result.setMessages(populateHintMessages(columnsList));
                         result.setIsExecutionSuccess(true);
-                        log.debug(Thread.currentThread().getName()
+                        System.out.println(Thread.currentThread().getName()
                                 + ": In the OraclePlugin, got action execution result");
                         return Mono.just(result);
                     })
@@ -325,6 +336,8 @@ private Mono<ActionExecutionResult> executeCommon(
         @Override
         public Mono<DatasourceStructure> getStructure(
                 HikariDataSource connectionPool, DatasourceConfiguration datasourceConfiguration) {
+            String printMessage = Thread.currentThread().getName() + ": getStructure() called for Oracle plugin.";
+            System.out.println(printMessage);
             return OracleDatasourceUtils.getStructure(connectionPool, datasourceConfiguration);
         }
 
@@ -433,6 +446,9 @@ public Object substituteValueInInput(
 
         @Override
         public Mono<String> getEndpointIdentifierForRateLimit(DatasourceConfiguration datasourceConfiguration) {
+            String printMessage = Thread.currentThread().getName()
+                    + ": getEndpointIdentifierForRateLimit() called for Oracle plugin.";
+            System.out.println(printMessage);
             List<Endpoint> endpoints = datasourceConfiguration.getEndpoints();
             String identifier = "";
             // When hostname and port both are available, both will be used as identifier
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 218eba72eb78..a27e2ecc8e9b 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
@@ -9,9 +9,12 @@
 import com.appsmith.external.exceptions.pluginExceptions.StaleConnectionException;
 import com.appsmith.external.helpers.DataTypeServiceUtils;
 import com.appsmith.external.helpers.MustacheHelper;
+import com.appsmith.external.helpers.SSHUtils;
+import com.appsmith.external.helpers.Stopwatch;
 import com.appsmith.external.models.ActionConfiguration;
 import com.appsmith.external.models.ActionExecutionRequest;
 import com.appsmith.external.models.ActionExecutionResult;
+import com.appsmith.external.models.ConnectionContext;
 import com.appsmith.external.models.DBAuth;
 import com.appsmith.external.models.DatasourceConfiguration;
 import com.appsmith.external.models.DatasourceStructure;
@@ -22,6 +25,7 @@
 import com.appsmith.external.models.Property;
 import com.appsmith.external.models.PsParameterDTO;
 import com.appsmith.external.models.RequestParamDTO;
+import com.appsmith.external.models.SSHConnection;
 import com.appsmith.external.models.SSLDetails;
 import com.appsmith.external.plugins.BasePlugin;
 import com.appsmith.external.plugins.PluginExecutor;
@@ -43,6 +47,8 @@
 import org.pf4j.Extension;
 import org.pf4j.PluginWrapper;
 import org.postgresql.util.PGobject;
+import org.postgresql.util.PSQLException;
+import org.postgresql.util.PSQLState;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 import reactor.core.publisher.Mono;
@@ -83,10 +89,17 @@
 import java.util.stream.Stream;
 
 import static com.appsmith.external.constants.ActionConstants.ACTION_CONFIGURATION_BODY;
+import static com.appsmith.external.constants.PluginConstants.HostName.LOCALHOST;
 import static com.appsmith.external.constants.PluginConstants.PluginName.POSTGRES_PLUGIN_NAME;
+import static com.appsmith.external.exceptions.pluginExceptions.BasePluginErrorMessages.DS_INVALID_SSH_HOSTNAME_ERROR_MSG;
+import static com.appsmith.external.exceptions.pluginExceptions.BasePluginErrorMessages.DS_MISSING_SSH_HOSTNAME_ERROR_MSG;
+import static com.appsmith.external.exceptions.pluginExceptions.BasePluginErrorMessages.DS_MISSING_SSH_KEY_ERROR_MSG;
+import static com.appsmith.external.exceptions.pluginExceptions.BasePluginErrorMessages.DS_MISSING_SSH_USERNAME_ERROR_MSG;
 import static com.appsmith.external.helpers.PluginUtils.getColumnsListForJdbcPlugin;
 import static com.appsmith.external.helpers.PluginUtils.getIdenticalColumns;
 import static com.appsmith.external.helpers.PluginUtils.getPSParamLabel;
+import static com.appsmith.external.helpers.SSHUtils.getConnectionContext;
+import static com.appsmith.external.helpers.SSHUtils.isSSHEnabled;
 import static com.appsmith.external.helpers.Sizeof.sizeof;
 import static com.appsmith.external.helpers.SmartSubstitutionHelper.replaceQuestionMarkWithDollarIndex;
 import static com.external.plugins.utils.PostgresDataTypeUtils.DataType.BOOL;
@@ -135,6 +148,8 @@ public class PostgresPlugin extends BasePlugin {
 
     private static int MAX_SIZE_SUPPORTED;
 
+    private static final int CONNECTION_METHOD_INDEX = 1;
+
     public static PostgresDatasourceUtils postgresDatasourceUtils = new PostgresDatasourceUtils();
 
     public PostgresPlugin(PluginWrapper wrapper) {
@@ -227,6 +242,9 @@ public Mono<ActionExecutionResult> executeParameterized(
                 DatasourceConfiguration datasourceConfiguration,
                 ActionConfiguration actionConfiguration) {
 
+            String printMessage =
+                    Thread.currentThread().getName() + ": executeParameterized() called for Postgres plugin.";
+            System.out.println(printMessage);
             String query = actionConfiguration.getBody();
             // Check for query parameter before performing the probably expensive fetch
             // connection from the pool op.
@@ -281,6 +299,9 @@ public Mono<ActionExecutionResult> executeParameterized(
 
         @Override
         public ActionConfiguration getSchemaPreviewActionConfig(Template queryTemplate, Boolean isMock) {
+            String printMessage =
+                    Thread.currentThread().getName() + ": getSchemaPreviewActionConfig() called for Postgres plugin.";
+            System.out.println(printMessage);
             ActionConfiguration actionConfig = new ActionConfiguration();
             // Sets query body
             actionConfig.setBody(queryTemplate.getBody());
@@ -296,7 +317,11 @@ public ActionConfiguration getSchemaPreviewActionConfig(Template queryTemplate,
 
         @Override
         public Mono<String> getEndpointIdentifierForRateLimit(DatasourceConfiguration datasourceConfiguration) {
+            String printMessage = Thread.currentThread().getName()
+                    + ": getEndpointIdentifierForRateLimit() called for Postgres plugin.";
+            System.out.println(printMessage);
             List<Endpoint> endpoints = datasourceConfiguration.getEndpoints();
+            SSHConnection sshProxy = datasourceConfiguration.getSshProxy();
             String identifier = "";
             // When hostname and port both are available, both will be used as identifier
             // When port is not present, default port along with hostname will be used
@@ -308,6 +333,12 @@ public Mono<String> getEndpointIdentifierForRateLimit(DatasourceConfiguration da
                     identifier = hostName + "_" + ObjectUtils.defaultIfNull(port, DEFAULT_POSTGRES_PORT);
                 }
             }
+            if (SSHUtils.isSSHEnabled(datasourceConfiguration, CONNECTION_METHOD_INDEX)
+                    && sshProxy != null
+                    && !isBlank(sshProxy.getHost())) {
+                identifier += "_" + sshProxy.getHost() + "_"
+                        + SSHUtils.getSSHPortFromConfigOrDefault(datasourceConfiguration);
+            }
             return Mono.just(identifier);
         }
 
@@ -331,6 +362,8 @@ private Mono<ActionExecutionResult> executeCommon(
             Instant requestedAt = Instant.now();
 
             return Mono.fromCallable(() -> {
+                        System.out.println(Thread.currentThread().getName()
+                                + ": Within the executeCommon method of PostgresPluginExecutor.");
                         Connection connectionFromPool;
 
                         try {
@@ -364,13 +397,13 @@ private Mono<ActionExecutionResult> executeCommon(
                         int activeConnections = poolProxy.getActiveConnections();
                         int totalConnections = poolProxy.getTotalConnections();
                         int threadsAwaitingConnection = poolProxy.getThreadsAwaitingConnection();
-                        log.debug(
-                                "Before executing postgres query [{}] Hikari Pool stats : active - {} , idle - {} , awaiting - {} , total - {}",
+                        System.out.println(String.format(
+                                "Before executing postgres query [%s] Hikari Pool stats: active - %d, idle - %d, awaiting - %d, total - %d",
                                 query,
                                 activeConnections,
                                 idleConnections,
                                 threadsAwaitingConnection,
-                                totalConnections);
+                                totalConnections));
                         try {
                             if (FALSE.equals(preparedStatement)) {
                                 statement = connectionFromPool.createStatement();
@@ -423,10 +456,9 @@ private Mono<ActionExecutionResult> executeCommon(
                                         int objectSize = sizeof(rowsList);
 
                                         if (objectSize > MAX_SIZE_SUPPORTED) {
-                                            log.debug(
-                                                    "[PostgresPlugin] Result size greater than maximum supported size of {} bytes. Current size : {}",
-                                                    MAX_SIZE_SUPPORTED,
-                                                    objectSize);
+                                            System.out.println(String.format(
+                                                    "[PostgresPlugin] Result size greater than maximum supported size of %d bytes. Current size: %d",
+                                                    MAX_SIZE_SUPPORTED, objectSize));
                                             return Mono.error(new AppsmithPluginException(
                                                     PostgresPluginError.RESPONSE_SIZE_TOO_LARGE,
                                                     (float) (MAX_SIZE_SUPPORTED / (1024 * 1024))));
@@ -470,7 +502,13 @@ private Mono<ActionExecutionResult> executeCommon(
 
                                         } else if (JSON_TYPE_NAME.equalsIgnoreCase(typeName)
                                                 || JSONB_TYPE_NAME.equalsIgnoreCase(typeName)) {
+                                            System.out.println(
+                                                    Thread.currentThread().getName()
+                                                            + ": objectMapper readTree for Postgres plugin.");
+                                            Stopwatch processStopwatch =
+                                                    new Stopwatch("Postgres Plugin objectMapper readTree");
                                             value = objectMapper.readTree(resultSet.getString(i));
+                                            processStopwatch.stopAndLogTimeInMillisWithSysOut();
                                         } else {
                                             value = resultSet.getObject(i);
 
@@ -499,7 +537,7 @@ private Mono<ActionExecutionResult> executeCommon(
                             }
 
                         } catch (SQLException e) {
-                            log.debug("In the PostgresPlugin, got action execution error");
+                            System.out.println("In the PostgresPlugin, got action execution error");
                             return Mono.error(new AppsmithPluginException(
                                     PostgresPluginError.QUERY_EXECUTION_FAILED,
                                     PostgresErrorMessages.QUERY_EXECUTION_FAILED_ERROR_MSG,
@@ -509,7 +547,7 @@ private Mono<ActionExecutionResult> executeCommon(
                             // Since postgres json type field can only hold valid json data, this exception
                             // is not expected
                             // to occur.
-                            log.debug("In the PostgresPlugin, got action execution error");
+                            System.out.println("In the PostgresPlugin, got action execution error");
                             return Mono.error(new AppsmithPluginException(
                                     PostgresPluginError.QUERY_EXECUTION_FAILED,
                                     PostgresErrorMessages.QUERY_EXECUTION_FAILED_ERROR_MSG,
@@ -519,17 +557,15 @@ private Mono<ActionExecutionResult> executeCommon(
                             activeConnections = poolProxy.getActiveConnections();
                             totalConnections = poolProxy.getTotalConnections();
                             threadsAwaitingConnection = poolProxy.getThreadsAwaitingConnection();
-                            log.debug(
-                                    "After executing postgres query, Hikari Pool stats active - {} , idle - {} , awaiting - {} , total - {} ",
-                                    activeConnections,
-                                    idleConnections,
-                                    threadsAwaitingConnection,
-                                    totalConnections);
+                            System.out.println(String.format(
+                                    "After executing postgres query, Hikari Pool stats active - %d, idle - %d, awaiting - %d, total - %d",
+                                    activeConnections, idleConnections, threadsAwaitingConnection, totalConnections));
                             if (resultSet != null) {
                                 try {
                                     resultSet.close();
                                 } catch (SQLException e) {
-                                    log.debug("Execute Error closing Postgres ResultSet", e);
+                                    System.out.println("Execute Error closing Postgres ResultSet");
+                                    e.printStackTrace();
                                 }
                             }
 
@@ -537,7 +573,8 @@ private Mono<ActionExecutionResult> executeCommon(
                                 try {
                                     statement.close();
                                 } catch (SQLException e) {
-                                    log.debug("Execute Error closing Postgres Statement", e);
+                                    System.out.println("Execute Error closing Postgres Statement");
+                                    e.printStackTrace();
                                 }
                             }
 
@@ -545,7 +582,8 @@ private Mono<ActionExecutionResult> executeCommon(
                                 try {
                                     preparedQuery.close();
                                 } catch (SQLException e) {
-                                    log.debug("Execute Error closing Postgres Statement", e);
+                                    System.out.println("Execute Error closing Postgres Statement");
+                                    e.printStackTrace();
                                 }
                             }
 
@@ -554,16 +592,22 @@ private Mono<ActionExecutionResult> executeCommon(
                                     // Return the connection back to the pool
                                     connectionFromPool.close();
                                 } catch (SQLException e) {
-                                    log.debug("Execute Error returning Postgres connection to pool", e);
+                                    System.out.println("Execute Error returning Postgres connection to pool");
+                                    e.printStackTrace();
                                 }
                             }
                         }
 
                         ActionExecutionResult result = new ActionExecutionResult();
+                        System.out.println(
+                                Thread.currentThread().getName() + ": objectMapper valueToTree for Postgres plugin.");
+                        Stopwatch processStopwatch = new Stopwatch("Postgres Plugin objectMapper valueToTree");
                         result.setBody(objectMapper.valueToTree(rowsList));
+                        processStopwatch.stopAndLogTimeInMillisWithSysOut();
                         result.setMessages(populateHintMessages(columnsList));
                         result.setIsExecutionSuccess(true);
-                        log.debug("In the PostgresPlugin, got action execution result");
+                        System.out.println(Thread.currentThread().getName()
+                                + ": In the PostgresPlugin, got action execution result");
                         return Mono.just(result);
                     })
                     .flatMap(obj -> obj)
@@ -626,6 +670,8 @@ public Mono<ActionExecutionResult> execute(
 
         @Override
         public Mono<HikariDataSource> datasourceCreate(DatasourceConfiguration datasourceConfiguration) {
+            String printMessage = Thread.currentThread().getName() + ": datasourceCreate() called for Postgres plugin.";
+            System.out.println(printMessage);
             try {
                 Class.forName(JDBC_DRIVER);
             } catch (ClassNotFoundException e) {
@@ -635,15 +681,11 @@ public Mono<HikariDataSource> datasourceCreate(DatasourceConfiguration datasourc
                         e.getMessage()));
             }
 
-            return connectionPoolConfig
-                    .getMaxConnectionPoolSize()
-                    .flatMap(maxPoolSize -> {
-                        return Mono.fromCallable(() -> {
-                            log.debug("Connecting to Postgres db");
-                            return createConnectionPool(datasourceConfiguration, maxPoolSize);
-                        });
+            return connectionPoolConfig.getMaxConnectionPoolSize().flatMap(maxPoolSize -> Mono.fromCallable(() -> {
+                        System.out.println(Thread.currentThread().getName() + ": Connecting to Postgres db");
+                        return createConnectionPool(datasourceConfiguration, maxPoolSize);
                     })
-                    .subscribeOn(scheduler);
+                    .subscribeOn(scheduler));
         }
 
         @Override
@@ -655,6 +697,9 @@ public void datasourceDestroy(HikariDataSource connection) {
 
         @Override
         public Set<String> validateDatasource(DatasourceConfiguration datasourceConfiguration) {
+            String printMessage =
+                    Thread.currentThread().getName() + ": validateDatasource() called for Postgres plugin.";
+            System.out.println(printMessage);
             Set<String> invalids = new HashSet<>();
 
             if (CollectionUtils.isEmpty(datasourceConfiguration.getEndpoints())) {
@@ -685,6 +730,10 @@ public Set<String> validateDatasource(DatasourceConfiguration datasourceConfigur
                     invalids.add(PostgresErrorMessages.DS_MISSING_USERNAME_ERROR_MSG);
                 }
 
+                if (StringUtils.isEmpty(authentication.getPassword())) {
+                    invalids.add(PostgresErrorMessages.DS_MISSING_PASSWORD_ERROR_MSG);
+                }
+
                 if (StringUtils.isEmpty(authentication.getDatabaseName())) {
                     invalids.add(PostgresErrorMessages.DS_MISSING_DATABASE_NAME_ERROR_MSG);
                 }
@@ -700,6 +749,32 @@ public Set<String> validateDatasource(DatasourceConfiguration datasourceConfigur
                 invalids.add(PostgresErrorMessages.SSL_CONFIGURATION_ERROR_MSG);
             }
 
+            if (isSSHEnabled(datasourceConfiguration, CONNECTION_METHOD_INDEX)) {
+                if (datasourceConfiguration.getSshProxy() == null
+                        || isBlank(datasourceConfiguration.getSshProxy().getHost())) {
+                    invalids.add(DS_MISSING_SSH_HOSTNAME_ERROR_MSG);
+                } else {
+                    String sshHost = datasourceConfiguration.getSshProxy().getHost();
+                    if (sshHost.contains("/") || sshHost.contains(":")) {
+                        invalids.add(DS_INVALID_SSH_HOSTNAME_ERROR_MSG);
+                    }
+                }
+
+                if (isBlank(datasourceConfiguration.getSshProxy().getUsername())) {
+                    invalids.add(DS_MISSING_SSH_USERNAME_ERROR_MSG);
+                }
+
+                if (datasourceConfiguration.getSshProxy().getPrivateKey() == null
+                        || datasourceConfiguration.getSshProxy().getPrivateKey().getKeyFile() == null
+                        || isBlank(datasourceConfiguration
+                                .getSshProxy()
+                                .getPrivateKey()
+                                .getKeyFile()
+                                .getBase64Content())) {
+                    invalids.add(DS_MISSING_SSH_KEY_ERROR_MSG);
+                }
+            }
+
             return invalids;
         }
 
@@ -707,6 +782,8 @@ public Set<String> validateDatasource(DatasourceConfiguration datasourceConfigur
         public Mono<DatasourceStructure> getStructure(
                 HikariDataSource connection, DatasourceConfiguration datasourceConfiguration) {
 
+            String printMessage = Thread.currentThread().getName() + ": getStructure() called for Postgres plugin.";
+            System.out.println(printMessage);
             final DatasourceStructure structure = new DatasourceStructure();
             final Map<String, DatasourceStructure.Table> tablesByName = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
 
@@ -735,12 +812,9 @@ public Mono<DatasourceStructure> getStructure(
                         int activeConnections = poolProxy.getActiveConnections();
                         int totalConnections = poolProxy.getTotalConnections();
                         int threadsAwaitingConnection = poolProxy.getThreadsAwaitingConnection();
-                        log.debug(
-                                "Before getting postgres db structure Hikari Pool stats active - {} , idle - {} , awaiting - {} , total - {} ",
-                                activeConnections,
-                                idleConnections,
-                                threadsAwaitingConnection,
-                                totalConnections);
+                        System.out.println(String.format(
+                                "Before getting postgres db structure Hikari Pool stats active - %d, idle - %d, awaiting - %d, total - %d",
+                                activeConnections, idleConnections, threadsAwaitingConnection, totalConnections));
 
                         // Ref:
                         // <https://docs.oracle.com/en/java/javase/11/docs/api/java.sql/java/sql/DatabaseMetaData.html>.
@@ -922,19 +996,18 @@ public Mono<DatasourceStructure> getStructure(
                             activeConnections = poolProxy.getActiveConnections();
                             totalConnections = poolProxy.getTotalConnections();
                             threadsAwaitingConnection = poolProxy.getThreadsAwaitingConnection();
-                            log.debug(
-                                    "After postgres db structure, Hikari Pool stats active - {} , idle - {} , awaiting - {} , total - {} ",
-                                    activeConnections,
-                                    idleConnections,
-                                    threadsAwaitingConnection,
-                                    totalConnections);
+                            System.out.println(String.format(
+                                    "After postgres db structure, Hikari Pool stats active - %d, idle - %d, awaiting - %d, total - %d",
+                                    activeConnections, idleConnections, threadsAwaitingConnection, totalConnections));
 
                             if (connectionFromPool != null) {
                                 try {
                                     // Return the connection back to the pool
                                     connectionFromPool.close();
                                 } catch (SQLException e) {
-                                    log.debug("Error returning Postgres connection to pool during get structure", e);
+                                    System.out.println(
+                                            "Error returning Postgres connection to pool during get structure");
+                                    e.printStackTrace();
                                 }
                             }
                         }
@@ -943,7 +1016,7 @@ public Mono<DatasourceStructure> getStructure(
                         for (DatasourceStructure.Table table : structure.getTables()) {
                             table.getKeys().sort(Comparator.naturalOrder());
                         }
-                        log.debug("Got the structure of postgres db");
+                        System.out.println(Thread.currentThread().getName() + ": Got the structure of postgres db");
                         return structure;
                     })
                     .map(resultStructure -> (DatasourceStructure) resultStructure)
@@ -1024,7 +1097,12 @@ public Object substituteValueInInput(
                         preparedStatement.setArray(index, null);
                         break;
                     case ARRAY: {
+                        System.out.println(Thread.currentThread().getName()
+                                + ": objectMapper readValue for Postgres plugin ARRAY class");
+                        Stopwatch processStopwatch =
+                                new Stopwatch("Postgres Plugin objectMapper readValue for ARRAY class");
                         List arrayListFromInput = objectMapper.readValue(value, List.class);
+                        processStopwatch.stopAndLogTimeInMillisWithSysOut();
                         if (arrayListFromInput.isEmpty()) {
                             break;
                         }
@@ -1130,9 +1208,20 @@ private static HikariDataSource createConnectionPool(
         // Set up the connection URL
         StringBuilder urlBuilder = new StringBuilder("jdbc:postgresql://");
 
-        List<String> hosts = datasourceConfiguration.getEndpoints().stream()
-                .map(endpoint -> endpoint.getHost() + ":" + ObjectUtils.defaultIfNull(endpoint.getPort(), 5432L))
-                .collect(Collectors.toList());
+        List<String> hosts = new ArrayList<>();
+
+        if (!isSSHEnabled(datasourceConfiguration, CONNECTION_METHOD_INDEX)) {
+            for (Endpoint endpoint : datasourceConfiguration.getEndpoints()) {
+                hosts.add(endpoint.getHost() + ":" + ObjectUtils.defaultIfNull(endpoint.getPort(), 5432L));
+            }
+        } else {
+            ConnectionContext<HikariDataSource> connectionContext;
+            connectionContext = getConnectionContext(
+                    datasourceConfiguration, CONNECTION_METHOD_INDEX, DEFAULT_POSTGRES_PORT, HikariDataSource.class);
+
+            hosts.add(LOCALHOST + ":"
+                    + connectionContext.getSshTunnelContext().getServerSocket().getLocalPort());
+        }
 
         urlBuilder.append(String.join(",", hosts)).append("/");
 
@@ -1260,10 +1349,21 @@ private static HikariDataSource createConnectionPool(
         try {
             datasource = new HikariDataSource(config);
         } catch (PoolInitializationException e) {
+            Throwable cause = e.getCause();
+            if (cause instanceof PSQLException) {
+                PSQLException psqlException = (PSQLException) cause;
+                String sqlState = psqlException.getSQLState();
+                if (PSQLState.CONNECTION_UNABLE_TO_CONNECT.getState().equals(sqlState)) {
+                    throw new AppsmithPluginException(
+                            AppsmithPluginError.PLUGIN_DATASOURCE_ARGUMENT_ERROR,
+                            PostgresErrorMessages.DS_INVALID_HOSTNAME_AND_PORT_MSG,
+                            psqlException.getMessage());
+                }
+            }
             throw new AppsmithPluginException(
                     AppsmithPluginError.PLUGIN_DATASOURCE_ARGUMENT_ERROR,
                     PostgresErrorMessages.CONNECTION_POOL_CREATION_FAILED_ERROR_MSG,
-                    e.getMessage());
+                    cause != null ? cause.getMessage() : e.getMessage());
         }
 
         return datasource;
diff --git a/app/server/appsmith-plugins/postgresPlugin/src/main/java/com/external/plugins/exceptions/PostgresErrorMessages.java b/app/server/appsmith-plugins/postgresPlugin/src/main/java/com/external/plugins/exceptions/PostgresErrorMessages.java
index 06af60d122c3..8cee7970b58a 100644
--- a/app/server/appsmith-plugins/postgresPlugin/src/main/java/com/external/plugins/exceptions/PostgresErrorMessages.java
+++ b/app/server/appsmith-plugins/postgresPlugin/src/main/java/com/external/plugins/exceptions/PostgresErrorMessages.java
@@ -46,5 +46,9 @@ public class PostgresErrorMessages extends BasePluginErrorMessages {
 
     public static final String DS_MISSING_USERNAME_ERROR_MSG = "Missing username for authentication.";
 
+    public static final String DS_MISSING_PASSWORD_ERROR_MSG = "Missing password for authentication.";
+
     public static final String DS_MISSING_DATABASE_NAME_ERROR_MSG = "Missing database name.";
+
+    public static final String DS_INVALID_HOSTNAME_AND_PORT_MSG = "Please check the host and port.";
 }
diff --git a/app/server/appsmith-plugins/postgresPlugin/src/main/resources/form.json b/app/server/appsmith-plugins/postgresPlugin/src/main/resources/form.json
index 5c12b3c893f4..6bb1ea90937b 100644
--- a/app/server/appsmith-plugins/postgresPlugin/src/main/resources/form.json
+++ b/app/server/appsmith-plugins/postgresPlugin/src/main/resources/form.json
@@ -4,14 +4,43 @@
       "sectionName": "Connection",
       "id": 1,
       "children": [
+        {
+          "label": "Connection method",
+          "configProperty": "datasourceConfiguration.properties[1].key",
+          "initialValue": "Connection method",
+          "hidden": true,
+          "controlType": "INPUT_TEXT"
+        },
+        {
+          "label": "Connection method",
+          "configProperty": "datasourceConfiguration.properties[1].value",
+          "controlType": "SEGMENTED_CONTROL",
+          "initialValue": "STANDARD",
+          "options": [
+            {
+              "label": "Standard",
+              "value": "STANDARD"
+            },
+            {
+              "label": "SSH tunnel",
+              "value": "SSH"
+            }
+          ]
+        },
         {
           "label": "Connection mode",
           "configProperty": "datasourceConfiguration.connection.mode",
           "controlType": "SEGMENTED_CONTROL",
           "initialValue": "READ_WRITE",
           "options": [
-            { "label": "Read / Write", "value": "READ_WRITE" },
-            { "label": "Read only", "value": "READ_ONLY" }
+            {
+              "label": "Read / Write",
+              "value": "READ_WRITE"
+            },
+            {
+              "label": "Read only",
+              "value": "READ_ONLY"
+            }
           ]
         },
         {
@@ -35,6 +64,32 @@
             }
           ]
         },
+        {
+          "sectionName": null,
+          "children": [
+            {
+              "label": "SSH host address",
+              "configProperty": "datasourceConfiguration.sshProxy.endpoints[*].host",
+              "controlType": "KEYVALUE_ARRAY",
+              "validationMessage": "Please enter a valid host",
+              "validationRegex": "^((?![/:]).)*$",
+              "placeholderText": "myapp.abcde.sshHost.net"
+            },
+            {
+              "label": "SSH port",
+              "configProperty": "datasourceConfiguration.sshProxy.endpoints[*].port",
+              "dataType": "NUMBER",
+              "controlType": "KEYVALUE_ARRAY",
+              "initialValue": ["22"],
+              "placeholderText": "22"
+            }
+          ],
+          "hidden": {
+            "path": "datasourceConfiguration.properties[1].value",
+            "comparison": "NOT_EQUALS",
+            "value": "SSH"
+          }
+        },
         {
           "label": "Database name",
           "configProperty": "datasourceConfiguration.authentication.databaseName",
@@ -64,6 +119,28 @@
               "controlType": "INPUT_TEXT",
               "placeholderText": "Password",
               "encrypted": true
+            },
+            {
+              "label": "SSH username",
+              "configProperty": "datasourceConfiguration.sshProxy.username",
+              "controlType": "INPUT_TEXT",
+              "placeholderText": "Username",
+              "hidden": {
+                "path": "datasourceConfiguration.properties[1].value",
+                "comparison": "NOT_EQUALS",
+                "value": "SSH"
+              }
+            },
+            {
+              "label": "SSH key",
+              "configProperty": "datasourceConfiguration.sshProxy.privateKey.keyFile",
+              "controlType": "FILE_PICKER",
+              "encrypted": true,
+              "hidden": {
+                "path": "datasourceConfiguration.properties[1].value",
+                "comparison": "NOT_EQUALS",
+                "value": "SSH"
+              }
             }
           ]
         }
@@ -79,13 +156,34 @@
           "controlType": "DROP_DOWN",
           "initialValue": "DEFAULT",
           "options": [
-            { "label": "Default", "value": "DEFAULT" },
-            { "label": "Allow", "value": "ALLOW" },
-            { "label": "Prefer", "value": "PREFER" },
-            { "label": "Require", "value": "REQUIRE" },
-            { "label": "Disable", "value": "DISABLE" },
-            { "label": "Verify CA", "value": "VERIFY_CA" },
-            { "label": "Verify Full", "value": "VERIFY_FULL" }
+            {
+              "label": "Default",
+              "value": "DEFAULT"
+            },
+            {
+              "label": "Allow",
+              "value": "ALLOW"
+            },
+            {
+              "label": "Prefer",
+              "value": "PREFER"
+            },
+            {
+              "label": "Require",
+              "value": "REQUIRE"
+            },
+            {
+              "label": "Disable",
+              "value": "DISABLE"
+            },
+            {
+              "label": "Verify CA",
+              "value": "VERIFY_CA"
+            },
+            {
+              "label": "Verify Full",
+              "value": "VERIFY_FULL"
+            }
           ]
         },
         {
@@ -94,8 +192,14 @@
           "controlType": "DROP_DOWN",
           "initialValue": "-Select-",
           "options": [
-            { "label": "Upload File", "value": "FILE" },
-            { "label": "Base64 String", "value": "BASE64_STRING" }
+            {
+              "label": "Upload File",
+              "value": "FILE"
+            },
+            {
+              "label": "Base64 String",
+              "value": "BASE64_STRING"
+            }
           ],
           "hidden": {
             "conditionType": "AND",
@@ -114,10 +218,15 @@
           }
         },
         {
-          "sectionStyles": { "display": "flex", "flex-wrap": "wrap" },
+          "sectionStyles": {
+            "display": "flex",
+            "flex-wrap": "wrap"
+          },
           "children": [
             {
-              "sectionStyles": { "marginRight": "10px" },
+              "sectionStyles": {
+                "marginRight": "10px"
+              },
               "children": [
                 {
                   "label": "Client CA Certificate File",
@@ -145,7 +254,9 @@
               ]
             },
             {
-              "sectionStyles": { "marginRight": "10px" },
+              "sectionStyles": {
+                "marginRight": "10px"
+              },
               "children": [
                 {
                   "label": "Server CA Certificate File",
@@ -173,7 +284,9 @@
               ]
             },
             {
-              "sectionStyles": { "marginRight": "10px" },
+              "sectionStyles": {
+                "marginRight": "10px"
+              },
               "children": [
                 {
                   "label": "Client Key Certificate File",
@@ -201,15 +314,21 @@
               ]
             },
             {
-              "sectionStyles": { "flex": 1 },
+              "sectionStyles": {
+                "flex": 1
+              },
               "children": []
             },
             {
-              "sectionStyles": { "flex": 1 },
+              "sectionStyles": {
+                "flex": 1
+              },
               "children": []
             },
             {
-              "sectionStyles": { "flex": 1 },
+              "sectionStyles": {
+                "flex": 1
+              },
               "children": []
             }
           ],
diff --git a/app/server/appsmith-plugins/postgresPlugin/src/test/java/com/external/plugins/PostgresDatasourceValidationTest.java b/app/server/appsmith-plugins/postgresPlugin/src/test/java/com/external/plugins/PostgresDatasourceValidationTest.java
new file mode 100644
index 000000000000..6e5b2a16be05
--- /dev/null
+++ b/app/server/appsmith-plugins/postgresPlugin/src/test/java/com/external/plugins/PostgresDatasourceValidationTest.java
@@ -0,0 +1,180 @@
+package com.external.plugins;
+
+import com.appsmith.external.configurations.connectionpool.ConnectionPoolConfig;
+import com.appsmith.external.models.Connection;
+import com.appsmith.external.models.DBAuth;
+import com.appsmith.external.models.DatasourceConfiguration;
+import com.appsmith.external.models.Endpoint;
+import com.appsmith.external.models.Property;
+import com.appsmith.external.models.SSHConnection;
+import com.appsmith.external.models.SSHPrivateKey;
+import com.appsmith.external.models.SSLDetails;
+import com.appsmith.external.models.UploadedFile;
+import com.appsmith.external.services.SharedConfig;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import static com.appsmith.external.exceptions.pluginExceptions.BasePluginErrorMessages.DS_INVALID_SSH_HOSTNAME_ERROR_MSG;
+import static com.appsmith.external.exceptions.pluginExceptions.BasePluginErrorMessages.DS_MISSING_SSH_HOSTNAME_ERROR_MSG;
+import static com.appsmith.external.exceptions.pluginExceptions.BasePluginErrorMessages.DS_MISSING_SSH_KEY_ERROR_MSG;
+import static com.appsmith.external.exceptions.pluginExceptions.BasePluginErrorMessages.DS_MISSING_SSH_USERNAME_ERROR_MSG;
+import static com.appsmith.external.models.Connection.Mode.READ_WRITE;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+
+public class PostgresDatasourceValidationTest {
+
+    static SharedConfig mockSharedConfig = mock(SharedConfig.class);
+    static ConnectionPoolConfig mockConnectionPoolConfig = mock(ConnectionPoolConfig.class);
+    static PostgresPlugin.PostgresPluginExecutor pluginExecutor =
+            new PostgresPlugin.PostgresPluginExecutor(mockSharedConfig, mockConnectionPoolConfig);
+
+    private DatasourceConfiguration getDatasourceConfigurationWithStandardConnectionMethod() {
+        DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
+
+        /* Set connection method toggle */
+        ArrayList<Property> properties = new ArrayList<>();
+        properties.add(null);
+        properties.add(new Property("Connection method", "STANDARD"));
+        datasourceConfiguration.setProperties(properties);
+
+        /* Set connection mode */
+        datasourceConfiguration.setConnection(new Connection());
+        datasourceConfiguration.getConnection().setMode(READ_WRITE);
+
+        /* Set MySQL endpoints */
+        ArrayList<Endpoint> mysqlEndpoints = new ArrayList<>();
+        mysqlEndpoints.add(new Endpoint("postgresHost", 5432L));
+        datasourceConfiguration.setEndpoints(mysqlEndpoints);
+
+        /* Set DB username and password */
+        datasourceConfiguration.setAuthentication(new DBAuth(null, "username", "password", "dbname"));
+
+        /* Set ssl mode */
+        datasourceConfiguration.getConnection().setSsl(new SSLDetails());
+        datasourceConfiguration.getConnection().getSsl().setAuthType(SSLDetails.AuthType.DEFAULT);
+        return datasourceConfiguration;
+    }
+
+    private DatasourceConfiguration getDatasourceConfigurationWithSSHConnectionMethod() {
+        DatasourceConfiguration datasourceConfiguration = getDatasourceConfigurationWithStandardConnectionMethod();
+
+        /* Set connection method toggle */
+        ArrayList<Property> properties = new ArrayList<>();
+        properties.add(null);
+        properties.add(new Property("Connection method", "SSH"));
+        datasourceConfiguration.setProperties(properties);
+
+        /* Set SSH endpoints */
+        ArrayList<Endpoint> sshEndpoints = new ArrayList<>();
+        sshEndpoints.add(new Endpoint("sshHost", 22L));
+        SSHConnection sshConnection = new SSHConnection();
+        sshConnection.setEndpoints(sshEndpoints);
+
+        /* Set SSH username and key */
+        sshConnection.setUsername("sshUser");
+        sshConnection.setPrivateKey(new SSHPrivateKey(new UploadedFile("key", "base64Key"), null));
+        datasourceConfiguration.setSshProxy(sshConnection);
+
+        return datasourceConfiguration;
+    }
+
+    /* Test error message for empty SSH host */
+    @Test
+    public void testErrorMessageOnEmptySSHHost() {
+        DatasourceConfiguration sshDatasourceConfiguration = getDatasourceConfigurationWithSSHConnectionMethod();
+        sshDatasourceConfiguration.getSshProxy().setHost("");
+        Set<String> validationErrors = pluginExecutor.validateDatasource(sshDatasourceConfiguration);
+        assertTrue(validationErrors.size() > 0);
+        assertTrue(validationErrors.contains(DS_MISSING_SSH_HOSTNAME_ERROR_MSG), validationErrors::toString);
+    }
+
+    /* Test error message for bad SSH host */
+    @Test
+    public void testErrorMessageOnBadSSHHost() {
+        DatasourceConfiguration sshDatasourceConfiguration = getDatasourceConfigurationWithSSHConnectionMethod();
+        sshDatasourceConfiguration.getSshProxy().setHost("hostname:port");
+        Set<String> validationErrors = pluginExecutor.validateDatasource(sshDatasourceConfiguration);
+        assertTrue(validationErrors.size() > 0);
+        assertTrue(validationErrors.contains(DS_INVALID_SSH_HOSTNAME_ERROR_MSG), validationErrors::toString);
+    }
+
+    /* Test no error message for empty SSH port */
+    @Test
+    public void testErrorMessageOnEmptySSHPort() {
+        DatasourceConfiguration sshDatasourceConfiguration = getDatasourceConfigurationWithSSHConnectionMethod();
+        sshDatasourceConfiguration.getSshProxy().setPort(null);
+        Set<String> validationErrors = pluginExecutor.validateDatasource(sshDatasourceConfiguration);
+        assertTrue(validationErrors.isEmpty(), validationErrors::toString);
+    }
+
+    /* Test error message for empty SSH username */
+    @Test
+    public void testErrorMessageOnEmptySSHUsername() {
+        DatasourceConfiguration sshDatasourceConfiguration = getDatasourceConfigurationWithSSHConnectionMethod();
+        sshDatasourceConfiguration.getSshProxy().setUsername("");
+        Set<String> validationErrors = pluginExecutor.validateDatasource(sshDatasourceConfiguration);
+        assertTrue(validationErrors.size() > 0);
+        assertTrue(validationErrors.contains(DS_MISSING_SSH_USERNAME_ERROR_MSG), validationErrors::toString);
+    }
+
+    /* Test error message for empty SSH key */
+    @Test
+    public void testErrorMessageOnEmptySSHKey() {
+        DatasourceConfiguration sshDatasourceConfiguration = getDatasourceConfigurationWithSSHConnectionMethod();
+        sshDatasourceConfiguration.getSshProxy().getPrivateKey().getKeyFile().setBase64Content("");
+        Set<String> validationErrors = pluginExecutor.validateDatasource(sshDatasourceConfiguration);
+        assertTrue(validationErrors.size() > 0);
+        assertTrue(validationErrors.contains(DS_MISSING_SSH_KEY_ERROR_MSG), validationErrors::toString);
+    }
+
+    @Test
+    public void testValidateDatasourceNullCredentials() {
+        DatasourceConfiguration dsConfig = getDatasourceConfigurationWithStandardConnectionMethod();
+        dsConfig.setConnection(new com.appsmith.external.models.Connection());
+        DBAuth auth = (DBAuth) dsConfig.getAuthentication();
+        auth.setUsername(null);
+        auth.setPassword(null);
+        auth.setDatabaseName("someDbName");
+        Set<String> output = pluginExecutor.validateDatasource(dsConfig);
+        assertTrue(output.contains("Missing username for authentication."));
+        System.out.println("Output : " + output);
+        assertTrue(output.contains("Missing password for authentication."));
+    }
+
+    @Test
+    public void testValidateDatasourceMissingDBName() {
+        DatasourceConfiguration dsConfig = getDatasourceConfigurationWithStandardConnectionMethod();
+        ((DBAuth) dsConfig.getAuthentication()).setDatabaseName("");
+        Set<String> output = pluginExecutor.validateDatasource(dsConfig);
+        assertTrue(output.stream().anyMatch(error -> error.contains("Missing database name.")));
+    }
+
+    @Test
+    public void testValidateDatasourceNullEndpoint() {
+        DatasourceConfiguration dsConfig = getDatasourceConfigurationWithStandardConnectionMethod();
+        dsConfig.setEndpoints(null);
+        Set<String> output = pluginExecutor.validateDatasource(dsConfig);
+        assertTrue(output.stream().anyMatch(error -> error.contains("Missing endpoint.")));
+    }
+
+    @Test
+    public void testValidateDatasource_NullHost() {
+        DatasourceConfiguration dsConfig = getDatasourceConfigurationWithStandardConnectionMethod();
+        dsConfig.setEndpoints(List.of(new Endpoint()));
+        Set<String> output = pluginExecutor.validateDatasource(dsConfig);
+        assertTrue(output.stream().anyMatch(error -> error.contains("Missing hostname.")));
+    }
+
+    @Test
+    public void testValidateDatasourceInvalidEndpoint() {
+        DatasourceConfiguration dsConfig = getDatasourceConfigurationWithStandardConnectionMethod();
+        String hostname = "jdbc:postgresql://localhost";
+        dsConfig.getEndpoints().get(0).setHost(hostname);
+        Set<String> output = pluginExecutor.validateDatasource(dsConfig);
+        assertTrue(output.contains("Host value cannot contain `/` or `:` characters. Found `" + hostname + "`."));
+    }
+}
diff --git a/app/server/appsmith-plugins/postgresPlugin/src/test/java/com/external/plugins/PostgresPluginTest.java b/app/server/appsmith-plugins/postgresPlugin/src/test/java/com/external/plugins/PostgresPluginTest.java
index b15878ccbc5e..2ec1943e85a4 100644
--- a/app/server/appsmith-plugins/postgresPlugin/src/test/java/com/external/plugins/PostgresPluginTest.java
+++ b/app/server/appsmith-plugins/postgresPlugin/src/test/java/com/external/plugins/PostgresPluginTest.java
@@ -17,6 +17,7 @@
 import com.appsmith.external.models.Property;
 import com.appsmith.external.models.PsParameterDTO;
 import com.appsmith.external.models.RequestParamDTO;
+import com.appsmith.external.models.SSHConnection;
 import com.appsmith.external.models.SSLDetails;
 import com.appsmith.external.services.SharedConfig;
 import com.external.plugins.exceptions.PostgresErrorMessages;
@@ -576,7 +577,7 @@ public void validateDatasource_withCorrectCredentialsNoPwd_returnsWithoutInvalid
 
         final Set<String> datasourceValidationInvalids = pluginExecutor.validateDatasource(dsConfig);
 
-        assertTrue(datasourceValidationInvalids.isEmpty());
+        assertEquals(Set.of("Missing password for authentication."), datasourceValidationInvalids);
     }
 
     @Test
@@ -2028,4 +2029,111 @@ public void testGetEndpointIdentifierForRateLimit_HostPresentPortAbsent_ReturnsC
                 })
                 .verifyComplete();
     }
+
+    @Test
+    public void testGetEndpointIdentifierForRateLimit_HostPresentPortAbsentSshEnabled_ReturnsCorrectString() {
+        DatasourceConfiguration dsConfig = createDatasourceConfiguration();
+
+        // Setting hostname and port
+        dsConfig.getEndpoints().get(0).setHost("localhost");
+        dsConfig.getEndpoints().get(0).setPort(null);
+
+        // Set ssh enabled
+        List<Property> properties = new ArrayList();
+        properties.add(null);
+        properties.add(new Property("Connection Method", "SSH"));
+        dsConfig.setProperties(properties);
+
+        final Mono<String> endPointIdentifierMono = pluginExecutor.getEndpointIdentifierForRateLimit(dsConfig);
+
+        StepVerifier.create(endPointIdentifierMono)
+                .assertNext(endpointIdentifier -> {
+                    assertEquals("localhost_5432", endpointIdentifier);
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    public void
+            testGetEndpointIdentifierForRateLimit_HostPresentPortAbsentSshEnabledwithHostAndPort_ReturnsCorrectString() {
+        DatasourceConfiguration dsConfig = createDatasourceConfiguration();
+
+        // Setting hostname and port
+        dsConfig.getEndpoints().get(0).setHost("localhost");
+        dsConfig.getEndpoints().get(0).setPort(null);
+
+        // Set ssh enabled
+        List<Property> properties = new ArrayList();
+        properties.add(null);
+        properties.add(new Property("Connection Method", "SSH"));
+        dsConfig.setProperties(properties);
+
+        SSHConnection sshProxy = new SSHConnection();
+        sshProxy.setHost("sshHost");
+        sshProxy.setPort(22L);
+        dsConfig.setSshProxy(sshProxy);
+
+        final Mono<String> endPointIdentifierMono = pluginExecutor.getEndpointIdentifierForRateLimit(dsConfig);
+
+        StepVerifier.create(endPointIdentifierMono)
+                .assertNext(endpointIdentifier -> {
+                    assertEquals("localhost_5432_sshHost_22", endpointIdentifier);
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    public void
+            testGetEndpointIdentifierForRateLimit_HostPresentPortAbsentSshEnabledwithHostAndNullPort_ReturnsCorrectString() {
+        DatasourceConfiguration dsConfig = createDatasourceConfiguration();
+
+        // Setting hostname and port
+        dsConfig.getEndpoints().get(0).setHost("localhost");
+        dsConfig.getEndpoints().get(0).setPort(null);
+
+        // Set ssh enabled
+        List<Property> properties = new ArrayList();
+        properties.add(null);
+        properties.add(new Property("Connection Method", "SSH"));
+        dsConfig.setProperties(properties);
+
+        SSHConnection sshProxy = new SSHConnection();
+        sshProxy.setHost("sshHost");
+        dsConfig.setSshProxy(sshProxy);
+
+        final Mono<String> endPointIdentifierMono = pluginExecutor.getEndpointIdentifierForRateLimit(dsConfig);
+
+        StepVerifier.create(endPointIdentifierMono)
+                .assertNext(endpointIdentifier -> {
+                    assertEquals("localhost_5432_sshHost_22", endpointIdentifier);
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    public void
+            testGetEndpointIdentifierForRateLimit_EndpointAbsentSshEnabledwithHostAndNullPort_ReturnsCorrectString() {
+        DatasourceConfiguration dsConfig = createDatasourceConfiguration();
+
+        // Setting hostname and port
+        dsConfig.setEndpoints(new ArrayList());
+
+        // Set ssh enabled
+        List<Property> properties = new ArrayList();
+        properties.add(null);
+        properties.add(new Property("Connection Method", "SSH"));
+        dsConfig.setProperties(properties);
+
+        SSHConnection sshProxy = new SSHConnection();
+        sshProxy.setHost("sshHost");
+        dsConfig.setSshProxy(sshProxy);
+
+        final Mono<String> endPointIdentifierMono = pluginExecutor.getEndpointIdentifierForRateLimit(dsConfig);
+
+        StepVerifier.create(endPointIdentifierMono)
+                .assertNext(endpointIdentifier -> {
+                    assertEquals("_sshHost_22", endpointIdentifier);
+                })
+                .verifyComplete();
+    }
 }
diff --git a/app/server/appsmith-plugins/redisPlugin/src/main/java/com/external/plugins/RedisPlugin.java b/app/server/appsmith-plugins/redisPlugin/src/main/java/com/external/plugins/RedisPlugin.java
index cf6d4c8645e9..50520412df62 100644
--- a/app/server/appsmith-plugins/redisPlugin/src/main/java/com/external/plugins/RedisPlugin.java
+++ b/app/server/appsmith-plugins/redisPlugin/src/main/java/com/external/plugins/RedisPlugin.java
@@ -68,6 +68,8 @@ public Mono<ActionExecutionResult> execute(
                 DatasourceConfiguration datasourceConfiguration,
                 ActionConfiguration actionConfiguration) {
 
+            String printMessage = Thread.currentThread().getName() + ": execute() called for Redis plugin.";
+            System.out.println(printMessage);
             String query = actionConfiguration.getBody();
             List<RequestParamDTO> requestParams =
                     List.of(new RequestParamDTO(ACTION_CONFIGURATION_BODY, query, null, null, null));
@@ -119,7 +121,9 @@ public Mono<ActionExecutionResult> execute(
                                 objectMapper.valueToTree(removeQuotes(processCommandOutput(commandOutput))));
                         actionExecutionResult.setIsExecutionSuccess(true);
 
-                        log.debug("In the RedisPlugin, got action execution result");
+                        System.out.println(
+                                Thread.currentThread().getName() + ": In the RedisPlugin, got action execution result");
+
                         return Mono.just(actionExecutionResult);
                     })
                     .flatMap(obj -> obj)
@@ -252,12 +256,15 @@ private JedisPoolConfig buildPoolConfig() {
 
         @Override
         public Mono<JedisPool> datasourceCreate(DatasourceConfiguration datasourceConfiguration) {
+            String printMessage = Thread.currentThread().getName() + ": datasourceCreate() called for Redis plugin.";
+            System.out.println(printMessage);
             return Mono.fromCallable(() -> {
                         final JedisPoolConfig poolConfig = buildPoolConfig();
                         int timeout =
                                 (int) Duration.ofSeconds(CONNECTION_TIMEOUT).toMillis();
                         URI uri = RedisURIUtils.getURI(datasourceConfiguration);
                         JedisPool jedisPool = new JedisPool(poolConfig, uri, timeout);
+                        System.out.println(Thread.currentThread().getName() + ": Created Jedis pool.");
                         return jedisPool;
                     })
                     .subscribeOn(scheduler);
@@ -265,6 +272,8 @@ public Mono<JedisPool> datasourceCreate(DatasourceConfiguration datasourceConfig
 
         @Override
         public void datasourceDestroy(JedisPool jedisPool) {
+            String printMessage = Thread.currentThread().getName() + ": datasourceDestroy() called for Redis plugin.";
+            System.out.println(printMessage);
             // Schedule on elastic thread pool and subscribe immediately.
             Mono.fromSupplier(() -> {
                         try {
@@ -272,7 +281,7 @@ public void datasourceDestroy(JedisPool jedisPool) {
                                 jedisPool.destroy();
                             }
                         } catch (JedisException e) {
-                            log.debug("Error destroying Jedis pool.");
+                            System.out.println("Error destroying Jedis pool.");
                         }
 
                         return Mono.empty();
@@ -283,6 +292,8 @@ public void datasourceDestroy(JedisPool jedisPool) {
 
         @Override
         public Set<String> validateDatasource(DatasourceConfiguration datasourceConfiguration) {
+            String printMessage = Thread.currentThread().getName() + ": validateDatasource() called for Redis plugin.";
+            System.out.println(printMessage);
             Set<String> invalids = new HashSet<>();
 
             if (isEndpointMissing(datasourceConfiguration.getEndpoints())) {
@@ -299,6 +310,9 @@ public Set<String> validateDatasource(DatasourceConfiguration datasourceConfigur
 
         @Override
         public Mono<String> getEndpointIdentifierForRateLimit(DatasourceConfiguration datasourceConfiguration) {
+            String printMessage =
+                    Thread.currentThread().getName() + ": getEndpointIdentifierForRateLimit() called for Redis plugin.";
+            System.out.println(printMessage);
             List<Endpoint> endpoints = datasourceConfiguration.getEndpoints();
             String identifier = "";
             // When hostname and port both are available, both will be used as identifier
@@ -364,6 +378,8 @@ private Mono<Void> verifyPing(JedisPool connectionPool) {
 
         @Override
         public Mono<DatasourceTestResult> testDatasource(JedisPool connectionPool) {
+            String printMessage = Thread.currentThread().getName() + ": testDatasource() called for Redis plugin.";
+            System.out.println(printMessage);
 
             return Mono.just(connectionPool)
                     .flatMap(c -> verifyPing(connectionPool))
diff --git a/app/server/appsmith-plugins/redshiftPlugin/src/main/java/com/external/plugins/RedshiftPlugin.java b/app/server/appsmith-plugins/redshiftPlugin/src/main/java/com/external/plugins/RedshiftPlugin.java
index c16154e0de0f..812d51ccf0a9 100644
--- a/app/server/appsmith-plugins/redshiftPlugin/src/main/java/com/external/plugins/RedshiftPlugin.java
+++ b/app/server/appsmith-plugins/redshiftPlugin/src/main/java/com/external/plugins/RedshiftPlugin.java
@@ -131,7 +131,7 @@ public static class RedshiftPluginExecutor implements PluginExecutor<HikariDataS
 
         private void checkResultSetValidity(ResultSet resultSet) throws AppsmithPluginException {
             if (resultSet == null) {
-                log.debug("Redshift plugin: getRow: driver failed to fetch result: resultSet is null.");
+                System.out.println("Redshift plugin: getRow: driver failed to fetch result: resultSet is null.");
                 throw new AppsmithPluginException(
                         RedshiftPluginError.QUERY_EXECUTION_FAILED, RedshiftErrorMessages.NULL_RESULTSET_ERROR_MSG);
             }
@@ -147,7 +147,7 @@ private Map<String, Object> getRow(ResultSet resultSet) throws SQLException, App
              *    ResultSetMetaData.
              */
             if (metaData == null) {
-                log.debug("Redshift plugin: getRow: metaData is null. Ideally this is never supposed to "
+                System.out.println("Redshift plugin: getRow: metaData is null. Ideally this is never supposed to "
                         + "happen as the Redshift JDBC driver does a null check before passing this object. This means "
                         + "that something has gone wrong while processing the query result.");
                 throw new AppsmithPluginException(
@@ -195,6 +195,8 @@ public Mono<ActionExecutionResult> execute(
                 DatasourceConfiguration datasourceConfiguration,
                 ActionConfiguration actionConfiguration) {
 
+            String printMessage = Thread.currentThread().getName() + ": execute() called for Redshift plugin.";
+            System.out.println(printMessage);
             String query = actionConfiguration.getBody();
             List<RequestParamDTO> requestParams =
                     List.of(new RequestParamDTO(ACTION_CONFIGURATION_BODY, query, null, null, null));
@@ -271,7 +273,8 @@ public Mono<ActionExecutionResult> execute(
                                 try {
                                     resultSet.close();
                                 } catch (SQLException e) {
-                                    log.error("Error closing Redshift ResultSet", e);
+                                    System.out.println("Error closing Redshift ResultSet");
+                                    e.printStackTrace();
                                 }
                             }
 
@@ -279,14 +282,16 @@ public Mono<ActionExecutionResult> execute(
                                 try {
                                     statement.close();
                                 } catch (SQLException e) {
-                                    log.error("Error closing Redshift Statement", e);
+                                    System.out.println("Error closing Redshift Statement");
+                                    e.printStackTrace();
                                 }
                             }
 
                             try {
                                 connection.close();
                             } catch (SQLException e) {
-                                log.error("Error closing Redshift Connection", e);
+                                System.out.println("Error closing Redshift Connection");
+                                e.printStackTrace();
                             }
                         }
 
@@ -294,7 +299,8 @@ public Mono<ActionExecutionResult> execute(
                         result.setBody(objectMapper.valueToTree(rowsList));
                         result.setMessages(populateHintMessages(columnsList));
                         result.setIsExecutionSuccess(true);
-                        log.debug("In RedshiftPlugin, got action execution result");
+                        System.out.println(Thread.currentThread().getName()
+                                + ": In the RedshiftPlugin, got action execution result");
                         return Mono.just(result);
                     })
                     .flatMap(obj -> obj)
@@ -327,19 +333,25 @@ public Mono<ActionExecutionResult> execute(
         }
 
         public void printConnectionPoolStatus(HikariDataSource connectionPool, boolean isFetchingStructure) {
+            String printMessage =
+                    Thread.currentThread().getName() + ": printConnectionPoolStatus() called for Redshift plugin.";
+            System.out.println(printMessage);
             HikariPoolMXBean poolProxy = connectionPool.getHikariPoolMXBean();
             int idleConnections = poolProxy.getIdleConnections();
             int activeConnections = poolProxy.getActiveConnections();
             int totalConnections = poolProxy.getTotalConnections();
             int threadsAwaitingConnection = poolProxy.getThreadsAwaitingConnection();
-            log.debug(Thread.currentThread().getName()
+            System.out.println(Thread.currentThread().getName()
                     + (isFetchingStructure
-                            ? "Before fetching Redshift db" + " structure."
-                            : "Before executing Redshift query.")
-                    + " Hikari Pool stats : " + " active - "
-                    + activeConnections + ", idle - "
-                    + idleConnections + ", awaiting - "
-                    + threadsAwaitingConnection + ", total - "
+                            ? " Before fetching Redshift db structure."
+                            : " Before executing Redshift query.")
+                    + " Hikari Pool stats: active - "
+                    + activeConnections
+                    + ", idle - "
+                    + idleConnections
+                    + ", awaiting - "
+                    + threadsAwaitingConnection
+                    + ", total - "
                     + totalConnections);
         }
 
@@ -360,6 +372,8 @@ private Set<String> populateHintMessages(List<String> columnNames) {
 
         @Override
         public Mono<HikariDataSource> datasourceCreate(DatasourceConfiguration datasourceConfiguration) {
+            String printMessage = Thread.currentThread().getName() + ": datasourceCreate() called for Redshift plugin.";
+            System.out.println(printMessage);
             try {
                 Class.forName(JDBC_DRIVER);
             } catch (ClassNotFoundException e) {
@@ -370,7 +384,7 @@ public Mono<HikariDataSource> datasourceCreate(DatasourceConfiguration datasourc
             }
 
             return Mono.fromCallable(() -> {
-                        log.debug(Thread.currentThread().getName() + ": Connecting to Redshift db");
+                        System.out.println(Thread.currentThread().getName() + ": Connecting to Redshift db");
                         return createConnectionPool(datasourceConfiguration);
                     })
                     .subscribeOn(scheduler);
@@ -378,6 +392,9 @@ public Mono<HikariDataSource> datasourceCreate(DatasourceConfiguration datasourc
 
         @Override
         public void datasourceDestroy(HikariDataSource connectionPool) {
+            String printMessage =
+                    Thread.currentThread().getName() + ": datasourceDestroy() called for Redshift plugin.";
+            System.out.println(printMessage);
             if (connectionPool != null) {
                 connectionPool.close();
             }
@@ -385,6 +402,9 @@ public void datasourceDestroy(HikariDataSource connectionPool) {
 
         @Override
         public Set<String> validateDatasource(@NonNull DatasourceConfiguration datasourceConfiguration) {
+            String printMessage =
+                    Thread.currentThread().getName() + ": validateDatasource() called for Redshift plugin.";
+            System.out.println(printMessage);
             Set<String> invalids = new HashSet<>();
 
             if (CollectionUtils.isEmpty(datasourceConfiguration.getEndpoints())) {
@@ -429,6 +449,9 @@ public Set<String> validateDatasource(@NonNull DatasourceConfiguration datasourc
 
         @Override
         public Mono<String> getEndpointIdentifierForRateLimit(DatasourceConfiguration datasourceConfiguration) {
+            String printMessage = Thread.currentThread().getName()
+                    + ": getEndpointIdentifierForRateLimit() called for Redshift plugin.";
+            System.out.println(printMessage);
             List<Endpoint> endpoints = datasourceConfiguration.getEndpoints();
             String identifier = "";
             // When hostname and port both are available, both will be used as identifier
@@ -602,6 +625,8 @@ private void getTemplates(Map<String, DatasourceStructure.Table> tablesByName) {
         @Override
         public Mono<DatasourceStructure> getStructure(
                 HikariDataSource connectionPool, DatasourceConfiguration datasourceConfiguration) {
+            String printMessage = Thread.currentThread().getName() + ": getStructure() called for Redshift plugin.";
+            System.out.println(printMessage);
             final DatasourceStructure structure = new DatasourceStructure();
             final Map<String, DatasourceStructure.Table> tablesByName = new LinkedHashMap<>();
             final Map<String, DatasourceStructure.Key> keyRegistry = new HashMap<>();
@@ -640,7 +665,7 @@ public Mono<DatasourceStructure> getStructure(
 
                         // Ref:
                         // <https://docs.oracle.com/en/java/javase/11/docs/api/java.sql/java/sql/DatabaseMetaData.html>.
-                        log.debug(Thread.currentThread().getName() + ": Getting Redshift Db structure");
+                        System.out.println(Thread.currentThread().getName() + ": Getting Redshift Db structure");
                         try (Statement statement = connection.createStatement()) {
 
                             // Get tables' schema and fill up their columns.
@@ -672,7 +697,8 @@ public Mono<DatasourceStructure> getStructure(
                             try {
                                 connection.close();
                             } catch (SQLException e) {
-                                log.error("Error closing Redshift Connection", e);
+                                System.out.println("Error closing Redshift Connection");
+                                e.printStackTrace();
                             }
                         }
 
diff --git a/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/plugins/RestApiPlugin.java b/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/plugins/RestApiPlugin.java
index 9fe83b18905f..97b2e5b08b09 100644
--- a/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/plugins/RestApiPlugin.java
+++ b/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/plugins/RestApiPlugin.java
@@ -72,6 +72,9 @@ public Mono<ActionExecutionResult> executeParameterized(
                 DatasourceConfiguration datasourceConfiguration,
                 ActionConfiguration actionConfiguration) {
 
+            String printMessage = Thread.currentThread().getName()
+                    + ": executeParameterized() called for RestAPI plugin. Executing the API call.";
+            System.out.println(printMessage);
             final List<Property> properties = actionConfiguration.getPluginSpecifiedTemplates();
             List<Map.Entry<String, String>> parameters = new ArrayList<>();
 
@@ -131,6 +134,9 @@ public Mono<ActionExecutionResult> executeCommon(
                 ActionConfiguration actionConfiguration,
                 List<Map.Entry<String, String>> insertedParams) {
 
+            String printMessage = Thread.currentThread().getName()
+                    + ": executeCommon() called for RestAPI plugin. Executing the API call.";
+            System.out.println(printMessage);
             // Initializing object for error condition
             ActionExecutionResult errorResult = new ActionExecutionResult();
             initUtils.initializeResponseWithError(errorResult);
@@ -209,10 +215,9 @@ public Mono<ActionExecutionResult> executeCommon(
                         errorResult.setRequest(requestCaptureFilter.populateRequestFields(
                                 actionExecutionRequest, isBodySentWithApiRequest, datasourceConfiguration));
                         errorResult.setIsExecutionSuccess(false);
-                        log.debug(
-                                "An error has occurred while trying to run the API query for url: {}, path : {}",
-                                datasourceConfiguration.getUrl(),
-                                actionConfiguration.getPath());
+                        System.out.println(String.format(
+                                "An error has occurred while trying to run the API query for url: %s, path: %s",
+                                datasourceConfiguration.getUrl(), actionConfiguration.getPath()));
                         error.printStackTrace();
                         if (!(error instanceof AppsmithPluginException)) {
                             error = new AppsmithPluginException(
diff --git a/app/server/appsmith-plugins/saasPlugin/src/main/java/com/external/plugins/SaasPlugin.java b/app/server/appsmith-plugins/saasPlugin/src/main/java/com/external/plugins/SaasPlugin.java
index f1b153530588..da4c99e70ec6 100644
--- a/app/server/appsmith-plugins/saasPlugin/src/main/java/com/external/plugins/SaasPlugin.java
+++ b/app/server/appsmith-plugins/saasPlugin/src/main/java/com/external/plugins/SaasPlugin.java
@@ -3,6 +3,7 @@
 import com.appsmith.external.dtos.ExecutePluginDTO;
 import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginError;
 import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginException;
+import com.appsmith.external.helpers.Stopwatch;
 import com.appsmith.external.models.ActionConfiguration;
 import com.appsmith.external.models.ActionExecutionRequest;
 import com.appsmith.external.models.ActionExecutionResult;
@@ -84,6 +85,8 @@ public Mono<ActionExecutionResult> execute(
                 ExecutePluginDTO connection,
                 DatasourceConfiguration datasourceConfiguration,
                 ActionConfiguration actionConfiguration) {
+            String printMessage = Thread.currentThread().getName() + ": execute() called for Saas plugin.";
+            System.out.println(printMessage);
             // Initializing object for error condition
             ActionExecutionResult errorResult = new ActionExecutionResult();
 
@@ -132,7 +135,12 @@ public Mono<ActionExecutionResult> execute(
 
             String valueAsString = "";
             try {
+                System.out.println(
+                        Thread.currentThread().getName() + ": objectMapper writing value as string for Saas plugin.");
+                Stopwatch processStopwatch =
+                        new Stopwatch("SaaS Plugin objectMapper writing value as string for connection");
                 valueAsString = saasObjectMapper.writeValueAsString(connection);
+                processStopwatch.stopAndLogTimeInMillisWithSysOut();
             } catch (JsonProcessingException e) {
                 e.printStackTrace();
             }
@@ -145,7 +153,14 @@ public Mono<ActionExecutionResult> execute(
                         byte[] body = stringResponseEntity.getBody();
                         if (statusCode.is2xxSuccessful()) {
                             try {
-                                return saasObjectMapper.readValue(body, ActionExecutionResult.class);
+                                System.out.println(Thread.currentThread().getName()
+                                        + ": objectMapper reading value as string for Saas plugin.");
+                                Stopwatch processStopwatch =
+                                        new Stopwatch("SaaS Plugin objectMapper reading value as string for body");
+                                ActionExecutionResult result =
+                                        saasObjectMapper.readValue(body, ActionExecutionResult.class);
+                                processStopwatch.stopAndLogTimeInMillisWithSysOut();
+                                return result;
                             } catch (IOException e) {
                                 throw Exceptions.propagate(new AppsmithPluginException(
                                         AppsmithPluginError.PLUGIN_JSON_PARSE_ERROR, body, e.getMessage()));
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 b7a0804fb39d..952a34df655d 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
@@ -71,6 +71,8 @@ public Mono<ActionExecutionResult> execute(
                 DatasourceConfiguration datasourceConfiguration,
                 ActionConfiguration actionConfiguration) {
 
+            String printMessage = Thread.currentThread().getName() + ": execute() called for SMTP plugin.";
+            System.out.println(printMessage);
             MimeMessage message = getMimeMessage(connection);
             ActionExecutionResult result = new ActionExecutionResult();
             try {
@@ -164,7 +166,7 @@ public Mono<ActionExecutionResult> execute(
                 }
 
                 // Send the email now
-                log.debug("Going to send the email");
+                System.out.println("Going to send the email");
                 Transport.send(message);
 
                 result.setIsExecutionSuccess(true);
@@ -172,7 +174,7 @@ public Mono<ActionExecutionResult> execute(
                 responseBody.put("message", "Sent the email successfully");
                 result.setBody(objectMapper.valueToTree(responseBody));
 
-                log.debug("Sent the email successfully");
+                System.out.println("Sent the email successfully");
             } catch (MessagingException e) {
                 return Mono.error(new AppsmithPluginException(
                         SMTPPluginError.MAIL_SENDING_FAILED,
@@ -198,7 +200,8 @@ MimeMessage getMimeMessage(Session connection) {
 
         @Override
         public Mono<Session> datasourceCreate(DatasourceConfiguration datasourceConfiguration) {
-
+            String printMessage = Thread.currentThread().getName() + ": datasourceCreate() called for SMTP plugin.";
+            System.out.println(printMessage);
             Endpoint endpoint = datasourceConfiguration.getEndpoints().get(0);
             DBAuth authentication = (DBAuth) datasourceConfiguration.getAuthentication();
 
@@ -225,7 +228,8 @@ protected PasswordAuthentication getPasswordAuthentication() {
 
         @Override
         public void datasourceDestroy(Session session) {
-            log.debug("Going to destroy email datasource");
+            String printMessage = Thread.currentThread().getName() + ": datasourceDestroy() called for SMTP plugin.";
+            System.out.println(printMessage);
             try {
                 if (session != null && session.getTransport() != null) {
                     session.getTransport().close();
@@ -237,7 +241,8 @@ public void datasourceDestroy(Session session) {
 
         @Override
         public Set<String> validateDatasource(DatasourceConfiguration datasourceConfiguration) {
-            log.debug("Going to validate email datasource");
+            String printMessage = Thread.currentThread().getName() + ": validateDatasource() called for SMTP plugin.";
+            System.out.println(printMessage);
             Set<String> invalids = new HashSet<>();
             if (CollectionUtils.isEmpty(datasourceConfiguration.getEndpoints())) {
                 invalids.add(SMTPErrorMessages.DS_MISSING_HOST_ADDRESS_ERROR_MSG);
@@ -260,7 +265,8 @@ public Set<String> validateDatasource(DatasourceConfiguration datasourceConfigur
 
         @Override
         public Mono<DatasourceTestResult> testDatasource(Session connection) {
-            log.debug("Going to test email datasource");
+            String printMessage = Thread.currentThread().getName() + ": testDatasource() called for SMTP plugin.";
+            System.out.println(printMessage);
             return Mono.fromCallable(() -> {
                         Set<String> invalids = new HashSet<>();
                         try {
@@ -274,7 +280,7 @@ public Mono<DatasourceTestResult> testDatasource(Session connection) {
                         } catch (AuthenticationFailedException e) {
                             invalids.add(SMTPErrorMessages.DS_AUTHENTICATION_FAILED_ERROR_MSG);
                         } catch (MessagingException e) {
-                            log.debug(e.getMessage());
+                            System.out.println(e.getMessage());
                             invalids.add(SMTPErrorMessages.DS_CONNECTION_FAILED_TO_SMTP_SERVER_ERROR_MSG);
                         }
                         return invalids;
@@ -284,6 +290,9 @@ public Mono<DatasourceTestResult> testDatasource(Session connection) {
 
         @Override
         public Mono<String> getEndpointIdentifierForRateLimit(DatasourceConfiguration datasourceConfiguration) {
+            String printMessage =
+                    Thread.currentThread().getName() + ": getEndpointIdentifierForRateLimit() called for SMTP plugin.";
+            System.out.println(printMessage);
             List<Endpoint> endpoints = datasourceConfiguration.getEndpoints();
             String identifier = "";
             // When hostname and port both are available, both will be used as identifier
diff --git a/app/server/appsmith-plugins/smtpPlugin/src/main/resources/editor/body.json b/app/server/appsmith-plugins/smtpPlugin/src/main/resources/editor/body.json
new file mode 100644
index 000000000000..fe906d4b097b
--- /dev/null
+++ b/app/server/appsmith-plugins/smtpPlugin/src/main/resources/editor/body.json
@@ -0,0 +1,102 @@
+{
+  "controlType": "SECTION_V2",
+  "identifier": "BODY",
+  "conditionals": {
+    "show": "{{actionConfiguration.formData.command === 'SEND'}}"
+  },
+  "children": [
+    {
+      "controlType": "SINGLE_COLUMN_ZONE",
+      "identifier": "BODY-Z1",
+      "children": [
+        {
+          "label": "Recepients",
+          "subtitle": "Separate with comma",
+          "configProperty": "actionConfiguration.formData.send.to",
+          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+          "evaluationSubstitutionType": "TEMPLATE",
+          "placeholderText": "email@example.com, email2@example.com",
+          "isRequired": true
+        }
+      ]
+    },
+    {
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "identifier": "BODY-Z2",
+      "children": [
+        {
+          "label": "CC",
+          "subtitle": "Separate with comma",
+          "configProperty": "actionConfiguration.formData.send.cc",
+          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+          "evaluationSubstitutionType": "TEMPLATE",
+          "placeholderText": "email@example.com, email2@example.com"
+        },
+        {
+          "label": "BCC",
+          "subtitle": "Separate with comma",
+          "configProperty": "actionConfiguration.formData.send.bcc",
+          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+          "evaluationSubstitutionType": "TEMPLATE",
+          "placeholderText": "email@example.com, email2@example.com"
+        }
+      ]
+    },
+    {
+      "controlType": "SINGLE_COLUMN_ZONE",
+      "identifier": "BODY-Z3",
+      "children": [
+        {
+          "label": "Subject",
+          "configProperty": "actionConfiguration.formData.send.subject",
+          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+          "evaluationSubstitutionType": "TEMPLATE",
+          "placeholderText": "Awesome email subject"
+        }
+      ]
+    },
+    {
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "identifier": "BODY-Z4",
+      "children": [
+        {
+          "label": "Body type",
+          "configProperty": "actionConfiguration.formData.send.bodyType",
+          "controlType": "DROP_DOWN",
+          "initialValue": "text/plain",
+          "options": [
+            {
+              "label": "Plain text",
+              "value": "text/plain"
+            },
+            {
+              "label": "HTML",
+              "value": "text/html"
+            }
+          ],
+          "evaluationSubstitutionType": "TEMPLATE"
+        }
+      ]
+    },
+    {
+      "controlType": "SINGLE_COLUMN_ZONE",
+      "identifier": "BODY-Z5",
+      "children": [
+        {
+          "label": "Body",
+          "configProperty": "actionConfiguration.body",
+          "controlType": "QUERY_DYNAMIC_TEXT",
+          "evaluationSubstitutionType": "TEMPLATE",
+          "placeholderText": "Incredible body text"
+        },
+        {
+          "label": "Attachment(s)",
+          "configProperty": "actionConfiguration.formData.send.attachments",
+          "controlType": "QUERY_DYNAMIC_TEXT",
+          "evaluationSubstitutionType": "TEMPLATE",
+          "placeholderText": "{{Filepicker.files}}"
+        }
+      ]
+    }
+  ]
+}
diff --git a/app/server/appsmith-plugins/smtpPlugin/src/main/resources/editor/root.json b/app/server/appsmith-plugins/smtpPlugin/src/main/resources/editor/root.json
index 191cbf2a73bf..8a59a0c4c875 100644
--- a/app/server/appsmith-plugins/smtpPlugin/src/main/resources/editor/root.json
+++ b/app/server/appsmith-plugins/smtpPlugin/src/main/resources/editor/root.json
@@ -1,24 +1,30 @@
 {
   "editor": [
     {
-      "controlType": "SECTION",
+      "controlType": "SECTION_V2",
       "identifier": "SELECTOR",
       "children": [
         {
-          "label": "Command",
-          "description": "Choose method you would like to use to send an email",
-          "configProperty": "actionConfiguration.formData.command",
-          "controlType": "DROP_DOWN",
-          "initialValue": "SEND",
-          "options": [
+          "controlType": "DOUBLE_COLUMN_ZONE",
+          "identifier": "SELECTOR-Z1",
+          "children": [
             {
-              "label": "Send email",
-              "value": "SEND"
+              "label": "Command",
+              "description": "Choose method you would like to use to send an email",
+              "configProperty": "actionConfiguration.formData.command",
+              "controlType": "DROP_DOWN",
+              "initialValue": "SEND",
+              "options": [
+                {
+                  "label": "Send email",
+                  "value": "SEND"
+                }
+              ]
             }
           ]
         }
       ]
     }
   ],
-  "files": ["send.json"]
+  "files": ["send.json", "body.json"]
 }
diff --git a/app/server/appsmith-plugins/smtpPlugin/src/main/resources/editor/send.json b/app/server/appsmith-plugins/smtpPlugin/src/main/resources/editor/send.json
index babfc19e1dfd..68d6e80193ae 100644
--- a/app/server/appsmith-plugins/smtpPlugin/src/main/resources/editor/send.json
+++ b/app/server/appsmith-plugins/smtpPlugin/src/main/resources/editor/send.json
@@ -1,96 +1,49 @@
 {
+  "controlType": "SECTION_V2",
   "identifier": "SEND",
-  "controlType": "SECTION",
   "conditionals": {
     "show": "{{actionConfiguration.formData.command === 'SEND'}}"
   },
   "children": [
     {
-      "controlType": "SECTION",
-      "label": "Email Configuration",
-      "description": "Optional",
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "identifier": "SEND-Z1",
       "children": [
         {
-          "label": "From email *",
+          "label": "From email",
           "configProperty": "actionConfiguration.formData.send.from",
           "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
           "evaluationSubstitutionType": "TEMPLATE",
-          "placeholderText": "fromAddress@example.com"
-        },
+          "placeholderText": "email@example.com",
+          "isRequired": true
+        }
+      ]
+    },
+    {
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "identifier": "SEND-Z2",
+      "children": [
         {
-          "label": "Set Reply To Email",
+          "label": "Set reply to email",
           "configProperty": "actionConfiguration.formData.send.isReplyTo",
           "controlType": "SWITCH",
           "evaluationSubstitutionType": "TEMPLATE"
-        },
+        }
+      ]
+    },
+    {
+      "controlType": "DOUBLE_COLUMN_ZONE",
+      "identifier": "SEND-Z3",
+      "children": [
         {
           "label": "Reply to email",
           "configProperty": "actionConfiguration.formData.send.replyTo",
           "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
           "evaluationSubstitutionType": "TEMPLATE",
-          "placeholderText": "replyTo@example.com",
+          "placeholderText": "email@example.com",
           "conditionals": {
             "show": "{{actionConfiguration.formData.send.isReplyTo === true}}"
           }
-        },
-        {
-          "label": "To email(s) *",
-          "configProperty": "actionConfiguration.formData.send.to",
-          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
-          "evaluationSubstitutionType": "TEMPLATE",
-          "placeholderText": "to@example.com,to2@example.com"
-        },
-        {
-          "label": "CC email(s)",
-          "configProperty": "actionConfiguration.formData.send.cc",
-          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
-          "evaluationSubstitutionType": "TEMPLATE",
-          "placeholderText": "cc@example.com,cc2@example.com"
-        },
-        {
-          "label": "BCC email(s)",
-          "configProperty": "actionConfiguration.formData.send.bcc",
-          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
-          "evaluationSubstitutionType": "TEMPLATE",
-          "placeholderText": "bcc@example.com,bcc2@example.com"
-        },
-        {
-          "label": "Subject",
-          "configProperty": "actionConfiguration.formData.send.subject",
-          "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
-          "evaluationSubstitutionType": "TEMPLATE",
-          "placeholderText": "Awesome email subject"
-        },
-        {
-          "label": "Body type",
-          "configProperty": "actionConfiguration.formData.send.bodyType",
-          "controlType": "DROP_DOWN",
-          "initialValue": "text/plain",
-          "options": [
-            {
-              "label": "Plain text",
-              "value": "text/plain"
-            },
-            {
-              "label": "HTML",
-              "value": "text/html"
-            }
-          ],
-          "evaluationSubstitutionType": "TEMPLATE"
-        },
-        {
-          "label": "Body",
-          "configProperty": "actionConfiguration.body",
-          "controlType": "QUERY_DYNAMIC_TEXT",
-          "evaluationSubstitutionType": "TEMPLATE",
-          "placeholderText": "Incredible body text"
-        },
-        {
-          "label": "Attachment(s)",
-          "configProperty": "actionConfiguration.formData.send.attachments",
-          "controlType": "QUERY_DYNAMIC_TEXT",
-          "evaluationSubstitutionType": "TEMPLATE",
-          "placeholderText": "{{Filepicker.files}}"
         }
       ]
     }
diff --git a/app/server/appsmith-plugins/snowflakePlugin/src/main/java/com/external/plugins/SnowflakePlugin.java b/app/server/appsmith-plugins/snowflakePlugin/src/main/java/com/external/plugins/SnowflakePlugin.java
index e178c61df48e..04cc9c2b499e 100644
--- a/app/server/appsmith-plugins/snowflakePlugin/src/main/java/com/external/plugins/SnowflakePlugin.java
+++ b/app/server/appsmith-plugins/snowflakePlugin/src/main/java/com/external/plugins/SnowflakePlugin.java
@@ -71,6 +71,8 @@ public Mono<ActionExecutionResult> execute(
                 DatasourceConfiguration datasourceConfiguration,
                 ActionConfiguration actionConfiguration) {
 
+            String printMessage = Thread.currentThread().getName() + ": execute() called for Snowflake plugin.";
+            System.out.println(printMessage);
             String query = actionConfiguration.getBody();
 
             if (!StringUtils.hasLength(query)) {
@@ -80,6 +82,7 @@ public Mono<ActionExecutionResult> execute(
             }
 
             return Mono.fromCallable(() -> {
+                        System.out.println(Thread.currentThread().getName() + ": Execute Snowflake Query");
                         Connection connectionFromPool;
 
                         try {
@@ -104,13 +107,13 @@ public Mono<ActionExecutionResult> execute(
                         int activeConnections = poolProxy.getActiveConnections();
                         int totalConnections = poolProxy.getTotalConnections();
                         int threadsAwaitingConnection = poolProxy.getThreadsAwaitingConnection();
-                        log.debug(
-                                "Before executing snowflake query [{}] Hikari Pool stats : active - {} , idle - {} , awaiting - {} , total - {}",
+                        System.out.println(String.format(
+                                "Before executing snowflake query [%s] Hikari Pool stats: active - %d, idle - %d, awaiting - %d, total - %d",
                                 query,
                                 activeConnections,
                                 idleConnections,
                                 threadsAwaitingConnection,
-                                totalConnections);
+                                totalConnections));
 
                         try {
                             // Connection staleness is checked as part of this method call.
@@ -123,19 +126,17 @@ public Mono<ActionExecutionResult> execute(
                             activeConnections = poolProxy.getActiveConnections();
                             totalConnections = poolProxy.getTotalConnections();
                             threadsAwaitingConnection = poolProxy.getThreadsAwaitingConnection();
-                            log.debug(
-                                    "After executing snowflake query, Hikari Pool stats active - {} , idle - {} , awaiting - {} , total - {} ",
-                                    activeConnections,
-                                    idleConnections,
-                                    threadsAwaitingConnection,
-                                    totalConnections);
+                            System.out.println(String.format(
+                                    "After executing snowflake query, Hikari Pool stats active - %d, idle - %d, awaiting - %d, total - %d",
+                                    activeConnections, idleConnections, threadsAwaitingConnection, totalConnections));
 
                             if (connectionFromPool != null) {
                                 try {
                                     // Return the connection back to the pool
                                     connectionFromPool.close();
                                 } catch (SQLException e) {
-                                    log.debug("Execute Error returning Snowflake connection to pool", e);
+                                    System.out.println("Execute Error returning Snowflake connection to pool");
+                                    e.printStackTrace();
                                 }
                             }
                         }
@@ -155,8 +156,13 @@ public Mono<ActionExecutionResult> execute(
         @Override
         public Mono<HikariDataSource> createConnectionClient(
                 DatasourceConfiguration datasourceConfiguration, Properties properties) {
+            String printMessage =
+                    Thread.currentThread().getName() + ": createConnectionClient() called for Snowflake plugin.";
+            System.out.println(printMessage);
             return getHikariConfig(datasourceConfiguration, properties)
                     .flatMap(config -> Mono.fromCallable(() -> {
+                                System.out.println(
+                                        Thread.currentThread().getName() + ": creating Snowflake connection client");
                                 // Set up the connection URL
                                 String jdbcUrl = getJDBCUrl(datasourceConfiguration);
                                 config.setJdbcUrl(jdbcUrl);
@@ -196,6 +202,9 @@ public Properties addPluginSpecificProperties(
         @Override
         public Properties addAuthParamsToConnectionConfig(
                 DatasourceConfiguration datasourceConfiguration, Properties properties) {
+            String printMessage = Thread.currentThread().getName()
+                    + ": addAuthParamsToConnectionConfig() called for Snowflake plugin.";
+            System.out.println(printMessage);
             // Only for username password auth, we need to set these properties, for others
             // like key-pair auth, authentication specific properties need to be set on config itself
             AuthenticationDTO authentication = datasourceConfiguration.getAuthentication();
@@ -235,6 +244,9 @@ public void datasourceDestroy(HikariDataSource connection) {
 
         @Override
         public Set<String> validateDatasource(DatasourceConfiguration datasourceConfiguration) {
+            String printMessage =
+                    Thread.currentThread().getName() + ": validateDatasource() called for Snowflake plugin.";
+            System.out.println(printMessage);
             Set<String> invalids = new HashSet<>();
 
             if (StringUtils.isEmpty(datasourceConfiguration.getUrl())) {
@@ -303,9 +315,11 @@ public Set<String> validateDatasource(DatasourceConfiguration datasourceConfigur
 
         @Override
         public Mono<DatasourceTestResult> testDatasource(HikariDataSource connection) {
-
+            String printMessage = Thread.currentThread().getName() + ": testDatasource() called for Snowflake plugin.";
+            System.out.println(printMessage);
             return Mono.just(connection)
                     .flatMap(connectionPool -> {
+                        System.out.println(Thread.currentThread().getName() + ": Testing Snowflake Datasource");
                         Connection connectionFromPool;
                         try {
                             /**
@@ -345,6 +359,8 @@ public Mono<DatasourceTestResult> testDatasource(HikariDataSource connection) {
         @Override
         public Mono<DatasourceStructure> getStructure(
                 HikariDataSource connection, DatasourceConfiguration datasourceConfiguration) {
+            String printMessage = Thread.currentThread().getName() + ": getStructure() called for Snowflake plugin.";
+            System.out.println(printMessage);
             final DatasourceStructure structure = new DatasourceStructure();
             final Map<String, DatasourceStructure.Table> tablesByName = new LinkedHashMap<>();
             final Map<String, DatasourceStructure.Key> keyRegistry = new HashMap<>();
@@ -374,12 +390,9 @@ public Mono<DatasourceStructure> getStructure(
                         int activeConnections = poolProxy.getActiveConnections();
                         int totalConnections = poolProxy.getTotalConnections();
                         int threadsAwaitingConnection = poolProxy.getThreadsAwaitingConnection();
-                        log.debug(
-                                "Before getting snowflake structure Hikari Pool stats active - {} , idle - {} , awaiting - {} , total - {} ",
-                                activeConnections,
-                                idleConnections,
-                                threadsAwaitingConnection,
-                                totalConnections);
+                        System.out.println(String.format(
+                                "Before getting snowflake structure Hikari Pool stats active - %d, idle - %d, awaiting - %d, total - %d",
+                                activeConnections, idleConnections, threadsAwaitingConnection, totalConnections));
 
                         try {
                             // Connection staleness is checked as part of this method call.
@@ -417,33 +430,32 @@ public Mono<DatasourceStructure> getStructure(
                                 table.getKeys().sort(Comparator.naturalOrder());
                             }
                         } catch (SQLException throwable) {
-                            log.error(
-                                    "Exception caught while fetching structure of Snowflake datasource. Cause: ",
-                                    throwable);
+                            System.out.println(
+                                    "Exception caught while fetching structure of Snowflake datasource. Cause:");
+                            throwable.printStackTrace();
                             throw new AppsmithPluginException(
                                     AppsmithPluginError.PLUGIN_GET_STRUCTURE_ERROR,
                                     SnowflakeErrorMessages.GET_STRUCTURE_ERROR_MSG,
                                     throwable.getMessage(),
                                     "SQLSTATE: " + throwable.getSQLState());
                         } finally {
-
+                            System.out.println(Thread.currentThread().getName() + ": Get Structure Snowflake");
                             idleConnections = poolProxy.getIdleConnections();
                             activeConnections = poolProxy.getActiveConnections();
                             totalConnections = poolProxy.getTotalConnections();
                             threadsAwaitingConnection = poolProxy.getThreadsAwaitingConnection();
-                            log.debug(
-                                    "After snowflake structure, Hikari Pool stats active - {} , idle - {} , awaiting - {} , total - {} ",
-                                    activeConnections,
-                                    idleConnections,
-                                    threadsAwaitingConnection,
-                                    totalConnections);
+                            System.out.println(String.format(
+                                    "After snowflake structure, Hikari Pool stats active - %d, idle - %d, awaiting - %d, total - %d",
+                                    activeConnections, idleConnections, threadsAwaitingConnection, totalConnections));
 
                             if (connectionFromPool != null) {
                                 try {
                                     // Return the connection back to the pool
                                     connectionFromPool.close();
                                 } catch (SQLException e) {
-                                    log.debug("Error returning snowflake connection to pool during get structure", e);
+                                    System.out.println(
+                                            "Error returning snowflake connection to pool during get structure");
+                                    e.printStackTrace();
                                 }
                             }
                         }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/ServerApplication.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/ServerApplication.java
index 192adeeaa45a..b78caa3e547b 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/ServerApplication.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/ServerApplication.java
@@ -1,54 +1,21 @@
 package com.appsmith.server;
 
-import com.appsmith.server.annotations.ConditionalOnMicrometerMetricsEnabled;
 import com.appsmith.server.configurations.ProjectProperties;
-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.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.Banner;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
-import java.time.Duration;
-
 @SpringBootApplication
 @ComponentScan({"com.appsmith"})
 @EnableScheduling
 @Slf4j
 public class ServerApplication {
-    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 SERVICE_NAME_KEY = "service.name";
-    public static final String INSTRUMENTATION_PROVIDER_KEY = "instrumentation.provider";
-    public static final String MICROMETER = "micrometer";
-    public static final int MICROMETER_COLLECTION_INTERVAL_SECONDS = 60;
 
     private final ProjectProperties projectProperties;
 
-    @Value("${appsmith.newrelic.micrometer.metrics.application.name}")
-    private String newRelicApplicationName;
-
-    @Value("${appsmith.newrelic.licensekey}")
-    private String newRelicKey;
-
     public ServerApplication(ProjectProperties projectProperties) {
         this.projectProperties = projectProperties;
         printBuildInfo();
@@ -65,55 +32,4 @@ private void printBuildInfo() {
         String commitId = projectProperties.getCommitSha();
         log.info("Application started with build version {}, and commitSha {}", version, commitId);
     }
-
-    @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)
-                                .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.ofSeconds(MICROMETER_COLLECTION_INTERVAL_SECONDS))
-                                .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/actioncollections/base/ActionCollectionServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionServiceCEImpl.java
index b7d369ef7242..7b062f630587 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionServiceCEImpl.java
@@ -20,6 +20,7 @@
 import com.appsmith.server.services.BaseService;
 import com.appsmith.server.solutions.ActionPermission;
 import com.appsmith.server.solutions.ApplicationPermission;
+import io.micrometer.observation.ObservationRegistry;
 import jakarta.validation.Validator;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
@@ -28,6 +29,7 @@
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.util.StringUtils;
+import reactor.core.observability.micrometer.Micrometer;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -41,6 +43,7 @@
 import java.util.Set;
 import java.util.UUID;
 
+import static com.appsmith.external.constants.spans.ActionCollectionSpan.GET_ACTION_COLLECTION_BY_ID;
 import static com.appsmith.external.helpers.AppsmithBeanUtils.copyNewFieldValuesIntoOldObject;
 import static java.lang.Boolean.TRUE;
 
@@ -53,6 +56,7 @@ public class ActionCollectionServiceCEImpl extends BaseService<ActionCollectionR
     private final ApplicationService applicationService;
     private final ApplicationPermission applicationPermission;
     private final ActionPermission actionPermission;
+    private final ObservationRegistry observationRegistry;
 
     @Autowired
     public ActionCollectionServiceCEImpl(
@@ -63,7 +67,8 @@ public ActionCollectionServiceCEImpl(
             PolicyGenerator policyGenerator,
             ApplicationService applicationService,
             ApplicationPermission applicationPermission,
-            ActionPermission actionPermission) {
+            ActionPermission actionPermission,
+            ObservationRegistry observationRegistry) {
 
         super(validator, repository, analyticsService);
         this.newActionService = newActionService;
@@ -71,6 +76,7 @@ public ActionCollectionServiceCEImpl(
         this.applicationService = applicationService;
         this.applicationPermission = applicationPermission;
         this.actionPermission = actionPermission;
+        this.observationRegistry = observationRegistry;
     }
 
     @Override
@@ -372,7 +378,10 @@ public Mono<ActionCollectionDTO> generateActionCollectionByViewMode(
 
     @Override
     public Mono<ActionCollection> findById(String id, AclPermission aclPermission) {
-        return repository.findById(id, aclPermission);
+        return repository
+                .findById(id, aclPermission)
+                .name(GET_ACTION_COLLECTION_BY_ID)
+                .tap(Micrometer.observation(observationRegistry));
     }
 
     @Override
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionServiceImpl.java
index e24740b82307..a9e2e3f2f1fa 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionServiceImpl.java
@@ -7,6 +7,7 @@
 import com.appsmith.server.services.AnalyticsService;
 import com.appsmith.server.solutions.ActionPermission;
 import com.appsmith.server.solutions.ApplicationPermission;
+import io.micrometer.observation.ObservationRegistry;
 import jakarta.validation.Validator;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -22,7 +23,8 @@ public ActionCollectionServiceImpl(
             PolicyGenerator policyGenerator,
             ApplicationService applicationService,
             ApplicationPermission applicationPermission,
-            ActionPermission actionPermission) {
+            ActionPermission actionPermission,
+            ObservationRegistry observationRegistry) {
         super(
                 validator,
                 repository,
@@ -31,6 +33,7 @@ public ActionCollectionServiceImpl(
                 policyGenerator,
                 applicationService,
                 applicationPermission,
-                actionPermission);
+                actionPermission,
+                observationRegistry);
     }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/base/ApplicationServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/base/ApplicationServiceCEImpl.java
index b04292a75406..50872df66db3 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/base/ApplicationServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/base/ApplicationServiceCEImpl.java
@@ -1037,7 +1037,9 @@ public Mono<Application> findByBaseIdBranchNameAndApplicationMode(
                 ? applicationPermission.getReadPermission()
                 : applicationPermission.getEditPermission();
 
-        return findByBranchNameAndBaseApplicationId(branchName, defaultApplicationId, permissionForApplication);
+        return findByBranchNameAndBaseApplicationId(branchName, defaultApplicationId, permissionForApplication)
+                .name(APPLICATION_FETCH_FROM_DB)
+                .tap(Micrometer.observation(observationRegistry));
     }
 
     @Override
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/git/ApplicationGitFileUtilsCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/git/ApplicationGitFileUtilsCEImpl.java
index 39a87d72fac6..99333df7b92c 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/git/ApplicationGitFileUtilsCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/git/ApplicationGitFileUtilsCEImpl.java
@@ -362,7 +362,8 @@ public Mono<ArtifactExchangeJson> reconstructArtifactExchangeJsonFromFilesInRepo
                     getApplicationResource(applicationReference.getMetadata(), ApplicationJson.class);
             ApplicationJson applicationJson = getApplicationJsonFromGitReference(applicationReference);
             copyNestedNonNullProperties(metadata, applicationJson);
-            return jsonSchemaMigration.migrateApplicationJsonToLatestSchema(applicationJson);
+            return jsonSchemaMigration.migrateApplicationJsonToLatestSchema(
+                    applicationJson, baseArtifactId, branchName);
         });
     }
 
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 aedf383937d4..9ff767657283 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
@@ -67,6 +67,12 @@ public class CommonConfig {
     @Value("${appsmith.micrometer.tracing.detail.enabled:false}")
     private boolean tracingDetail;
 
+    @Value("${appsmith.micrometer.metrics.detail.enabled:false}")
+    private boolean metricsDetail;
+
+    @Value("${appsmith.micrometer.metrics.interval.millis:60000}")
+    private int metricsIntervalMillis;
+
     private List<String> allowedDomains;
 
     private String mongoDBVersion;
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
new file mode 100644
index 000000000000..a4a6d1576ee8
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/MetricsConfig.java
@@ -0,0 +1,103 @@
+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/ReactorNettyConfiguration.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/ReactorNettyConfiguration.java
new file mode 100644
index 000000000000..1a55dd8a08af
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/ReactorNettyConfiguration.java
@@ -0,0 +1,22 @@
+package com.appsmith.server.configurations;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.boot.web.embedded.netty.NettyReactiveWebServerFactory;
+import org.springframework.boot.web.server.WebServerFactoryCustomizer;
+import org.springframework.stereotype.Component;
+
+import java.util.function.Function;
+
+@RequiredArgsConstructor
+@Component
+public class ReactorNettyConfiguration implements WebServerFactoryCustomizer<NettyReactiveWebServerFactory> {
+
+    private final CommonConfig commonConfig;
+
+    @Override
+    public void customize(NettyReactiveWebServerFactory factory) {
+        if (commonConfig.isMetricsDetail()) {
+            factory.addServerCustomizers(httpServer -> httpServer.metrics(true, Function.identity()));
+        }
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/HealthCheckControllerCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/HealthCheckControllerCE.java
index 12d6c1428fc0..846514fd6825 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/HealthCheckControllerCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/HealthCheckControllerCE.java
@@ -6,11 +6,13 @@
 import com.appsmith.server.services.HealthCheckService;
 import com.fasterxml.jackson.annotation.JsonView;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import reactor.core.publisher.Mono;
 
+@Slf4j
 @RequestMapping(Url.HEALTH_CHECK)
 @AllArgsConstructor
 public class HealthCheckControllerCE {
@@ -19,6 +21,7 @@ public class HealthCheckControllerCE {
     @JsonView(Views.Public.class)
     @GetMapping
     public Mono<ResponseDTO<String>> getHealth() {
+        log.debug("Checking server health ...");
         return healthCheckService.getHealth().map(health -> new ResponseDTO<>(HttpStatus.OK.value(), health, null));
     }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/TenantControllerCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/TenantControllerCE.java
index e4b4cbc0ba4c..ba34d1029f44 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/TenantControllerCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/TenantControllerCE.java
@@ -7,6 +7,7 @@
 import com.appsmith.server.dtos.ResponseDTO;
 import com.appsmith.server.services.TenantService;
 import com.fasterxml.jackson.annotation.JsonView;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -16,6 +17,7 @@
 
 import java.util.Map;
 
+@Slf4j
 @RequestMapping(Url.TENANT_URL)
 public class TenantControllerCE {
 
@@ -37,6 +39,7 @@ public TenantControllerCE(TenantService service) {
     @JsonView(Views.Public.class)
     @GetMapping("/current")
     public Mono<ResponseDTO<Tenant>> getTenantConfig() {
+        log.debug("Attempting to retrieve tenant configuration ... ");
         return service.getTenantConfiguration()
                 .map(resource -> new ResponseDTO<>(HttpStatus.OK.value(), resource, null));
     }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Application.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Application.java
index d34f79fb93c3..4e3aecd74f9b 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Application.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Application.java
@@ -1,36 +1,16 @@
 package com.appsmith.server.domains;
 
-import com.appsmith.external.models.BaseDomain;
-import com.appsmith.external.views.Git;
-import com.appsmith.external.views.Views;
-import com.appsmith.server.constants.ArtifactType;
-import com.appsmith.server.dtos.CustomJSLibContextDTO;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonView;
-import jakarta.validation.constraints.NotNull;
-import lombok.AllArgsConstructor;
+import com.appsmith.server.domains.ce.ApplicationCE;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.FieldNameConstants;
-import org.springframework.data.annotation.Transient;
 import org.springframework.data.mongodb.core.mapping.Document;
-import org.springframework.util.StringUtils;
 
 import java.io.Serializable;
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import static com.appsmith.external.helpers.StringUtils.dotted;
-import static com.appsmith.server.constants.ResourceModes.EDIT;
-import static com.appsmith.server.constants.ResourceModes.VIEW;
-import static com.appsmith.server.helpers.DateUtils.ISO_FORMATTER;
 
 @Getter
 @Setter
@@ -38,349 +18,20 @@
 @NoArgsConstructor
 @Document
 @FieldNameConstants
-public class Application extends BaseDomain implements Artifact {
-
-    @NotNull @JsonView(Views.Public.class)
-    String name;
-
-    @JsonView(Views.Public.class)
-    String workspaceId;
-
-    // TODO: remove default values from application
-    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
-    @Deprecated(forRemoval = true)
-    @JsonView(Views.Public.class)
-    Boolean isPublic = false;
-
-    @JsonView({Views.Public.class, Git.class})
-    List<ApplicationPage> pages;
-
-    @JsonView(Views.Internal.class)
-    List<ApplicationPage> publishedPages;
-
-    @JsonView(Views.Internal.class)
-    @Transient
-    Boolean viewMode = false;
-
-    @Transient
-    @JsonView({Views.Public.class, Git.class})
-    boolean appIsExample = false;
-
-    @Transient
-    @JsonView(Views.Public.class)
-    long unreadCommentThreads;
-
-    @JsonView(Views.Internal.class)
-    String clonedFromApplicationId;
-
-    @JsonView({Views.Internal.class, Git.class})
-    ApplicationDetail unpublishedApplicationDetail;
-
-    @JsonView(Views.Internal.class)
-    ApplicationDetail publishedApplicationDetail;
-
-    @JsonView({Views.Public.class, Git.class})
-    String color;
-
-    @JsonView({Views.Public.class, Git.class})
-    String icon;
-
-    @JsonView(Views.Public.class)
-    private String slug;
-
-    @JsonView({Views.Internal.class, Git.class})
-    AppLayout unpublishedAppLayout;
-
-    @JsonView(Views.Internal.class)
-    AppLayout publishedAppLayout;
-
-    @JsonView(Views.Public.class)
-    Set<CustomJSLibContextDTO> unpublishedCustomJSLibs;
-
-    @JsonView(Views.Public.class)
-    Set<CustomJSLibContextDTO> publishedCustomJSLibs;
-
-    @JsonView(Views.Public.class)
-    GitArtifactMetadata gitApplicationMetadata;
-
-    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
-    @JsonView(Views.Public.class)
-    Instant lastDeployedAt; // when this application was last deployed
-
-    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
-    @JsonView({Views.Public.class, Git.class})
-    Integer evaluationVersion;
-
-    /**
-     * applicationVersion will be used when we've a breaking change in application, and it's not possible to write a
-     * migration. User need to update the application manually.
-     * In such cases, we can use this field to determine whether we need to notify user about that breaking change
-     * so that they can update their application.
-     * Once updated, we should set applicationVersion to latest version as well.
-     */
-    @JsonView({Views.Public.class, Git.class})
-    Integer applicationVersion;
-
-    /**
-     * Changing name, change in pages, widgets and datasources will set lastEditedAt.
-     * Other activities e.g. changing policy will not change this property.
-     * We're adding JsonIgnore here because it'll be exposed as modifiedAt to keep it backward compatible
-     */
-    @JsonView(Views.Internal.class)
-    Instant lastEditedAt;
-
-    @JsonView({Views.Public.class, Git.class})
-    EmbedSetting embedSetting;
-
-    @JsonView({Views.Public.class, Git.class})
-    Boolean collapseInvisibleWidgets;
-
-    /**
-     * Earlier this was returning value of the updatedAt property in the base domain.
-     * As this property is modified by the framework when there is any change in domain,
-     * a new property lastEditedAt has been added to track the edit actions from users.
-     * This method exposes that property.
-     *
-     * @return updated time as a string
-     */
-    @JsonProperty(value = "modifiedAt", access = JsonProperty.Access.READ_ONLY)
-    @JsonView(Views.Public.class)
-    public String getLastUpdateTime() {
-        if (lastEditedAt != null) {
-            return ISO_FORMATTER.format(lastEditedAt);
-        }
-        return null;
-    }
-
-    @JsonView(Views.Public.class)
-    public String getLastDeployedAt() {
-        if (lastDeployedAt != null) {
-            return ISO_FORMATTER.format(lastDeployedAt);
-        }
-        return null;
-    }
-
-    @JsonView(Views.Public.class)
-    Boolean forkingEnabled;
-
-    // Field to convey if the application is updated by the user
-    @JsonView(Views.Public.class)
-    Boolean isManualUpdate;
-
-    // Field to convey if the application is modified from the DB migration
-    @Transient
-    @JsonView(Views.Public.class)
-    Boolean isAutoUpdate;
-
-    // To convey current schema version for client and server. This will be used to check if we run the migration
-    // between 2 commits if the application is connected to git
-    @JsonView({Views.Internal.class, Git.class})
-    Integer clientSchemaVersion;
-
-    @JsonView({Views.Internal.class, Git.class})
-    Integer serverSchemaVersion;
-
-    @JsonView(Views.Internal.class)
-    String publishedModeThemeId;
-
-    @JsonView(Views.Internal.class)
-    String editModeThemeId;
-
-    // TODO Temporary provision for exporting the application with datasource configuration for the sample/template apps
-    @JsonView(Views.Public.class)
-    Boolean exportWithConfiguration;
-
-    // forkWithConfiguration represents whether credentials are shared or not while forking an app
-    @JsonView(Views.Public.class)
-    Boolean forkWithConfiguration;
-
-    // isCommunityTemplate represents whether this application has been published as a community template
-    @JsonView(Views.Public.class)
-    Boolean isCommunityTemplate;
-
-    /* Template title of the template from which this app was forked, if any */
-    @JsonView(Views.Public.class)
-    String forkedFromTemplateTitle;
+public class Application extends ApplicationCE implements Artifact {
 
     // This constructor is used during clone application. It only deeply copies selected fields. The rest are either
     // initialized newly or is left up to the calling function to set.
     public Application(Application application) {
-        super();
-        this.workspaceId = application.getWorkspaceId();
-        this.pages = new ArrayList<>();
-        this.publishedPages = new ArrayList<>();
-        this.clonedFromApplicationId = application.getId();
-        this.color = application.getColor();
-        this.icon = application.getIcon();
-        this.unpublishedAppLayout = application.getUnpublishedAppLayout() == null
-                ? null
-                : new AppLayout(application.getUnpublishedAppLayout().type);
-        this.publishedAppLayout = application.getPublishedAppLayout() == null
-                ? null
-                : new AppLayout(application.getPublishedAppLayout().type);
-        this.setUnpublishedApplicationDetail(new ApplicationDetail());
-        this.setPublishedApplicationDetail(new ApplicationDetail());
-        if (application.getUnpublishedApplicationDetail() == null) {
-            application.setUnpublishedApplicationDetail(new ApplicationDetail());
-        }
-        if (application.getPublishedApplicationDetail() == null) {
-            application.setPublishedApplicationDetail(new ApplicationDetail());
-        }
-        AppPositioning unpublishedAppPositioning =
-                application.getUnpublishedApplicationDetail().getAppPositioning() == null
-                        ? null
-                        : new AppPositioning(
-                                application.getUnpublishedApplicationDetail().getAppPositioning().type);
-        this.getUnpublishedApplicationDetail().setAppPositioning(unpublishedAppPositioning);
-        AppPositioning publishedAppPositioning =
-                application.getPublishedApplicationDetail().getAppPositioning() == null
-                        ? null
-                        : new AppPositioning(
-                                application.getPublishedApplicationDetail().getAppPositioning().type);
-        this.getPublishedApplicationDetail().setAppPositioning(publishedAppPositioning);
-        this.getUnpublishedApplicationDetail()
-                .setNavigationSetting(
-                        application.getUnpublishedApplicationDetail().getNavigationSetting() == null
-                                ? null
-                                : new NavigationSetting());
-        this.getPublishedApplicationDetail()
-                .setNavigationSetting(
-                        application.getPublishedApplicationDetail().getNavigationSetting() == null
-                                ? null
-                                : new NavigationSetting());
-        this.getUnpublishedApplicationDetail()
-                .setThemeSetting(
-                        application.getUnpublishedApplicationDetail().getThemeSetting() == null
-                                ? null
-                                : new ThemeSetting());
-        this.getPublishedApplicationDetail()
-                .setThemeSetting(
-                        application.getPublishedApplicationDetail().getThemeSetting() == null
-                                ? null
-                                : new ThemeSetting());
-        this.unpublishedCustomJSLibs = application.getUnpublishedCustomJSLibs();
-        this.collapseInvisibleWidgets = application.getCollapseInvisibleWidgets();
-    }
-
-    public void exportApplicationPages(final Map<String, String> pageIdToNameMap) {
-        for (ApplicationPage applicationPage : this.getPages()) {
-            applicationPage.setId(pageIdToNameMap.get(applicationPage.getId() + EDIT));
-            applicationPage.setDefaultPageId(null);
-        }
-        for (ApplicationPage applicationPage : this.getPublishedPages()) {
-            applicationPage.setId(pageIdToNameMap.get(applicationPage.getId() + VIEW));
-            applicationPage.setDefaultPageId(null);
-        }
-    }
-
-    @Override
-    public String getBaseId() {
-        if (this.getGitArtifactMetadata() != null
-                && StringUtils.hasLength(this.getGitArtifactMetadata().getDefaultArtifactId())) {
-            return this.getGitArtifactMetadata().getDefaultArtifactId();
-        }
-        return Artifact.super.getBaseId();
-    }
-
-    @JsonView(Views.Internal.class)
-    @Override
-    public GitArtifactMetadata getGitArtifactMetadata() {
-        return this.gitApplicationMetadata;
-    }
-
-    @JsonView(Views.Internal.class)
-    @Override
-    public void setGitArtifactMetadata(GitArtifactMetadata gitArtifactMetadata) {
-        this.gitApplicationMetadata = gitArtifactMetadata;
-    }
-
-    @Override
-    public String getUnpublishedThemeId() {
-        return this.getEditModeThemeId();
-    }
-
-    @Override
-    public void setUnpublishedThemeId(String themeId) {
-        this.setEditModeThemeId(themeId);
-    }
-
-    @Override
-    public String getPublishedThemeId() {
-        return this.getPublishedModeThemeId();
-    }
-
-    @Override
-    public void setPublishedThemeId(String themeId) {
-        this.setPublishedModeThemeId(themeId);
-    }
-
-    @Override
-    public void sanitiseToExportDBObject() {
-        this.setWorkspaceId(null);
-        this.setModifiedBy(null);
-        this.setCreatedBy(null);
-        this.setLastDeployedAt(null);
-        this.setLastEditedAt(null);
-        this.setGitApplicationMetadata(null);
-        this.setEditModeThemeId(null);
-        this.setPublishedModeThemeId(null);
-        this.setClientSchemaVersion(null);
-        this.setServerSchemaVersion(null);
-        this.setIsManualUpdate(false);
-        this.setPublishedCustomJSLibs(new HashSet<>());
-        this.setExportWithConfiguration(null);
-        this.setForkWithConfiguration(null);
-        this.setForkingEnabled(null);
-        super.sanitiseToExportDBObject();
-    }
-
-    public List<ApplicationPage> getPages() {
-        return Boolean.TRUE.equals(viewMode) ? publishedPages : pages;
-    }
-
-    public AppLayout getAppLayout() {
-        return Boolean.TRUE.equals(viewMode) ? publishedAppLayout : unpublishedAppLayout;
-    }
-
-    public void setAppLayout(AppLayout appLayout) {
-        if (Boolean.TRUE.equals(viewMode)) {
-            publishedAppLayout = appLayout;
-        } else {
-            unpublishedAppLayout = appLayout;
-        }
-    }
-
-    public ApplicationDetail getApplicationDetail() {
-        return Boolean.TRUE.equals(viewMode) ? publishedApplicationDetail : unpublishedApplicationDetail;
-    }
-
-    public void setApplicationDetail(ApplicationDetail applicationDetail) {
-        if (Boolean.TRUE.equals(viewMode)) {
-            publishedApplicationDetail = applicationDetail;
-        } else {
-            unpublishedApplicationDetail = applicationDetail;
-        }
-    }
-
-    @Override
-    @JsonView({Views.Internal.class})
-    public ArtifactType getArtifactType() {
-        return ArtifactType.APPLICATION;
+        super(application);
     }
 
     @Data
+    @EqualsAndHashCode(callSuper = true)
     @NoArgsConstructor
-    @AllArgsConstructor
-    public static class AppLayout implements Serializable {
-        @JsonView({Views.Public.class, Git.class})
-        Type type;
-
-        public enum Type {
-            DESKTOP,
-            TABLET_LARGE,
-            TABLET,
-            MOBILE,
-            FLUID,
+    public static class AppLayout extends AppLayoutCE implements Serializable {
+        public AppLayout(AppLayout.Type type) {
+            super(type);
         }
     }
 
@@ -388,136 +39,40 @@ public enum Type {
      * EmbedSetting is used for embedding Appsmith apps on other platforms
      */
     @Data
-    public static class EmbedSetting {
-
-        @JsonView({Views.Public.class, Git.class})
-        private String height;
-
-        @JsonView({Views.Public.class, Git.class})
-        private String width;
-
-        @JsonView({Views.Public.class, Git.class})
-        private Boolean showNavigationBar;
-    }
+    @EqualsAndHashCode(callSuper = true)
+    public static class EmbedSetting extends EmbedSettingCE {}
 
     /**
      * NavigationSetting stores the navigation configuration for the app
      */
     @Data
-    public static class NavigationSetting {
-        @JsonView({Views.Public.class, Git.class})
-        private Boolean showNavbar;
-
-        @JsonView({Views.Public.class, Git.class})
-        private String orientation;
-
-        @JsonView({Views.Public.class, Git.class})
-        private String navStyle;
-
-        @JsonView({Views.Public.class, Git.class})
-        private String position;
-
-        @JsonView({Views.Public.class, Git.class})
-        private String itemStyle;
-
-        @JsonView({Views.Public.class, Git.class})
-        private String colorStyle;
-
-        @JsonView({Views.Public.class, Git.class})
-        private String logoAssetId;
-
-        @JsonView({Views.Public.class, Git.class})
-        private String logoConfiguration;
-
-        @JsonView({Views.Public.class, Git.class})
-        private Boolean showSignIn;
-    }
+    @EqualsAndHashCode(callSuper = true)
+    public static class NavigationSetting extends NavigationSettingCE {}
 
     /**
      * AppPositioning captures widget positioning Mode of the application
      */
     @Data
+    @EqualsAndHashCode(callSuper = true)
     @NoArgsConstructor
-    @AllArgsConstructor
-    public static class AppPositioning {
-        @JsonView({Views.Public.class, Git.class})
-        Type type;
-
+    public static class AppPositioning extends AppPositioningCE {
         public AppPositioning(String type) {
-            setType(Type.valueOf(type));
+            super(type);
         }
 
-        public enum Type {
-            FIXED,
-            AUTO,
-            ANVIL
+        public AppPositioning(AppPositioning.Type type) {
+            super(type);
         }
     }
 
     @Data
+    @EqualsAndHashCode(callSuper = true)
     @NoArgsConstructor
-    public static class ThemeSetting {
-
-        @JsonView({Views.Public.class, Git.class})
-        private String accentColor;
-
-        @JsonView({Views.Public.class, Git.class})
-        private String borderRadius;
-
-        @JsonView({Views.Public.class, Git.class})
-        private float sizing = 1;
-
-        @JsonView({Views.Public.class, Git.class})
-        private float density = 1;
-
-        @JsonView({Views.Public.class, Git.class})
-        private String fontFamily;
-
-        @JsonView({Views.Public.class, Git.class})
-        Type colorMode;
-
-        @JsonView({Views.Public.class, Git.class})
-        IconStyle iconStyle;
-
-        @JsonView({Views.Public.class, Git.class})
-        AppMaxWidth appMaxWidth = AppMaxWidth.LARGE;
-
+    public static class ThemeSetting extends ThemeSettingCE {
         public ThemeSetting(Type colorMode) {
-            this.colorMode = colorMode;
-        }
-
-        public enum Type {
-            LIGHT,
-            DARK
-        }
-
-        public enum IconStyle {
-            OUTLINED,
-            FILLED
-        }
-
-        public enum AppMaxWidth {
-            UNLIMITED,
-            LARGE,
-            MEDIUM,
+            super(colorMode);
         }
     }
 
-    public static class Fields extends BaseDomain.Fields {
-        public static final String gitApplicationMetadata_gitAuth =
-                dotted(gitApplicationMetadata, GitArtifactMetadata.Fields.gitAuth);
-        public static final String gitApplicationMetadata_defaultApplicationId =
-                dotted(gitApplicationMetadata, GitArtifactMetadata.Fields.defaultApplicationId);
-
-        public static final String gitApplicationMetadata_defaultArtifactId =
-                dotted(gitApplicationMetadata, GitArtifactMetadata.Fields.defaultArtifactId);
-        public static final String gitApplicationMetadata_isAutoDeploymentEnabled =
-                dotted(gitApplicationMetadata, GitArtifactMetadata.Fields.isAutoDeploymentEnabled);
-        public static final String gitApplicationMetadata_branchName =
-                dotted(gitApplicationMetadata, GitArtifactMetadata.Fields.branchName);
-        public static final String gitApplicationMetadata_isRepoPrivate =
-                dotted(gitApplicationMetadata, GitArtifactMetadata.Fields.isRepoPrivate);
-        public static final String gitApplicationMetadata_isProtectedBranch =
-                dotted(gitApplicationMetadata, GitArtifactMetadata.Fields.isProtectedBranch);
-    }
+    public static class Fields extends ApplicationCE.Fields {}
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/GitArtifactMetadata.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/GitArtifactMetadata.java
index 1e20e973b67e..b416e3c66642 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/GitArtifactMetadata.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/GitArtifactMetadata.java
@@ -1,124 +1,15 @@
 package com.appsmith.server.domains;
 
 import com.appsmith.external.models.AppsmithDomain;
-import com.appsmith.external.views.Views;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonView;
+import com.appsmith.server.domains.ce.GitArtifactMetadataCE;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.FieldNameConstants;
-import org.springframework.data.annotation.Transient;
-import org.springframework.util.StringUtils;
-
-import java.time.Instant;
-import java.util.List;
-import java.util.Map;
 
 // This class will be used for one-to-one mapping for the DB application and the application present in the git repo.
 @Data
 @FieldNameConstants
-public class GitArtifactMetadata implements AppsmithDomain {
-    // Git branch corresponding to this application, we have one to one mapping for application in DB with git-branch
-    @JsonView(Views.Public.class)
-    String branchName;
-
-    // Git default branch corresponding to the remote git repo to which the application is connected to
-    @JsonView(Views.Public.class)
-    String defaultBranchName;
-
-    // Git remote url will be used while pushing and pulling changes
-    @JsonView(Views.Public.class)
-    String remoteUrl;
-
-    // Git remote https url will be used while checking if the repo is public or private
-    @JsonView(Views.Public.class)
-    String browserSupportedRemoteUrl;
-
-    // If remote repo is private and will be stored only with default application
-    @JsonView(Views.Public.class)
-    Boolean isRepoPrivate;
-
-    // The name of git repo
-    @JsonView(Views.Public.class)
-    String repoName;
-
-    // Default application id used for storing the application files in local volume :
-    // container-volumes/git_repo/workspaceId/defaultApplicationId/branchName/applicationDirectoryStructure...
-    @JsonView(Views.Public.class)
-    String defaultApplicationId;
-
-    // We are maintaining this attribute separately from defaultApplicationId to maintain backward compatibility with
-    // the directory structure that folks might on their file systems
-    // Default artifact id used for storing the artifact files in local volume :
-    // container-volumes/git_repo/workspaceId/artifactType/defaultArtifactId/branchName/artifactDirectoryStructure...
-    @JsonView(Views.Public.class)
-    String defaultArtifactId;
-
-    // Git credentials used to push changes to remote repo and will be stored with default application only to optimise
-    // space requirement and update operation
-    @JsonView(Views.Internal.class)
-    GitAuth gitAuth;
-
-    @Transient
-    @JsonView(Views.Public.class)
-    Map<String, GitProfile> gitProfiles;
-
-    @Transient
-    @JsonView(Views.Public.class)
-    String publicKey;
-
-    // Deploy key documentation url
-    @Transient
-    @JsonView(Views.Public.class)
-    String docUrl;
-
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssX", timezone = "UTC")
-    @JsonView(Views.Public.class)
-    Instant lastCommittedAt;
-
-    @JsonView(Views.Metadata.class)
-    List<String> branchProtectionRules;
-
-    /**
-     * This field is no more used and will be removed in future version.
-     * Please use the branchProtectionRules field to know whether a branch is protected or not.
-     */
-    @Deprecated
-    @JsonView(Views.Internal.class)
-    Boolean isProtectedBranch;
-
-    @JsonView(Views.Metadata.class)
-    AutoCommitConfig autoCommitConfig;
-
-    /**
-     * Boolean flag to store whether auto deployment is enabled for any branch of this application.
-     * If true, any branch of this application can be automatically deployed using git web hook.
-     */
-    @JsonView(Views.Metadata.class)
-    boolean isAutoDeploymentEnabled;
-
-    public AutoCommitConfig getAutoCommitConfig() {
-        // by default, the auto commit should be enabled.
-        // new AutoCommitConfig will have enabled=true so we're returning a new object when field is null
-        if (autoCommitConfig == null) {
-            autoCommitConfig = new AutoCommitConfig();
-        }
-        return autoCommitConfig;
-    }
-
-    @JsonView(Views.Public.class)
-    public String getDefaultArtifactId() {
-        if (StringUtils.hasText(defaultArtifactId)) {
-            return defaultArtifactId;
-        } else return defaultApplicationId;
-    }
-
-    // TODO : Set to private to prevent direct access unless migration is performed
-    private void setDefaultArtifactId(String defaultArtifactId) {
-        this.defaultArtifactId = defaultArtifactId;
-    }
-
-    public void setDefaultApplicationId(String defaultApplicationId) {
-        this.defaultApplicationId = defaultApplicationId;
-        this.defaultArtifactId = defaultApplicationId;
-    }
+@EqualsAndHashCode(callSuper = true)
+public class GitArtifactMetadata extends GitArtifactMetadataCE implements AppsmithDomain {
+    public static class Fields extends GitArtifactMetadataCE.Fields {}
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/ApplicationCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/ApplicationCE.java
new file mode 100644
index 000000000000..e00580ef8831
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/ApplicationCE.java
@@ -0,0 +1,525 @@
+package com.appsmith.server.domains.ce;
+
+import com.appsmith.external.models.BaseDomain;
+import com.appsmith.external.views.Git;
+import com.appsmith.external.views.Views;
+import com.appsmith.server.constants.ArtifactType;
+import com.appsmith.server.domains.Application;
+import com.appsmith.server.domains.ApplicationDetail;
+import com.appsmith.server.domains.ApplicationPage;
+import com.appsmith.server.domains.GitArtifactMetadata;
+import com.appsmith.server.dtos.CustomJSLibContextDTO;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonView;
+import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.FieldNameConstants;
+import org.springframework.data.annotation.Transient;
+import org.springframework.data.mongodb.core.mapping.Document;
+import org.springframework.util.StringUtils;
+
+import java.io.Serializable;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static com.appsmith.external.helpers.StringUtils.dotted;
+import static com.appsmith.server.constants.ResourceModes.EDIT;
+import static com.appsmith.server.constants.ResourceModes.VIEW;
+import static com.appsmith.server.helpers.DateUtils.ISO_FORMATTER;
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+@Document
+@FieldNameConstants
+public class ApplicationCE extends BaseDomain implements ArtifactCE {
+
+    @NotNull @JsonView(Views.Public.class)
+    String name;
+
+    @JsonView(Views.Public.class)
+    String workspaceId;
+
+    // TODO: remove default values from application
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    @Deprecated(forRemoval = true)
+    @JsonView(Views.Public.class)
+    Boolean isPublic = false;
+
+    @JsonView({Views.Public.class, Git.class})
+    List<ApplicationPage> pages;
+
+    @JsonView(Views.Internal.class)
+    List<ApplicationPage> publishedPages;
+
+    @JsonView(Views.Internal.class)
+    @Transient
+    Boolean viewMode = false;
+
+    @Transient
+    @JsonView({Views.Public.class, Git.class})
+    boolean appIsExample = false;
+
+    @Transient
+    @JsonView(Views.Public.class)
+    long unreadCommentThreads;
+
+    @JsonView(Views.Internal.class)
+    String clonedFromApplicationId;
+
+    @JsonView({Views.Internal.class, Git.class})
+    ApplicationDetail unpublishedApplicationDetail;
+
+    @JsonView(Views.Internal.class)
+    ApplicationDetail publishedApplicationDetail;
+
+    @JsonView({Views.Public.class, Git.class})
+    String color;
+
+    @JsonView({Views.Public.class, Git.class})
+    String icon;
+
+    @JsonView(Views.Public.class)
+    private String slug;
+
+    @JsonView({Views.Internal.class, Git.class})
+    Application.AppLayout unpublishedAppLayout;
+
+    @JsonView(Views.Internal.class)
+    Application.AppLayout publishedAppLayout;
+
+    @JsonView(Views.Public.class)
+    Set<CustomJSLibContextDTO> unpublishedCustomJSLibs;
+
+    @JsonView(Views.Public.class)
+    Set<CustomJSLibContextDTO> publishedCustomJSLibs;
+
+    @JsonView(Views.Public.class)
+    GitArtifactMetadata gitApplicationMetadata;
+
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    @JsonView(Views.Public.class)
+    Instant lastDeployedAt; // when this application was last deployed
+
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    @JsonView({Views.Public.class, Git.class})
+    Integer evaluationVersion;
+
+    /**
+     * applicationVersion will be used when we've a breaking change in application, and it's not possible to write a
+     * migration. User need to update the application manually.
+     * In such cases, we can use this field to determine whether we need to notify user about that breaking change
+     * so that they can update their application.
+     * Once updated, we should set applicationVersion to latest version as well.
+     */
+    @JsonView({Views.Public.class, Git.class})
+    Integer applicationVersion;
+
+    /**
+     * Changing name, change in pages, widgets and datasources will set lastEditedAt.
+     * Other activities e.g. changing policy will not change this property.
+     * We're adding JsonIgnore here because it'll be exposed as modifiedAt to keep it backward compatible
+     */
+    @JsonView(Views.Internal.class)
+    Instant lastEditedAt;
+
+    @JsonView({Views.Public.class, Git.class})
+    Application.EmbedSetting embedSetting;
+
+    @JsonView({Views.Public.class, Git.class})
+    Boolean collapseInvisibleWidgets;
+
+    /**
+     * Earlier this was returning value of the updatedAt property in the base domain.
+     * As this property is modified by the framework when there is any change in domain,
+     * a new property lastEditedAt has been added to track the edit actions from users.
+     * This method exposes that property.
+     *
+     * @return updated time as a string
+     */
+    @JsonProperty(value = "modifiedAt", access = JsonProperty.Access.READ_ONLY)
+    @JsonView(Views.Public.class)
+    public String getLastUpdateTime() {
+        if (lastEditedAt != null) {
+            return ISO_FORMATTER.format(lastEditedAt);
+        }
+        return null;
+    }
+
+    @JsonView(Views.Public.class)
+    public String getLastDeployedAt() {
+        if (lastDeployedAt != null) {
+            return ISO_FORMATTER.format(lastDeployedAt);
+        }
+        return null;
+    }
+
+    @JsonView(Views.Public.class)
+    Boolean forkingEnabled;
+
+    // Field to convey if the application is updated by the user
+    @JsonView(Views.Public.class)
+    Boolean isManualUpdate;
+
+    // Field to convey if the application is modified from the DB migration
+    @Transient
+    @JsonView(Views.Public.class)
+    Boolean isAutoUpdate;
+
+    // To convey current schema version for client and server. This will be used to check if we run the migration
+    // between 2 commits if the application is connected to git
+    @JsonView({Views.Internal.class, Git.class})
+    Integer clientSchemaVersion;
+
+    @JsonView({Views.Internal.class, Git.class})
+    Integer serverSchemaVersion;
+
+    @JsonView(Views.Internal.class)
+    String publishedModeThemeId;
+
+    @JsonView(Views.Internal.class)
+    String editModeThemeId;
+
+    // TODO Temporary provision for exporting the application with datasource configuration for the sample/template apps
+    @JsonView(Views.Public.class)
+    Boolean exportWithConfiguration;
+
+    // forkWithConfiguration represents whether credentials are shared or not while forking an app
+    @JsonView(Views.Public.class)
+    Boolean forkWithConfiguration;
+
+    // isCommunityTemplate represents whether this application has been published as a community template
+    @JsonView(Views.Public.class)
+    Boolean isCommunityTemplate;
+
+    /* Template title of the template from which this app was forked, if any */
+    @JsonView(Views.Public.class)
+    String forkedFromTemplateTitle;
+
+    // This constructor is used during clone application. It only deeply copies selected fields. The rest are either
+    // initialized newly or is left up to the calling function to set.
+    public ApplicationCE(ApplicationCE application) {
+        super();
+        this.workspaceId = application.getWorkspaceId();
+        this.pages = new ArrayList<>();
+        this.publishedPages = new ArrayList<>();
+        this.clonedFromApplicationId = application.getId();
+        this.color = application.getColor();
+        this.icon = application.getIcon();
+        this.unpublishedAppLayout = application.getUnpublishedAppLayout() == null
+                ? null
+                : new Application.AppLayout(application.getUnpublishedAppLayout().type);
+        this.publishedAppLayout = application.getPublishedAppLayout() == null
+                ? null
+                : new Application.AppLayout(application.getPublishedAppLayout().type);
+        this.setUnpublishedApplicationDetail(new ApplicationDetail());
+        this.setPublishedApplicationDetail(new ApplicationDetail());
+        if (application.getUnpublishedApplicationDetail() == null) {
+            application.setUnpublishedApplicationDetail(new ApplicationDetail());
+        }
+        if (application.getPublishedApplicationDetail() == null) {
+            application.setPublishedApplicationDetail(new ApplicationDetail());
+        }
+
+        Application.AppPositioning unpublishedAppPositioning =
+                application.getUnpublishedApplicationDetail().getAppPositioning() == null
+                        ? null
+                        : new Application.AppPositioning(
+                                application.getUnpublishedApplicationDetail().getAppPositioning().type);
+        this.getUnpublishedApplicationDetail().setAppPositioning(unpublishedAppPositioning);
+        Application.AppPositioning publishedAppPositioning =
+                application.getPublishedApplicationDetail().getAppPositioning() == null
+                        ? null
+                        : new Application.AppPositioning(
+                                application.getPublishedApplicationDetail().getAppPositioning().type);
+        this.getPublishedApplicationDetail().setAppPositioning(publishedAppPositioning);
+        this.getUnpublishedApplicationDetail()
+                .setNavigationSetting(
+                        application.getUnpublishedApplicationDetail().getNavigationSetting() == null
+                                ? null
+                                : new Application.NavigationSetting());
+        this.getPublishedApplicationDetail()
+                .setNavigationSetting(
+                        application.getPublishedApplicationDetail().getNavigationSetting() == null
+                                ? null
+                                : new Application.NavigationSetting());
+        this.getUnpublishedApplicationDetail()
+                .setThemeSetting(
+                        application.getUnpublishedApplicationDetail().getThemeSetting() == null
+                                ? null
+                                : new Application.ThemeSetting());
+        this.getPublishedApplicationDetail()
+                .setThemeSetting(
+                        application.getPublishedApplicationDetail().getThemeSetting() == null
+                                ? null
+                                : new Application.ThemeSetting());
+        this.unpublishedCustomJSLibs = application.getUnpublishedCustomJSLibs();
+        this.collapseInvisibleWidgets = application.getCollapseInvisibleWidgets();
+    }
+
+    public void exportApplicationPages(final Map<String, String> pageIdToNameMap) {
+        for (ApplicationPage applicationPage : this.getPages()) {
+            applicationPage.setId(pageIdToNameMap.get(applicationPage.getId() + EDIT));
+            applicationPage.setDefaultPageId(null);
+        }
+        for (ApplicationPage applicationPage : this.getPublishedPages()) {
+            applicationPage.setId(pageIdToNameMap.get(applicationPage.getId() + VIEW));
+            applicationPage.setDefaultPageId(null);
+        }
+    }
+
+    @Override
+    public String getBaseId() {
+        if (this.getGitArtifactMetadata() != null
+                && StringUtils.hasLength(this.getGitArtifactMetadata().getDefaultArtifactId())) {
+            return this.getGitArtifactMetadata().getDefaultArtifactId();
+        }
+        return ArtifactCE.super.getBaseId();
+    }
+
+    @JsonView(Views.Internal.class)
+    @Override
+    public GitArtifactMetadata getGitArtifactMetadata() {
+        return this.gitApplicationMetadata;
+    }
+
+    @JsonView(Views.Internal.class)
+    @Override
+    public void setGitArtifactMetadata(GitArtifactMetadata gitArtifactMetadata) {
+        this.gitApplicationMetadata = gitArtifactMetadata;
+    }
+
+    @Override
+    public String getUnpublishedThemeId() {
+        return this.getEditModeThemeId();
+    }
+
+    @Override
+    public void setUnpublishedThemeId(String themeId) {
+        this.setEditModeThemeId(themeId);
+    }
+
+    @Override
+    public String getPublishedThemeId() {
+        return this.getPublishedModeThemeId();
+    }
+
+    @Override
+    public void setPublishedThemeId(String themeId) {
+        this.setPublishedModeThemeId(themeId);
+    }
+
+    @Override
+    public void sanitiseToExportDBObject() {
+        this.setWorkspaceId(null);
+        this.setModifiedBy(null);
+        this.setCreatedBy(null);
+        this.setLastDeployedAt(null);
+        this.setLastEditedAt(null);
+        this.setGitApplicationMetadata(null);
+        this.setEditModeThemeId(null);
+        this.setPublishedModeThemeId(null);
+        this.setClientSchemaVersion(null);
+        this.setServerSchemaVersion(null);
+        this.setIsManualUpdate(false);
+        this.setPublishedCustomJSLibs(new HashSet<>());
+        this.setExportWithConfiguration(null);
+        this.setForkWithConfiguration(null);
+        this.setForkingEnabled(null);
+        super.sanitiseToExportDBObject();
+    }
+
+    public List<ApplicationPage> getPages() {
+        return Boolean.TRUE.equals(viewMode) ? publishedPages : pages;
+    }
+
+    public Application.AppLayout getAppLayout() {
+        return Boolean.TRUE.equals(viewMode) ? publishedAppLayout : unpublishedAppLayout;
+    }
+
+    public void setAppLayout(Application.AppLayout appLayout) {
+        if (Boolean.TRUE.equals(viewMode)) {
+            publishedAppLayout = appLayout;
+        } else {
+            unpublishedAppLayout = appLayout;
+        }
+    }
+
+    public ApplicationDetail getApplicationDetail() {
+        return Boolean.TRUE.equals(viewMode) ? publishedApplicationDetail : unpublishedApplicationDetail;
+    }
+
+    public void setApplicationDetail(ApplicationDetail applicationDetail) {
+        if (Boolean.TRUE.equals(viewMode)) {
+            publishedApplicationDetail = applicationDetail;
+        } else {
+            unpublishedApplicationDetail = applicationDetail;
+        }
+    }
+
+    @Override
+    @JsonView({Views.Internal.class})
+    public ArtifactType getArtifactType() {
+        return ArtifactType.APPLICATION;
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class AppLayoutCE implements Serializable {
+        @JsonView({Views.Public.class, Git.class})
+        protected Type type;
+
+        public enum Type {
+            DESKTOP,
+            TABLET_LARGE,
+            TABLET,
+            MOBILE,
+            FLUID,
+        }
+    }
+
+    /**
+     * EmbedSetting is used for embedding Appsmith apps on other platforms
+     */
+    @Data
+    public static class EmbedSettingCE {
+
+        @JsonView({Views.Public.class, Git.class})
+        private String height;
+
+        @JsonView({Views.Public.class, Git.class})
+        private String width;
+
+        @JsonView({Views.Public.class, Git.class})
+        private Boolean showNavigationBar;
+    }
+
+    /**
+     * NavigationSetting stores the navigation configuration for the app
+     */
+    @Data
+    public static class NavigationSettingCE {
+        @JsonView({Views.Public.class, Git.class})
+        private Boolean showNavbar;
+
+        @JsonView({Views.Public.class, Git.class})
+        private String orientation;
+
+        @JsonView({Views.Public.class, Git.class})
+        private String navStyle;
+
+        @JsonView({Views.Public.class, Git.class})
+        private String position;
+
+        @JsonView({Views.Public.class, Git.class})
+        private String itemStyle;
+
+        @JsonView({Views.Public.class, Git.class})
+        private String colorStyle;
+
+        @JsonView({Views.Public.class, Git.class})
+        private String logoAssetId;
+
+        @JsonView({Views.Public.class, Git.class})
+        private String logoConfiguration;
+
+        @JsonView({Views.Public.class, Git.class})
+        private Boolean showSignIn;
+    }
+
+    /**
+     * AppPositioning captures widget positioning Mode of the application
+     */
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class AppPositioningCE {
+        @JsonView({Views.Public.class, Git.class})
+        protected Type type;
+
+        public AppPositioningCE(String type) {
+            setType(Type.valueOf(type));
+        }
+
+        public enum Type {
+            FIXED,
+            AUTO,
+            ANVIL
+        }
+    }
+
+    @Data
+    @NoArgsConstructor
+    public static class ThemeSettingCE {
+
+        @JsonView({Views.Public.class, Git.class})
+        private String accentColor;
+
+        @JsonView({Views.Public.class, Git.class})
+        private String borderRadius;
+
+        @JsonView({Views.Public.class, Git.class})
+        private float sizing = 1;
+
+        @JsonView({Views.Public.class, Git.class})
+        private float density = 1;
+
+        @JsonView({Views.Public.class, Git.class})
+        private String fontFamily;
+
+        @JsonView({Views.Public.class, Git.class})
+        protected Type colorMode;
+
+        @JsonView({Views.Public.class, Git.class})
+        IconStyle iconStyle;
+
+        @JsonView({Views.Public.class, Git.class})
+        AppMaxWidth appMaxWidth = AppMaxWidth.LARGE;
+
+        public ThemeSettingCE(Type colorMode) {
+            this.colorMode = colorMode;
+        }
+
+        public enum Type {
+            LIGHT,
+            DARK
+        }
+
+        public enum IconStyle {
+            OUTLINED,
+            FILLED
+        }
+
+        public enum AppMaxWidth {
+            UNLIMITED,
+            LARGE,
+            MEDIUM,
+        }
+    }
+
+    public static class Fields extends BaseDomain.Fields {
+        public static final String gitApplicationMetadata_gitAuth =
+                dotted(gitApplicationMetadata, GitArtifactMetadata.Fields.gitAuth);
+        public static final String gitApplicationMetadata_defaultApplicationId =
+                dotted(gitApplicationMetadata, GitArtifactMetadata.Fields.defaultApplicationId);
+        public static final String gitApplicationMetadata_defaultArtifactId =
+                dotted(gitApplicationMetadata, GitArtifactMetadata.Fields.defaultArtifactId);
+        public static final String gitApplicationMetadata_branchName =
+                dotted(gitApplicationMetadata, GitArtifactMetadata.Fields.branchName);
+        public static final String gitApplicationMetadata_isRepoPrivate =
+                dotted(gitApplicationMetadata, GitArtifactMetadata.Fields.isRepoPrivate);
+        public static final String gitApplicationMetadata_isProtectedBranch =
+                dotted(gitApplicationMetadata, GitArtifactMetadata.Fields.isProtectedBranch);
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/GitArtifactMetadataCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/GitArtifactMetadataCE.java
new file mode 100644
index 000000000000..ce46a144fc3c
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/GitArtifactMetadataCE.java
@@ -0,0 +1,122 @@
+package com.appsmith.server.domains.ce;
+
+import com.appsmith.external.models.AppsmithDomain;
+import com.appsmith.external.views.Views;
+import com.appsmith.server.domains.AutoCommitConfig;
+import com.appsmith.server.domains.GitAuth;
+import com.appsmith.server.domains.GitProfile;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonView;
+import lombok.Data;
+import lombok.experimental.FieldNameConstants;
+import org.springframework.data.annotation.Transient;
+import org.springframework.util.StringUtils;
+
+import java.time.Instant;
+import java.util.List;
+import java.util.Map;
+
+// This class will be used for one-to-one mapping for the DB application and the application present in the git repo.
+@Data
+@FieldNameConstants
+public class GitArtifactMetadataCE implements AppsmithDomain {
+    // Git branch corresponding to this application, we have one to one mapping for application in DB with git-branch
+    @JsonView(Views.Public.class)
+    String branchName;
+
+    // Git default branch corresponding to the remote git repo to which the application is connected to
+    @JsonView(Views.Public.class)
+    String defaultBranchName;
+
+    // Git remote url will be used while pushing and pulling changes
+    @JsonView(Views.Public.class)
+    String remoteUrl;
+
+    // Git remote https url will be used while checking if the repo is public or private
+    @JsonView(Views.Public.class)
+    String browserSupportedRemoteUrl;
+
+    // If remote repo is private and will be stored only with default application
+    @JsonView(Views.Public.class)
+    Boolean isRepoPrivate;
+
+    // The name of git repo
+    @JsonView(Views.Public.class)
+    String repoName;
+
+    // Default application id used for storing the application files in local volume :
+    // container-volumes/git_repo/workspaceId/defaultApplicationId/branchName/applicationDirectoryStructure...
+    @JsonView(Views.Public.class)
+    String defaultApplicationId;
+
+    // We are maintaining this attribute separately from defaultApplicationId to maintain backward compatibility with
+    // the directory structure that folks might on their file systems
+    // Default artifact id used for storing the artifact files in local volume :
+    // container-volumes/git_repo/workspaceId/artifactType/defaultArtifactId/branchName/artifactDirectoryStructure...
+    @JsonView(Views.Public.class)
+    String defaultArtifactId;
+
+    // Git credentials used to push changes to remote repo and will be stored with default application only to optimise
+    // space requirement and update operation
+    @JsonView(Views.Internal.class)
+    GitAuth gitAuth;
+
+    @Transient
+    @JsonView(Views.Public.class)
+    Map<String, GitProfile> gitProfiles;
+
+    @Transient
+    @JsonView(Views.Public.class)
+    String publicKey;
+
+    // Deploy key documentation url
+    @Transient
+    @JsonView(Views.Public.class)
+    String docUrl;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssX", timezone = "UTC")
+    @JsonView(Views.Public.class)
+    Instant lastCommittedAt;
+
+    @JsonView(Views.Metadata.class)
+    List<String> branchProtectionRules;
+
+    /**
+     * This field is no more used and will be removed in future version.
+     * Please use the branchProtectionRules field to know whether a branch is protected or not.
+     */
+    @Deprecated
+    @JsonView(Views.Internal.class)
+    Boolean isProtectedBranch;
+
+    @JsonView(Views.Metadata.class)
+    AutoCommitConfig autoCommitConfig;
+
+    public AutoCommitConfig getAutoCommitConfig() {
+        // by default, the auto commit should be enabled.
+        // new AutoCommitConfig will have enabled=true so we're returning a new object when field is null
+        if (autoCommitConfig == null) {
+            autoCommitConfig = new AutoCommitConfig();
+        }
+        return autoCommitConfig;
+    }
+
+    @JsonView(Views.Public.class)
+    public String getDefaultArtifactId() {
+        if (StringUtils.hasText(defaultArtifactId)) {
+            return defaultArtifactId;
+        } else return defaultApplicationId;
+    }
+
+    // TODO : Set to private to prevent direct access unless migration is performed
+    private void setDefaultArtifactId(String defaultArtifactId) {
+        this.defaultArtifactId = defaultArtifactId;
+    }
+
+    public void setDefaultApplicationId(String defaultApplicationId) {
+        this.defaultApplicationId = defaultApplicationId;
+        this.defaultArtifactId = defaultApplicationId;
+    }
+
+    public static class Fields {}
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/autocommit/helpers/AutoCommitEligibilityHelperImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/autocommit/helpers/AutoCommitEligibilityHelperImpl.java
index 4886234416c0..4237b320a116 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/autocommit/helpers/AutoCommitEligibilityHelperImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/autocommit/helpers/AutoCommitEligibilityHelperImpl.java
@@ -1,7 +1,5 @@
 package com.appsmith.server.git.autocommit.helpers;
 
-import com.appsmith.external.annotations.FeatureFlagged;
-import com.appsmith.external.enums.FeatureFlagEnum;
 import com.appsmith.server.domains.GitArtifactMetadata;
 import com.appsmith.server.domains.Layout;
 import com.appsmith.server.dtos.AutoCommitTriggerDTO;
@@ -36,7 +34,6 @@ public class AutoCommitEligibilityHelperImpl extends AutoCommitEligibilityHelper
     private final JsonSchemaVersions jsonSchemaVersions;
 
     @Override
-    @FeatureFlagged(featureFlagName = FeatureFlagEnum.release_git_autocommit_eligibility_enabled)
     public Mono<Boolean> isServerAutoCommitRequired(String workspaceId, GitArtifactMetadata gitMetadata) {
 
         String defaultApplicationId = gitMetadata.getDefaultArtifactId();
@@ -75,7 +72,6 @@ public Mono<Boolean> isServerAutoCommitRequired(String workspaceId, GitArtifactM
      */
     @Override
     @Deprecated
-    @FeatureFlagged(featureFlagName = FeatureFlagEnum.release_git_autocommit_eligibility_enabled)
     public Mono<Boolean> isClientMigrationRequired(PageDTO pageDTO) {
         return dslMigrationUtils
                 .getLatestDslVersion()
@@ -95,7 +91,6 @@ public Mono<Boolean> isClientMigrationRequired(PageDTO pageDTO) {
     }
 
     @Override
-    @FeatureFlagged(featureFlagName = FeatureFlagEnum.release_git_autocommit_eligibility_enabled)
     public Mono<Boolean> isClientMigrationRequiredFSOps(
             String workspaceId, GitArtifactMetadata gitMetadata, PageDTO pageDTO) {
         String defaultApplicationId = gitMetadata.getDefaultArtifactId();
@@ -127,7 +122,6 @@ public Mono<Boolean> isClientMigrationRequiredFSOps(
     }
 
     @Override
-    @FeatureFlagged(featureFlagName = FeatureFlagEnum.release_git_autocommit_eligibility_enabled)
     public Mono<AutoCommitTriggerDTO> isAutoCommitRequired(
             String workspaceId, GitArtifactMetadata gitArtifactMetadata, PageDTO pageDTO) {
 
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/autocommit/helpers/GitAutoCommitHelperFallbackImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/autocommit/helpers/GitAutoCommitHelperFallbackImpl.java
index 07a5ff852613..052792e35c0e 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/autocommit/helpers/GitAutoCommitHelperFallbackImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/autocommit/helpers/GitAutoCommitHelperFallbackImpl.java
@@ -2,9 +2,11 @@
 
 import com.appsmith.server.dtos.AutoCommitResponseDTO;
 import com.appsmith.server.dtos.AutoCommitTriggerDTO;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import reactor.core.publisher.Mono;
 
+@Slf4j
 @Component
 public class GitAutoCommitHelperFallbackImpl implements GitAutoCommitHelper {
 
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/autocommit/helpers/GitAutoCommitHelperImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/autocommit/helpers/GitAutoCommitHelperImpl.java
index eb399c0cae91..dfd2421cd60e 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/autocommit/helpers/GitAutoCommitHelperImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/autocommit/helpers/GitAutoCommitHelperImpl.java
@@ -89,7 +89,7 @@ private Mono<Boolean> isAutoCommitAllowed(Application defaultApplication, String
         String defaultApplicationId = defaultApplication.getId();
 
         if (!GitUtils.isAutoCommitEnabled(defaultApplication.getGitApplicationMetadata())) {
-            log.debug("auto commit is disabled for application: {}", defaultApplicationId);
+            log.info("Auto commit is disabled for application: {}", defaultApplicationId);
             return Mono.just(Boolean.FALSE);
         }
 
@@ -107,14 +107,19 @@ private Mono<Boolean> isAutoCommitAllowed(Application defaultApplication, String
                     Boolean isAutoCommitRunning = tuple.getT2();
 
                     if (isBranchProtected || isAutoCommitRunning) {
-                        log.debug(
-                                "auto commit is not applicable for application: {} branch: {}, isAutoCommitDisabledForBranch: {}",
+                        log.info(
+                                "Auto commit is not applicable for application: {} branch: {}, isAutoCommitDisabledForBranch: {}",
                                 defaultApplicationId,
                                 branchName,
                                 isBranchProtected);
                         return Mono.just(Boolean.FALSE);
                     }
 
+                    log.info(
+                            "Auto commit for application: {} branch: {} is applicable",
+                            defaultApplicationId,
+                            branchName);
+
                     return Mono.just(Boolean.TRUE);
                 })
                 .switchIfEmpty(Mono.just(Boolean.FALSE));
@@ -135,6 +140,8 @@ public Mono<Boolean> autoCommitServerMigration(String defaultApplicationId, Stri
     public Mono<Boolean> autoCommitApplication(
             String defaultApplicationId, String branchName, Boolean isClientMigration) {
 
+        log.info("Auto commit for application {} and branch {} in the publish flow", defaultApplicationId, branchName);
+
         // if either param is absent, then application is not connected to git.
         if (!StringUtils.hasText(branchName) || !StringUtils.hasText(defaultApplicationId)) {
             return Mono.just(Boolean.FALSE);
@@ -155,21 +162,33 @@ public Mono<Boolean> autoCommitApplication(
                 .flatMap(defaultApplication -> {
                     return isAutoCommitAllowed(defaultApplication, finalBranchName)
                             .flatMap(isEligible -> {
+                                log.info(
+                                        "Auto commit for application {}, and branch name {} is not allowed.",
+                                        defaultApplication.getId(),
+                                        branchName);
                                 if (!Boolean.TRUE.equals(isEligible)) {
                                     return Mono.empty();
                                 }
 
+                                log.info(
+                                        "Auto commit for application {}, and branch name {} is applicable",
+                                        defaultApplication.getId(),
+                                        branchName);
                                 return Mono.zip(applicationMono, branchedApplicationMono);
                             });
                 })
                 .flatMap(tuple2 -> {
                     Application defaultApplication = tuple2.getT1();
                     Application branchedApplication = tuple2.getT2();
+                    log.info(
+                            "Auto commit for application {}, and branch name {} is fetching remote changes",
+                            defaultApplication.getId(),
+                            branchName);
                     return commonGitService
                             .fetchRemoteChanges(defaultApplication, branchedApplication, true)
                             .flatMap(branchTrackingStatus -> {
                                 if (branchTrackingStatus.getBehindCount() > 0) {
-                                    log.debug(
+                                    log.info(
                                             "the remote is ahead of the local, aborting autocommit for application {} and branch {}",
                                             defaultApplicationId,
                                             branchName);
@@ -221,6 +240,8 @@ public Mono<Boolean> autoCommitApplication(
     public Mono<Boolean> publishAutoCommitEvent(
             AutoCommitTriggerDTO autoCommitTriggerDTO, String defaultApplicationId, String branchName) {
 
+        log.info("Trying to publish auto commit for application {} and branch {}", defaultApplicationId, branchName);
+
         if (!Boolean.TRUE.equals(autoCommitTriggerDTO.getIsAutoCommitRequired())) {
             return Mono.just(Boolean.FALSE);
         }
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 d005ecb032ea..d14132a352e7 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
@@ -91,4 +91,8 @@ public Mono<WebClient.RequestBodySpec> post(@NonNull String path, @NonNull Objec
     public Mono<WebClient.RequestBodySpec> put(@NonNull String path, @NonNull Object requestBody) {
         return makeRequest(HttpMethod.PUT, path, requestBody);
     }
+
+    public Mono<WebClient.RequestBodySpec> delete(@NonNull String path) {
+        return makeRequest(HttpMethod.DELETE, path, null);
+    }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/CommonGitFileUtilsCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/CommonGitFileUtilsCE.java
index a648871bb165..5cfd3c2a2b88 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/CommonGitFileUtilsCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/CommonGitFileUtilsCE.java
@@ -34,6 +34,7 @@
 import org.springframework.stereotype.Component;
 import reactor.core.Exceptions;
 import reactor.core.publisher.Mono;
+import reactor.core.scheduler.Schedulers;
 
 import java.io.IOException;
 import java.nio.file.Path;
@@ -93,7 +94,9 @@ public Mono<Path> saveArtifactToLocalRepo(
 
         // Save application to git repo
         try {
-            return fileUtils.saveApplicationToGitRepo(baseRepoSuffix, artifactGitReference, branchName);
+            return fileUtils
+                    .saveApplicationToGitRepo(baseRepoSuffix, artifactGitReference, branchName)
+                    .subscribeOn(Schedulers.boundedElastic());
         } catch (IOException | GitAPIException e) {
             log.error("Error occurred while saving files to local git repo: ", e);
             throw Exceptions.propagate(e);
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
old mode 100644
new mode 100755
index fa8747b8b91d..d9d44d439ff9
--- 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
@@ -25,12 +25,14 @@
 import com.appsmith.server.solutions.PagePermission;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import io.micrometer.observation.ObservationRegistry;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import net.minidev.json.JSONObject;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
+import reactor.core.observability.micrometer.Micrometer;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -46,6 +48,12 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+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;
+import static com.appsmith.external.constants.spans.LayoutSpan.UPDATE_LAYOUT_DSL_METHOD;
+import static com.appsmith.external.constants.spans.LayoutSpan.UPDATE_LAYOUT_METHOD;
+import static com.appsmith.external.constants.spans.PageSpan.GET_PAGE_BY_ID;
 import static com.appsmith.server.constants.CommonConstants.EVALUATION_VERSION;
 import static java.lang.Boolean.FALSE;
 
@@ -60,8 +68,8 @@ public class UpdateLayoutServiceCEImpl implements UpdateLayoutServiceCE {
     private final AnalyticsService analyticsService;
     private final PagePermission pagePermission;
     private final ApplicationService applicationService;
-
     private final ObjectMapper objectMapper;
+    private final ObservationRegistry observationRegistry;
 
     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";
@@ -122,6 +130,7 @@ private Mono<LayoutDTO> updateLayoutDsl(
         try {
             dsl = extractAllWidgetNamesAndDynamicBindingsFromDSL(
                     dsl, widgetNames, widgetDynamicBindingsMap, creatorId, layoutId, escapedWidgetNames, creatorType);
+
         } catch (Throwable t) {
             return sendUpdateLayoutAnalyticsEvent(creatorId, layoutId, dsl, false, t, creatorType)
                     .then(Mono.error(t));
@@ -155,6 +164,8 @@ private Mono<LayoutDTO> updateLayoutDsl(
                         flatmapOnLoadExecutables,
                         executablesUsedInDSL,
                         creatorType)
+                .name(FIND_ALL_ON_LOAD_EXECUTABLES)
+                .tap(Micrometer.observation(observationRegistry))
                 .onErrorResume(AppsmithException.class, error -> {
                     log.info(error.getMessage());
                     validOnLoadExecutables.set(FALSE);
@@ -181,6 +192,8 @@ private Mono<LayoutDTO> updateLayoutDsl(
                     return onLoadExecutablesUtil
                             .updateExecutablesExecuteOnLoad(
                                     flatmapOnLoadExecutables, creatorId, executableUpdatesRef, messagesRef, creatorType)
+                            .name(UPDATE_EXECUTABLES_EXECUTE_ONLOAD)
+                            .tap(Micrometer.observation(observationRegistry))
                             .thenReturn(allOnLoadExecutables);
                 })
                 // Now update the page layout with the page load executables and the graph.
@@ -192,7 +205,10 @@ private Mono<LayoutDTO> updateLayoutDsl(
                     // valid when last stored in the database.
                     layout.setValidOnPageLoadActions(validOnLoadExecutables.get());
 
-                    return onLoadExecutablesUtil.findAndUpdateLayout(creatorId, creatorType, layoutId, layout);
+                    return onLoadExecutablesUtil
+                            .findAndUpdateLayout(creatorId, creatorType, layoutId, layout)
+                            .name(FIND_AND_UPDATE_LAYOUT)
+                            .tap(Micrometer.observation(observationRegistry));
                 })
                 .map(savedLayout -> {
                     savedLayout.setDsl(this.unescapeMongoSpecialCharacters(savedLayout));
@@ -219,7 +235,8 @@ public Mono<LayoutDTO> updateLayout(String pageId, String applicationId, String
                     if (evaluationVersion == null) {
                         evaluationVersion = EVALUATION_VERSION;
                     }
-                    return updateLayoutDsl(pageId, layoutId, layout, evaluationVersion, CreatorContextType.PAGE);
+                    return updateLayoutDsl(pageId, layoutId, layout, evaluationVersion, CreatorContextType.PAGE)
+                            .name(UPDATE_LAYOUT_DSL_METHOD);
                 });
     }
 
@@ -276,13 +293,17 @@ public Mono<String> updatePageLayoutsByPageId(String pageId) {
         return Mono.justOrEmpty(pageId)
                 // fetch the unpublished page
                 .flatMap(id -> newPageService.findPageById(id, pagePermission.getEditPermission(), false))
+                .name(GET_PAGE_BY_ID)
+                .tap(Micrometer.observation(observationRegistry))
                 .flatMapMany(page -> {
                     if (page.getLayouts() == null) {
                         return Mono.empty();
                     }
                     return Flux.fromIterable(page.getLayouts()).flatMap(layout -> {
                         layout.setDsl(this.unescapeMongoSpecialCharacters(layout));
-                        return this.updateLayout(page.getId(), page.getApplicationId(), layout.getId(), layout);
+                        return this.updateLayout(page.getId(), page.getApplicationId(), layout.getId(), layout)
+                                .name(UPDATE_LAYOUT_METHOD)
+                                .tap(Micrometer.observation(observationRegistry));
                     });
                 })
                 .collectList()
@@ -324,7 +345,8 @@ public Mono<List<Set<DslExecutableDTO>>> getOnPageLoadActions(
 
         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<>());
 
         return onLoadExecutablesUtil
@@ -364,13 +386,15 @@ private JSONObject unEscapeDslKeys(JSONObject dsl, Set<String> escapedWidgetName
             String widgetType = dsl.getAsString(FieldName.WIDGET_TYPE);
             if (widgetType.equals(FieldName.TABLE_WIDGET)) {
                 // UnEscape Table widget keys
-                // Since this is a table widget, it wouldnt have children. We can safely return from here with updated
+                // Since this is a table widget, it wouldnt have children. We can safely return
+                // from here with updated
                 // dsl
                 return WidgetSpecificUtils.unEscapeTableWidgetPrimaryColumns(dsl);
             }
         }
 
-        // Fetch the children of the current node in the DSL and recursively iterate over them to extract bindings
+        // Fetch the children of the current node in the DSL and recursively iterate
+        // over them to extract bindings
         ArrayList<Object> children = (ArrayList<Object>) dsl.get(FieldName.CHILDREN);
         ArrayList<Object> newChildren = new ArrayList<>();
         if (children != null) {
@@ -392,9 +416,11 @@ private JSONObject unEscapeDslKeys(JSONObject dsl, Set<String> escapedWidgetName
 
     /**
      * Walks the DSL and extracts all the widget names from it.
-     * A widget is expected to have a few properties defining its own behaviour, with any mustache bindings present
+     * A widget is expected to have a few properties defining its own behaviour,
+     * with any mustache bindings present
      * in them aggregated in the field dynamicBindingsPathList.
-     * A widget may also have other widgets as children, each of which will follow the same structure
+     * A widget may also have other widgets as children, each of which will follow
+     * the same structure
      * Refer to FieldName.DEFAULT_PAGE_LAYOUT for a template
      *
      * @param dsl
@@ -423,27 +449,33 @@ private JSONObject extractAllWidgetNamesAndDynamicBindingsFromDSL(
         String widgetId = dsl.getAsString(FieldName.WIDGET_ID);
         String widgetType = dsl.getAsString(FieldName.WIDGET_TYPE);
 
-        // Since we are parsing this widget in this, add it to the global set of widgets found so far in the DSL.
+        // Since we are parsing this widget in this, add it to the global set of widgets
+        // found so far in the DSL.
         widgetNames.add(widgetName);
 
-        // Start by picking all fields where we expect to find dynamic bindings for this particular widget
+        // Start by picking all fields where we expect to find dynamic bindings for this
+        // particular widget
         ArrayList<Object> dynamicallyBoundedPathList = (ArrayList<Object>) dsl.get(FieldName.DYNAMIC_BINDING_PATH_LIST);
 
-        // Widgets will not have FieldName.DYNAMIC_BINDING_PATH_LIST if there are no bindings in that widget.
+        // Widgets will not have FieldName.DYNAMIC_BINDING_PATH_LIST if there are no
+        // bindings in that widget.
         // Hence we skip over the extraction of the bindings from that widget.
         if (dynamicallyBoundedPathList != null) {
-            // Each of these might have nested structures, so we iterate through them to find the leaf node for each
+            // Each of these might have nested structures, so we iterate through them to
+            // find the leaf node for each
             for (Object x : dynamicallyBoundedPathList) {
                 final String fieldPath = String.valueOf(((Map) x).get(FieldName.KEY));
                 String[] fields = fieldPath.split("[].\\[]");
-                // For nested fields, the parent dsl to search in would shift by one level every iteration
+                // For nested fields, the parent dsl to search in would shift by one level every
+                // iteration
                 Object parent = dsl;
                 Iterator<String> fieldsIterator = Arrays.stream(fields)
                         .filter(fieldToken -> !fieldToken.isBlank())
                         .iterator();
                 boolean isLeafNode = false;
                 Object oldParent;
-                // This loop will end at either a leaf node, or the last identified JSON field (by throwing an
+                // This loop will end at either a leaf node, or the last identified JSON field
+                // (by throwing an
                 // exception)
                 // Valid forms of the fieldPath for this search could be:
                 // root.field.list[index].childField.anotherList.indexWithDotOperator.multidimensionalList[index1][index2]
@@ -510,7 +542,8 @@ private JSONObject extractAllWidgetNamesAndDynamicBindingsFromDSL(
                     // Only extract mustache keys from leaf nodes
                     if (isLeafNode) {
 
-                        // We found the path. But if the path does not have any mustache bindings, throw the error
+                        // We found the path. But if the path does not have any mustache bindings, throw
+                        // the error
                         if (!MustacheHelper.laxIsBindingPresentInString((String) parent)) {
                             try {
                                 String bindingAsString = objectMapper.writeValueAsString(parent);
@@ -551,7 +584,8 @@ private JSONObject extractAllWidgetNamesAndDynamicBindingsFromDSL(
         // Escape the widget keys if required and update dsl and escapedWidgetNames
         removeSpecialCharactersFromKeys(dsl, escapedWidgetNames);
 
-        // Fetch the children of the current node in the DSL and recursively iterate over them to extract bindings
+        // Fetch the children of the current node in the DSL and recursively iterate
+        // over them to extract bindings
         ArrayList<Object> children = (ArrayList<Object>) dsl.get(FieldName.CHILDREN);
         ArrayList<Object> newChildren = new ArrayList<>();
         if (children != null) {
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 46ab98cc2151..4d1689947366 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
@@ -7,6 +7,7 @@
 import com.appsmith.server.services.SessionUserService;
 import com.appsmith.server.solutions.PagePermission;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import io.micrometer.observation.ObservationRegistry;
 import org.springframework.stereotype.Service;
 
 @Service
@@ -19,7 +20,8 @@ public UpdateLayoutServiceImpl(
             AnalyticsService analyticsService,
             PagePermission pagePermission,
             ApplicationService applicationService,
-            ObjectMapper objectMapper) {
+            ObjectMapper objectMapper,
+            ObservationRegistry observationRegistry) {
         super(
                 onLoadExecutablesUtil,
                 sessionUserService,
@@ -27,6 +29,7 @@ public UpdateLayoutServiceImpl(
                 analyticsService,
                 pagePermission,
                 applicationService,
-                objectMapper);
+                objectMapper,
+                observationRegistry);
     }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/JsonSchemaMigration.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/JsonSchemaMigration.java
index 047c037e6c4f..03d543dd3d05 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/JsonSchemaMigration.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/JsonSchemaMigration.java
@@ -6,35 +6,27 @@
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
 import com.appsmith.server.helpers.CollectionUtils;
+import com.appsmith.server.migrations.utils.JsonSchemaMigrationHelper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import reactor.core.publisher.Mono;
 
+import java.util.Map;
+
 @Slf4j
 @Component
 @RequiredArgsConstructor
 public class JsonSchemaMigration {
 
     private final JsonSchemaVersions jsonSchemaVersions;
+    private final JsonSchemaMigrationHelper jsonSchemaMigrationHelper;
 
     private boolean isCompatible(ApplicationJson applicationJson) {
         return (applicationJson.getClientSchemaVersion() <= jsonSchemaVersions.getClientVersion())
                 && (applicationJson.getServerSchemaVersion() <= jsonSchemaVersions.getServerVersion());
     }
 
-    /**
-     * This is a temporary check which is being placed for the compatibility of server versions in scenarios
-     * where user is moving a json from an instance which has
-     * release_autocommit_feature_enabled true to an instance which has the flag as false. In that case the server
-     * version number of json would be 8 and in new instance it would be not compatible.
-     * @param applicationJson
-     * @return
-     */
-    private boolean isAutocommitVersionBump(ApplicationJson applicationJson) {
-        return jsonSchemaVersions.getServerVersion() == 7 && applicationJson.getServerSchemaVersion() == 8;
-    }
-
     private void setSchemaVersions(ApplicationJson applicationJson) {
         applicationJson.setServerSchemaVersion(getCorrectSchemaVersion(applicationJson.getServerSchemaVersion()));
         applicationJson.setClientSchemaVersion(getCorrectSchemaVersion(applicationJson.getClientSchemaVersion()));
@@ -53,24 +45,53 @@ public Mono<? extends ArtifactExchangeJson> migrateArtifactExchangeJsonToLatestS
             ArtifactExchangeJson artifactExchangeJson) {
 
         if (ArtifactType.APPLICATION.equals(artifactExchangeJson.getArtifactJsonType())) {
-            return migrateApplicationJsonToLatestSchema((ApplicationJson) artifactExchangeJson);
+            return migrateApplicationJsonToLatestSchema((ApplicationJson) artifactExchangeJson, null, null);
         }
 
         return Mono.fromCallable(() -> artifactExchangeJson);
     }
 
-    public Mono<ApplicationJson> migrateApplicationJsonToLatestSchema(ApplicationJson applicationJson) {
+    public Mono<ApplicationJson> migrateApplicationJsonToLatestSchema(
+            ApplicationJson applicationJson, String baseApplicationId, String branchName) {
         return Mono.fromCallable(() -> {
                     setSchemaVersions(applicationJson);
-                    if (isCompatible(applicationJson)) {
-                        return migrateServerSchema(applicationJson);
-                    }
-
-                    if (isAutocommitVersionBump(applicationJson)) {
-                        return migrateServerSchema(applicationJson);
+                    return applicationJson;
+                })
+                .flatMap(appJson -> {
+                    if (!isCompatible(appJson)) {
+                        return Mono.empty();
                     }
 
-                    return null;
+                    // Taking a tech debt over here for import of file application.
+                    // All migration above version 9 is reactive
+                    // TODO: make import flow migration reactive
+                    return Mono.just(migrateServerSchema(appJson))
+                            .flatMap(migratedApplicationJson -> {
+                                if (migratedApplicationJson.getServerSchemaVersion() == 9
+                                        && Boolean.TRUE.equals(MigrationHelperMethods.doesRestApiRequireMigration(
+                                                migratedApplicationJson))) {
+                                    return jsonSchemaMigrationHelper
+                                            .addDatasourceConfigurationToDefaultRestApiActions(
+                                                    baseApplicationId, branchName, migratedApplicationJson)
+                                            .map(applicationJsonWithMigration10 -> {
+                                                applicationJsonWithMigration10.setServerSchemaVersion(10);
+                                                return applicationJsonWithMigration10;
+                                            });
+                                }
+
+                                migratedApplicationJson.setServerSchemaVersion(10);
+                                return Mono.just(migratedApplicationJson);
+                            })
+                            .map(migratedAppJson -> {
+                                if (applicationJson
+                                        .getServerSchemaVersion()
+                                        .equals(jsonSchemaVersions.getServerVersion())) {
+                                    return applicationJson;
+                                }
+
+                                applicationJson.setServerSchemaVersion(jsonSchemaVersions.getServerVersion());
+                                return applicationJson;
+                            });
                 })
                 .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.INCOMPATIBLE_IMPORTED_JSON)));
     }
@@ -81,7 +102,7 @@ public Mono<ApplicationJson> migrateApplicationJsonToLatestSchema(ApplicationJso
      * @param artifactExchangeJson : the json to be imported
      * @return transformed artifact exchange json
      */
-    @Deprecated
+    @Deprecated(forRemoval = true, since = "Use migrateArtifactJsonToLatestSchema")
     public ArtifactExchangeJson migrateArtifactToLatestSchema(ArtifactExchangeJson artifactExchangeJson) {
 
         if (!ArtifactType.APPLICATION.equals(artifactExchangeJson.getArtifactJsonType())) {
@@ -91,11 +112,11 @@ public ArtifactExchangeJson migrateArtifactToLatestSchema(ArtifactExchangeJson a
         ApplicationJson applicationJson = (ApplicationJson) artifactExchangeJson;
         setSchemaVersions(applicationJson);
         if (!isCompatible(applicationJson)) {
-            if (!isAutocommitVersionBump(applicationJson)) {
-                throw new AppsmithException(AppsmithError.INCOMPATIBLE_IMPORTED_JSON);
-            }
+            throw new AppsmithException(AppsmithError.INCOMPATIBLE_IMPORTED_JSON);
         }
-        return migrateServerSchema(applicationJson);
+
+        applicationJson = migrateServerSchema(applicationJson);
+        return nonReactiveServerMigrationForImport(applicationJson);
     }
 
     /**
@@ -145,11 +166,37 @@ private ApplicationJson migrateServerSchema(ApplicationJson applicationJson) {
                 MigrationHelperMethods.ensureXmlParserPresenceInCustomJsLibList(applicationJson);
                 applicationJson.setServerSchemaVersion(7);
             case 7:
+                applicationJson.setServerSchemaVersion(8);
             case 8:
                 MigrationHelperMethods.migrateThemeSettingsForAnvil(applicationJson);
                 applicationJson.setServerSchemaVersion(9);
+
+                // This is not supposed to have anymore additions to the schema.
             default:
                 // Unable to detect the serverSchema
+
+        }
+
+        return applicationJson;
+    }
+
+    /**
+     * This method is an alternative to reactive way of adding migrations to application json.
+     * this is getting used by flows which haven't implemented the reactive way yet.
+     * @param applicationJson : application json for which migration has to be done.
+     * @return return application json after migration
+     */
+    private ApplicationJson nonReactiveServerMigrationForImport(ApplicationJson applicationJson) {
+        if (jsonSchemaVersions.getServerVersion().equals(applicationJson.getServerSchemaVersion())) {
+            return applicationJson;
+        }
+
+        switch (applicationJson.getServerSchemaVersion()) {
+            case 9:
+                // this if for cases where we have empty datasource configs
+                MigrationHelperMethods.migrateApplicationJsonToVersionTen(applicationJson, Map.of());
+                applicationJson.setServerSchemaVersion(10);
+            default:
         }
 
         if (applicationJson.getServerSchemaVersion().equals(jsonSchemaVersions.getServerVersion())) {
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/JsonSchemaVersionsFallback.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/JsonSchemaVersionsFallback.java
index 63b6c7e7d4e3..06518c18b4e1 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/JsonSchemaVersionsFallback.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/JsonSchemaVersionsFallback.java
@@ -4,7 +4,7 @@
 
 @Component
 public class JsonSchemaVersionsFallback {
-    private static final Integer serverVersion = 9;
+    private static final Integer serverVersion = 10;
     public static final Integer clientVersion = 1;
 
     public Integer getServerVersion() {
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/MigrationHelperMethods.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/MigrationHelperMethods.java
index cf18759a867a..87e3d93e6ff6 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/MigrationHelperMethods.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/MigrationHelperMethods.java
@@ -1,8 +1,11 @@
 package com.appsmith.server.migrations;
 
+import com.appsmith.external.constants.PluginConstants;
 import com.appsmith.external.helpers.MustacheHelper;
 import com.appsmith.external.models.ActionDTO;
 import com.appsmith.external.models.BaseDomain;
+import com.appsmith.external.models.Datasource;
+import com.appsmith.external.models.DatasourceConfiguration;
 import com.appsmith.external.models.InvisibleActionFields;
 import com.appsmith.external.models.Property;
 import com.appsmith.server.constants.ApplicationConstants;
@@ -1231,4 +1234,106 @@ public static void setThemeSettings(Application.ThemeSetting themeSetting) {
             themeSetting.setSizing(1);
         }
     }
+
+    private static boolean conditionForDefaultRestDatasourceMigration(NewAction action) {
+        Datasource actionDatasource = action.getUnpublishedAction().getDatasource();
+
+        // condition to check if the action is default rest datasource.
+        // it has no datasource id and name is equal to DEFAULT_REST_DATASOURCE
+        boolean isActionDefaultRestDatasource = !org.springframework.util.StringUtils.hasText(actionDatasource.getId())
+                && PluginConstants.DEFAULT_REST_DATASOURCE.equals(actionDatasource.getName());
+
+        // condition to check if the action has missing url or has no config at all
+        boolean isDatasourceConfigurationOrUrlMissing = actionDatasource.getDatasourceConfiguration() == null
+                || !org.springframework.util.StringUtils.hasText(
+                        actionDatasource.getDatasourceConfiguration().getUrl());
+
+        return isActionDefaultRestDatasource && isDatasourceConfigurationOrUrlMissing;
+    }
+
+    /**
+     * Adds datasource configuration and relevant url to the embedded datasource actions.
+     * @param applicationJson: ApplicationJson for which the migration has to be performed
+     * @param defaultDatasourceActionMap: gitSyncId to actions with default rest datasource map
+     */
+    public static void migrateApplicationJsonToVersionTen(
+            ApplicationJson applicationJson, Map<String, NewAction> defaultDatasourceActionMap) {
+        List<NewAction> actionList = applicationJson.getActionList();
+        if (CollectionUtils.isNullOrEmpty(actionList)) {
+            return;
+        }
+
+        for (NewAction action : actionList) {
+            if (action.getUnpublishedAction() == null
+                    || action.getUnpublishedAction().getDatasource() == null) {
+                continue;
+            }
+
+            Datasource actionDatasource = action.getUnpublishedAction().getDatasource();
+            if (conditionForDefaultRestDatasourceMigration(action)) {
+                // Idea is to add datasourceConfiguration to existing DEFAULT_REST_DATASOURCE apis,
+                // for which the datasource configuration is missing
+                // the url would be set to empty string as right url is not present over here.
+                setDatasourceConfigDetailsInDefaultRestDatasourceForActions(action, defaultDatasourceActionMap);
+            }
+        }
+    }
+
+    /**
+     * Finds if the applicationJson has any default rest datasource which has a null datasource configuration
+     * or an unset url.
+     * @param applicationJson : Application Json for which requirement is to be checked.
+     * @return true if the application has a rest api which doesn't have a valid datasource configuration.
+     */
+    public static Boolean doesRestApiRequireMigration(ApplicationJson applicationJson) {
+        List<NewAction> actionList = applicationJson.getActionList();
+        if (CollectionUtils.isNullOrEmpty(actionList)) {
+            return Boolean.FALSE;
+        }
+
+        for (NewAction action : actionList) {
+            if (action.getUnpublishedAction() == null
+                    || action.getUnpublishedAction().getDatasource() == null) {
+                continue;
+            }
+
+            Datasource actionDatasource = action.getUnpublishedAction().getDatasource();
+            if (conditionForDefaultRestDatasourceMigration(action)) {
+                return Boolean.TRUE;
+            }
+        }
+
+        return Boolean.FALSE;
+    }
+
+    /**
+     * Adds the relevant url in the default rest datasource for the given action from an action in the db
+     * otherwise sets the url to empty
+     * it's established that action doesn't have the datasource.
+     * @param action : default rest datasource actions which doesn't have valid datasource configuration.
+     * @param defaultDatasourceActionMap : gitSyncId to actions with default rest datasource map
+     */
+    public static void setDatasourceConfigDetailsInDefaultRestDatasourceForActions(
+            NewAction action, Map<String, NewAction> defaultDatasourceActionMap) {
+
+        ActionDTO actionDTO = action.getUnpublishedAction();
+        Datasource actionDatasource = actionDTO.getDatasource();
+        DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
+
+        if (defaultDatasourceActionMap.containsKey(action.getGitSyncId())) {
+            NewAction actionFromMap = defaultDatasourceActionMap.get(action.getGitSyncId());
+            DatasourceConfiguration datasourceConfigurationFromDBAction =
+                    actionFromMap.getUnpublishedAction().getDatasource().getDatasourceConfiguration();
+
+            if (datasourceConfigurationFromDBAction != null) {
+                datasourceConfiguration.setUrl(datasourceConfigurationFromDBAction.getUrl());
+            }
+        }
+
+        if (!org.springframework.util.StringUtils.hasText(datasourceConfiguration.getUrl())) {
+            datasourceConfiguration.setUrl("");
+        }
+
+        actionDatasource.setDatasourceConfiguration(datasourceConfiguration);
+    }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/utils/JsonSchemaMigrationHelper.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/utils/JsonSchemaMigrationHelper.java
new file mode 100644
index 000000000000..934bf79c6ed5
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/utils/JsonSchemaMigrationHelper.java
@@ -0,0 +1,75 @@
+package com.appsmith.server.migrations.utils;
+
+import com.appsmith.external.constants.PluginConstants;
+import com.appsmith.server.applications.base.ApplicationService;
+import com.appsmith.server.domains.Application;
+import com.appsmith.server.domains.NewAction;
+import com.appsmith.server.dtos.ApplicationJson;
+import com.appsmith.server.migrations.MigrationHelperMethods;
+import com.appsmith.server.newactions.base.NewActionService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+import reactor.core.publisher.Mono;
+
+import java.util.Map;
+import java.util.Optional;
+
+@Component
+@Slf4j
+@RequiredArgsConstructor
+public class JsonSchemaMigrationHelper {
+
+    private final ApplicationService applicationService;
+    private final NewActionService newActionService;
+
+    public Mono<ApplicationJson> addDatasourceConfigurationToDefaultRestApiActions(
+            String baseApplicationId, String branchName, ApplicationJson applicationJson) {
+
+        Mono<ApplicationJson> contingencyMigrationJson = Mono.defer(() -> Mono.fromCallable(() -> {
+            MigrationHelperMethods.migrateApplicationJsonToVersionTen(applicationJson, Map.of());
+            return applicationJson;
+        }));
+
+        if (!StringUtils.hasText(baseApplicationId) || !StringUtils.hasText(branchName)) {
+            return contingencyMigrationJson;
+        }
+
+        Mono<Application> applicationMono = applicationService
+                .findByBranchNameAndBaseApplicationId(branchName, baseApplicationId, null)
+                .cache();
+
+        return applicationMono
+                .flatMap(branchedApplication -> {
+                    return newActionService
+                            .findAllByApplicationIdAndViewMode(
+                                    branchedApplication.getId(), Boolean.FALSE, Optional.empty(), Optional.empty())
+                            .filter(action -> {
+                                if (action.getUnpublishedAction() == null
+                                        || action.getUnpublishedAction().getDatasource() == null) {
+                                    return false;
+                                }
+
+                                boolean reverseFlag = StringUtils.hasText(action.getUnpublishedAction()
+                                                .getDatasource()
+                                                .getId())
+                                        || !PluginConstants.DEFAULT_REST_DATASOURCE.equals(action.getUnpublishedAction()
+                                                .getDatasource()
+                                                .getName());
+
+                                return !reverseFlag;
+                            })
+                            .collectMap(NewAction::getGitSyncId);
+                })
+                .map(newActionMap -> {
+                    MigrationHelperMethods.migrateApplicationJsonToVersionTen(applicationJson, newActionMap);
+                    return applicationJson;
+                })
+                .switchIfEmpty(contingencyMigrationJson)
+                .onErrorResume(error -> {
+                    log.error("Error occurred while migrating actions of application json. {}", error.getMessage());
+                    return contingencyMigrationJson;
+                });
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCE.java
index b52362f42686..a2cf04bbd120 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCE.java
@@ -78,11 +78,10 @@ Flux<NewAction> findAllByApplicationIdAndViewMode(
     Flux<NewAction> findAllByApplicationIdAndViewMode(
             String applicationId, Boolean viewMode, Optional<AclPermission> permission, Optional<Sort> sort);
 
-    Flux<NewAction> findAllByApplicationIdAndPluginType(
-            String applicationId, Boolean viewMode, AclPermission permission, Sort sort, List<String> pluginTypes);
-
     Flux<ActionViewDTO> getActionsForViewMode(String applicationId);
 
+    Flux<ActionViewDTO> getActionsForViewModeByPageId(String pageId);
+
     ActionViewDTO generateActionViewDTO(NewAction action, ActionDTO actionDTO, boolean viewMode);
 
     Mono<ActionDTO> deleteUnpublishedAction(String id);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCEImpl.java
index 127254e26009..12b787c4dfb8 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCEImpl.java
@@ -81,10 +81,6 @@
 import static com.appsmith.external.constants.spans.ActionSpan.GET_ACTION_REPOSITORY_CALL;
 import static com.appsmith.external.constants.spans.ce.ActionSpanCE.VIEW_MODE_FETCH_ACTIONS_FROM_DB;
 import static com.appsmith.external.constants.spans.ce.ActionSpanCE.VIEW_MODE_FETCH_PLUGIN_FROM_DB;
-import static com.appsmith.external.constants.spans.ce.ActionSpanCE.VIEW_MODE_FILTER_ACTION;
-import static com.appsmith.external.constants.spans.ce.ActionSpanCE.VIEW_MODE_FINAL_ACTION;
-import static com.appsmith.external.constants.spans.ce.ActionSpanCE.VIEW_MODE_INITIAL_ACTION;
-import static com.appsmith.external.constants.spans.ce.ActionSpanCE.VIEW_MODE_SANITISE_ACTION;
 import static com.appsmith.external.constants.spans.ce.ActionSpanCE.VIEW_MODE_SET_PLUGIN_ID_AND_TYPE_ACTION;
 import static com.appsmith.external.constants.spans.ce.ActionSpanCE.VIEW_MODE_SET_PLUGIN_ID_AND_TYPE_JS;
 import static com.appsmith.external.helpers.AppsmithBeanUtils.copyNestedNonNullProperties;
@@ -733,26 +729,6 @@ public Flux<NewAction> findByPageIdAndViewMode(String pageId, Boolean viewMode,
         return repository.findByPageIdAndViewMode(pageId, viewMode, permission).flatMap(this::sanitizeAction);
     }
 
-    @Override
-    public Flux<NewAction> findAllByApplicationIdAndPluginType(
-            String applicationId,
-            Boolean viewMode,
-            AclPermission permission,
-            Sort sort,
-            List<String> excludedPluginTypes) {
-        return repository
-                .findByApplicationIdAndPluginType(applicationId, excludedPluginTypes, permission, sort)
-                .name(VIEW_MODE_FETCH_ACTIONS_FROM_DB)
-                .tap(Micrometer.observation(observationRegistry))
-                // In case of view mode being true, filter out all the actions which haven't been published
-                .flatMap(action -> this.filterAction(action, viewMode))
-                .name(VIEW_MODE_FILTER_ACTION)
-                .tap(Micrometer.observation(observationRegistry))
-                .flatMap(this::sanitizeAction)
-                .name(VIEW_MODE_SANITISE_ACTION)
-                .tap(Micrometer.observation(observationRegistry));
-    }
-
     @Override
     public Flux<NewAction> findAllByApplicationIdAndViewMode(
             String applicationId, Boolean viewMode, AclPermission permission, Sort sort) {
@@ -787,25 +763,41 @@ public Flux<NewAction> findAllByApplicationIdAndViewMode(
                 .flatMapMany(this::addMissingPluginDetailsIntoAllActions);
     }
 
-    @Override
     public Flux<ActionViewDTO> getActionsForViewMode(String applicationId) {
 
         if (applicationId == null || applicationId.isEmpty()) {
-            return Flux.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.APPLICATION_ID));
+            return Flux.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.PAGE_ID));
+        }
+
+        List<String> excludedPluginTypes = List.of(PluginType.JS.toString());
+
+        // fetch the published actions by appId
+        // No need to sort the results
+        return repository
+                .findPublishedActionsByAppIdAndExcludedPluginType(
+                        applicationId, excludedPluginTypes, actionPermission.getExecutePermission(), null)
+                .name(VIEW_MODE_FETCH_ACTIONS_FROM_DB)
+                .tap(Micrometer.observation(observationRegistry))
+                .map(action -> generateActionViewDTO(action, action.getPublishedAction(), true));
+    }
+
+    @Override
+    public Flux<ActionViewDTO> getActionsForViewModeByPageId(String pageId) {
+
+        if (pageId == null || pageId.isEmpty()) {
+            return Flux.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.PAGE_ID));
         }
 
         List<String> excludedPluginTypes = List.of(PluginType.JS.toString());
 
-        // fetch the published actions by applicationId
+        // fetch the published actions by pageId
         // No need to sort the results
-        return findAllByApplicationIdAndPluginType(
-                        applicationId, true, actionPermission.getExecutePermission(), null, excludedPluginTypes)
-                .name(VIEW_MODE_INITIAL_ACTION)
+        return repository
+                .findPublishedActionsByPageIdAndExcludedPluginType(
+                        pageId, excludedPluginTypes, actionPermission.getExecutePermission(), null)
+                .name(VIEW_MODE_FETCH_ACTIONS_FROM_DB)
                 .tap(Micrometer.observation(observationRegistry))
-                .filter(newAction -> !PluginType.JS.equals(newAction.getPluginType()))
-                .map(action -> generateActionViewDTO(action, action.getPublishedAction(), true))
-                .name(VIEW_MODE_FINAL_ACTION)
-                .tap(Micrometer.observation(observationRegistry));
+                .map(action -> generateActionViewDTO(action, action.getPublishedAction(), true));
     }
 
     @Override
@@ -1020,7 +1012,7 @@ public Flux<ActionDTO> getUnpublishedActions(
         Mono<NewPage> branchedPageMono = !StringUtils.hasLength(params.getFirst(FieldName.PAGE_ID))
                 ? Mono.just(new NewPage())
                 : newPageService.findByBranchNameAndBasePageId(
-                        branchName, params.getFirst(FieldName.PAGE_ID), pagePermission.getReadPermission());
+                        branchName, params.getFirst(FieldName.PAGE_ID), pagePermission.getReadPermission(), null);
         Mono<Application> branchedApplicationMono = !StringUtils.hasLength(params.getFirst(FieldName.APPLICATION_ID))
                 ? Mono.just(new Application())
                 : applicationService.findByBranchNameAndBaseApplicationId(
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/base/NewPageServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/base/NewPageServiceCE.java
index 071ad9342ef9..b669c91a4142 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/base/NewPageServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/base/NewPageServiceCE.java
@@ -27,7 +27,8 @@ public interface NewPageServiceCE extends CrudService<NewPage, String> {
 
     Flux<NewPage> findNewPagesByApplicationId(String applicationId, AclPermission permission);
 
-    Mono<NewPage> findByIdAndBranchName(String id, String branchName);
+    Flux<NewPage> findNewPagesByApplicationId(
+            String applicationId, AclPermission permission, List<String> includeFields);
 
     Mono<PageDTO> saveUnpublishedPage(PageDTO page);
 
@@ -52,8 +53,6 @@ Mono<PageDTO> findByNameAndApplicationIdAndViewMode(
 
     Mono<List<NewPage>> archivePagesByApplicationId(String applicationId, AclPermission permission);
 
-    Mono<List<String>> findAllPageIdsInApplication(String applicationId, AclPermission permission, Boolean view);
-
     Mono<PageDTO> updatePage(String pageId, PageDTO page);
 
     Mono<NewPage> save(NewPage page);
@@ -70,7 +69,8 @@ Mono<PageDTO> findByNameAndApplicationIdAndViewMode(
 
     Mono<String> getNameByPageId(String pageId, boolean isPublishedName);
 
-    Mono<NewPage> findByBranchNameAndBasePageId(String branchName, String defaultPageId, AclPermission permission);
+    Mono<NewPage> findByBranchNameAndBasePageId(
+            String branchName, String defaultPageId, AclPermission permission, List<String> projectedFieldNames);
 
     Mono<NewPage> findByBranchNameAndBasePageIdAndApplicationMode(
             String branchName, String basePageId, ApplicationMode mode);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/base/NewPageServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/base/NewPageServiceCEImpl.java
index ee3aca5221da..594e94d033e8 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/base/NewPageServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/base/NewPageServiceCEImpl.java
@@ -9,6 +9,7 @@
 import com.appsmith.server.domains.ApplicationPage;
 import com.appsmith.server.domains.Layout;
 import com.appsmith.server.domains.NewPage;
+import com.appsmith.server.domains.UserData;
 import com.appsmith.server.dtos.ApplicationPagesDTO;
 import com.appsmith.server.dtos.PageDTO;
 import com.appsmith.server.dtos.PageNameIdDTO;
@@ -28,13 +29,13 @@
 import net.minidev.json.parser.JSONParser;
 import net.minidev.json.parser.ParseException;
 import org.bson.types.ObjectId;
-import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 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.Collection;
@@ -135,11 +136,6 @@ public Flux<PageDTO> findByApplicationId(String applicationId, AclPermission per
         return findNewPagesByApplicationId(applicationId, permission).flatMap(page -> getPageByViewMode(page, view));
     }
 
-    @Override
-    public Mono<NewPage> findByIdAndBranchName(String id, String branchName) {
-        return this.findByBranchNameAndBasePageId(branchName, id, pagePermission.getReadPermission());
-    }
-
     @Override
     public Mono<PageDTO> saveUnpublishedPage(PageDTO page) {
 
@@ -291,24 +287,25 @@ public Mono<ApplicationPagesDTO> findApplicationPagesByBranchedApplicationIdAndV
     public Mono<ApplicationPagesDTO> createApplicationPagesDTO(
             Application branchedApplication, List<NewPage> newPages, boolean viewMode, boolean markRecentlyAccessed) {
 
-        Mono<Void> markedRecentlyAccessedMono = Mono.empty();
-
-        if (Boolean.TRUE.equals(markRecentlyAccessed)) {
-            markedRecentlyAccessedMono = userDataService
+        ApplicationMode applicationMode = viewMode ? ApplicationMode.PUBLISHED : ApplicationMode.EDIT;
+        Mono<ApplicationPagesDTO> getApplicationPagesDTOMono = Mono.just(
+                        getApplicationPagesDTO(branchedApplication, newPages, viewMode))
+                .name(getQualifiedSpanName(PREPARE_APPLICATION_PAGES_DTO_FROM_PAGES, applicationMode))
+                .tap(Micrometer.observation(observationRegistry));
+        if (Boolean.TRUE.equals(markRecentlyAccessed) && !viewMode) {
+            Mono<UserData> markedRecentlyAccessedMono = userDataService
                     .updateLastUsedResourceAndWorkspaceList(
                             branchedApplication.getId(),
                             branchedApplication.getWorkspaceId(),
                             WorkspaceResourceContext.APPLICATIONS)
-                    .then();
+                    .name(getQualifiedSpanName(MARK_RECENTLY_ACCESSED_RESOURCES_PAGES, applicationMode))
+                    .tap(Micrometer.observation(observationRegistry));
+
+            return Mono.zip(markedRecentlyAccessedMono, getApplicationPagesDTOMono)
+                    .map(Tuple2::getT2);
         }
 
-        ApplicationMode applicationMode = viewMode ? ApplicationMode.PUBLISHED : ApplicationMode.EDIT;
-        return markedRecentlyAccessedMono
-                .name(getQualifiedSpanName(MARK_RECENTLY_ACCESSED_RESOURCES_PAGES, applicationMode))
-                .tap(Micrometer.observation(observationRegistry))
-                .then(Mono.fromCallable(() -> getApplicationPagesDTO(branchedApplication, newPages, viewMode))
-                        .name(getQualifiedSpanName(PREPARE_APPLICATION_PAGES_DTO_FROM_PAGES, applicationMode))
-                        .tap(Micrometer.observation(observationRegistry)));
+        return getApplicationPagesDTOMono;
     }
 
     private List<ApplicationPage> getApplicationPages(Application application, boolean viewMode) {
@@ -385,7 +382,7 @@ public ApplicationPagesDTO getApplicationPagesDTO(
         return applicationPagesDTO;
     }
 
-    private static @NotNull PageNameIdDTO getPageNameIdDTO(NewPage pageFromDb, String homePageId, boolean viewMode) {
+    private static PageNameIdDTO getPageNameIdDTO(NewPage pageFromDb, String homePageId, boolean viewMode) {
         PageNameIdDTO pageNameIdDTO = new PageNameIdDTO();
         pageNameIdDTO.setId(pageFromDb.getId());
         pageNameIdDTO.setBaseId(pageFromDb.getBaseIdOrFallback());
@@ -427,32 +424,15 @@ public Flux<NewPage> findNewPagesByApplicationId(String applicationId, AclPermis
     }
 
     @Override
-    public Mono<List<NewPage>> archivePagesByApplicationId(String applicationId, AclPermission permission) {
-        return findNewPagesByApplicationId(applicationId, permission)
-                .flatMap(repository::archive)
-                .collectList();
+    public Flux<NewPage> findNewPagesByApplicationId(
+            String applicationId, AclPermission permission, List<String> includeFields) {
+        return repository.findByApplicationId(applicationId, permission, includeFields);
     }
 
     @Override
-    // Remove if not used
-    public Mono<List<String>> findAllPageIdsInApplication(
-            String applicationId, AclPermission aclPermission, Boolean view) {
-        return findNewPagesByApplicationId(applicationId, aclPermission)
-                .flatMap(newPage -> {
-                    // Look if the page is migrated
-                    // Real time migration
-                    if (Boolean.TRUE.equals(view)) {
-                        if (newPage.getPublishedPage().getDeletedAt() != null) {
-                            return Mono.just(newPage.getId());
-                        }
-                    } else {
-                        if (newPage.getUnpublishedPage().getDeletedAt() != null) {
-                            return Mono.just(newPage.getId());
-                        }
-                    }
-                    // Looks like the page has been deleted in the `view` mode. Don't return the id for this page.
-                    return Mono.empty();
-                })
+    public Mono<List<NewPage>> archivePagesByApplicationId(String applicationId, AclPermission permission) {
+        return findNewPagesByApplicationId(applicationId, permission)
+                .flatMap(repository::archive)
                 .collectList();
     }
 
@@ -526,19 +506,21 @@ public Mono<String> getNameByPageId(String pageId, boolean isPublishedName) {
     }
 
     @Override
-    public Mono<NewPage> findByBranchNameAndBasePageId(String branchName, String basePageId, AclPermission permission) {
+    public Mono<NewPage> findByBranchNameAndBasePageId(
+            String branchName, String basePageId, AclPermission permission, List<String> projectedFieldNames) {
 
         if (!StringUtils.hasText(basePageId)) {
             return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.PAGE_ID));
         } else if (!StringUtils.hasText(branchName)) {
-            return this.findById(basePageId, permission)
+            return repository
+                    .findById(basePageId, permission, projectedFieldNames)
                     .name(GET_PAGE_WITHOUT_BRANCH)
                     .tap(Micrometer.observation(observationRegistry))
                     .switchIfEmpty(Mono.error(
                             new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.PAGE, basePageId)));
         }
         return repository
-                .findPageByBranchNameAndBasePageId(branchName, basePageId, permission)
+                .findPageByBranchNameAndBasePageId(branchName, basePageId, permission, projectedFieldNames)
                 .name(GET_PAGE_WITH_BRANCH)
                 .tap(Micrometer.observation(observationRegistry))
                 .switchIfEmpty(Mono.error(new AppsmithException(
@@ -556,7 +538,8 @@ public Mono<NewPage> findByBranchNameAndBasePageIdAndApplicationMode(
             permission = pagePermission.getReadPermission();
         }
 
-        return this.findByBranchNameAndBasePageId(branchName, basePageId, permission)
+        return this.findByBranchNameAndBasePageId(
+                        branchName, basePageId, permission, List.of(NewPage.Fields.id, NewPage.Fields.applicationId))
                 .name(getQualifiedSpanName(GET_PAGE, mode))
                 .tap(Micrometer.observation(observationRegistry));
     }
@@ -571,7 +554,7 @@ public Mono<String> findBranchedPageId(String branchName, String basePageId, Acl
             return Mono.just(basePageId);
         }
         return repository
-                .findPageByBranchNameAndBasePageId(branchName, basePageId, permission)
+                .findPageByBranchNameAndBasePageId(branchName, basePageId, permission, null)
                 .switchIfEmpty(Mono.error(new AppsmithException(
                         AppsmithError.NO_RESOURCE_FOUND, FieldName.PAGE_ID, basePageId + ", " + branchName)))
                 .map(NewPage::getId);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/BaseAppsmithRepositoryCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/BaseAppsmithRepositoryCEImpl.java
index dcaa76bf9ac9..8a297df4bf0e 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/BaseAppsmithRepositoryCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/BaseAppsmithRepositoryCEImpl.java
@@ -416,11 +416,13 @@ public Mono<T> setUserPermissionsInObject(T obj, Set<String> permissionGroups) {
         Set<String> permissions = new HashSet<>();
         obj.setUserPermissions(permissions);
 
-        if (CollectionUtils.isEmpty(obj.getPolicies()) || permissionGroups.isEmpty()) {
+        Set<Policy> existingPolicies = obj.getPolicies();
+        final Set<Policy> policies = new HashSet<>(existingPolicies == null ? Set.of() : existingPolicies);
+        if (CollectionUtils.isEmpty(policies) || permissionGroups.isEmpty()) {
             return Mono.just(obj);
         }
 
-        for (Policy policy : obj.getPolicies()) {
+        for (Policy policy : policies) {
             Set<String> policyPermissionGroups = policy.getPermissionGroups();
             if (CollectionUtils.isEmpty(policyPermissionGroups)) {
                 continue;
@@ -432,7 +434,7 @@ public Mono<T> setUserPermissionsInObject(T obj, Set<String> permissionGroups) {
                 }
             }
         }
-
+        obj.setPolicies(policies);
         return Mono.just(obj);
     }
 
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CacheableRepositoryHelperCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CacheableRepositoryHelperCE.java
index 8bf2c469b9aa..fc66e5e2eeec 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CacheableRepositoryHelperCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CacheableRepositoryHelperCE.java
@@ -4,6 +4,7 @@
 import com.appsmith.server.domains.User;
 import reactor.core.publisher.Mono;
 
+import java.util.List;
 import java.util.Set;
 
 public interface CacheableRepositoryHelperCE {
@@ -23,4 +24,25 @@ public interface CacheableRepositoryHelperCE {
     Mono<Tenant> fetchDefaultTenant(String tenantId);
 
     Mono<Void> evictCachedTenant(String tenantId);
+
+    /**
+     * Retrieves the base application ID from the cache based on the provided base page ID.
+     *
+     * <p>If the cache contains the ID for the specified {@code basePageId}, it is returned as a {@code Mono} containing the {@code baseApplicationId}.
+     * If the cache does not contain the ID (cache miss) and {@code baseApplicationId} is {@code null} or empty, an empty {@code Mono} is returned.</p>
+     *
+     * <p>If {@code baseApplicationId} is not {@code null} or empty and a cache miss occurs, the cache will be updated with the provided {@code baseApplicationId}.</p>
+     *
+     * <p>Note that calling this method with a {@code null} {@code baseApplicationId} on a cache miss will not update the cache.
+     * In this case, the method will return an empty {@code Mono}, and no cache update will occur.</p>
+     *
+     * @param basePageId the identifier for the base page used as the cache key
+     * @param baseApplicationId the base application ID to be returned or used to update the cache if not {@code null} or empty
+     * @return a {@code Mono} containing the {@code baseApplicationId} if it is present in the cache or provided; otherwise, an empty {@code Mono} on a cache miss with a {@code null} or empty {@code baseApplicationId}.
+     *
+     * <p>On a cache miss, if {@code baseApplicationId} is provided, the cache will be updated with the new value after performing additional database operations to fetch the application document.</p>
+     */
+    Mono<String> fetchBaseApplicationId(String basePageId, String baseApplicationId);
+
+    Mono<Boolean> evictCachedBasePageIds(List<String> basePageIds);
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CacheableRepositoryHelperCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CacheableRepositoryHelperCEImpl.java
index 330ae848910c..3cdcc4e8b087 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CacheableRepositoryHelperCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CacheableRepositoryHelperCEImpl.java
@@ -21,9 +21,11 @@
 import org.springframework.data.mongodb.core.ReactiveMongoOperations;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
 import reactor.core.observability.micrometer.Micrometer;
 import reactor.core.publisher.Mono;
 
+import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -41,6 +43,7 @@ public class CacheableRepositoryHelperCEImpl implements CacheableRepositoryHelpe
     private final ReactiveMongoOperations mongoOperations;
     private final InMemoryCacheableRepositoryHelper inMemoryCacheableRepositoryHelper;
     private final ObservationRegistry observationRegistry;
+    private static final String CACHE_DEFAULT_PAGE_ID_TO_DEFAULT_APPLICATION_ID = "pageIdToAppId";
 
     @Cache(cacheName = "permissionGroupsForUser", key = "{#user.email + #user.tenantId}")
     @Override
@@ -199,4 +202,16 @@ public Mono<Tenant> fetchDefaultTenant(String tenantId) {
     public Mono<Void> evictCachedTenant(String tenantId) {
         return Mono.empty().then();
     }
+
+    @Cache(cacheName = CACHE_DEFAULT_PAGE_ID_TO_DEFAULT_APPLICATION_ID, key = "{#basePageId}")
+    @Override
+    public Mono<String> fetchBaseApplicationId(String basePageId, String baseApplicationId) {
+        return !StringUtils.hasText(baseApplicationId) ? Mono.empty() : Mono.just(baseApplicationId);
+    }
+
+    @CacheEvict(cacheName = CACHE_DEFAULT_PAGE_ID_TO_DEFAULT_APPLICATION_ID, keys = "#basePageIds")
+    @Override
+    public Mono<Boolean> evictCachedBasePageIds(List<String> basePageIds) {
+        return Mono.just(Boolean.TRUE);
+    }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewActionRepositoryCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewActionRepositoryCE.java
index 6026e79bc622..80351b502b01 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewActionRepositoryCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewActionRepositoryCE.java
@@ -37,8 +37,11 @@ Flux<NewAction> findAllActionsByNameAndPageIdsAndViewMode(
 
     Flux<NewAction> findByApplicationId(String applicationId, AclPermission aclPermission, Sort sort);
 
-    Flux<NewAction> findByApplicationIdAndPluginType(
-            String applicationId, List<String> pluginTypes, AclPermission aclPermission, Sort sort);
+    Flux<NewAction> findPublishedActionsByPageIdAndExcludedPluginType(
+            String pageId, List<String> pluginTypes, AclPermission aclPermission, Sort sort);
+
+    Flux<NewAction> findPublishedActionsByAppIdAndExcludedPluginType(
+            String appId, List<String> pluginTypes, AclPermission aclPermission, Sort sort);
 
     Flux<NewAction> findByApplicationId(
             String applicationId, Optional<AclPermission> aclPermission, Optional<Sort> sort);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewActionRepositoryCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewActionRepositoryCEImpl.java
index 5913e10ced03..0d56c4dcabb8 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewActionRepositoryCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewActionRepositoryCEImpl.java
@@ -202,23 +202,44 @@ protected BridgeQuery<NewAction> getCriterionForFindByApplicationId(String appli
         return Bridge.equal(NewAction.Fields.applicationId, applicationId);
     }
 
-    @Override
-    public Flux<NewAction> findByApplicationIdAndPluginType(
+    public Flux<NewAction> findPublishedActionsByAppIdAndExcludedPluginType(
             String applicationId, List<String> excludedPluginTypes, AclPermission aclPermission, Sort sort) {
         return queryBuilder()
-                .criteria(getCriterionForFindByApplicationIdAndPluginType(applicationId, excludedPluginTypes))
+                .criteria(getCriterionForFindPublishedActionsByAppIdAndExcludedPluginType(
+                        applicationId, excludedPluginTypes))
                 .permission(aclPermission)
                 .sort(sort)
                 .all();
     }
 
-    protected BridgeQuery<NewAction> getCriterionForFindByApplicationIdAndPluginType(
+    protected BridgeQuery<NewAction> getCriterionForFindPublishedActionsByAppIdAndExcludedPluginType(
             String applicationId, List<String> excludedPluginTypes) {
         final BridgeQuery<NewAction> q = getCriterionForFindByApplicationId(applicationId);
         q.and(Bridge.or(
                 Bridge.notIn(NewAction.Fields.pluginType, excludedPluginTypes),
                 Bridge.isNull(NewAction.Fields.pluginType)));
 
+        q.isNotNull(NewAction.Fields.publishedAction_pageId);
+        return q;
+    }
+
+    @Override
+    public Flux<NewAction> findPublishedActionsByPageIdAndExcludedPluginType(
+            String pageId, List<String> excludedPluginTypes, AclPermission aclPermission, Sort sort) {
+        return queryBuilder()
+                .criteria(getCriterionForFindPublishedActionsByPageIdAndExcludedPluginType(pageId, excludedPluginTypes))
+                .permission(aclPermission)
+                .sort(sort)
+                .all();
+    }
+
+    protected BridgeQuery<NewAction> getCriterionForFindPublishedActionsByPageIdAndExcludedPluginType(
+            String pageId, List<String> excludedPluginTypes) {
+        final BridgeQuery<NewAction> q = Bridge.equal(NewAction.Fields.publishedAction_pageId, pageId);
+        q.and(Bridge.or(
+                Bridge.notIn(NewAction.Fields.pluginType, excludedPluginTypes),
+                Bridge.isNull(NewAction.Fields.pluginType)));
+
         return q;
     }
 
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewPageRepositoryCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewPageRepositoryCE.java
index 96bda4c7b989..ca0beb98bec7 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewPageRepositoryCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewPageRepositoryCE.java
@@ -12,8 +12,12 @@
 
 public interface CustomNewPageRepositoryCE extends AppsmithRepository<NewPage> {
 
+    Mono<NewPage> findById(String id, AclPermission permission, List<String> projectedFields);
+
     Flux<NewPage> findByApplicationId(String applicationId, AclPermission aclPermission);
 
+    Flux<NewPage> findByApplicationId(String applicationId, AclPermission aclPermission, List<String> includeFields);
+
     Flux<NewPage> findByApplicationIdAndNonDeletedEditMode(String applicationId, AclPermission aclPermission);
 
     Mono<NewPage> findByIdAndLayoutsIdAndViewMode(
@@ -28,7 +32,8 @@ Mono<NewPage> findByNameAndApplicationIdAndViewMode(
 
     Mono<String> getNameByPageId(String pageId, boolean isPublishedName);
 
-    Mono<NewPage> findPageByBranchNameAndBasePageId(String branchName, String basePageId, AclPermission permission);
+    Mono<NewPage> findPageByBranchNameAndBasePageId(
+            String branchName, String basePageId, AclPermission permission, List<String> projectedFieldNames);
 
     Flux<NewPage> findAllByApplicationIds(List<String> branchedArtifactIds, List<String> includedFields);
 
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewPageRepositoryCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewPageRepositoryCEImpl.java
index b4aae0c3601a..03b06fc065f2 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewPageRepositoryCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewPageRepositoryCEImpl.java
@@ -40,6 +40,15 @@ public class CustomNewPageRepositoryCEImpl extends BaseAppsmithRepositoryImpl<Ne
     private final MongoTemplate mongoTemplate;
     private final ObservationRegistry observationRegistry;
 
+    @Override
+    public Mono<NewPage> findById(String id, AclPermission permission, List<String> projectedFields) {
+        return queryBuilder()
+                .criteria(Bridge.equal(NewPage.Fields.id, id))
+                .permission(permission)
+                .fields(projectedFields)
+                .one();
+    }
+
     @Override
     public Flux<NewPage> findByApplicationId(String applicationId, AclPermission aclPermission) {
         return queryBuilder()
@@ -48,6 +57,16 @@ public Flux<NewPage> findByApplicationId(String applicationId, AclPermission acl
                 .all();
     }
 
+    @Override
+    public Flux<NewPage> findByApplicationId(
+            String applicationId, AclPermission aclPermission, List<String> includeFields) {
+        return queryBuilder()
+                .criteria(Bridge.equal(NewPage.Fields.applicationId, applicationId))
+                .permission(aclPermission)
+                .fields(includeFields)
+                .all();
+    }
+
     @Override
     public Flux<NewPage> findByApplicationIdAndNonDeletedEditMode(String applicationId, AclPermission aclPermission) {
         BridgeQuery<NewPage> q = Bridge.<NewPage>equal(NewPage.Fields.applicationId, applicationId)
@@ -151,7 +170,7 @@ public Mono<String> getNameByPageId(String pageId, boolean isPublishedName) {
 
     @Override
     public Mono<NewPage> findPageByBranchNameAndBasePageId(
-            String branchName, String basePageId, AclPermission permission) {
+            String branchName, String basePageId, AclPermission permission, List<String> projectedFieldNames) {
 
         final BridgeQuery<NewPage> q =
                 // defaultPageIdCriteria
@@ -167,6 +186,7 @@ public Mono<NewPage> findPageByBranchNameAndBasePageId(
         return queryBuilder()
                 .criteria(q)
                 .permission(permission)
+                .fields(projectedFieldNames)
                 .one()
                 .name(FETCH_PAGE_FROM_DB)
                 .tap(Micrometer.observation(observationRegistry));
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationPageServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationPageServiceImpl.java
index 808a45405e4a..f31d8f50c3a4 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationPageServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationPageServiceImpl.java
@@ -13,6 +13,7 @@
 import com.appsmith.server.newpages.base.NewPageService;
 import com.appsmith.server.repositories.ActionCollectionRepository;
 import com.appsmith.server.repositories.ApplicationRepository;
+import com.appsmith.server.repositories.CacheableRepositoryHelper;
 import com.appsmith.server.repositories.DatasourceRepository;
 import com.appsmith.server.repositories.NewActionRepository;
 import com.appsmith.server.repositories.NewPageRepository;
@@ -60,7 +61,8 @@ public ApplicationPageServiceImpl(
             DSLMigrationUtils dslMigrationUtils,
             ClonePageService<NewAction> actionClonePageService,
             ClonePageService<ActionCollection> actionCollectionClonePageService,
-            ObservationRegistry observationRegistry) {
+            ObservationRegistry observationRegistry,
+            CacheableRepositoryHelper cacheableRepositoryHelper) {
         super(
                 workspaceService,
                 applicationService,
@@ -89,6 +91,7 @@ public ApplicationPageServiceImpl(
                 dslMigrationUtils,
                 actionClonePageService,
                 actionCollectionClonePageService,
-                observationRegistry);
+                observationRegistry,
+                cacheableRepositoryHelper);
     }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ConsolidatedAPIServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ConsolidatedAPIServiceImpl.java
index f786ac90c1b9..9b0c48a44d0d 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ConsolidatedAPIServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ConsolidatedAPIServiceImpl.java
@@ -7,6 +7,7 @@
 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.CacheableRepositoryHelper;
 import com.appsmith.server.services.ce_compatible.ConsolidatedAPIServiceCECompatibleImpl;
 import com.appsmith.server.themes.base.ThemeService;
 import io.micrometer.observation.ObservationRegistry;
@@ -33,7 +34,8 @@ public ConsolidatedAPIServiceImpl(
             PluginService pluginService,
             DatasourceService datasourceService,
             MockDataService mockDataService,
-            ObservationRegistry observationRegistry) {
+            ObservationRegistry observationRegistry,
+            CacheableRepositoryHelper cacheableRepositoryHelper) {
         super(
                 sessionUserService,
                 userService,
@@ -50,6 +52,7 @@ public ConsolidatedAPIServiceImpl(
                 pluginService,
                 datasourceService,
                 mockDataService,
-                observationRegistry);
+                observationRegistry,
+                cacheableRepositoryHelper);
     }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/LayoutActionServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/LayoutActionServiceImpl.java
index 1c0737cbc795..cf6158324512 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/LayoutActionServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/LayoutActionServiceImpl.java
@@ -8,6 +8,7 @@
 import com.appsmith.server.services.ce.LayoutActionServiceCEImpl;
 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;
 
@@ -24,7 +25,9 @@ public LayoutActionServiceImpl(
             UpdateLayoutService updateLayoutService,
             DatasourceService datasourceService,
             PagePermission pagePermission,
-            ActionPermission actionPermission) {
+            ActionPermission actionPermission,
+            ObservationRegistry observationRegistry) {
+
         super(
                 analyticsService,
                 newPageService,
@@ -34,6 +37,7 @@ public LayoutActionServiceImpl(
                 updateLayoutService,
                 datasourceService,
                 pagePermission,
-                actionPermission);
+                actionPermission,
+                observationRegistry);
     }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/LayoutCollectionServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/LayoutCollectionServiceImpl.java
index 66ac12133349..621b10bab460 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/LayoutCollectionServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/LayoutCollectionServiceImpl.java
@@ -9,6 +9,7 @@
 import com.appsmith.server.services.ce.LayoutCollectionServiceCEImpl;
 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;
 
@@ -26,7 +27,8 @@ public LayoutCollectionServiceImpl(
             AnalyticsService analyticsService,
             ActionCollectionRepository actionCollectionRepository,
             PagePermission pagePermission,
-            ActionPermission actionPermission) {
+            ActionPermission actionPermission,
+            ObservationRegistry observationRegistry) {
         super(
                 newPageService,
                 layoutActionService,
@@ -37,6 +39,7 @@ public LayoutCollectionServiceImpl(
                 analyticsService,
                 actionCollectionRepository,
                 pagePermission,
-                actionPermission);
+                actionPermission,
+                observationRegistry);
     }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCEImpl.java
index e4a6a9ca494b..1536ba67a357 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCEImpl.java
@@ -43,6 +43,7 @@
 import com.appsmith.server.newpages.base.NewPageService;
 import com.appsmith.server.repositories.ActionCollectionRepository;
 import com.appsmith.server.repositories.ApplicationRepository;
+import com.appsmith.server.repositories.CacheableRepositoryHelper;
 import com.appsmith.server.repositories.DatasourceRepository;
 import com.appsmith.server.repositories.NewActionRepository;
 import com.appsmith.server.repositories.NewPageRepository;
@@ -128,6 +129,7 @@ public class ApplicationPageServiceCEImpl implements ApplicationPageServiceCE {
     private final ClonePageService<NewAction> actionClonePageService;
     private final ClonePageService<ActionCollection> actionCollectionClonePageService;
     private final ObservationRegistry observationRegistry;
+    private final CacheableRepositoryHelper cacheableRepositoryHelper;
 
     @Override
     public Mono<PageDTO> createPage(PageDTO page) {
@@ -255,7 +257,22 @@ public Mono<PageDTO> getPage(String pageId, boolean viewMode) {
     public Mono<List<NewPage>> getPagesBasedOnApplicationMode(
             Application branchedApplication, ApplicationMode applicationMode) {
 
-        Boolean viewMode = ApplicationMode.PUBLISHED.equals(applicationMode) ? Boolean.TRUE : Boolean.FALSE;
+        Boolean viewMode = Boolean.FALSE;
+        List<String> projectedFieldNames = null;
+        if (ApplicationMode.PUBLISHED.equals(applicationMode)) {
+            viewMode = Boolean.TRUE;
+            projectedFieldNames = List.of(
+                    NewPage.Fields.id,
+                    NewPage.Fields.baseId,
+                    NewPage.Fields.publishedPage_name,
+                    NewPage.Fields.publishedPage_icon,
+                    NewPage.Fields.publishedPage_slug,
+                    NewPage.Fields.publishedPage_customSlug,
+                    NewPage.Fields.publishedPage_isHidden,
+                    NewPage.Fields.userPermissions,
+                    NewPage.Fields.policies,
+                    NewPage.Fields.policyMap);
+        }
 
         List<ApplicationPage> applicationPages = Boolean.TRUE.equals(viewMode)
                 ? branchedApplication.getPublishedPages()
@@ -265,7 +282,8 @@ public Mono<List<NewPage>> getPagesBasedOnApplicationMode(
                 applicationPages.stream().map(ApplicationPage::getId).collect(Collectors.toSet());
 
         return newPageService
-                .findNewPagesByApplicationId(branchedApplication.getId(), pagePermission.getReadPermission())
+                .findNewPagesByApplicationId(
+                        branchedApplication.getId(), pagePermission.getReadPermission(), projectedFieldNames)
                 .filter(newPage -> pageIds.contains(newPage.getId()))
                 .collectList()
                 .name(getQualifiedSpanName(FETCH_PAGES_BY_APP_ID_DB, applicationMode))
@@ -295,7 +313,7 @@ public Mono<PageDTO> getPageAndMigrateDslByBranchAndBasePageId(
         ApplicationMode applicationMode = viewMode ? ApplicationMode.PUBLISHED : ApplicationMode.EDIT;
         // Fetch the page with read permission in both editor and in viewer.
         return newPageService
-                .findByBranchNameAndBasePageId(branchName, defaultPageId, pagePermission.getReadPermission())
+                .findByBranchNameAndBasePageId(branchName, defaultPageId, pagePermission.getReadPermission(), null)
                 .flatMap(newPage -> getPageDTOAfterMigratingDSL(newPage, viewMode, migrateDsl)
                         .name(getQualifiedSpanName(MIGRATE_DSL, applicationMode))
                         .tap(Micrometer.observation(observationRegistry)));
@@ -1068,6 +1086,9 @@ protected Mono<Tuple2<Mono<Application>, ApplicationPublishingMetaDTO>> publishA
 
                     Mono<Boolean> archivePageMono;
 
+                    Mono<Boolean> evictDeletedDefaultPageIdsMono =
+                            cacheableRepositoryHelper.evictCachedBasePageIds(new ArrayList<>(publishedPageIds));
+
                     if (!publishedPageIds.isEmpty()) {
                         archivePageMono = newPageService.archiveByIds(publishedPageIds);
                     } else {
@@ -1086,8 +1107,12 @@ protected Mono<Tuple2<Mono<Application>, ApplicationPublishingMetaDTO>> publishA
                             newPageService.publishPages(editedPageIds, pagePermission.getEditPermission());
 
                     // Archive the deleted pages and save the application changes and then return the pages so that
-                    // the pages can also be published
-                    return Mono.when(archivePageMono, publishPagesMono, applicationService.save(application))
+                    // the pages can also be published; In addition invalidate the cache for the deleted page Ids
+                    return Mono.when(
+                                    archivePageMono,
+                                    publishPagesMono,
+                                    applicationService.save(application),
+                                    evictDeletedDefaultPageIdsMono)
                             .thenReturn(pages);
                 })
                 .cache(); // caching as we'll need this to send analytics attributes after publishing the app
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 15fc9b8e251c..1f046c8ba290 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
@@ -21,6 +21,7 @@
 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.CacheableRepositoryHelper;
 import com.appsmith.server.services.ApplicationPageService;
 import com.appsmith.server.services.MockDataService;
 import com.appsmith.server.services.ProductAlertService;
@@ -37,6 +38,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
+import org.springframework.util.StringUtils;
 import reactor.core.observability.micrometer.Micrometer;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -50,6 +52,8 @@
 import java.util.stream.Collectors;
 
 import static com.appsmith.external.constants.PluginConstants.PLUGINS_THAT_ALLOW_QUERY_CREATION_WITHOUT_DATASOURCE;
+import static com.appsmith.external.constants.spans.ApplicationSpan.APPLICATION_ID_FETCH_REDIS_SPAN;
+import static com.appsmith.external.constants.spans.ApplicationSpan.APPLICATION_ID_UPDATE_REDIS_SPAN;
 import static com.appsmith.external.constants.spans.ConsolidatedApiSpanNames.ACTIONS_SPAN;
 import static com.appsmith.external.constants.spans.ConsolidatedApiSpanNames.ACTION_COLLECTIONS_SPAN;
 import static com.appsmith.external.constants.spans.ConsolidatedApiSpanNames.APPLICATION_ID_SPAN;
@@ -98,6 +102,7 @@ public class ConsolidatedAPIServiceCEImpl implements ConsolidatedAPIServiceCE {
     private final DatasourceService datasourceService;
     private final MockDataService mockDataService;
     private final ObservationRegistry observationRegistry;
+    private final CacheableRepositoryHelper cacheableRepositoryHelper;
 
     <T> ResponseDTO<T> getSuccessResponse(T data) {
         return new ResponseDTO<>(HttpStatus.OK.value(), data, null);
@@ -196,21 +201,57 @@ public Mono<ConsolidatedAPIResponseDTO> getConsolidatedInfoForPageLoad(
         boolean isViewMode = ApplicationMode.PUBLISHED.equals(mode);
 
         /* Fetch default application id if not provided */
+        if (isBlank(basePageId)) {
+            return Mono.when(fetches).thenReturn(consolidatedAPIResponseDTO);
+        }
         Mono<Application> branchedApplicationMonoCached;
-        if (isBlank(baseApplicationId)) {
-            branchedApplicationMonoCached = newPageService
-                    .findByBranchNameAndBasePageIdAndApplicationMode(branchName, basePageId, mode)
-                    .map(NewPage::getApplicationId)
-                    .flatMap(applicationId ->
-                            applicationService.findByBranchedApplicationIdAndApplicationMode(applicationId, mode))
-                    .name(getQualifiedSpanName(APPLICATION_ID_SPAN, mode))
-                    .tap(Micrometer.observation(observationRegistry))
-                    .cache();
-        } else {
-            branchedApplicationMonoCached = applicationService
-                    .findByBaseIdBranchNameAndApplicationMode(baseApplicationId, branchName, mode)
-                    .cache();
+        Mono<String> baseApplicationIdMono = Mono.just("");
+        if (isViewMode) {
+            // Attempt to retrieve the application ID associated with the given base page ID from the cache.
+            baseApplicationIdMono = cacheableRepositoryHelper
+                    .fetchBaseApplicationId(basePageId, baseApplicationId)
+                    .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();
+
+        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));
+                                    }
+                                    return Mono.just(application);
+                                }));
+            } else {
+                // Handle non-empty baseApplicationId
+                return applicationService.findByBaseIdBranchNameAndApplicationMode(
+                        cachedBaseApplicationId, branchName, mode);
+            }
+        });
+
+        branchedApplicationMonoCached = branchedApplicationMonoCached
+                .name(getQualifiedSpanName(APPLICATION_ID_SPAN, mode))
+                .tap(Micrometer.observation(observationRegistry))
+                .cache();
 
         Mono<List<NewPage>> pagesFromCurrentApplicationMonoCached = branchedApplicationMonoCached
                 .flatMap(branchedApplication ->
@@ -277,18 +318,23 @@ public Mono<ConsolidatedAPIResponseDTO> getConsolidatedInfoForPageLoad(
 
         /* Fetch view specific data */
         if (isViewMode) {
-            /* Get list of all actions in view mode */
-            fetches.add(branchedApplicationMonoCached
-                    .name(getQualifiedSpanName(APPLICATION_ID_SPAN, mode))
-                    .tap(Micrometer.observation(observationRegistry))
-                    .flatMap(branchedApplication -> newActionService
-                            .getActionsForViewMode(branchedApplication.getId())
-                            .collectList())
-                    .as(this::toResponseDTO)
-                    .doOnError(e -> log.error("Error fetching actions for view mode", e))
-                    .doOnSuccess(consolidatedAPIResponseDTO::setPublishedActions)
-                    .name(getQualifiedSpanName(ACTIONS_SPAN, mode))
-                    .tap(Micrometer.observation(observationRegistry)));
+            /* 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);
+                fetches.add(branchedPageIdMono
+                        .flatMap(branchedPageId -> newActionService
+                                .getActionsForViewModeByPageId(branchedPageId)
+                                .collectList())
+                        .as(this::toResponseDTO)
+                        .doOnError(e -> log.error("Error fetching actions for view mode", e))
+                        .doOnSuccess(consolidatedAPIResponseDTO::setPublishedActions)
+                        .name(getQualifiedSpanName(ACTIONS_SPAN, mode))
+                        .tap(Micrometer.observation(observationRegistry)));
+            }
 
             /* Get list of all action collections in view mode */
             fetches.add(branchedApplicationMonoCached
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/CurlImporterServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/CurlImporterServiceCEImpl.java
index 0a75c2f9d7bb..d4a473ae650e 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/CurlImporterServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/CurlImporterServiceCEImpl.java
@@ -107,7 +107,8 @@ public Mono<ActionDTO> importAction(
 
     protected Mono<String> getBranchedContextId(CreatorContextType contextType, String contextId, String branchName) {
         return newPageService
-                .findByBranchNameAndBasePageId(branchName, contextId, pagePermission.getActionCreatePermission())
+                .findByBranchNameAndBasePageId(
+                        branchName, contextId, pagePermission.getActionCreatePermission(), List.of(NewPage.Fields.id))
                 .map(NewPage::getId);
     }
 
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
old mode 100644
new mode 100755
index f3d88efa89d8..43a29dcca185
--- 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
@@ -23,14 +23,20 @@
 import com.appsmith.server.services.CollectionService;
 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.stereotype.Service;
 import org.springframework.util.StringUtils;
+import reactor.core.observability.micrometer.Micrometer;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.util.function.Tuple2;
 
+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.LayoutSpan.UPDATE_PAGE_LAYOUT_BY_PAGE_ID;
 import static java.util.stream.Collectors.toSet;
 
 @Slf4j
@@ -47,6 +53,7 @@ public class LayoutActionServiceCEImpl implements LayoutActionServiceCE {
     private final DatasourceService datasourceService;
     private final PagePermission pagePermission;
     private final ActionPermission actionPermission;
+    private final ObservationRegistry observationRegistry;
 
     /**
      * Called by Action controller to create Action
@@ -214,7 +221,11 @@ public Mono<ActionDTO> updateSingleAction(String id, ActionDTO actionDTO) {
     public Mono<ActionDTO> updateNewActionByBranchedId(String branchedId, ActionDTO actionDTO) {
         return newActionService
                 .findById(branchedId, actionPermission.getEditPermission())
-                .flatMap(newAction -> updateActionBasedOnContextType(newAction, actionDTO));
+                .name(GET_ACTION_BY_ID)
+                .tap(Micrometer.observation(observationRegistry))
+                .flatMap(newAction -> updateActionBasedOnContextType(newAction, actionDTO)
+                        .name(UPDATE_ACTION_BASED_ON_CONTEXT)
+                        .tap(Micrometer.observation(observationRegistry)));
     }
 
     /**
@@ -227,8 +238,13 @@ protected Mono<ActionDTO> updateActionBasedOnContextType(NewAction newAction, Ac
         action.setApplicationId(null);
         action.setPageId(null);
         return updateSingleAction(newAction.getId(), action)
-                .flatMap(updatedAction ->
-                        updateLayoutService.updatePageLayoutsByPageId(pageId).thenReturn(updatedAction))
+                .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();
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 42a5d1b09a52..d4cc9fcbdf65 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
@@ -23,9 +23,11 @@
 import com.appsmith.server.services.LayoutActionService;
 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.apache.commons.lang3.StringUtils;
+import reactor.core.observability.micrometer.Micrometer;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -36,6 +38,14 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import static com.appsmith.external.constants.spans.ActionCollectionSpan.ACTION_COLLECTION_UPDATE;
+import static com.appsmith.external.constants.spans.ActionCollectionSpan.GENERATE_ACTION_COLLECTION_BY_VIEW_MODE;
+import static com.appsmith.external.constants.spans.ActionCollectionSpan.POPULATE_ACTION_COLLECTION_BY_VIEW_MODE;
+import static com.appsmith.external.constants.spans.ActionCollectionSpan.SAVE_ACTION_COLLECTION_LAST_EDIT_INFO;
+import static com.appsmith.external.constants.spans.ActionSpan.CREATE_ACTION;
+import static com.appsmith.external.constants.spans.ActionSpan.DELETE_ACTION;
+import static com.appsmith.external.constants.spans.ActionSpan.UPDATE_ACTION;
+import static com.appsmith.external.constants.spans.LayoutSpan.UPDATE_LAYOUT_BASED_ON_CONTEXT;
 import static com.appsmith.external.helpers.AppsmithBeanUtils.copyNewFieldValuesIntoOldObject;
 import static com.appsmith.server.helpers.ContextTypeUtils.isPageContext;
 import static java.util.stream.Collectors.toMap;
@@ -55,6 +65,7 @@ public class LayoutCollectionServiceCEImpl implements LayoutCollectionServiceCE
     private final ActionCollectionRepository actionCollectionRepository;
     private final PagePermission pagePermission;
     private final ActionPermission actionPermission;
+    private final ObservationRegistry observationRegistry;
 
     @Override
     public Mono<ActionCollectionDTO> createCollection(ActionCollection actionCollection) {
@@ -325,7 +336,10 @@ public Mono<ActionCollectionDTO> updateUnpublishedActionCollection(
                                 actionDTO.setPluginId(actionCollectionDTO.getPluginId());
                                 actionDTO.setBranchName(branchedActionCollection.getBranchName());
                                 // actionCollectionService is a new action, we need to create one
-                                return layoutActionService.createSingleAction(actionDTO, Boolean.TRUE);
+                                return layoutActionService
+                                        .createSingleAction(actionDTO, Boolean.TRUE)
+                                        .name(CREATE_ACTION)
+                                        .tap(Micrometer.observation(observationRegistry));
                             } else {
                                 actionDTO.setCollectionId(null);
                                 // Client only knows about the default action ID, fetch branched action id to update the
@@ -333,7 +347,10 @@ public Mono<ActionCollectionDTO> updateUnpublishedActionCollection(
                                 String branchedActionId = actionDTO.getId();
                                 actionDTO.setId(null);
                                 actionDTO.setBaseId(null);
-                                return layoutActionService.updateNewActionByBranchedId(branchedActionId, actionDTO);
+                                return layoutActionService
+                                        .updateNewActionByBranchedId(branchedActionId, actionDTO)
+                                        .name(UPDATE_ACTION)
+                                        .tap(Micrometer.observation(observationRegistry));
                             }
                         })
                         .collect(toMap(actionDTO -> actionDTO.getBaseId(), ActionDTO::getId)));
@@ -354,7 +371,9 @@ public Mono<ActionCollectionDTO> updateUnpublishedActionCollection(
                             log.error(throwable.getMessage());
                             return Mono.empty();
                         }))
-                .collectList();
+                .collectList()
+                .name(DELETE_ACTION)
+                .tap(Micrometer.observation(observationRegistry));
 
         return deleteNonExistingActionMono
                 .then(newValidActionIdsMono)
@@ -373,17 +392,27 @@ public Mono<ActionCollectionDTO> updateUnpublishedActionCollection(
                     });
                 })
                 .flatMap(actionCollection -> actionCollectionService.update(actionCollection.getId(), actionCollection))
+                .name(ACTION_COLLECTION_UPDATE)
+                .tap(Micrometer.observation(observationRegistry))
                 .flatMap(actionCollectionRepository::setUserPermissionsInObject)
-                .flatMap(savedActionCollection ->
-                        updateLayoutBasedOnContext(savedActionCollection).thenReturn(savedActionCollection))
+                .flatMap(savedActionCollection -> updateLayoutBasedOnContext(savedActionCollection)
+                        .name(UPDATE_LAYOUT_BASED_ON_CONTEXT)
+                        .tap(Micrometer.observation(observationRegistry))
+                        .thenReturn(savedActionCollection))
                 .flatMap(savedActionCollection -> analyticsService.sendUpdateEvent(
                         savedActionCollection, actionCollectionService.getAnalyticsProperties(savedActionCollection)))
                 .flatMap(actionCollection -> actionCollectionService
                         .generateActionCollectionByViewMode(actionCollection, false)
+                        .name(GENERATE_ACTION_COLLECTION_BY_VIEW_MODE)
+                        .tap(Micrometer.observation(observationRegistry))
                         .flatMap(actionCollectionDTO1 -> actionCollectionService
                                 .populateActionCollectionByViewMode(actionCollection.getUnpublishedCollection(), false)
+                                .name(POPULATE_ACTION_COLLECTION_BY_VIEW_MODE)
+                                .tap(Micrometer.observation(observationRegistry))
                                 .flatMap(actionCollectionDTO2 -> actionCollectionService
                                         .saveLastEditInformationInParent(actionCollectionDTO2)
+                                        .name(SAVE_ACTION_COLLECTION_LAST_EDIT_INFO)
+                                        .tap(Micrometer.observation(observationRegistry))
                                         .thenReturn(actionCollectionDTO2))))
                 .flatMap(branchedActionCollection -> sendErrorReportsFromPageToCollection(branchedActionCollection));
     }
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 ca6cb2f60446..1589daf14bde 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
@@ -1,6 +1,5 @@
 package com.appsmith.server.services.ce;
 
-import com.appsmith.external.helpers.AppsmithBeanUtils;
 import com.appsmith.external.helpers.EncryptionHelper;
 import com.appsmith.server.acl.AclPermission;
 import com.appsmith.server.configurations.CommonConfig;
@@ -576,8 +575,7 @@ private Mono<User> update(User existingUser, User userUpdate) {
             userUpdate.setPassword(passwordEncoder.encode(userUpdate.getPassword()));
         }
 
-        AppsmithBeanUtils.copyNewFieldValuesIntoOldObject(userUpdate, existingUser);
-        return repository.save(existingUser);
+        return repository.updateById(existingUser.getId(), userUpdate, null);
     }
 
     private boolean validateName(String name) {
@@ -603,6 +601,8 @@ public Mono<User> updateCurrentUser(final UserUpdateDTO allUpdates, ServerWebExc
                 return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.NAME));
             }
             updates.setName(inputName);
+            // Set policies to null to avoid overriding them.
+            updates.setPolicies(null);
             updatedUserMono = sessionUserService
                     .getCurrentUser()
                     .flatMap(user -> updateWithoutPermission(user.getId(), updates)
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce_compatible/ConsolidatedAPIServiceCECompatibleImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce_compatible/ConsolidatedAPIServiceCECompatibleImpl.java
index c41efc869570..c7cc66cc4360 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce_compatible/ConsolidatedAPIServiceCECompatibleImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce_compatible/ConsolidatedAPIServiceCECompatibleImpl.java
@@ -7,6 +7,7 @@
 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.CacheableRepositoryHelper;
 import com.appsmith.server.services.ApplicationPageService;
 import com.appsmith.server.services.MockDataService;
 import com.appsmith.server.services.ProductAlertService;
@@ -36,7 +37,8 @@ public ConsolidatedAPIServiceCECompatibleImpl(
             PluginService pluginService,
             DatasourceService datasourceService,
             MockDataService mockDataService,
-            ObservationRegistry observationRegistry) {
+            ObservationRegistry observationRegistry,
+            CacheableRepositoryHelper cacheableRepositoryHelper) {
         super(
                 sessionUserService,
                 userService,
@@ -53,6 +55,7 @@ public ConsolidatedAPIServiceCECompatibleImpl(
                 pluginService,
                 datasourceService,
                 mockDataService,
-                observationRegistry);
+                observationRegistry,
+                cacheableRepositoryHelper);
     }
 }
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 738f4a14a223..fa8172f2fd04 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
@@ -1151,10 +1151,12 @@ private Mono<ActionExecutionRequest> sendExecuteAnalyticsEvent(
                         eventData.put(FieldName.ACTION_EXECUTION_REQUEST_PARAMS, REDACTED_DATA);
                     }
                     if (executeActionDto != null) {
-                        if (commonConfig.isCloudHosting()) {
-                            // Only send this parameter if cloud hosting is true as it contains user's evaluated params
-                            data.put(FieldName.ACTION_EXECUTION_REQUEST_PARAMS_VALUE_MAP, executeActionDto.getParams());
+                        // Remove the value from the executeActionDto.params before sending to mixpanel as it contains
+                        // user submitted data
+                        if (executeActionDto.getParams() != null) {
+                            executeActionDto.getParams().forEach(param -> param.setValue(REDACTED_DATA));
                         }
+                        data.put(FieldName.ACTION_EXECUTION_REQUEST_PARAMS_VALUE_MAP, executeActionDto.getParams());
                         data.put(
                                 FieldName.ACTION_EXECUTION_INVERT_PARAMETER_MAP,
                                 executeActionDto.getInvertParameterMap());
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/DatasourceTriggerSolutionCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/DatasourceTriggerSolutionCEImpl.java
index cb853fe27f84..374264fdaf8d 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/DatasourceTriggerSolutionCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/DatasourceTriggerSolutionCEImpl.java
@@ -27,6 +27,7 @@
 import reactor.util.function.Tuple2;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -128,19 +129,23 @@ public Mono<TriggerResultDTO> trigger(
                                 entitySelectorTriggerSolution(datasourceId, triggerRequestDTO, trueEnvironmentId))
                         .map(Tuple2::getT2))
                 .map(entityNames -> {
-                    List<Object> result = new ArrayList<>();
+                    List<Map<String, String>> result = new ArrayList<>();
 
                     if (ClientDataDisplayType.DROP_DOWN.equals(displayType)) {
-                        // label, value
+                        // Create maps and add them to the result list
                         for (String entityName : entityNames) {
                             Map<String, String> entity = new HashMap<>();
                             entity.put("label", entityName);
                             entity.put("value", entityName);
                             result.add(entity);
                         }
+                        // Sort the list of maps based on the 'label' value
+                        result.sort(Comparator.comparing(
+                                entity -> entity.get("label").toLowerCase()));
                     }
-
-                    return new TriggerResultDTO(result);
+                    // Convert the result into a list of objects
+                    List<Object> objectResult = new ArrayList<>(result);
+                    return new TriggerResultDTO(objectResult);
                 });
 
         return resultFromPluginMono.switchIfEmpty(defaultResultMono);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/PolicySolutionCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/PolicySolutionCEImpl.java
index b4d51099a3fa..8617fbf739d9 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/PolicySolutionCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/PolicySolutionCEImpl.java
@@ -69,7 +69,8 @@ public <T extends BaseDomain> T addPoliciesToExistingObject(@NonNull Map<String,
             policyMap1.put(entry.getKey(), policy);
         }
 
-        final Set<Policy> policies = new HashSet<>(obj.getPolicies());
+        Set<Policy> existingPolicies = obj.getPolicies();
+        final Set<Policy> policies = new HashSet<>(existingPolicies == null ? Set.of() : existingPolicies);
 
         // Append the user to the existing permission policy if it already exists.
         for (Policy policy : policies) {
@@ -102,8 +103,10 @@ public <T extends BaseDomain> T removePoliciesFromExistingObject(Map<String, Pol
             policyMap1.put(entry.getKey(), entry.getValue());
         }
 
+        Set<Policy> existingPolicies = obj.getPolicies();
+        final Set<Policy> policies = new HashSet<>(existingPolicies == null ? Set.of() : existingPolicies);
         // Remove the user from the existing permission policy if it exists.
-        for (Policy policy : obj.getPolicies()) {
+        for (Policy policy : policies) {
             String permission = policy.getPermission();
             if (policyMap1.containsKey(permission)) {
                 if (policy.getPermissionGroups() == null) {
@@ -117,7 +120,7 @@ public <T extends BaseDomain> T removePoliciesFromExistingObject(Map<String, Pol
                 policyMap1.remove(permission);
             }
         }
-
+        obj.setPolicies(policies);
         return obj;
     }
 
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 931d850e7ab9..75133d866d02 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
@@ -440,8 +440,8 @@ private Mono<Void> sendInstallationSetupAnalytics(
                     final String instanceId = tuple.getT1();
                     final String ip = tuple.getT2();
                     log.debug("Installation setup complete.");
-                    String newsletterSignedUpUserEmail = userFromRequest.isSignupForNewsletter() ? user.getEmail() : "";
-                    String newsletterSignedUpUserName = userFromRequest.isSignupForNewsletter() ? user.getName() : "";
+                    String newsletterSignedUpUserEmail = user.getEmail();
+                    String newsletterSignedUpUserName = user.getName();
                     Map<String, Object> analyticsProps = new HashMap<>();
                     analyticsProps.put(DISABLE_TELEMETRY, !userFromRequest.isAllowCollectingAnonymousData());
                     analyticsProps.put(SUBSCRIBE_MARKETING, userFromRequest.isSignupForNewsletter());
diff --git a/app/server/appsmith-server/src/main/resources/application.properties b/app/server/appsmith-server/src/main/resources/application.properties
index 58281832ee54..3db4bfbfa753 100644
--- a/app/server/appsmith-server/src/main/resources/application.properties
+++ b/app/server/appsmith-server/src/main/resources/application.properties
@@ -31,7 +31,7 @@ appsmith.codec.max-in-memory-size=${APPSMITH_CODEC_SIZE:150}
 logging.level.root=info
 logging.level.com.appsmith=debug
 logging.level.com.external.plugins=debug
-logging.pattern.console=[%d{ISO8601, UTC}] requestId=%X{X-Appsmith-Request-Id} userEmail=%X{userEmail} traceId=%X{traceId} spanId=%X{spanId} - %m%n
+logging.pattern.console=[%d{ISO8601, UTC}] [%t] requestId=%X{X-Appsmith-Request-Id} userEmail=%X{userEmail} traceId=%X{traceId} spanId=%X{spanId} - %m%n
 
 #Spring security
 spring.security.oauth2.client.registration.google.client-id=${APPSMITH_OAUTH2_GOOGLE_CLIENT_ID:missing_value_sentinel}
@@ -119,10 +119,13 @@ 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/domains/EqualityTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/domains/EqualityTest.java
index e15667024b9c..ff0476e4cbed 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/domains/EqualityTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/domains/EqualityTest.java
@@ -18,7 +18,11 @@ public class EqualityTest {
 
     private final Set<Class<?>> TESTED_CLASSES = Set.of(
             // Note: Adding a class here means that we have a test for its equality in this file.
-            ApplicationDetail.class, TenantConfiguration.class);
+            ApplicationDetail.class,
+            TenantConfiguration.class,
+            Application.AppLayout.class,
+            Application.EmbedSetting.class,
+            GitArtifactMetadata.class);
 
     @SneakyThrows
     @Test
@@ -72,4 +76,55 @@ void testApplicationDetail() {
         assertThat(d1).isEqualTo(d2);
         assertThat(d1).isNotEqualTo(d3);
     }
+
+    @Test
+    void testAppLayout() {
+        Application.AppLayout a1 = new Application.AppLayout(Application.AppLayout.Type.DESKTOP);
+        Application.AppLayout a2 = new Application.AppLayout(Application.AppLayout.Type.DESKTOP);
+        Application.AppLayout a3 = new Application.AppLayout(Application.AppLayout.Type.MOBILE);
+        assertThat(a1).isEqualTo(a2).isNotEqualTo(a3);
+    }
+
+    @Test
+    void testAppEmbedSetting() {
+        Application.EmbedSetting a1 = new Application.EmbedSetting();
+        a1.setHeight("5");
+        a1.setWidth("5");
+        a1.setShowNavigationBar(Boolean.TRUE);
+        Application.EmbedSetting a2 = new Application.EmbedSetting();
+        a2.setHeight("5");
+        a2.setWidth("5");
+        a2.setShowNavigationBar(Boolean.TRUE);
+        Application.EmbedSetting a3 = new Application.EmbedSetting();
+        a3.setHeight("5");
+        a3.setWidth("5");
+        a3.setShowNavigationBar(Boolean.FALSE);
+        assertThat(a1).isEqualTo(a2).isNotEqualTo(a3);
+    }
+
+    @Test
+    void testArtifactEquality() {
+        String remoteUrl1 = "protocol://domain.superdomain";
+        String remoteUrl2 = "protocol://domain.superdomain2";
+
+        GitArtifactMetadata a1 = new GitArtifactMetadata();
+        a1.setRemoteUrl(remoteUrl1);
+        GitArtifactMetadata a2 = new GitArtifactMetadata();
+        a2.setRemoteUrl(remoteUrl1);
+        GitArtifactMetadata a3 = new GitArtifactMetadata();
+        a3.setRemoteUrl(remoteUrl2);
+
+        assertThat(a1).isEqualTo(a2).isNotEqualTo(a3);
+
+        a1.setAutoCommitConfig(new AutoCommitConfig());
+        a2.setAutoCommitConfig(new AutoCommitConfig());
+        a3.setAutoCommitConfig(new AutoCommitConfig());
+
+        assertThat(a1).isEqualTo(a2).isNotEqualTo(a3);
+
+        a1.getAutoCommitConfig().setEnabled(Boolean.TRUE);
+        a2.getAutoCommitConfig().setEnabled(Boolean.FALSE);
+
+        assertThat(a1).isNotEqualTo(a2).isNotEqualTo(a3);
+    }
 }
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/git/autocommit/AutoCommitEventHandlerImplTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/git/autocommit/AutoCommitEventHandlerImplTest.java
index bf49502f0596..29265607ffd1 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/git/autocommit/AutoCommitEventHandlerImplTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/git/autocommit/AutoCommitEventHandlerImplTest.java
@@ -442,7 +442,8 @@ public void autoCommitServerMigration_WhenServerHasNoChanges_NoCommitMade() thro
 
         doReturn(Mono.just(applicationJson1))
                 .when(jsonSchemaMigration)
-                .migrateApplicationJsonToLatestSchema(applicationJson);
+                .migrateApplicationJsonToLatestSchema(
+                        Mockito.eq(applicationJson), Mockito.anyString(), Mockito.anyString());
 
         doReturn(Mono.just("success"))
                 .when(gitExecutor)
@@ -574,7 +575,9 @@ public void autocommitServerMigration_WhenJsonSchemaMigrationPresent_CommitSucce
         AppsmithBeanUtils.copyNewFieldValuesIntoOldObject(applicationJson, applicationJson1);
         applicationJson1.setServerSchemaVersion(jsonSchemaVersions.getServerVersion() + 1);
 
-        doReturn(Mono.just(applicationJson1)).when(jsonSchemaMigration).migrateApplicationJsonToLatestSchema(any());
+        doReturn(Mono.just(applicationJson1))
+                .when(jsonSchemaMigration)
+                .migrateApplicationJsonToLatestSchema(any(), Mockito.anyString(), Mockito.anyString());
 
         gitFileSystemTestHelper.setupGitRepository(autoCommitEvent, applicationJson);
 
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/git/autocommit/AutoCommitServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/git/autocommit/AutoCommitServiceTest.java
index 070b7d525b94..e18f8e66fe9b 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/git/autocommit/AutoCommitServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/git/autocommit/AutoCommitServiceTest.java
@@ -15,6 +15,7 @@
 import com.appsmith.server.domains.Layout;
 import com.appsmith.server.dtos.ApplicationJson;
 import com.appsmith.server.dtos.AutoCommitResponseDTO;
+import com.appsmith.server.dtos.AutoCommitTriggerDTO;
 import com.appsmith.server.dtos.PageDTO;
 import com.appsmith.server.featureflags.CachedFeatures;
 import com.appsmith.server.git.autocommit.helpers.AutoCommitEligibilityHelper;
@@ -106,7 +107,7 @@ public class AutoCommitServiceTest {
     @MockBean
     GitPrivateRepoHelper gitPrivateRepoHelper;
 
-    @SpyBean
+    @MockBean
     AutoCommitEligibilityHelper autoCommitEligibilityHelper;
 
     @MockBean
@@ -193,20 +194,26 @@ private org.json.JSONObject getMockedDsl() {
     }
 
     private void mockAutoCommitTriggerResponse(Boolean serverMigration, Boolean clientMigration) {
-        doReturn(Mono.just(getMockedDsl()))
-                .when(commonGitFileUtils)
-                .getPageDslVersionNumber(anyString(), any(), any(), anyBoolean(), any());
-
-        Integer serverVersion = jsonSchemaVersions.getServerVersion();
-        Integer dslVersionNumber = clientMigration ? DSL_VERSION_NUMBER + 1 : DSL_VERSION_NUMBER;
-        Integer serverSchemaVersionNumber = serverMigration ? serverVersion - 1 : serverVersion;
-
-        doReturn(Mono.just(dslVersionNumber)).when(dslMigrationUtils).getLatestDslVersion();
 
-        // server as true
-        doReturn(Mono.just(serverSchemaVersionNumber))
-                .when(commonGitFileUtils)
-                .getMetadataServerSchemaMigrationVersion(anyString(), any(), anyBoolean(), any());
+        Boolean isAutocommitRequired = serverMigration || clientMigration;
+        doReturn(Mono.just(new AutoCommitTriggerDTO(isAutocommitRequired, clientMigration, serverMigration)))
+                .when(autoCommitEligibilityHelper)
+                .isAutoCommitRequired(anyString(), any(), any());
+
+        //        doReturn(Mono.just(getMockedDsl()))
+        //                .when(commonGitFileUtils)
+        //                .getPageDslVersionNumber(anyString(), any(), any(), anyBoolean(), any());
+        //
+        //        Integer serverVersion = jsonSchemaVersions.getServerVersion();
+        //        Integer dslVersionNumber = clientMigration ? DSL_VERSION_NUMBER + 1 : DSL_VERSION_NUMBER;
+        //        Integer serverSchemaVersionNumber = serverMigration ? serverVersion - 1 : serverVersion;
+        //
+        //        doReturn(Mono.just(dslVersionNumber)).when(dslMigrationUtils).getLatestDslVersion();
+        //
+        //        // server as true
+        //        doReturn(Mono.just(serverSchemaVersionNumber))
+        //                .when(commonGitFileUtils)
+        //                .getMetadataServerSchemaMigrationVersion(anyString(), any(), anyBoolean(), any());
     }
 
     @BeforeEach
@@ -237,9 +244,6 @@ public void beforeTest() {
         Mockito.when(featureFlagService.getCachedTenantFeatureFlags())
                 .thenAnswer((Answer<CachedFeatures>) invocations -> cachedFeatures);
 
-        Mockito.when(featureFlagService.check(FeatureFlagEnum.release_git_autocommit_eligibility_enabled))
-                .thenReturn(Mono.just(TRUE));
-
         Mockito.when(featureFlagService.check(FeatureFlagEnum.release_git_autocommit_feature_enabled))
                 .thenReturn(Mono.just(TRUE));
 
@@ -280,7 +284,8 @@ public void testAutoCommit_whenOnlyServerIsEligibleForMigration_commitSuccess()
 
         doReturn(Mono.just(applicationJson1))
                 .when(jsonSchemaMigration)
-                .migrateApplicationJsonToLatestSchema(any(ApplicationJson.class));
+                .migrateApplicationJsonToLatestSchema(
+                        any(ApplicationJson.class), Mockito.anyString(), Mockito.anyString());
 
         gitFileSystemTestHelper.setupGitRepository(
                 WORKSPACE_ID, DEFAULT_APP_ID, BRANCH_NAME, REPO_NAME, applicationJson);
@@ -465,6 +470,7 @@ public void testAutoCommit_whenAutoCommitAlreadyInProgressOnAnotherBranch_return
 
         Mockito.when(redisUtils.getAutoCommitProgress(DEFAULT_APP_ID)).thenReturn(Mono.just(70));
 
+        mockAutoCommitTriggerResponse(TRUE, TRUE);
         // this would not trigger autocommit
         Mono<AutoCommitResponseDTO> autoCommitResponseDTOMono =
                 autoCommitService.autoCommitApplication(testApplication.getId());
@@ -486,6 +492,8 @@ public void testAutoCommit_whenAutoCommitAlreadyInProgressOnSameBranch_returnsIn
 
         Mockito.when(redisUtils.getAutoCommitProgress(DEFAULT_APP_ID)).thenReturn(Mono.just(70));
 
+        mockAutoCommitTriggerResponse(TRUE, TRUE);
+
         // this would not trigger autocommit
         Mono<AutoCommitResponseDTO> autoCommitResponseDTOMono =
                 autoCommitService.autoCommitApplication(testApplication.getId());
@@ -564,7 +572,8 @@ public void testAutoCommit_whenAutoCommitEligibleButPrerequisiteNotComplete_retu
 
         doReturn(Mono.just(applicationJson1))
                 .when(jsonSchemaMigration)
-                .migrateApplicationJsonToLatestSchema(any(ApplicationJson.class));
+                .migrateApplicationJsonToLatestSchema(
+                        any(ApplicationJson.class), Mockito.anyString(), Mockito.anyString());
 
         gitFileSystemTestHelper.setupGitRepository(
                 WORKSPACE_ID, DEFAULT_APP_ID, BRANCH_NAME, REPO_NAME, applicationJson);
@@ -637,7 +646,8 @@ public void testAutoCommit_whenServerIsRunningMigrationCallsAutocommitAgainOnDif
 
         doReturn(Mono.just(applicationJson1))
                 .when(jsonSchemaMigration)
-                .migrateApplicationJsonToLatestSchema(any(ApplicationJson.class));
+                .migrateApplicationJsonToLatestSchema(
+                        any(ApplicationJson.class), Mockito.anyString(), Mockito.anyString());
 
         gitFileSystemTestHelper.setupGitRepository(
                 WORKSPACE_ID, DEFAULT_APP_ID, BRANCH_NAME, REPO_NAME, applicationJson);
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/git/autocommit/helpers/AutoCommitEligibilityHelperTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/git/autocommit/helpers/AutoCommitEligibilityHelperTest.java
index 4eb1de96fae1..e107ffde6546 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/git/autocommit/helpers/AutoCommitEligibilityHelperTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/git/autocommit/helpers/AutoCommitEligibilityHelperTest.java
@@ -106,9 +106,6 @@ public void beforeEach() {
         Mockito.when(featureFlagService.check(FeatureFlagEnum.release_git_autocommit_feature_enabled))
                 .thenReturn(Mono.just(Boolean.TRUE));
 
-        Mockito.when(featureFlagService.check(FeatureFlagEnum.release_git_autocommit_eligibility_enabled))
-                .thenReturn(Mono.just(Boolean.TRUE));
-
         Mockito.when(dslMigrationUtils.getLatestDslVersion()).thenReturn(Mono.just(RANDOM_DSL_VERSION_NUMBER));
 
         Mockito.when(gitRedisUtils.addFileLock(DEFAULT_APPLICATION_ID, AUTO_COMMIT_ELIGIBILITY))
@@ -292,8 +289,6 @@ public void isServerMigrationRequired_whenJsonSchemaIsAhead_returnsTrue() {
 
     @Test
     public void isServerMigrationRequired_whenFeatureIsFlagFalse_returnsFalse() {
-        Mockito.when(featureFlagService.check(FeatureFlagEnum.release_git_autocommit_eligibility_enabled))
-                .thenReturn(Mono.just(Boolean.FALSE));
 
         GitArtifactMetadata gitArtifactMetadata = createGitMetadata();
 
@@ -350,8 +345,6 @@ public void isClientMigrationRequired_whenLatestDslIsAhead_returnsTrue() {
 
     @Test
     public void isClientMigrationRequired_whenFeatureFlagIsFalse_returnsFalse() {
-        Mockito.when(featureFlagService.check(FeatureFlagEnum.release_git_autocommit_eligibility_enabled))
-                .thenReturn(Mono.just(Boolean.FALSE));
 
         PageDTO pageDTO = createPageDTO(RANDOM_DSL_VERSION_NUMBER);
         Mono<Boolean> isClientMigrationRequiredMono = autoCommitEligibilityHelper.isClientMigrationRequired(pageDTO);
@@ -364,8 +357,6 @@ public void isClientMigrationRequired_whenFeatureFlagIsFalse_returnsFalse() {
 
     @Test
     public void isAutoCommitRequired_whenFeatureIsFlagFalse_returnsAllFalse() {
-        Mockito.when(featureFlagService.check(FeatureFlagEnum.release_git_autocommit_eligibility_enabled))
-                .thenReturn(Mono.just(Boolean.FALSE));
 
         GitArtifactMetadata gitArtifactMetadata = createGitMetadata();
         PageDTO pageDTO = createPageDTO(RANDOM_DSL_VERSION_NUMBER - 1);
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/migrations/JsonSchemaMigrationTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/migrations/JsonSchemaMigrationTest.java
index d31c18fcdcbd..9fbbfbe61200 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/migrations/JsonSchemaMigrationTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/migrations/JsonSchemaMigrationTest.java
@@ -97,7 +97,7 @@ public void migrateApplicationJsonToLatestSchema_whenFeatureFlagIsOn_returnsIncr
                 gitFileSystemTestHelper.getApplicationJson(this.getClass().getResource("application.json"));
 
         Mono<ApplicationJson> applicationJsonMono =
-                jsonSchemaMigration.migrateApplicationJsonToLatestSchema(applicationJson);
+                jsonSchemaMigration.migrateApplicationJsonToLatestSchema(applicationJson, null, null);
         StepVerifier.create(applicationJsonMono)
                 .assertNext(appJson -> {
                     assertThat(appJson.getServerSchemaVersion()).isEqualTo(jsonSchemaVersions.getServerVersion());
@@ -121,7 +121,7 @@ public void migrateApplicationJsonToLatestSchema_whenFeatureFlagIsOff_returnsFal
                 gitFileSystemTestHelper.getApplicationJson(this.getClass().getResource("application.json"));
 
         Mono<ApplicationJson> applicationJsonMono =
-                jsonSchemaMigration.migrateApplicationJsonToLatestSchema(applicationJson);
+                jsonSchemaMigration.migrateApplicationJsonToLatestSchema(applicationJson, null, null);
         StepVerifier.create(applicationJsonMono)
                 .assertNext(appJson -> {
                     assertThat(appJson.getClientSchemaVersion()).isEqualTo(jsonSchemaVersions.getClientVersion());
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/ce/BaseAppsmithRepositoryImplTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/ce/BaseAppsmithRepositoryImplTest.java
new file mode 100644
index 000000000000..4678384ff299
--- /dev/null
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/ce/BaseAppsmithRepositoryImplTest.java
@@ -0,0 +1,52 @@
+package com.appsmith.server.repositories.ce;
+
+import com.appsmith.external.models.BaseDomain;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+class BaseAppsmithRepositoryImplTest {
+
+    BaseAppsmithRepositoryCEImpl<TestClass> baseAppsmithRepositoryImpl;
+
+    @BeforeEach
+    public void setup() {
+        baseAppsmithRepositoryImpl = new BaseAppsmithRepositoryCEImpl<>() {};
+    }
+
+    class TestClass extends BaseDomain {}
+
+    @Test
+    void testSetUserPermissionsInObject_whenPoliciesIsEmptySet_emptyCollectionValueIsSet() {
+        // Test the method setPoliciesInObject when the policies are null
+        // The method should set an empty collection value in the object
+        // The method should return the object
+        TestClass obj = baseAppsmithRepositoryImpl
+                .setUserPermissionsInObject(new TestClass(), null)
+                .block();
+        assertNotNull(obj);
+        Assertions.assertEquals(0, obj.getPolicies().size());
+    }
+
+    @Test
+    void testSetUserPermissionsInObject_whenPoliciesIsNull_nullPoliciesAreSet() {
+        // Test the method setPoliciesInObject when the policies are empty
+        // The method should set an empty collection value in the object
+        // The method should return the object
+        TestClass obj = new TestClass();
+        obj.setPolicies(null);
+        Set<String> permissionGroups = new HashSet<>();
+        permissionGroups.add(UUID.randomUUID().toString());
+        obj = baseAppsmithRepositoryImpl
+                .setUserPermissionsInObject(obj, permissionGroups)
+                .block();
+        assertNotNull(obj);
+        Assertions.assertNull(obj.getPolicies());
+    }
+}
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/ce/CustomNewPageRepositoryTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/ce/CustomNewPageRepositoryTest.java
index 6cff70087a01..71da2c690722 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/ce/CustomNewPageRepositoryTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/ce/CustomNewPageRepositoryTest.java
@@ -101,7 +101,7 @@ void publishPages_WhenIdMatches_Published() {
     @Test
     void findPageWithoutBranchName() {
         StepVerifier.create(newPageRepository.findPageByBranchNameAndBasePageId(
-                        null, "pageId", AclPermission.PAGE_CREATE_PAGE_ACTIONS))
+                        null, "pageId", AclPermission.PAGE_CREATE_PAGE_ACTIONS, null))
                 .verifyComplete();
     }
 }
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ActionCollectionServiceImplTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ActionCollectionServiceImplTest.java
index 1f90c776f28a..43b0d91a0850 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ActionCollectionServiceImplTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ActionCollectionServiceImplTest.java
@@ -28,6 +28,7 @@
 import com.appsmith.server.solutions.PagePermissionImpl;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import io.micrometer.observation.ObservationRegistry;
 import jakarta.validation.Validator;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Assertions;
@@ -86,6 +87,9 @@ public class ActionCollectionServiceImplTest {
     PagePermission pagePermission;
     ActionPermission actionPermission;
 
+    @MockBean
+    ObservationRegistry observationRegistry;
+
     @MockBean
     private Validator validator;
 
@@ -108,7 +112,8 @@ public void setUp() {
                 policyGenerator,
                 applicationService,
                 applicationPermission,
-                actionPermission);
+                actionPermission,
+                observationRegistry);
 
         layoutCollectionService = new LayoutCollectionServiceImpl(
                 newPageService,
@@ -120,7 +125,8 @@ public void setUp() {
                 analyticsService,
                 actionCollectionRepository,
                 pagePermission,
-                actionPermission);
+                actionPermission,
+                observationRegistry);
 
         Mockito.when(analyticsService.sendCreateEvent(Mockito.any()))
                 .thenAnswer(
@@ -149,6 +155,10 @@ public void setUp() {
         Mockito.when(analyticsService.sendArchiveEvent(Mockito.any(), Mockito.any()))
                 .thenAnswer(
                         invocationOnMock -> Mono.justOrEmpty(invocationOnMock.getArguments()[0]));
+
+        ObservationRegistry.ObservationConfig mockObservationConfig =
+                Mockito.mock(ObservationRegistry.ObservationConfig.class);
+        Mockito.when(observationRegistry.observationConfig()).thenReturn(mockObservationConfig);
     }
 
     @Test
@@ -190,7 +200,8 @@ public void testCreateCollection_withRepeatedActionName_throwsError() throws IOE
         final NewPage newPage = objectMapper.convertValue(jsonNode.get("newPage"), NewPage.class);
         Mockito.when(newPageService.findById(Mockito.any(), Mockito.<AclPermission>any()))
                 .thenReturn(Mono.just(newPage));
-        Mockito.when(newPageService.findByBranchNameAndBasePageId(Mockito.any(), Mockito.any(), Mockito.any()))
+        Mockito.when(newPageService.findByBranchNameAndBasePageId(
+                        Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any()))
                 .thenReturn(Mono.just(newPage));
         Mockito.when(refactoringService.isNameAllowed(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any()))
                 .thenReturn(Mono.just(false));
@@ -223,7 +234,8 @@ public void testCreateCollection_createActionFailure_returnsWithIncompleteCollec
 
         Mockito.when(newPageService.findById(Mockito.any(), Mockito.<AclPermission>any()))
                 .thenReturn(Mono.just(newPage));
-        Mockito.when(newPageService.findByBranchNameAndBasePageId(Mockito.any(), Mockito.any(), Mockito.any()))
+        Mockito.when(newPageService.findByBranchNameAndBasePageId(
+                        Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any()))
                 .thenReturn(Mono.just(newPage));
         Mockito.when(refactoringService.isNameAllowed(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any()))
                 .thenReturn(Mono.just(true));
@@ -280,7 +292,8 @@ public void testCreateCollection_validCollection_returnsPopulatedCollection() th
 
         Mockito.when(newPageService.findById(Mockito.any(), Mockito.<AclPermission>any()))
                 .thenReturn(Mono.just(newPage));
-        Mockito.when(newPageService.findByBranchNameAndBasePageId(Mockito.any(), Mockito.any(), Mockito.any()))
+        Mockito.when(newPageService.findByBranchNameAndBasePageId(
+                        Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any()))
                 .thenReturn(Mono.just(newPage));
         Mockito.when(refactoringService.isNameAllowed(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any()))
                 .thenReturn(Mono.just(true));
@@ -375,7 +388,8 @@ public void testUpdateUnpublishedActionCollection_withInvalidId_throwsError() th
         Mockito.when(actionCollectionRepository.findById(Mockito.anyString(), Mockito.<AclPermission>any()))
                 .thenReturn(Mono.empty());
 
-        Mockito.when(newPageService.findByBranchNameAndBasePageId(Mockito.any(), Mockito.any(), Mockito.any()))
+        Mockito.when(newPageService.findByBranchNameAndBasePageId(
+                        Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any()))
                 .thenReturn(Mono.just(newPage));
 
         Mockito.when(newPageService.findById(Mockito.any(), Mockito.<AclPermission>any()))
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationPageServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationPageServiceTest.java
index 4082dfce510e..9260c2672ec1 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationPageServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationPageServiceTest.java
@@ -472,7 +472,7 @@ public void verifyGetPagesBasedOnApplicationMode_ReturnsRigthNumberOfPages_Based
                 .assertNext(pages -> {
                     assertThat(pages.size()).isEqualTo(2);
                     Set<String> pageNames = pages.stream()
-                            .map(page -> page.getUnpublishedPage().getName())
+                            .map(page -> page.getPublishedPage().getName())
                             .collect(Collectors.toSet());
                     assertThat(pageNames).contains(pageName);
                     assertThat(pageNames).doesNotContain(unpublishedPageName);
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ConsolidatedAPIServiceImplTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ConsolidatedAPIServiceImplTest.java
index 00d38a0eebce..cddb33847c5b 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ConsolidatedAPIServiceImplTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ConsolidatedAPIServiceImplTest.java
@@ -222,9 +222,10 @@ public void testPageLoadResponseForViewMode() {
 
         NewPage mockNewPage = new NewPage();
         mockNewPage.setApplicationId("mockApplicationId");
+        mockNewPage.setId("mockPageId");
         doReturn(Mono.just(mockNewPage))
                 .when(spyNewPageService)
-                .findByBranchNameAndBasePageId(anyString(), anyString(), any());
+                .findByBranchNameAndBasePageId(anyString(), anyString(), any(), any());
 
         doReturn(Mono.just(List.of(mockNewPage)))
                 .when(spyApplicationPageService)
@@ -257,7 +258,7 @@ public void testPageLoadResponseForViewMode() {
 
         ActionViewDTO sampleActionViewDTO = new ActionViewDTO();
         sampleActionViewDTO.setName("sampleActionViewDTO");
-        doReturn(Flux.just(sampleActionViewDTO)).when(spyNewActionService).getActionsForViewMode(anyString());
+        doReturn(Flux.just(sampleActionViewDTO)).when(spyNewActionService).getActionsForViewModeByPageId(anyString());
 
         ActionCollectionViewDTO sampleActionCollectionViewDTO = new ActionCollectionViewDTO();
         sampleActionCollectionViewDTO.setName("sampleActionCollectionViewDTO");
@@ -267,7 +268,7 @@ public void testPageLoadResponseForViewMode() {
 
         Mono<ConsolidatedAPIResponseDTO> consolidatedInfoForPageLoad =
                 consolidatedAPIService.getConsolidatedInfoForPageLoad(
-                        "pageId", null, "branch", ApplicationMode.PUBLISHED);
+                        "pageId123", null, "branch", ApplicationMode.PUBLISHED);
         StepVerifier.create(consolidatedInfoForPageLoad)
                 .assertNext(consolidatedAPIResponseDTO -> {
                     assertNotNull(consolidatedAPIResponseDTO.getPublishedActions());
@@ -415,7 +416,7 @@ public void testPageLoadResponseForEditMode() {
         mockNewPage.setApplicationId("mockApplicationId");
         doReturn(Mono.just(mockNewPage))
                 .when(spyNewPageService)
-                .findByBranchNameAndBasePageId(anyString(), anyString(), any());
+                .findByBranchNameAndBasePageId(anyString(), anyString(), any(), any());
 
         doReturn(Mono.just(List.of(mockNewPage)))
                 .when(spyApplicationPageService)
@@ -720,7 +721,7 @@ public void testErrorResponseWhenAnonymousUserAccessPrivateApp() {
         when(mockProductAlertService.getSingleApplicableMessage())
                 .thenReturn(Mono.just(List.of(sampleProductAlertResponseDTO)));
 
-        when(mockNewPageRepository.findPageByBranchNameAndBasePageId(anyString(), anyString(), any()))
+        when(mockNewPageRepository.findPageByBranchNameAndBasePageId(anyString(), anyString(), any(), any()))
                 .thenReturn(Mono.empty());
         doReturn(Mono.empty())
                 .when(spyApplicationRepository)
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/NewPageServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/NewPageServiceTest.java
index 3edbf8233094..11237328ac62 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/NewPageServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/NewPageServiceTest.java
@@ -395,8 +395,8 @@ public void verifyCreateApplicationPagesDTO_ReturnsRightNumberOfPages_BasedOnVie
                 })
                 .verifyComplete();
 
-        Mono<ApplicationPagesDTO> viewModeTrueMono = newPageService.createApplicationPagesDTO(
-                applicationService.findById(applicationId).block(), allPages, true, true);
+        Mono<ApplicationPagesDTO> viewModeTrueMono = Mono.defer(() -> newPageService.createApplicationPagesDTO(
+                applicationService.findById(applicationId).block(), allPages, true, true));
 
         StepVerifier.create(viewModeTrueMono).verifyErrorSatisfies(error -> {
             assertThat(error).isInstanceOf(AppsmithException.class);
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/PageServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/PageServiceTest.java
index fc702317864c..3ec766f804c9 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/PageServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/PageServiceTest.java
@@ -863,7 +863,7 @@ public void clonePage_whenPageCloned_defaultIdsRetained() {
         final Mono<NewPage> pageMono = applicationPageService
                 .clonePage(page.getId())
                 .flatMap(pageDTO ->
-                        newPageService.findByBranchNameAndBasePageId(branchName, pageDTO.getId(), MANAGE_PAGES))
+                        newPageService.findByBranchNameAndBasePageId(branchName, pageDTO.getId(), MANAGE_PAGES, null))
                 .cache();
 
         Mono<List<NewAction>> actionsMono = pageMono.flatMapMany(
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 fe9647bf7dec..03b2cdd7105a 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
@@ -13,6 +13,7 @@
 import com.appsmith.server.domains.TenantConfiguration;
 import com.appsmith.server.domains.User;
 import com.appsmith.server.domains.UserData;
+import com.appsmith.server.domains.UserState;
 import com.appsmith.server.domains.Workspace;
 import com.appsmith.server.dtos.InviteUsersDTO;
 import com.appsmith.server.dtos.ResendEmailVerificationDTO;
@@ -39,6 +40,9 @@
 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.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.context.SecurityContext;
+import org.springframework.security.core.context.SecurityContextImpl;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.test.context.support.WithUserDetails;
 import org.springframework.test.annotation.DirtiesContext;
@@ -748,4 +752,61 @@ public void updateNameProficiencyAndUseCaseOfUser() {
                 })
                 .verifyComplete();
     }
+
+    private <I> Mono<I> runAs(Mono<I> input, User user, String password) {
+        log.info("Running as user: {}", user.getEmail());
+        return input.contextWrite((ctx) -> {
+            SecurityContext securityContext = new SecurityContextImpl(
+                    new UsernamePasswordAuthenticationToken(user, password, user.getAuthorities()));
+            return ctx.put(SecurityContext.class, Mono.just(securityContext));
+        });
+    }
+
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void testUpdateCurrentUser_shouldNotUpdatePolicies() {
+        String testName = "testUpdateName_shouldNotUpdatePolicies";
+        User user = new User();
+        user.setEmail(testName + "@test.com");
+        user.setPassword(testName);
+        User createdUser = userService.create(user).block();
+        Set<Policy> policies = createdUser.getPolicies();
+
+        assertThat(createdUser.getName()).isNull();
+        assertThat(createdUser.getPolicies()).isNotEmpty();
+
+        UserUpdateDTO updateUser = new UserUpdateDTO();
+        updateUser.setName("Test Name");
+
+        User userUpdatedPostNameUpdate = runAs(userService.updateCurrentUser(updateUser, null), createdUser, testName)
+                .block();
+
+        assertThat(userUpdatedPostNameUpdate.getName()).isEqualTo("Test Name");
+        userUpdatedPostNameUpdate.getPolicies().forEach(policy -> {
+            assertThat(policies).contains(policy);
+        });
+    }
+
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void testUpdateWithoutPermission_shouldUpdateChangedFields() {
+        String testName = "testUpdateWithoutPermission_shouldUpdateChangedFields";
+        User user = new User();
+        user.setEmail(testName + "@test.com");
+        user.setPassword(testName);
+        User createdUser = userService.create(user).block();
+        Set<Policy> policies = createdUser.getPolicies();
+
+        User update = new User();
+        update.setName("Test Name");
+        update.setState(UserState.ACTIVATED);
+        User updatedUser =
+                userService.updateWithoutPermission(createdUser.getId(), update).block();
+
+        assertThat(updatedUser.getName()).isEqualTo("Test Name");
+        assertThat(updatedUser.getState()).isEqualTo(UserState.ACTIVATED);
+        policies.forEach(policy -> {
+            assertThat(updatedUser.getPolicies()).contains(policy);
+        });
+    }
 }
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ApplicationServiceCETest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ApplicationServiceCETest.java
index 001452bb0588..f71b19257321 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ApplicationServiceCETest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ApplicationServiceCETest.java
@@ -19,6 +19,7 @@
 import com.appsmith.server.domains.ActionCollection;
 import com.appsmith.server.domains.Application;
 import com.appsmith.server.domains.ApplicationDetail;
+import com.appsmith.server.domains.ApplicationMode;
 import com.appsmith.server.domains.ApplicationPage;
 import com.appsmith.server.domains.Asset;
 import com.appsmith.server.domains.CustomJSLib;
@@ -62,6 +63,7 @@
 import com.appsmith.server.repositories.PermissionGroupRepository;
 import com.appsmith.server.repositories.PluginRepository;
 import com.appsmith.server.repositories.UserRepository;
+import com.appsmith.server.services.ConsolidatedAPIService;
 import com.appsmith.server.services.LayoutActionService;
 import com.appsmith.server.services.LayoutCollectionService;
 import com.appsmith.server.services.PermissionGroupService;
@@ -124,6 +126,7 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 import static com.appsmith.server.acl.AclPermission.CONNECT_TO_GIT;
@@ -289,6 +292,9 @@ public class ApplicationServiceCETest {
     @Autowired
     private AssetRepository assetRepository;
 
+    @Autowired
+    private ConsolidatedAPIService consolidatedAPIService;
+
     private <I> Mono<I> runAs(Mono<I> input, User user) {
         log.info("Running as user: {}", user.getEmail());
         return input.contextWrite((ctx) -> {
@@ -1710,7 +1716,7 @@ public void cloneApplication_applicationWithGitMetadata_success() {
 
         Mono<List<NewPage>> srcNewPageListMono = Flux.fromIterable(gitConnectedApp.getPages())
                 .flatMap(applicationPage -> newPageService.findByBranchNameAndBasePageId(
-                        branchName, applicationPage.getDefaultPageId(), READ_PAGES))
+                        branchName, applicationPage.getDefaultPageId(), READ_PAGES, null))
                 .collectList();
 
         StepVerifier.create(Mono.zip(clonedNewPageListMono, srcNewPageListMono))
@@ -4392,4 +4398,126 @@ public void findByWorkspaceIdAndDefaultApplicationsInRecentlyUsedOrder_invalidWo
                 })
                 .verify();
     }
+
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void testCacheEviction_whenPagesDeletedInEditModeFollowedByAppPublish_shouldInvalidateCache() {
+        // Step 1: Initialize the test application and page identifiers
+        Application testApplication = new Application();
+        String appName = "ApplicationServiceTest Publish Application Delete Page";
+        testApplication.setName(appName);
+        AtomicReference<String> basePageId1Ref = new AtomicReference<>();
+        AtomicReference<String> basePageId2Ref = new AtomicReference<>();
+
+        // Step 2: Create an application with a page and publish it
+        Mono<Application> applicationMono = applicationPageService
+                .createApplication(testApplication, workspaceId)
+                .flatMap(application -> {
+                    // Step 2.1: Create a new page and set default layout
+                    PageDTO page = new PageDTO();
+                    page.setName("New Page");
+                    page.setApplicationId(application.getId());
+                    Layout defaultLayout = newPageService.createDefaultLayout();
+                    List<Layout> layouts = new ArrayList<>();
+                    layouts.add(defaultLayout);
+                    page.setLayouts(layouts);
+
+                    // Step 2.2: Create and clone the page, then publish the application
+                    return applicationPageService
+                            .createPage(page)
+                            .flatMap(page1 -> {
+                                basePageId1Ref.set(page1.getBaseId());
+                                return applicationPageService
+                                        .clonePage(page1.getId())
+                                        .flatMap(clonedPage -> {
+                                            basePageId2Ref.set(clonedPage.getId());
+                                            return applicationPageService.publish(page1.getApplicationId(), true);
+                                        });
+                            })
+                            .then(applicationService.findById(application.getId(), MANAGE_APPLICATIONS));
+                })
+                .cache();
+
+        // Step 3: Fetch the new page and verify its existence
+        PageDTO newPage = applicationMono
+                .flatMap(application -> newPageService
+                        .findByNameAndApplicationIdAndViewMode("New Page", application.getId(), READ_PAGES, false)
+                        .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, "page"))))
+                .block();
+
+        // Step 4: Assert that page IDs are not null
+        assertThat(basePageId1Ref.get()).isNotNull();
+        assertThat(basePageId2Ref.get()).isNotNull();
+
+        // Step 5: Delete the pages in edit mode
+        applicationPageService.deleteUnpublishedPage(basePageId1Ref.get()).block();
+        applicationPageService.deleteUnpublishedPage(basePageId2Ref.get()).block();
+
+        // Step 6: Verify basePageId1 is not cached before calling the consolidated API
+        String cachedBaseAppId1 = cacheableRepositoryHelper
+                .fetchBaseApplicationId(basePageId1Ref.get(), null)
+                .block();
+        assertThat(cachedBaseAppId1).isNull();
+
+        // Step 7: Call the consolidated API to force cache update
+        consolidatedAPIService
+                .getConsolidatedInfoForPageLoad(basePageId1Ref.get(), null, null, ApplicationMode.PUBLISHED)
+                .block();
+
+        // Step 8: Verify basePageId1 is now cached after the consolidated API call
+        cachedBaseAppId1 = cacheableRepositoryHelper
+                .fetchBaseApplicationId(basePageId1Ref.get(), null)
+                .block();
+        assertThat(cachedBaseAppId1).isNotNull();
+
+        // Step 9: Verify basePageId2 is not cached before calling the consolidated API
+        String cachedBaseAppId2 = cacheableRepositoryHelper
+                .fetchBaseApplicationId(basePageId2Ref.get(), null)
+                .block();
+        assertThat(cachedBaseAppId2).isNull();
+
+        // Step 10: Call the consolidated API to force cache update for basePageId2
+        consolidatedAPIService
+                .getConsolidatedInfoForPageLoad(basePageId2Ref.get(), null, null, ApplicationMode.PUBLISHED)
+                .block();
+
+        // Step 11: Verify basePageId2 is now cached after the consolidated API call
+        cachedBaseAppId2 = cacheableRepositoryHelper
+                .fetchBaseApplicationId(basePageId2Ref.get(), null)
+                .block();
+        assertThat(cachedBaseAppId2).isNotNull();
+
+        // Step 12: Verify the application pages after deletion and publishing
+        ApplicationPage applicationPage = new ApplicationPage();
+        applicationPage.setId(newPage.getId());
+        applicationPage.setIsDefault(false);
+        applicationPage.setDefaultPageId(newPage.getId());
+
+        StepVerifier.create(applicationService.findById(newPage.getApplicationId(), MANAGE_APPLICATIONS))
+                .assertNext(editedApplication -> {
+                    // Step 12.1: Check the published pages and edited pages
+                    List<ApplicationPage> publishedPages = editedApplication.getPublishedPages();
+                    assertThat(publishedPages).size().isEqualTo(3);
+                    assertThat(publishedPages).containsAnyOf(applicationPage);
+
+                    List<ApplicationPage> editedApplicationPages = editedApplication.getPages();
+                    assertThat(editedApplicationPages).hasSize(1);
+                    assertThat(editedApplicationPages).doesNotContain(applicationPage);
+                })
+                .verifyComplete();
+
+        // Step 13: Publish the application again
+        applicationPageService.publish(newPage.getApplicationId(), true).block();
+
+        // Step 14: Verify that the cache entries for deleted pages are evicted
+        cachedBaseAppId1 = cacheableRepositoryHelper
+                .fetchBaseApplicationId(basePageId1Ref.get(), null)
+                .block();
+        assertThat(cachedBaseAppId1).isNull();
+
+        cachedBaseAppId2 = cacheableRepositoryHelper
+                .fetchBaseApplicationId(basePageId2Ref.get(), null)
+                .block();
+        assertThat(cachedBaseAppId2).isNull();
+    }
 }
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/CreateDBTablePageSolutionTests.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/CreateDBTablePageSolutionTests.java
index ae1af27a4609..5ebba1803e6a 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/CreateDBTablePageSolutionTests.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/CreateDBTablePageSolutionTests.java
@@ -367,7 +367,7 @@ public void createPage_withValidBranch_validDefaultIds() {
                 .flatMap(savedPage ->
                         solution.createPageFromDBTable(savedPage.getId(), resource, testDefaultEnvironmentId))
                 .flatMap(crudPageResponseDTO -> newPageService.findByBranchNameAndBasePageId(
-                        gitData.getBranchName(), crudPageResponseDTO.getPage().getId(), READ_PAGES));
+                        gitData.getBranchName(), crudPageResponseDTO.getPage().getId(), READ_PAGES, null));
 
         StepVerifier.create(resultMono.zipWhen(newPage1 -> getActions(newPage1.getId())))
                 .assertNext(tuple -> {
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/DatasourceTriggerSolutionTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/DatasourceTriggerSolutionTest.java
index 1304acc6874c..6ad83290dcd3 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/DatasourceTriggerSolutionTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/DatasourceTriggerSolutionTest.java
@@ -199,4 +199,65 @@ public void datasourceTriggerTest() {
                 })
                 .verifyComplete();
     }
+
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void datasourceTriggerTest_should_return_collections_inorder() {
+        Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any()))
+                .thenReturn(Mono.just(new MockPluginExecutor()));
+
+        DatasourceStructure.Column[] table1Columns = {
+            new DatasourceStructure.Column("_id1", "ObjectId", null, true),
+            new DatasourceStructure.Column("age1", "Integer", null, false),
+            new DatasourceStructure.Column("dob1", "Date", null, false),
+            new DatasourceStructure.Column("gender1", "String", null, false),
+            new DatasourceStructure.Column("luckyNumber1", "Long", null, false),
+            new DatasourceStructure.Column("name1", "String", null, false),
+            new DatasourceStructure.Column("netWorth1", "BigDecimal", null, false),
+            new DatasourceStructure.Column("updatedByCommand1", "Object", null, false),
+        };
+
+        DatasourceStructure.Table table1 =
+                new DatasourceStructure.Table(TABLE, null, "TableSecond", List.of(table1Columns), null, null);
+
+        DatasourceStructure.Column[] table2Columns = {
+            new DatasourceStructure.Column("_id2", "ObjectId", null, true),
+            new DatasourceStructure.Column("age2", "Integer", null, false),
+            new DatasourceStructure.Column("dob2", "Date", null, false),
+            new DatasourceStructure.Column("gender2", "String", null, false),
+            new DatasourceStructure.Column("luckyNumber2", "Long", null, false),
+            new DatasourceStructure.Column("name2", "String", null, false),
+            new DatasourceStructure.Column("netWorth2", "BigDecimal", null, false),
+            new DatasourceStructure.Column("updatedByCommand2", "Object", null, false),
+        };
+
+        DatasourceStructure.Table table2 =
+                new DatasourceStructure.Table(TABLE, null, "TableFirst", List.of(table2Columns), null, null);
+
+        DatasourceStructure testStructure = new DatasourceStructure(List.of(table1, table2));
+
+        Mockito.when(datasourceStructureSolution.getStructure(Mockito.anyString(), Mockito.anyBoolean(), Mockito.any()))
+                .thenReturn(Mono.just(testStructure));
+
+        datasourceService
+                .findById(datasourceId, datasourcePermission.getReadPermission())
+                .block();
+        Mockito.doReturn(Mono.just(Boolean.TRUE)).when(featureFlagService).check(Mockito.any());
+
+        Mono<TriggerResultDTO> tableNameMono = datasourceTriggerSolution.trigger(
+                datasourceId,
+                defaultEnvironmentId,
+                new TriggerRequestDTO("ENTITY_SELECTOR", Map.of(), ClientDataDisplayType.DROP_DOWN));
+
+        StepVerifier.create(tableNameMono)
+                .assertNext(tablesResult -> {
+                    List<Map<String, String>> tables = (List<Map<String, String>>) tablesResult.getTrigger();
+
+                    assertEquals(2, tables.size());
+                    // Check the order of the tables
+                    assertEquals("TableFirst", tables.get(0).get("label"));
+                    assertEquals("TableSecond", tables.get(1).get("label"));
+                })
+                .verifyComplete();
+    }
 }
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/PolicySolutionCEImplTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/PolicySolutionCEImplTest.java
index 8adbefd23b62..fde23ba9fadb 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/PolicySolutionCEImplTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/PolicySolutionCEImplTest.java
@@ -32,6 +32,18 @@ private static class TestClass extends BaseDomain {
         TestClass() {}
     }
 
+    @Test
+    void testAddNewPoliciesToNullPoliciesObject() {
+        TestClass obj = new TestClass();
+        obj.setPolicies(null);
+        Map<String, Policy> policyMap = new HashMap<>();
+        policyMap.put("read", new Policy("read", new HashSet<>(Set.of("group1"))));
+
+        BaseDomain result = policySolution.addPoliciesToExistingObject(policyMap, obj);
+
+        assertTrue(result.getPolicies().containsAll(policyMap.values()));
+    }
+
     @Test
     void testAddNewPoliciesToEmptyObject() {
         BaseDomain obj = new TestClass(); // Assuming BaseDomain has a default empty set of policies.
diff --git a/app/server/reactive-caching/src/main/java/com/appsmith/caching/annotations/CacheEvict.java b/app/server/reactive-caching/src/main/java/com/appsmith/caching/annotations/CacheEvict.java
index 001aaa0b648a..7d307df03d8c 100644
--- a/app/server/reactive-caching/src/main/java/com/appsmith/caching/annotations/CacheEvict.java
+++ b/app/server/reactive-caching/src/main/java/com/appsmith/caching/annotations/CacheEvict.java
@@ -23,6 +23,13 @@
      */
     String key() default "";
 
+    /**
+     * Array of keys for which cache entries should be evicted.
+     * Can be used to specify multiple keys for bulk eviction.
+     * If empty, a single key can be derived from the method arguments.
+     */
+    String[] keys() default {};
+
     /**
      * Whether to evict all keys for a given cache name.
      */
diff --git a/app/server/reactive-caching/src/main/java/com/appsmith/caching/aspects/CacheAspect.java b/app/server/reactive-caching/src/main/java/com/appsmith/caching/aspects/CacheAspect.java
index 0ef5e9410e8a..7e489e64c5d9 100644
--- a/app/server/reactive-caching/src/main/java/com/appsmith/caching/aspects/CacheAspect.java
+++ b/app/server/reactive-caching/src/main/java/com/appsmith/caching/aspects/CacheAspect.java
@@ -11,6 +11,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.interceptor.SimpleKey;
 import org.springframework.expression.EvaluationContext;
+import org.springframework.expression.Expression;
 import org.springframework.expression.ExpressionParser;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
 import org.springframework.expression.spel.support.StandardEvaluationContext;
@@ -19,6 +20,7 @@
 import reactor.core.publisher.Mono;
 
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -201,6 +203,7 @@ public Object cacheEvict(ProceedingJoinPoint joinPoint) throws Throwable {
         CacheEvict annotation = method.getAnnotation(CacheEvict.class);
         String cacheName = annotation.cacheName();
         boolean all = annotation.all();
+        String[] keys = annotation.keys(); // Get the array of keys
         Class<?> returnType = method.getReturnType();
 
         if (!returnType.isAssignableFrom(Mono.class)) {
@@ -212,10 +215,55 @@ public Object cacheEvict(ProceedingJoinPoint joinPoint) throws Throwable {
             return cacheManager.evictAll(cacheName).then((Mono<?>) joinPoint.proceed());
         }
 
+        // Evict multiple keys
+        if (keys.length > 0) { // If there are specific keys, evict those
+            // Create a Flux from the array of keys and map each key to a Mono of eviction
+
+            // Create the expression parser and evaluation context
+            ExpressionParser parser = new SpelExpressionParser();
+            StandardEvaluationContext context = new StandardEvaluationContext();
+
+            // Bind method arguments to the context
+            String[] parameterNames = signature.getParameterNames();
+            List<Mono<Void>> evictionMonos = new ArrayList<>();
+            for (int i = 0; i < joinPoint.getArgs().length; i++) {
+                context.setVariable(parameterNames[i], joinPoint.getArgs()[i]);
+            }
+
+            // Evaluate each key expression
+            for (String keyExpression : keys) {
+                // Parse and evaluate the expression
+                Expression expression = parser.parseExpression(keyExpression);
+
+                Object keyObj = expression.getValue(context);
+
+                // Handle case where the key value is a List
+                if (keyObj instanceof List) {
+                    List<?> keyList = (List<?>) keyObj;
+                    for (Object key : keyList) {
+                        if (key != null) {
+                            evictionMonos.add(cacheManager.evict(cacheName, key.toString()));
+                        }
+                    }
+                } else {
+                    // Single key handling
+                    if (keyObj != null) {
+                        evictionMonos.add(cacheManager.evict(cacheName, keyObj.toString()));
+                    }
+                }
+            }
+            return Flux.fromIterable(evictionMonos)
+                    .flatMap(voidMono -> voidMono)
+                    .collectList()
+                    .then((Mono<?>) joinPoint.proceed());
+        }
+
+        // Evict single key
         // derive key
         String[] parameterNames = signature.getParameterNames();
         Object[] args = joinPoint.getArgs();
         String key = deriveKey(annotation.key(), parameterNames, args);
+
         // Evict key from the cache then call the original method
         return cacheManager.evict(cacheName, key).then((Mono<?>) joinPoint.proceed());
     }
diff --git a/contributions/ClientSetup.md b/contributions/ClientSetup.md
index 480ea1fc2387..0f8a4094b5ba 100644
--- a/contributions/ClientSetup.md
+++ b/contributions/ClientSetup.md
@@ -115,6 +115,28 @@ To setup the configurations for running integration tests via Cypress, use these
   yarn run setup
 ```
 
+**Prompt:**  
+ `Do you wish to continue without setting up the local server with docker? (yes/no):`
+
+**Options:**
+- **`no`:** Selecting "no" will trigger the setup of a local server using Docker with the `appsmith-ce:release` image.
+- **`yes`:** Selecting "yes" will skip the local server setup process.
+
+
+**Prompt:**  
+ `https://dev.appsmith.com is not accessible. Do you wish to continue without setting it up?  (yes/no):`
+
+**Options:**
+- **`no`:**  Simply close the process.
+- **`yes`:** Continue on the process for next stage
+
+**Prompt:**  
+ `TED (TestEventDriver) is not running. Do you want to pull & run the latest Docker container for TED (TestEventDriver)?  (yes/no):`
+
+**Options:**
+- **`no`:**  It will not create TED setup in local machine.
+- **`yes`:** Download the TED image and run the image for test purposes.
+
 ##### Running Cypress tests locally
 
 To run a specific test file in headless fashion, use the following command:
diff --git a/deploy/docker/fs/etc/supervisor/supervisord.conf b/deploy/docker/fs/etc/supervisor/supervisord.conf
index e3b341fca69e..21d4f98d696a 100644
--- a/deploy/docker/fs/etc/supervisor/supervisord.conf
+++ b/deploy/docker/fs/etc/supervisor/supervisord.conf
@@ -39,3 +39,9 @@ command = python3 -m supervisor.appsmith_supervisor_stdout
 buffer_size = 10000
 events = PROCESS_LOG
 result_handler = supervisor.appsmith_supervisor_stdout:event_handler
+stdout_logfile=%(ENV_APPSMITH_LOG_DIR)s/supervisor/access-supervisor-%(ENV_HOSTNAME)s.log
+stderr_logfile=%(ENV_APPSMITH_LOG_DIR)s/supervisor/error-supervisor-%(ENV_HOSTNAME)s.log
+stdout_logfile_maxbytes=10MB
+stderr_logfile_maxbytes=10MB
+stdout_logfile_backups=10
+stderr_logfile_backups=10
diff --git a/deploy/docker/fs/opt/appsmith/diagnostics.sh b/deploy/docker/fs/opt/appsmith/diagnostics.sh
new file mode 100644
index 000000000000..597e6f43da7c
--- /dev/null
+++ b/deploy/docker/fs/opt/appsmith/diagnostics.sh
@@ -0,0 +1,152 @@
+#!/usr/bin/env bash
+
+modified_within_last_x_minutes=180
+tail_lines=10000
+hostname=$(hostname)
+timestamp=$(date +%F_%H.%M.%S-%Z)
+tmpdir="${TMP}/$hostname/$timestamp"
+java_pid="$(pgrep -f -- "-jar\sserver.jar")"
+
+mkdir -p $tmpdir/{java,config,proc}
+
+#
+# Config info
+#
+
+# gather supervisord config
+cp -r /tmp/appsmith/supervisor-conf.d "$tmpdir/config/supervisor-conf.d"
+
+# gather caddy config
+cp /tmp/appsmith/Caddyfile "$tmpdir/config/Caddyfile"
+
+# gather env config
+/opt/appsmith/run-with-env.sh env > "$tmpdir/config/appsmith-env-config.txt"
+
+#
+# Log info
+#
+
+# gather the logs
+find /appsmith-stacks/logs/* -type f -mmin -"$modified_within_last_x_minutes" | while read -r i; do  
+    if [[ -e "$i" ]]; then  
+        mkdir -p "$tmpdir/$(dirname "${i:1}")"  
+        tail -"$tail_lines" "$i" > "$tmpdir/${i:1}"  
+    fi  
+done 
+
+#
+# App info
+#
+
+# gather the container-info
+cp /opt/appsmith/info.json "$tmpdir/container-info.json"
+
+# gather the infra-details
+cp /tmp/appsmith/infra.json "$tmpdir/infra-info.json"
+
+# gather the healthcheck
+/opt/appsmith/healthcheck.sh > "$tmpdir/healthcheck.txt"
+
+#
+# Java info
+#
+
+# gather the java vm.system_properties
+jcmd $java_pid VM.system_properties > "$tmpdir/java/vm.system_properties.txt"
+
+# gather the java vm.flags
+jcmd $java_pid VM.flags > "$tmpdir/java/vm.flags.txt"
+
+# gather the java gc.heap_dump
+jcmd $java_pid GC.heap_dump "$tmpdir/java/heap-dump.log"
+
+# gather the java thread.print
+jcmd $java_pid Thread.print > "$tmpdir/java/thread.print.txt"
+
+# gather the java gc.class_histogram
+jcmd $java_pid GC.class_histogram > "$tmpdir/java/gc.class_histogram.txt"
+
+#
+# System info
+#
+
+# gather the configured umask
+umask > "$tmpdir/umask.txt"
+
+# gather the system uptime
+uptime > "$tmpdir/uptime.txt"
+
+# gather information on CPU count and installed memory
+cp "/proc/cpuinfo" "$tmpdir/proc/cpuinfo"
+cp "/proc/meminfo" "$tmpdir/proc/meminfo"
+
+# gather running processes
+ps fauxww > "$tmpdir/ps_fauxww.txt"
+
+# gather free memory
+free -m > "$tmpdir/free_m.txt"
+
+# gather disk usage information
+df -h > "$tmpdir/df_h.txt"
+df -i > "$tmpdir/df_i.txt"
+df -k > "$tmpdir/df_k.txt"
+
+# gather uname
+uname -a > "$tmpdir/uname_a.txt"
+
+# gather memory info
+function memory_util ()
+{
+  
+  AVAILABLE_MEM=$(free -m | awk '/Mem/ {print $7}')
+  TOTAL_MEM=$(free -m | awk '/Mem/ {print $2}')
+
+  echo -e "........................................\nMEMORY UTILIZATION\n"
+  echo -e "Total Memory\t\t:$TOTAL_MEM MB"
+  echo -e "Available Memory\t:$AVAILABLE_MEM MB"
+  echo -e "Buffer+Cache Memory\t:$BUFFCACHE_MEM MB"
+  echo -e "Free Memory\t\t:$FREE_MEM MB"
+}
+
+memory_util > "$tmpdir/memory.txt"
+
+# gather cpu info
+function cpu_util ()
+{
+  # number of cpu cores
+  CORES=$(nproc)
+
+  # cpu load average of 15 minutes
+  LOAD_AVERAGE=$(uptime | awk '{print $10}')
+
+  echo -e "........................................\nCPU UTILIZATION\n"
+  echo -e "Number of Cores\t:$CORES\n"
+
+  echo -e "Total CPU Load Average for the past 15 minutes\t:$LOAD_AVERAGE\n"
+}
+
+cpu_util > "$tmpdir/cpu.txt"
+
+# gather disk info
+function disk_util ()
+{
+  DISK_USED=$(df -h | grep -w '/' | awk '{print $5}')
+  DISK_USED=$(printf %s "$DISK_USED" | tr -d '[=%=]')
+  DISK_AVAIL=$(( 100 - $DISK_USED ))
+
+  echo -e "........................................\nDISK UTILIZATION\n"
+  echo -e "Root(/) Used\t\t:$DISK_USED%"
+  echo -e "Root(/) Available\t:$DISK_AVAIL%\n"
+}
+
+disk_util > "$tmpdir/disk.txt"
+
+#
+# Create tarball and clean up 
+#
+
+tar -C "${tmpdir%/*/*}" -czpf "$hostname-$timestamp.tar.gz" "$hostname/$timestamp/"
+
+rm -rf "${tmpdir%/*/*}"
+
+echo "Diagnostics gathered in $PWD/$hostname-$timestamp.tar.gz"